Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r21064 -r21077
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 21064)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 21077)
@@ -584,6 +584,14 @@
                 	id :'mergeTousseRuleForInvoiceBatchPrint',
                 	name :'mergeTousseRuleForInvoiceBatchPrint'
                 },{
+                  	xtype:'hidden',
+                	id :'ftApplyDepartment',
+                	name :'ftApplyDepartment'
+                },{
+                  	xtype:'hidden',
+                	id :'ftApplyDepartmentCode',
+                	name :'ftApplyDepartmentCode'
+                },{
 					xtype : "fieldset",
 					title : '系统参数设置',
 					layout:'column',
@@ -1205,6 +1213,46 @@
 									triggerAction : 'all',
 									anchor : '100%'
 		             		  }]
+		             	  },{
+		             		  layout:'form',
+		             		  labelWidth : 180,
+		             		  columnWidth: .25,
+		             		  hidden: !sstsConfig.enableForeignTousseApplyDepartment,
+		             		  items:[{
+		             			  	xtype : 'combo',
+		             			  	fieldLabel : '外来器械默认申请科室',
+									id : 'ftApplyDepartmentCombo',
+									name : 'ftApplyDepartmentCombo',
+									valueField : 'departmentCode',
+									displayField : 'departmentName',
+									store : new Ext.data.Store({
+										proxy : new Ext.data.HttpProxy({
+											url : WWWROOT + '/systemmanage/orgUnit/searchApplyDepartmentByKeyWord.do',
+											method : 'POST'
+										}),
+										reader : new Ext.data.JsonReader({
+											root : 'data',
+											totalProperty : 'totalCount'
+										},[
+										    {name : 'departmentCode',mapping : 'departmentCode'}, 
+										    {name : 'departmentName',mapping : 'departmentName'}
+										  ]
+										)
+									}),
+									forceSelection : true,
+									listWidth:150,
+									minChars : 0,
+									queryParam : 'spell',
+									allowBlank : true,
+									triggerAction : 'all',
+									anchor : '100%',
+									listeners: {
+										select: function(combo, record, index) {
+											Ext.getCmp('ftApplyDepartment').setValue(record.data.departmentName);
+											Ext.getCmp('ftApplyDepartmentCode').setValue(record.data.departmentCode);
+										}
+									}
+		             		  }]
 		             	  }
 					]
                 },
@@ -2408,6 +2456,14 @@
             		var dptCodeOfForeignTousse = Ext.getCmp("dptCodeOfForeignTousse").getValue();
             		var dptNameOfForeignTousse = Ext.getCmp("dptNameOfForeignTousse").getValue();
             		var ftDefaultSterilingMethod = Ext.getCmp("ftDefaultSterilingMethod").getValue();
+            		//外来器械默认申请科室
+            		var ftApplyDepartment = '';
+            		var ftApplyDepartmentCode = '';
+            		if (Ext.getCmp("ftApplyDepartmentCombo").getRawValue()) {
+            			ftApplyDepartment = Ext.getCmp("ftApplyDepartment").getValue();
+            			ftApplyDepartmentCode = Ext.getCmp("ftApplyDepartmentCode").getValue();
+            		}
+            		
             		var ftDefaultPackageType = Ext.getCmp("ftDefaultPackageType").getValue();
             		var isORAppFormMerge = Ext.getCmp("isORAppFormMerge").getValue();
             		var isDgConvertApplication = Ext.getCmp("isDgConvertApplication").getValue();
@@ -2461,6 +2517,8 @@
 	                    	foreignTousseCleanedEntirely:foreignTousseCleanedEntirely,//
 	                    	foreignTousseNeedReview:foreignTousseNeedReview,//
 	                    	ftDefaultSterilingMethod:ftDefaultSterilingMethod,//
+	                    	ftApplyDepartment:ftApplyDepartment,//
+	                    	ftApplyDepartmentCode:ftApplyDepartmentCode,//
 	                    	ftDefaultPackageType:ftDefaultPackageType,//
 	                    	idCardPrice : idCardPrice,//
 	                    	invoiceOrigin : invoiceOrigin,//
@@ -2664,6 +2722,12 @@
 			if(supplyRoomConfig.ftDefaultSterilingMethod!=null){
 				  Ext.getCmp('ftDefaultSterilingMethod').setValue(supplyRoomConfig.ftDefaultSterilingMethod);
 			}
+			//外来器械默认申请科室
+			if(supplyRoomConfig.ftApplyDepartmentCode!=null){
+				Ext.getCmp('ftApplyDepartment').setValue(supplyRoomConfig.ftApplyDepartment);
+				Ext.getCmp('ftApplyDepartmentCode').setValue(supplyRoomConfig.ftApplyDepartmentCode);
+				Ext.getCmp('ftApplyDepartmentCombo').setValue(supplyRoomConfig.ftApplyDepartment);
+			}
 			if(supplyRoomConfig.ftDefaultPackageType!=null){
 				  Ext.getCmp('ftDefaultPackageType').setValue(supplyRoomConfig.ftDefaultPackageType);
 			}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r21064 -r21077
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 21064)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 21077)
@@ -835,6 +835,13 @@
 		supplyRoomConfig.setForeignTousseNeedReview(foreignTousseNeedReview);
 		String ftDefaultSterilingMethod = rq.getParameter("ftDefaultSterilingMethod");
 		supplyRoomConfig.setFtDefaultSterilingMethod(ftDefaultSterilingMethod);
+		
+		//外来器械默认申请科室
+		String ftApplyDepartment = rq.getParameter("ftApplyDepartment");
+		String ftApplyDepartmentCode = rq.getParameter("ftApplyDepartmentCode");
+		supplyRoomConfig.setFtApplyDepartment(ftApplyDepartment);
+		supplyRoomConfig.setFtApplyDepartmentCode(ftApplyDepartmentCode);
+		
 		String ftDefaultPackageType = rq.getParameter("ftDefaultPackageType");
 		supplyRoomConfig.setFtDefaultPackageType(ftDefaultPackageType);
 		// 同步修改外来器械包定义的是否审核属性
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r21064 -r21077
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 21064)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 21077)
@@ -74,6 +74,16 @@
 	
 	private String ftDefaultPackageType; //外来器械默认的包装类型
 	
+	/**
+	 * 外来器械包默认申请科室
+	 */
+	private String ftApplyDepartment;
+	
+	/**
+	 * 外来器械包默认申请科室编码
+	 */
+	private String ftApplyDepartmentCode;
+	
 	private String isCustomTousseCleanEntirely = STR_YES;
 	
 	private Integer registrationCertificationExpTime; //供应商注册证预警期
@@ -659,5 +669,21 @@
 			Integer registrationCertificationExpTime) {
 		this.registrationCertificationExpTime = registrationCertificationExpTime;
 	}
+
+	public String getFtApplyDepartment() {
+		return ftApplyDepartment;
+	}
+
+	public void setFtApplyDepartment(String ftApplyDepartment) {
+		this.ftApplyDepartment = ftApplyDepartment;
+	}
+
+	public String getFtApplyDepartmentCode() {
+		return ftApplyDepartmentCode;
+	}
+
+	public void setFtApplyDepartmentCode(String ftApplyDepartmentCode) {
+		this.ftApplyDepartmentCode = ftApplyDepartmentCode;
+	}
 	
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/dwr/table/SupplyRoomConfigTableManager.java
===================================================================
diff -u -r19493 -r21077
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/dwr/table/SupplyRoomConfigTableManager.java	(.../SupplyRoomConfigTableManager.java)	(revision 19493)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/dwr/table/SupplyRoomConfigTableManager.java	(.../SupplyRoomConfigTableManager.java)	(revision 21077)
@@ -1,5 +1,7 @@
 package com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.dwr.table;
 
+import net.sf.json.JSONObject;
+
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
@@ -130,4 +132,20 @@
 		}
 	}
 	
+	/**
+	 * 获取外来器械包默认申请科室.
+	 * @param 
+	 * @return返回值格式{ftApplyDepartment:'外来器械包默认申请科室名称',ftApplyDepartmentCode:'外来器械包默认申请科室编码'}
+	 */
+	public String getFtApplyDepartment(){
+		SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj();
+		if(config != null){
+			JSONObject obj = new JSONObject();
+			obj.put("ftApplyDepartment", config.getFtApplyDepartment());
+			obj.put("ftApplyDepartmentCode", config.getFtApplyDepartmentCode());
+			return obj.toString();
+		}
+		return "";
+	}
+	
 }
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r20658 -r21077
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 20658)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 21077)
@@ -1825,13 +1825,32 @@
 			}
 		});
 	}else{
-		// 1、首先取config里面的配置，没有配置才设置为当前登录科室的
+		// 1、默认的申请科室和结算科室，首先取科室供应室配置的，再取config里面的配置，都没有取到才设置为当前登录科室的
 		var depart = $Id('depart').value;
 		var departCoding = $Id('departCoding').value;
 		var appDepart = depart;
-		var settleAccountsDepart = depart;
 		var appDepartCode = departCoding;
+		var settleAccountsDepart = depart;
 		var settleAccountsDepartCode = departCoding;
+		
+		if (sstsConfig.enableForeignTousseApplyDepartment) {
+			DWREngine.setAsync(false);
+			SupplyRoomConfigTableManager.getFtApplyDepartment(function(result){
+				var data = JSON.parse(result);
+				if (!isUndefinedOrNullOrEmpty(data)) {
+					var ftApplyDepartment = data.ftApplyDepartment;
+					var ftApplyDepartmentCode = data.ftApplyDepartmentCode;
+					if (ftApplyDepartment && ftApplyDepartmentCode) {
+						appDepart = ftApplyDepartment;
+						appDepartCode = ftApplyDepartmentCode;
+						settleAccountsDepart = ftApplyDepartment;
+						settleAccountsDepartCode = ftApplyDepartmentCode;
+					}
+				}
+			});
+			DWREngine.setAsync(true);
+		}
+		
 		var foreignTousseAppliationDefaultDepartment = getObjValueFromJs('sstsConfig.foreignTousseAppliationDefaultDepartment',null);
 		if(!isUndefinedOrNullOrEmpty(foreignTousseAppliationDefaultDepartment)){
 			var departCfg = foreignTousseAppliationDefaultDepartment[appDepartCode];
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r20969 -r21077
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 20969)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 21077)
@@ -89,6 +89,8 @@
   expandAddTousseGroupInAndroidSterileView : true,
   //是否显示灭菌员发货按钮(true为显示,false或者不配置都不显示)
   showSterilizerDelivery : true,
+  //是否外来器械默认申请科室配置(true为启用,false或者不配置都不启用)
+  enableForeignTousseApplyDepartment: true,
   //是否启用手术预约功能(true为启,false或者不配置都不启用)
   enableOperationReservation:true,
   //手术预约科室名称