Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r23715 -r23718
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 23715)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 23718)
@@ -4565,11 +4565,20 @@
 				recyclingApplication.setDepartCoding(departCoding);
 				recyclingApplication.setHandleDepartCoding((String)handleDepartMap.get("handleDepartCoding"));
 				recyclingApplication.setHandleDepart((String)handleDepartMap.get("handleDepart"));
-				recyclingApplication.setSettleAccountsDepart(depart);
+				//设置结算科室
+				String settleAccountsDepart = depart;
+				String settleAccountsDepartCoding = departCoding;
+				SupplyRoomConfig settleSupplyRoomConfig = supplyRoomConfigManager.getApplyDepartDefaultSettleDepart(departCoding);
+				if(settleSupplyRoomConfig != null){
+					settleAccountsDepart = settleSupplyRoomConfig.getOrgUnitName();
+					settleAccountsDepartCoding = settleSupplyRoomConfig.getOrgUnitCoding();
+				}
+				recyclingApplication.setSettleAccountsDepart(settleAccountsDepart);
+				recyclingApplication.setSettleAccountsDepartCoding(settleAccountsDepartCoding);
+				
 				recyclingApplication.setOperationRoom(operationRoom);
 				recyclingApplication.setOrSpelling(GB2Alpha.string2Alpha(operationRoom));
 				recyclingApplication.setOrWBCode(GB2WB.getWBCode(operationRoom));
-				recyclingApplication.setSettleAccountsDepartCoding(departCoding);
 				recyclingApplication.setSequence(supplyRoomConfigManager.getOrgUnitSequence(departCoding));
 				recyclingApplication.setReaders(";ORGUNIT_"
 						+ recyclingApplication.getDepartCoding() + ";");
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r23715 -r23718
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 23715)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 23718)
@@ -1988,27 +1988,7 @@
 				
 				//设置结算科室
 				var settleAccountsDepart = action.result.data.settleAccountsDepart;
-				//simon-add:根据申请科室编码查找此申请科室设置的默认结算科室；如果没有配置默认的结算科室，那么结算科室默认显示为可结算的申请科室
-				top.Ext4.getCmp("settleAccountsDepart").setValue(settleAccountsDepart);
-				DWREngine.setAsync(false);
-				Ext4.Ajax.request({	
-					url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSupplyRoomConfigByCoding.do',
-					params : {'orgUnitCode':departCoding,'type':3},
-					timeout : 600000,
-					success : function(response, options) {
-						var result= Ext4.JSON.decode(response.responseText);
-						
-						if(!isUndefinedOrNullOrEmpty(result.settleAccountsDepart)&&!isUndefinedOrNullOrEmpty(result.settleAccountsDepartCoding)){
-							top.Ext4.getCmp('settleAccountsDepart').setValue(result.settleAccountsDepart);	
-							top.Ext4.getCmp('settleAccountsDepartCoding').setValue(result.settleAccountsDepartCoding);
-						}
-					},
-					failure : function(response, opts) {
-						showResult(response.responseText);
-					}
-				});
-				DWREngine.setAsync(true);
-				
+
 				//设置性别
 				var patientSex = action.result.data.patientSex;
 				top.Ext4.getCmp("patientSex").setValue(patientSex);