Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r26390 -r26528
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 26390)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 26528)
@@ -1538,7 +1538,29 @@
 					    		  triggerAction : 'all',
 					    		  anchor : '100%'
 					    	  }]
-					      }
+					      },{
+		             		  layout:'form',
+		             		  labelWidth : 180,
+		             		  columnWidth: .25,
+		             		  items:[{
+										xtype : 'combo',
+										fieldLabel : '外来器械是否二次回收',
+										id : 'foreignTousseIsSecondRecycle',
+										name : 'foreignTousseIsSecondRecycle',
+										valueField : 'value',
+										displayField : 'value',
+										mode : 'local',
+										anchor : '100%',
+										editable : false,
+										store : new Ext.data.SimpleStore( {
+											fields : [ 'value'],
+											data : [['是'],['否']]
+										}),
+										forceSelection : true,
+										allowBlank : false,
+										triggerAction : 'all'
+		             		  }]
+		             	  }
 		             	  
 					]
                 },
@@ -2835,6 +2857,7 @@
         				showResult('外来器械包是否审核不能为空！');
         				return false;
         			}
+					var foreignTousseIsSecondRecycle = Ext.getCmp("foreignTousseIsSecondRecycle").getRawValue();					
             		var barcodePaperType = Ext.getCmp("barcodePaperType").getValue();
             		if(barcodePaperType == ""){
         				showResult('外来器械包打印标签不能为空！');
@@ -2979,6 +3002,7 @@
 	                    	foreignToussePrice : foreignToussePrice,//
 	                    	foreignTousseCleanedEntirely:foreignTousseCleanedEntirely,//
 	                    	foreignTousseNeedReview:foreignTousseNeedReview,//
+							foreignTousseIsSecondRecycle:foreignTousseIsSecondRecycle,
 	                    	ftDefaultSterilingMethod:ftDefaultSterilingMethod,//
 	                    	ftPrintOrgSource:ftPrintOrgSource,
 	                    	ftPrintAmount:ftPrintAmount,
@@ -3244,7 +3268,8 @@
 			Ext.getCmp('mergeTousseRuleForInvoiceBatchPrintStr').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint);
 			Ext.getCmp('isCustomTousseCleanEntirely').setValue(supplyRoomConfig.isCustomTousseCleanEntirely);
 			Ext.getCmp('foreignTousseCleanedEntirely').setValue(supplyRoomConfig.foreignTousseCleanedEntirely);
-			Ext.getCmp('foreignTousseNeedReview').setValue(supplyRoomConfig.foreignTousseNeedReview);
+			Ext.getCmp('foreignTousseNeedReview').setValue(supplyRoomConfig.foreignTousseNeedReview); 
+			Ext.getCmp('foreignTousseIsSecondRecycle').setValue(supplyRoomConfig.foreignTousseIsSecondRecycle);
 			Ext.getCmp('ftPrintOrgSource').setValue(supplyRoomConfig.ftPrintOrgSource);
 			Ext.getCmp('ftPrintAmount').setValue(supplyRoomConfig.ftPrintAmount);
 			Ext.getCmp('ftPrintAmountSource').setValue(supplyRoomConfig.ftPrintAmountSource);