Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r25799 -r25806
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 25799)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 25806)
@@ -962,8 +962,9 @@
 		//6)自定义器械包打印科室来源
 		supplyRoomConfig.setCtPrintOrgSource(ctPrintOrgSource);
         //7)自定义器械包是否回收
-		String customTousseNeedRecycle = StrutsParamUtils.getPraramValue("customTousseNeedRecycle", Constants.STR_YES);
-		supplyRoomConfig.setCustomTousseNeedRecycle(customTousseNeedRecycle);
+//		String customTousseNeedRecycle = StrutsParamUtils.getPraramValue("customTousseNeedRecycle", Constants.STR_YES);
+		//固定为'是'
+		supplyRoomConfig.setCustomTousseNeedRecycle(Constants.STR_YES);
 		/************/
 	    
 		supplyRoomConfigManager.save(supplyRoomConfig);
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r25790 -r25806
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 25790)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 25806)
@@ -1558,7 +1558,7 @@
 								 triggerAction : 'all',
 								 anchor : '100%'
 						   }]
-						}, {
+						}/* , {
 							layout:'form',
 							labelWidth : 180,
 							columnWidth: .25,
@@ -1580,7 +1580,7 @@
 									 triggerAction : 'all',
 									 anchor : '100%'
 							}]
-						},{
+						} */,{
 							columnWidth : .25,
 							layout : 'form',
 							labelWidth : 180,
@@ -2778,7 +2778,7 @@
             		var ctDefaultSterilingMethod = Ext.getCmp("ctDefaultSterilingMethod").getValue();//自定义器械包默认灭菌程序
             		var ctBarcodePaperType = Ext.getCmp("ctBarcodePaperType").getValue();//自定义器械包打印标签
             		var ctPrintOrgSource = Ext.getCmp("ctPrintOrgSource").getValue();//自定义器械包打印科室来源
-            		var customTousseNeedRecycle = Ext.getCmp("customTousseNeedRecycle").getValue();//自定义器械包是否回收
+            		// var customTousseNeedRecycle = Ext.getCmp("customTousseNeedRecycle").getValue();//自定义器械包是否回收
             		var fTHandleDepartAndTaskGroup = Ext.getCmp("fTHandleDepartAndTaskGroup").getValue();
             		var ftDefaultSterilingMethod = Ext.getCmp("ftDefaultSterilingMethod").getValue();
             		
@@ -2840,7 +2840,7 @@
 	                    	ctDefaultSterilingMethod : ctDefaultSterilingMethod,//自定义器械包默认灭菌程序
 	                    	ctBarcodePaperType : ctBarcodePaperType,//自定义器械包默认打印标签
 	                    	ctPrintOrgSource : ctPrintOrgSource,//自定义器械包打印科室来源
-	                    	customTousseNeedRecycle : customTousseNeedRecycle,//自定义器械包是否回收
+	                    	// customTousseNeedRecycle : customTousseNeedRecycle,//自定义器械包是否回收
 	                    	customToussePrice : customToussePrice,//
 	                    	dayStartTime : dayStartTime,//
 	                    	disposableGoodsExpTime : disposableGoodsExpTime,//
@@ -2959,9 +2959,9 @@
 			if(supplyRoomConfig.ctPrintOrgSource != null) {//自定义器械包打印科室来源
 		  		Ext.getCmp('ctPrintOrgSource').setValue(supplyRoomConfig.ctPrintOrgSource);
 		  	}
-			if(supplyRoomConfig.customTousseNeedRecycle != null) {//自定义器械包是否回收
-		  		Ext.getCmp('customTousseNeedRecycle').setValue(supplyRoomConfig.customTousseNeedRecycle);
-		  	}
+			// if(supplyRoomConfig.customTousseNeedRecycle != null) {//自定义器械包是否回收
+		  	// 	Ext.getCmp('customTousseNeedRecycle').setValue(supplyRoomConfig.customTousseNeedRecycle);
+		  	// }
 		  	if(supplyRoomConfig.invoiceOrigin!=null){
 				  Ext.getCmp('invoiceOrigin').setValue(supplyRoomConfig.invoiceOrigin);
 			}