Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r30205 -r30253
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 30205)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 30253)
@@ -2638,6 +2638,12 @@
 					if(tousseItems && tousseItems.length > 0){
 						Ext.getCmp('tousseDefinitionId').setValue(tousseItems[0].tousseID);
 						Ext.getCmp('tousseName').setValue(tousseItems[0].tousseName);
+						var responsibilityPart = Ext.getCmp('responsibilityPart').getValue();
+						if(responsibilityPart == '装配管理'){
+							Ext.getCmp('responsiblePerson').setValue(tousseItems[0].data['packer']);
+							Ext.getCmp('tousseDefinitionId').setValue(tousseItems[0].data['tousseDefinition.id']);
+							Ext.getCmp('tousseName').setValue(tousseItems[0].data['tousseDefinition.name']);
+						}
 					}
 				}, 1000);
 			}
@@ -3898,10 +3904,27 @@
 			load:function(store,records) {
 					if( otherPartAddQM == true ){
 						if(records.length>0) {
-							Ext.getCmp('formName').setValue(records[0].data.name);
-							addQualityMonitoringItem(records[0].data.id,records[0].data.name);
-							Ext.getCmp("formDefinitionId").setValue(records[0].data.id);
-							Ext.getCmp("name").setValue(records[0].data.name);
+							if(Ext.getCmp('responsibilityPart').getValue() == '装配管理'){
+								var formName = '';
+								var formDefinitionId = '';
+								for(var i=0;i<records.length;i++){
+									if(records[i].data.name == '包装不合格'){
+										formName = records[i].data.name;
+										formDefinitionId = records[i].data.id;
+									}
+								}
+								if(formName !== ''){
+									Ext.getCmp('formName').setValue(formName);
+									addQualityMonitoringItem(formDefinitionId,formName);
+									Ext.getCmp("formDefinitionId").setValue(formDefinitionId);
+									Ext.getCmp("name").setValue(formName);
+								}
+							}else {
+								Ext.getCmp('formName').setValue(records[0].data.name);
+								addQualityMonitoringItem(records[0].data.id,records[0].data.name);
+								Ext.getCmp("formDefinitionId").setValue(records[0].data.id);
+								Ext.getCmp("name").setValue(records[0].data.name);
+							}
 						}else{
 							// 没有找到监测项
 							Ext.getCmp('formName').setValue('');
@@ -4149,8 +4172,11 @@
 												Ext.getCmp('cleaningEndTime').setValue(record.endDate);
 												Ext.getCmp('scanWashRecord_id').setValue(record.washRecordID);
 												Ext.getCmp('responsiblePerson').setValue(record.personInCharge);
-												Ext.getCmp('tousseDefinitionId').setValue(record.lastTousseInstanceId || '');
-												Ext.getCmp('tousseName').setValue(record.tousseName || '');
+												if(record.lastTousseInstanceId && record.tousseName){
+													Ext.getCmp('tousseDefinitionId').setValue(record.lastTousseInstanceId || '');
+													Ext.getCmp('tousseName').setValue(record.tousseName || '');
+												}
+												materialDefinitionStore.load()
 											}
 										}
 									},
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r30129 -r30253
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 30129)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 30253)
@@ -1186,6 +1186,23 @@
 			}
 		});
 	}
+	/*
+ * 添加质量监测
+ */
+function addQualityMonitoringWash()
+{
+	var records = grid.getSelectionModel().getSelections();
+	
+	if(records.length == 1){
+		var data = records[0].data;
+		qualityMonitoringWRRecordID = data['id'];
+	}else if(records.length > 1 ){
+		showResult("一次只能选中一条记录！");
+		return false;
+	}
+	otherPartAddQM = true;
+	addQualityMonitoringByResponPart("装配管理",'',records);
+}
 //展示器械包图片信息
 function getAndShowTousseInfoDiv(tousseName,tousseDefinitionID) {
     currentImageType = "器械包图片";
@@ -1322,7 +1339,8 @@
 	     {name : 'treatmentNum'},
 	     {name : 'hospitalNum'},
 		 {name : 'urgentLevel'},
-		 {name : 'reviewer'}
+		 {name : 'reviewer'},
+		 {name : 'packer'}
 	];
 	
 	
@@ -1409,7 +1427,13 @@
 				grid.dwrReload();
 			});
 		}
-	},'->',{
+	},{
+		text : '质量监测',
+		iconCls : 'btn_ext_application_add',
+		handler : function() {
+			addQualityMonitoringWash();
+		}
+	} ,'->',{
 		text : '科室分组:'
 	},{
         xtype : 'combo',
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
===================================================================
diff -u -r29513 -r30253
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp	(.../reviewView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp	(.../reviewView.jsp)	(revision 30253)
@@ -113,6 +113,10 @@
     <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
 </object>
 
+<!-- 质量监测 -->
+<script type="text/javascript" src="${ctx }/dwr/interface/QualityMonitoringInstanceTableManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js?version=${svnRevision}"></script>
+
 <!-- 打印函数 -->
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/ext/ext_datefield/Datetime.js?version=${svnRevision}"></script>