Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r36622 -r36625
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 36622)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 36625)
@@ -729,8 +729,36 @@
 					hideInspectItem();
 					resetRecycleAndRepackingValue();
 					var responsibilityPart = top.Ext.getCmp('responsibilityPart').getValue();
+					hideExtractCheckTousse();
+					tousseItemCount = 0;
 					if(responsibilityPart == '装配管理'){
 						showOrHideTousseReprint(true,true);
+						if(sessionItem){
+							var tousseItems = sessionItem.tousseItems;
+							var arr = [];
+							for (var i = 0; i < tousseItems.length; i++) {
+								var tousseDefinitionName = tousseItems[i].data.tousseDefinitionName || tousseItems[i].data['tousseDefinition.name'] || tousseItems[i].data['tousseName'];
+								var barcode = tousseItems[i].data.barcode || tousseItems[i].data.tousseBarcode;
+								arr.push({
+									id: tousseItems[i].data.id,
+									barcode: barcode,
+									tousseInstanceId: tousseItems[i].data.id,
+									tousseName: tousseDefinitionName + '(' + barcode + ')',
+									amount: tousseItems[i].data.amount || 1,
+									orderNumber: (i + 1),
+									isRecycle: '否',
+									isRePacking: '否',
+									isDiscard: '否',
+									isReprint: '是',
+									scope: result.data.scope,
+									showInput: true
+								});
+							}
+							loadTousseMsg({
+								responsibilityPart:sessionItem.responPartName,
+								ids:sessionItem.ids
+							}, arr);
+						}
 					}
 				} else if (result.data.scope == "材料") {
 					top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
@@ -759,6 +787,8 @@
 						hideExtractCheckTousseWrapper();
 						hideMaterialOrTousseOrTousseMaterial();
 					}
+					hideExtractCheckTousse();
+					tousseItemCount = 0;
 				} else if (result.data.scope == "灭菌炉记录") {
 					top.Ext.getCmp('sterilizationRecordInfo').setVisible(true);
 					// 如果监测范围为灭菌炉记录，隐藏器械包信息
@@ -777,6 +807,8 @@
 					//隐藏监测项
 					hideInspectItem();
 					resetRecycleAndRepackingValue();
+					hideExtractCheckTousse();
+					tousseItemCount = 0;
 				} else if (result.data.scope == "材料和器械包") {
 					top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
 					top.Ext.getCmp('tousseInfoFieldSet').setVisible(true);
@@ -807,6 +839,38 @@
 					var responsibilityPart = top.Ext.getCmp('responsibilityPart').getValue();
 					if(responsibilityPart == '装配管理'){
 						showOrHideTousseReprint(true,true);
+						if(sessionItem){
+							var tousseItems = sessionItem.tousseItems;
+							var arr = [];
+							if (tousseItems.length > 0) {
+								for (var i = 0; i < tousseItems.length; i++) {
+									var tousseDefinitionName = tousseItems[i].data.tousseDefinitionName || tousseItems[i].data['tousseDefinition.name'] || tousseItems[i].data['tousseName'];
+									var barcode = tousseItems[i].data.barcode || tousseItems[i].data.tousseBarcode;
+									var res = getTousseInstanceMsg(barcode);
+									arr.push({
+										id: tousseItems[i].data.id,
+										barcode: barcode,
+										tousseInstanceId: tousseItems[i].data.id,
+										tousseDefinitionId: res.tousseDefinitionId,
+										tousseName: tousseDefinitionName + '(' + barcode + ')',
+										amount: tousseItems[i].data.amount || 1,
+										orderNumber: (i + 1),
+										isRecycle: '否',
+										isRePacking: '否',
+										isDiscard: '否',
+										isReprint: '是',
+										scope: result.data.scope,
+										showInput: true
+									});
+								}
+								loadMateriaAndTousselMsg({
+									responsibilityPart:sessionItem.responPartName,
+									ids:sessionItem.ids
+								}, arr);
+								enableRecycleAndRepacking();
+								top.Ext.getCmp('disabledBarcode').enable();
+							}
+						}
 					}
 				} else if (result.data.scope == "无") {
 					top.Ext.getCmp('sterilizationRecordInfo').setVisible(false);
@@ -825,6 +889,8 @@
 					//FSSDERMYY-18：隐藏器械包信息
 					top.Ext.getCmp('tousseInfoFieldSet').setVisible(false);
 					resetRecycleAndRepackingValue();
+					hideExtractCheckTousse();
+					tousseItemCount = 0;
 				}
 				// 新建质量监测单，数量默认为1
 				var tAmount = top.Ext.getCmp('tousseAmount').getValue();
@@ -838,8 +904,6 @@
 					top.Ext.getCmp('materialAmount').setValue(1);
 				}
 				top.Ext.getCmp('handleDepart').setValue(result.data.handleDepart);
-				hideExtractCheckTousse();
-				tousseItemCount = 0;
 			}
 		},
 		failure: function (response, options) {
@@ -2552,13 +2616,23 @@
 	return null;
 }
 
+var sessionItem = {}
+
 /**
  * 通过生产环节添加质量监测,装配界面
  * @param {生产环节的名称} responPartName 
  * @param {清洗记录的ID} washRecordId
  * @param {选中的器械包数组} tousseItems
  */
 function addQualityMonitoringByResponPart(responPartName, washRecordId, tousseItems, ids) {
+	if(ids){
+		sessionItem = {
+			responPartName:responPartName,
+			washRecordId:washRecordId,
+			tousseItems:tousseItems,
+			ids:ids
+		}
+	}
 	addQualityMonitoring('', '', '', washRecordId, tousseItems);
 	otherPartAddQM = true;
 	if ('全部环节' == responPartName) {
@@ -2581,30 +2655,32 @@
 					scope = top.Ext.getCmp('scope').getValue();
 				}
 				if (scope == '器械包') {
-					for (var i = 0; i < tousseItems.length; i++) {
-						var tousseDefinitionName = tousseItems[i].data.tousseDefinitionName || tousseItems[i].data['tousseDefinition.name'] || tousseItems[i].data['tousseName'];
-						var barcode = tousseItems[i].data.barcode || tousseItems[i].data.tousseBarcode;
-						arr.push({
-							id: tousseItems[i].data.id,
-							barcode: barcode,
-							tousseInstanceId: tousseItems[i].data.id,
-							tousseName: tousseDefinitionName + '(' + barcode + ')',
-							amount: tousseItems[i].data.amount || 1,
-							orderNumber: (i + 1),
-							isRecycle: '否',
-							isRePacking: '否',
-							isDiscard: '否',
-							isReprint: '是',
-							scope: scope,
-							showInput: true
-						});
+					if (tousseItems.length > 0) {
+						for (var i = 0; i < tousseItems.length; i++) {
+							var tousseDefinitionName = tousseItems[i].data.tousseDefinitionName || tousseItems[i].data['tousseDefinition.name'] || tousseItems[i].data['tousseName'];
+							var barcode = tousseItems[i].data.barcode || tousseItems[i].data.tousseBarcode;
+							arr.push({
+								id: tousseItems[i].data.id,
+								barcode: barcode,
+								tousseInstanceId: tousseItems[i].data.id,
+								tousseName: tousseDefinitionName + '(' + barcode + ')',
+								amount: tousseItems[i].data.amount || 1,
+								orderNumber: (i + 1),
+								isRecycle: '否',
+								isRePacking: '否',
+								isDiscard: '否',
+								isReprint: '是',
+								scope: scope,
+								showInput: true
+							});
+						}
+						loadTousseMsg({
+							responsibilityPart:responPartName,
+							ids:ids
+						}, arr);
+						enableRecycleAndRepacking();
+						top.Ext.getCmp('disabledBarcode').enable();
 					}
-					loadTousseMsg({
-						responsibilityPart:responPartName,
-						ids:ids
-					}, arr);
-					enableRecycleAndRepacking();
-					top.Ext.getCmp('disabledBarcode').enable();
 				} else if (scope == '材料和器械包') {
 					if (tousseItems.length > 0) {
 						for (var i = 0; i < tousseItems.length; i++) {
@@ -2627,7 +2703,10 @@
 								showInput: true
 							});
 						}
-						loadMateriaAndTousselMsg({}, arr);
+						loadMateriaAndTousselMsg({
+							responsibilityPart:responPartName,
+							ids:ids
+						}, arr);
 						enableRecycleAndRepacking();
 						top.Ext.getCmp('disabledBarcode').enable();
 					}
@@ -4290,7 +4369,25 @@
 				top.Ext.getCmp('materialAmount').setValue(amount);
 				top.Ext.getCmp('position').setValue(position);
 			}
-
+			if(sstsConfig.enableRepeatPrintingLabelsAddQualityMonitoringFunction){
+				var isReprint = qualityMonitoringGoodsList[i].isReprint;
+				if(qualityMonitoringInstance.responsibilityPart == '装配管理'){
+					var ids = qualityMonitoringInstance.ids || '';
+					top.Ext.getCmp('isReprint').setValue(isReprint);
+					top.Ext.getCmp('tousseReprintC').setVisible(true);
+					if(isReprint == '是'){
+						top.Ext.getCmp('tousseReprint').setValue(true);
+					}else {
+						top.Ext.getCmp('tousseReprint').setValue(false);
+					}
+					if(ids !== ''){
+						top.Ext.getCmp('tempBarcode').disable();
+						top.Ext.getCmp('tousseName').disable();
+						top.Ext.getCmp('responsibilityPart').disable();
+						top.Ext.getCmp('addExtractCheckTousseBtnC').setVisible(false);
+					}
+				}
+			}
 		} else if (orderNumber == 2) {
 			var mateialName = qualityMonitoringGoodsList[i].material;
 			var tousseName = qualityMonitoringGoodsList[i].tousseName;
@@ -4312,7 +4409,7 @@
 				if (!showInput) {
 					addExtractCheckTousse(tousseName, barcode, tousseInstanceId, amount, orderNumber, isRecycle, isRePacking, isDiscard, "", "", "", "", true);
 				} else if (scope == '器械包' || scope == '材料和器械包') {
-					addExtractCheckTousse(tousseName, barcode, tousseInstanceId, amount, orderNumber, isRecycle, isRePacking, isDiscard, "", "", "", "", true, showInput);
+					addExtractCheckTousse(tousseName, barcode, tousseInstanceId, amount, orderNumber, isRecycle, isRePacking, isDiscard, "", "", "", "", true, showInput, qualityMonitoringInstance.ids);
 				}
 				if (scope == '材料和器械包' && showInput == true) {
 					addExtractCheckMaterial("", "", 1, "", "", "", true, "", "", true, "", "", orderNumber, tousseDefinitionId);