Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r15094 -r15098
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 15094)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 15098)
@@ -64,9 +64,9 @@
 
 	private String customTousseDefaultTaskGroup;// 自定义器械包默认装配组
 	
-	private String foreignTousseDefaultSterilingMethod; //外来器械默认的灭菌程序
+	private String ftDefaultSterilingMethod; //外来器械默认的灭菌程序
 	
-	private String foreignTousseDefaultPackageType; //外来器械默认的灭菌程序
+	private String ftDefaultPackageType; //外来器械默认的灭菌程序
 	
 	private String isCustomTousseCleanEntirely = STR_YES;
 
@@ -157,23 +157,21 @@
 	public void setId(Long id) {
 		this.id = id;
 	}
-	
-	public String getForeignTousseDefaultSterilingMethod() {
-		return foreignTousseDefaultSterilingMethod;
+
+	public String getFtDefaultSterilingMethod() {
+		return ftDefaultSterilingMethod;
 	}
 
-	public void setForeignTousseDefaultSterilingMethod(
-			String foreignTousseDefaultSterilingMethod) {
-		this.foreignTousseDefaultSterilingMethod = foreignTousseDefaultSterilingMethod;
+	public void setFtDefaultSterilingMethod(String ftDefaultSterilingMethod) {
+		this.ftDefaultSterilingMethod = ftDefaultSterilingMethod;
 	}
 
-	public String getForeignTousseDefaultPackageType() {
-		return foreignTousseDefaultPackageType;
+	public String getFtDefaultPackageType() {
+		return ftDefaultPackageType;
 	}
 
-	public void setForeignTousseDefaultPackageType(
-			String foreignTousseDefaultPackageType) {
-		this.foreignTousseDefaultPackageType = foreignTousseDefaultPackageType;
+	public void setFtDefaultPackageType(String ftDefaultPackageType) {
+		this.ftDefaultPackageType = ftDefaultPackageType;
 	}
 
 	public boolean isPrintUserFullName() {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r15094 -r15098
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 15094)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 15098)
@@ -1171,8 +1171,8 @@
                 		  items:[{
                 			  	xtype : 'combo',
 								fieldLabel : '外来器械默认灭菌程序',
-								id : 'foreignTousseDefaultSterilingMethod',
-								name : 'foreignTousseDefaultSterilingMethod',
+								id : 'ftDefaultSterilingMethod',
+								name : 'ftDefaultSterilingMethod',
 								valueField : 'typeName',
 								displayField : 'typeName',
 								store : sterilingTypeStore,
@@ -1190,8 +1190,8 @@
                 		  items:[{
                 			  	xtype : 'combo',
 								fieldLabel : '外来器械默认包装类型',
-								id : 'foreignTousseDefaultPackageType',
-								name : 'foreignTousseDefaultPackageType',
+								id : 'ftDefaultPackageType',
+								name : 'ftDefaultPackageType',
 								valueField : 'typeName',
 								displayField : 'typeName',
 								store : packageTypeStore,
@@ -1755,11 +1755,11 @@
 			}else{
 				Ext.getCmp('isTousseDgMergeConvert').setValue('否');
 			}
-			if(supplyRoomConfig.foreignTousseDefaultSterilingMethod!=null){
-				  Ext.getCmp('foreignTousseDefaultSterilingMethod').setValue(supplyRoomConfig.foreignTousseDefaultSterilingMethod);
+			if(supplyRoomConfig.ftDefaultSterilingMethod!=null){
+				  Ext.getCmp('ftDefaultSterilingMethod').setValue(supplyRoomConfig.ftDefaultSterilingMethod);
 			}
-			if(supplyRoomConfig.foreignTousseDefaultPackageType!=null){
-				  Ext.getCmp('foreignTousseDefaultPackageType').setValue(supplyRoomConfig.foreignTousseDefaultPackageType);
+			if(supplyRoomConfig.ftDefaultPackageType!=null){
+				  Ext.getCmp('ftDefaultPackageType').setValue(supplyRoomConfig.ftDefaultPackageType);
 			}
 			Ext.getCmp('mergeTousseRuleForInvoiceBatchPrint').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
 			Ext.getCmp('mergeTousseRuleForInvoiceBatchPrintStr').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r15094 -r15098
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 15094)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 15098)
@@ -1289,11 +1289,11 @@
 				}
 				// 如果是外来器械包，包装类型和灭菌程序为空，获取默认的
 				if(td.isForeignTousse() && supplyRoomConfig!= null){
-					String method = supplyRoomConfig.getForeignTousseDefaultSterilingMethod();
+					String method = supplyRoomConfig.getFtDefaultSterilingMethod();
 					if( !"无".equals(method) ){
 						itemVo.setSterilingMethod(method);
 					}
-					String pType = supplyRoomConfig.getForeignTousseDefaultPackageType();
+					String pType = supplyRoomConfig.getFtDefaultPackageType();
 					if( !"无".equals(pType) ){
 						itemVo.setPackageType(pType);
 					}
@@ -1326,11 +1326,11 @@
 					vo.setText(nodeText);
 					// 如果是外来器械包，包装类型和灭菌程序为空，获取默认的
 					if(td.isForeignTousse() && supplyRoomConfig!= null){
-						String method = supplyRoomConfig.getForeignTousseDefaultSterilingMethod();
+						String method = supplyRoomConfig.getFtDefaultSterilingMethod();
 						if( !"无".equals(method) ){
 							vo.setSterilingMethod(method);
 						}
-						String pType = supplyRoomConfig.getForeignTousseDefaultPackageType();
+						String pType = supplyRoomConfig.getFtDefaultPackageType();
 						if( !"无".equals(pType) ){
 							vo.setPackageType(pType);
 						}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r15094 -r15098
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 15094)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 15098)
@@ -722,10 +722,10 @@
 		supplyRoomConfig.setForeignTousseCleanedEntirely(rq.getParameter("foreignTousseCleanedEntirely"));
 		String foreignTousseNeedReview = StrutsParamUtils.getPraramValue("foreignTousseNeedReview", Constants.STR_YES);
 		supplyRoomConfig.setForeignTousseNeedReview(foreignTousseNeedReview);
-		String foreignTousseDefaultSterilingMethod = rq.getParameter("foreignTousseDefaultSterilingMethod");
-		supplyRoomConfig.setForeignTousseDefaultSterilingMethod(foreignTousseDefaultSterilingMethod);
-		String foreignTousseDefaultPackageType = rq.getParameter("foreignTousseDefaultPackageType");
-		supplyRoomConfig.setForeignTousseDefaultPackageType(foreignTousseDefaultPackageType);
+		String ftDefaultSterilingMethod = rq.getParameter("ftDefaultSterilingMethod");
+		supplyRoomConfig.setFtDefaultSterilingMethod(ftDefaultSterilingMethod);
+		String ftDefaultPackageType = rq.getParameter("ftDefaultPackageType");
+		supplyRoomConfig.setFtDefaultPackageType(ftDefaultPackageType);
 		// 同步修改外来器械包定义的是否审核属性
 		{
 			String sql = String.format("update %s set isReview='%s' where tousseType in('%s','%s')", TousseDefinition.class.getSimpleName(),foreignTousseNeedReview,TousseDefinition.PACKAGE_TYPE_FOREIGN,TousseDefinition.PACKAGE_TYPE_SPLIT);