Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.jsp
===================================================================
diff -u -r12331 -r14970
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.jsp	(.../routineMonitoringView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.jsp	(.../routineMonitoringView.jsp)	(revision 14970)
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %>
 
 <%
     request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
@@ -42,6 +43,10 @@
 <operation:authorize ifAnyGranted="SSTS_RoutineMonitoring_Review">
 SSTS_RoutineMonitoring_Review = false;
 </operation:authorize>
+
+var PACKAGE_TYPE_FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';
+var PACKAGE_TYPE_SPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>';
+
 </script>
 
 <input type="hidden" id="userName" value="${userName}">
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
===================================================================
diff -u -r14936 -r14970
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 14936)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 14970)
@@ -350,6 +350,10 @@
 						top.Ext.getCmp("material").getEl().up('.x-form-item').setDisplayed(false);
 						top.Ext.getCmp('amount').setVisible(false);   
 						top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(false);
+						top.Ext.getCmp('recycle').setVisible(true);   
+						top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(true);
+						top.Ext.getCmp('repacking').setVisible(true);   
+						top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(true);
 					}else if('材料' == result.data.scope){
 						top.Ext.getCmp("tousseName").setVisible(false);
 						top.Ext.getCmp("tousseName").getEl().up('.x-form-item').setDisplayed(false);
@@ -359,6 +363,15 @@
 						top.Ext.getCmp("material").getEl().up('.x-form-item').setDisplayed(true);
 						top.Ext.getCmp('amount').setVisible(true);   
 						top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(true);
+						top.Ext.getCmp('recycle').setVisible(false);   
+						top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(false);
+						top.Ext.getCmp('repacking').setVisible(false);   
+						top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(false);
+					}else{
+						top.Ext.getCmp('recycle').setVisible(false);   
+						top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(false);
+						top.Ext.getCmp('repacking').setVisible(false);   
+						top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(false);
 					}
 					for(var i = 0 ; result.data.items && i< result.data.items.length ; i++){
 						if(top.Ext.getCmp('optionAmount').getValue() == null || top.Ext.getCmp('optionAmount').getValue() == ''){
@@ -403,6 +416,7 @@
 				if(top.Ext.getCmp('resultFieldSet')){
 					top.Ext.getCmp('resultFieldSet').doLayout();
 				}
+				resetRecycleAndRepackingValue();
 			}
 		},
 		failure : function(response, options) {
@@ -864,6 +878,14 @@
 				id : 'tousseDefinitionId'
 			},{
 				xtype : 'hidden',
+				name : 'tousseType',
+				id : 'tousseType'
+			},{
+				xtype : 'hidden',
+				name : 'barcode',
+				id : 'barcode'
+			},{
+				xtype : 'hidden',
 				name : 'scope',
 				id : 'scope'
 			},{
@@ -885,6 +907,18 @@
 				name : 'qualityMonitoringItems',
 				id : 'qualityMonitoringItems'
 			},{
+				xtype:'hidden',
+				name:'isRecycle',
+				id:'isRecycle'
+			},{
+				xtype:'hidden',
+				name:'tousseDefRecycling',
+				id:'tousseDefRecycling'
+			},{
+				xtype:'hidden',
+				name:'isRepacking',
+				id:'isRepacking'
+			},{
 				layout : 'form',
 				columnWidth : .5,
 				labelWidth : 90,
@@ -922,7 +956,49 @@
 					allowBlank : false,
 					anchor : '95%'
 				}]
-			}, {
+			},{
+	        	layout : 'form',
+				columnWidth : .5,
+				labelWidth : 90,
+				items : [{
+					id : 'recycle',
+					name : 'recycle',
+					fieldLabel :  '重新回收',
+					xtype : 'checkbox',
+					inputValue :  '重新回收',
+					listeners:{
+						check:function( thiz, checked ){
+							if(checked){
+								top.Ext.getCmp('isRecycle').setValue('是');
+								top.Ext.getCmp('repacking').setValue(false);
+							}else{
+								top.Ext.getCmp('isRecycle').setValue('否');
+							}
+						}
+					}
+				}]
+			},{
+	        	layout : 'form',
+				columnWidth : .5,
+				labelWidth : 90,
+				items : [{
+					id : 'repacking',
+					name : 'repacking',
+					fieldLabel :  '重新装配',
+					xtype : 'checkbox',
+					inputValue :  '重新装配',
+					listeners:{
+						check:function( thiz, checked ){
+							if(checked){
+								top.Ext.getCmp('isRepacking').setValue('是');
+								top.Ext.getCmp('recycle').setValue(false);
+							}else{
+								top.Ext.getCmp('isRepacking').setValue('否');
+							}
+						}
+					}
+				}]
+			},{
 				layout : 'form',
 				columnWidth : .5,
 				labelWidth : 90,
@@ -1118,6 +1194,26 @@
 							});
 						}
 					}
+					if('是'==result.data.isRecycle){
+						top.Ext.getCmp('isRecycle').setValue(result.data.isRecycle);
+						top.Ext.getCmp('isRepacking').setValue('否');
+						
+						top.Ext.getCmp('recycle').setValue(true);
+						top.Ext.getCmp('repacking').setValue(false);
+					}else if('是'==result.data.isRepacking){
+						top.Ext.getCmp('isRecycle').setValue('否');
+						top.Ext.getCmp('isRepacking').setValue(result.data.isRepacking);
+						
+						top.Ext.getCmp('recycle').setValue(false);
+						top.Ext.getCmp('repacking').setValue(true);
+					}else{
+						top.Ext.getCmp('isRecycle').setValue('否');
+						top.Ext.getCmp('isRepacking').setValue('否');
+						
+						top.Ext.getCmp('recycle').setValue(false);
+						top.Ext.getCmp('repacking').setValue(false);
+					}
+					
 					if('器械包' == result.data.scope){
 						top.Ext.getCmp("tousseName").setVisible(true);
 						top.Ext.getCmp("tousseName").getEl().up('.x-form-item').setDisplayed(true);
@@ -1256,6 +1352,12 @@
 					}
 					top.Ext.getCmp('resultColumn').doLayout();
 					top.Ext.getCmp('qualityMonitoringsColumn').doLayout();
+					
+					//打开已有质量监测记录,器械包条码，器械包名称，重新回收和重新装配都禁用掉,不能再修改
+					top.Ext.getCmp('recycle').disable();
+					top.Ext.getCmp('repacking').disable();
+					top.Ext.getCmp('tempBarcode').disable();
+					top.Ext.getCmp('tousseName').disable();
 				}else{
 					showResult("找不到该条码所对应的器械包实例");
 				}
@@ -1265,10 +1367,58 @@
 			}
 		});
 	}else{
+		disableRecycleAndRepacking();
 		inspectItemStore.load();
 	}
 }
 
+function updateControlStatus(){
+	var tousseType = top.Ext.getCmp('tousseType').getValue();
+	var tousseInstanceId = top.Ext.getCmp('tousseInstanceId').getValue();
+	
+	if(tousseType==PACKAGE_TYPE_FOREIGN || tousseType==PACKAGE_TYPE_SPLIT){
+		disableRecycleAndRepacking();
+	}else if(isUndefinedOrNullOrEmpty(tousseInstanceId)){
+		disableRecycleAndRepacking();
+	}else{
+		enableRecycleAndRepacking();
+	}
+	var toussedefRecycling = top.Ext.getCmp('tousseDefRecycling').getValue();
+	if(!isUndefinedOrNullOrEmpty(toussedefRecycling)){
+		if(tousseType == '敷料包' || toussedefRecycling == '否'){
+			//敷料包或者是不回收的包，不能选择重新回收,只能选重新装配
+			top.Ext.getCmp('recycle').setValue(false);
+			top.Ext.getCmp('recycle').disable();
+		}else{
+			top.Ext.getCmp('recycle').enable();
+		}
+	}
+}
+/**
+ * 将重新回收和重新装配及是否整炉设置为未选种状态
+ */
+function resetRecycleAndRepackingValue(){
+	top.Ext.getCmp('isRecycle').setValue('');
+	top.Ext.getCmp('isRepacking').setValue('');
+	
+	top.Ext.getCmp('recycle').setValue(false);
+	top.Ext.getCmp('repacking').setValue(false);
+}
+//重置重新回收和重新装配
+function disableRecycleAndRepacking(){
+	top.Ext.getCmp('isRecycle').setValue('');
+	top.Ext.getCmp('isRepacking').setValue('');
+	top.Ext.getCmp('recycle').disable();
+	top.Ext.getCmp('repacking').disable();
+	
+	top.Ext.getCmp('recycle').setValue(false);
+	top.Ext.getCmp('repacking').setValue(false);
+}
+function enableRecycleAndRepacking(){
+	top.Ext.getCmp('recycle').enable();
+	top.Ext.getCmp('repacking').enable();
+}
+
 function getTousseInstanceNameAndResponsiblePerson(tempBarcode, inspectItem, materialDefinitionStore){
 	if(tempBarcode){
 		Ext.Ajax.request({
@@ -1280,7 +1430,9 @@
 					top.Ext.getCmp('tousseName').setValue(result.tousseName);
 					top.Ext.getCmp('barcode').setValue(tempBarcode);
 					top.Ext.getCmp('tousseInstanceId').setValue(result.tousseInstanceId);
-					top.Ext.getCmp('responsiblePerson').setValue(result.responsiblePerson);
+					top.Ext.getCmp('tousseType').setValue(result.tousseType);
+					top.Ext.getCmp('tousseDefRecycling').setValue(result.isRecycle);
+//					top.Ext.getCmp('responsiblePerson').setValue(result.responsiblePerson);
 					if(result.tousseDefinitionId){
 						top.Ext.getCmp('tousseDefinitionId').setValue(result.tousseDefinitionId);
 						if(materialDefinitionStore){
@@ -1289,6 +1441,7 @@
 					}else if(materialDefinitionStore){
 						top.Ext.getCmp('tousseDefinitionId').setValue('');
 					}
+					updateControlStatus();
 				}else{
 					showResult("找不到该条码所对应的器械包实例");
 				}