Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp
===================================================================
diff -u -r18333 -r18578
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp	(.../addQualityMonitoring.jsp)	(revision 18333)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp	(.../addQualityMonitoring.jsp)	(revision 18578)
@@ -31,45 +31,39 @@
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/ext_datefield/datetime.css"></link>
 <script type="text/javascript" src="${ctx}/ext/ext_datefield/Datetime.js"></script>
 <script type="text/javascript" src="commonRecycle.js"></script>
+<script type="text/javascript" src="${ctx}/js/json3.min.js"></script>
 <script>
 var countOfLI = 10;//定义出现多少个li标签
 var amount = 10;//定义出现多少个li标签
 var pages = 1;
 
 var parm_s_type ="质量监测";
 var userName = '<%=request.getAttribute("userName")%>';
+var materialMsg = '<%=request.getParameter("materialMsg")%>';
 var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
 var PACKAGE_TYPE_FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';
 var PACKAGE_TYPE_SPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>';
+var errorDamageQmKey = '${param.errorDamageQmKey}';
 //扫描篮筐允许的篮筐状态集合
 var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
 
 //动态加载JS和CSS
 document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/style.css" rel="stylesheet" type="text/css" />');
-	function closeLayer(){
-		if(typeof parent.closeLayer == 'function'){
-			  //统一到父窗口
-			  parent.closeLayer();
-		  }else if(parent.LAYER){
-			  //layer库1.4版本的
-			  var index = parent.LAYER.getFrameIndex();
-			  parent.LAYER.close(index);
-		  }else if(parent.layer){
-			  //新版本的layer库
-			  var index = parent.layer.getFrameIndex(window.name);
-			  parent.layer.close(index);
-		  }
+	
+	function closeQMLayer(){
+		parent.closeQmLayer();
 	}
 	function openFocus(){
 		Ext.QuickTips.init();
 		addNewQMRecord();
 	}
 	
 	function addNewQMRecord(){
+		materialMsg = parent.getMaterialMsg();
 		disableShowImageButton = false;
 		recycleQM = true;
 		var panel = getFormPanelContent("");
-		recycleAddQualityMonitoringDo();
+		recycleAddQualityMonitoringDo(errorDamageQmKey);
 		var viewport = new Ext.Viewport( {
 			layout : 'border',
 			items : [{
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
===================================================================
diff -u -r18235 -r18578
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp	(.../recyclingDamage.jsp)	(revision 18235)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp	(.../recyclingDamage.jsp)	(revision 18578)
@@ -3,6 +3,7 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@page import="java.util.Date"%>
 <%@page import="java.text.SimpleDateFormat"%>
+<%@page import="com.forgon.disinfectsystem.common.*"%>
 <%@page import="com.forgon.directory.acegi.tools.AcegiHelper"%>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@@ -18,6 +19,12 @@
 <%
     String orgUnitName = AcegiHelper.getLoginUser().getCurrentOrgUnitName();
     request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
+    boolean haveRecycleAddQualityMonitoring = CssdUtils.getSystemSetConfigByNameBool("recycleAddQualityMonitoring");
+    if(haveRecycleAddQualityMonitoring == true){
+    	session.setAttribute("recycleAddQualityMonitoring", "display: block");
+    }else{
+    	session.setAttribute("recycleAddQualityMonitoring", "display: none");
+    }
 %>
 <style type="text/css">
 body{ background:#f0f0f0;}
@@ -34,6 +41,9 @@
 var tousseItemId = '${param.tousseItemId}';
 var damageRemark = '${param.damageRemark}';
 var params_recordType = '${param.recordType}';
+var resolution = '${param.resolution}';
+var errorDamageQmKey = '${param.errorDamageQmKey}';
+errorDamageQmKey = errorDamageQmKey + "_damage";
 var dep = '${param.depart}';//$('depart').val();
 $('depart').val(dep);
 var departCoding = '${param.departCode}';//$('departCoding').val();
@@ -105,7 +115,8 @@
 	            	materialDefinitionId: materialDefinitionId,
 	            	materialName: materialName,
 	            	tousseBarcode : tousseBarcode,
-	            	amount: amount
+	            	amount: amount,
+	            	errorDamageQmKey : errorDamageQmKey
 	            };
 				newJsonArray.push(item);
 			}
@@ -121,7 +132,62 @@
 	window.parent.setTousseItemRecyclingDamage(row,JSON.stringify(newJsonArray),$('#damageRemark').val());
 	closeLayer();
 }
-
+//获取报损的材料信息，添加质量监测用
+function getMaterialMsg(){
+	var retArray = new Array(); 
+	var length = $("#recyclingDamageTable tbody tr").length;
+	for ( var i = 0; i < length; i++) {
+		var amount = parseInt($('#errorAmount' + i).html());
+		var tousseBarcode = $('#tousseBarcode' + i).val();
+		var materialDefinitionId = $('#materialDefinitionId' + i).attr('value');
+		var materialName = $('#materialName'+i).text();
+		if(amount > 0){
+			var item = {
+            	materialName: materialName,
+            	amount: amount
+            };
+			retArray.push(item);
+		}
+	}
+	return retArray;
+}
+//添加质量监测记录
+function addQM(){
+	
+	var width = 780;
+	var height = 650;
+	var designedTousseWidth = 1080;
+	var designedTousseHeight = 770;
+	var designedWidth = 1920;
+	var designedHeight = 1080;
+	var actualWidth = window.screen.availWidth;
+	var actualHeight = window.screen.availHeight;
+	var offsetTop = 100;
+	var heightExtra = 10;
+	if(resolution == '1980'){
+		width = 1380;
+		height = 830;
+	}
+	var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight);
+	var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
+	
+	width = size.width;
+	height = size.height;
+	
+	offsetTop = offsetTop*zoomRatio;
+	var mMsg = getMaterialMsg();
+	parent.setMaterialMsg(mMsg);
+	var index= parent.layer.open({
+        type : 2,
+        title : ['添加质量监测记录',true],
+        content : 'addQualityMonitoring.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&errorDamageQmKey='+errorDamageQmKey,
+        area : [ width + 'px' , height +heightExtra+ 'px'],
+        border : [5, 0.3, '#fff', true],
+        closeBtn : [2 , true],
+        offset : [offsetTop+'px','']
+    });
+	parent.setQmLayerIndex(index);
+}
 function openMaterialImage(materialName){
     $.ajax({
         type:'get',
@@ -252,6 +318,7 @@
     <div class="send">
         <table width="50%" border="0" align="center" cellpadding="0" cellspacing="0">
             <tr>
+           	 	<td><a href="javascript:void(0);" class="addQMDamgerError" id="addQMDamgerErrorButton" onclick="addQM();" style="${recycleAddQualityMonitoring}"></a></td>
                 <td><a href="javascript:void(0);" class="submit" id="damageSubmitButton" onclick="submit();">确定</a></td>
                 <td><a href="javascript:void(0);" class="cancel" onclick="closeLayer();">取消</a></td>
             </tr>
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java
===================================================================
diff -u -r18232 -r18578
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java	(.../TousseItemVo.java)	(revision 18232)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java	(.../TousseItemVo.java)	(revision 18578)
@@ -77,12 +77,23 @@
 	 * 备注
 	 */
 	private String tousseRemark;
-
 	/**
+	 * 丢失报损添加质量监测的key
+	 */
+	private String errorDamageQmKey;
+	/**
 	 * 借物单是否需要供应室审核
 	 */
 	private String borrowConfirmStatus;
 
+	public String getErrorDamageQmKey() {
+		return errorDamageQmKey;
+	}
+
+	public void setErrorDamageQmKey(String errorDamageQmKey) {
+		this.errorDamageQmKey = errorDamageQmKey;
+	}
+
 	public String getBorrowConfirmStatus() {
 		return borrowConfirmStatus;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
===================================================================
diff -u -r18153 -r18578
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp	(.../addTousse.jsp)	(revision 18153)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp	(.../addTousse.jsp)	(revision 18578)
@@ -34,6 +34,8 @@
   
    function addToussItem(tousseDefinitionId,tousseName,isApplyEntireTousse,isCleanedEntirely,tousseType,isThereIdentificationCard){
 	   var row = window.parent.document.getElementById("tousseItemTable").rows.length;
+	   var timeStr = new Date().getTime();
+	   var errorDamageQmKey = tousseDefinitionId + "_" + timeStr;
 	   var toussItem = {
 			row: row,
 			tousseItemId: '',
@@ -46,7 +48,8 @@
 			tousseType: tousseType,
 			isThereIdentificationCard: isThereIdentificationCard,
 			isApplyEntireTousse: isApplyEntireTousse,
-			urgentAmount:0
+			urgentAmount:0,
+			errorDamageQmKey:errorDamageQmKey
        };
 	   window.parent.addToussItem(toussItem);
 	   //已删除又添加该物品jsonArray处理
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r18500 -r18578
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 18500)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 18578)
@@ -217,7 +217,8 @@
                   	amount: detail.amount,
                   	errorType: detail.errorType,
                   	tousseBarcode:detail.tousseBarcode,
-                  	intoBasketAmount:detail.amount
+                  	intoBasketAmount:detail.amount,
+                  	errorDamageQmKey : detail.errorDamageQmKey
           	    };
            		recyclingErrorJsonArray.push(errorObj);
            	}else if(detail.type == '器械报损'){
@@ -227,7 +228,8 @@
                    	materialDefinitionId: detail.materialDefinitionId,
                    	materialName: detail.materialName,
                    	tousseBarcode:detail.tousseBarcode,
-                   	amount: detail.amount
+                   	amount: detail.amount,
+                   	errorDamageQmKey : detail.errorDamageQmKey
                    };
                 recyclingDamageJsonArray.push(item);
            	}
@@ -884,6 +886,8 @@
                 				isThereIdentificationCard = '是';
                 			}
                 			var tmpRow = $("#tousseItemTable > tbody > tr").length;    //获取子元素,不包含孙子及以下的元素
+           					var timeStr = new Date().getTime();
+           					var errorDamageQmKey = td.id + "_" + timeStr;
                 			var toussItem = {
                						row: tmpRow,
                						tousseItemId: '',
@@ -897,7 +901,8 @@
                						isThereIdentificationCard: isThereIdentificationCard,
                						isApplyEntireTousse: td.isApplyEntireTousse,
                						urgentAmount : 0,
-               						tousseRemark:''
+               						tousseRemark:'',
+               						errorDamageQmKey : errorDamageQmKey
                				};
     	   	                addToussItem(toussItem);
     	   	                //清除已删除的包
@@ -950,6 +955,8 @@
                             	     });
                                 	 if(!tousseIsExist){
                                 		 var tmpRow = $("#tousseItemTable > tbody > tr").length;
+                                		 var timeStr = new Date().getTime();
+                        				 var errorDamageQmKey = td.id + "_" + timeStr;
                                 		 var toussItem = {
                             						row: tmpRow,
                             						tousseItemId: '',
@@ -963,7 +970,8 @@
                             						isThereIdentificationCard: '是',
                             						isApplyEntireTousse: td.isApplyEntireTousse,
                             						urgentAmount : 0,
-                            						tousseRemark:''
+                            						tousseRemark:'',
+                            						errorDamageQmKey : errorDamageQmKey
                             			 };
                                 		 addToussItem(toussItem);
                                 		 //清除已删除的包
@@ -1066,7 +1074,7 @@
     });
 }
 
-function openRecyclingErrorPage(row){
+function openRecyclingErrorPage(row,errorDamageQmKey){
 	
 	var tousseType = $('#tousseType' + row).val();
 	if(tousseType == '外来器械包'){
@@ -1107,7 +1115,8 @@
         content : 'recyclingErrors.jsp?resolution='+resolution+'&isEditIDCardError='+isEditIDCardError+'&width='+width+'&height='+height
         	+'&row='+row+'&tousseDefinitionID='+$('#tousseDefinitionID'+row).val()+'&tousseName='+encodeAll(tousseName)
         	+'&recordType=' + params_recordType
-        	+'&tousseCount='+($('#recycleAmount'+row).val()==''?0:$('#recycleAmount'+row).val()) + '&errorRemark=' + errorRemark,
+        	+'&tousseCount='+($('#recycleAmount'+row).val()==''?0:$('#recycleAmount'+row).val()) + '&errorRemark=' + errorRemark
+        	+'&errorDamageQmKey=' + errorDamageQmKey,
         area : [ width + 'px' , height +heightExtra + 'px'],
         border : [5, 0.3, '#fff', true],
         closeBtn : [2 , true],  
@@ -1308,7 +1317,7 @@
 	}
 }
 
-function openRecyclingDamagePage(row,tousseName,tousseItemId){
+function openRecyclingDamagePage(row,tousseName,tousseItemId,errorDamageQmKey){
 	
 	var tousseType = $('#tousseType' + row).val();
 	if(tousseType == '外来器械包'){
@@ -1347,7 +1356,8 @@
         	+'&row='+row+'&tousseDefinitionID='+$('#tousseDefinitionID'+row).val()+'&tousseName='+tousseName
         	+'&tousseItemId='+tousseItemId+'&tousseCount='+$('#recycleAmount'+row).attr('value')
         	+'&recordType=' + params_recordType
-        	+'&depart='+depart+'&departCode='+departCode+ '&damageRemark=' + damageRemark,
+        	+'&depart='+depart+'&departCode='+departCode+ '&damageRemark=' + damageRemark
+        	+'&errorDamageQmKey=' + errorDamageQmKey,
         area : [ width + 'px' , height +heightExtra + 'px'],
         border : [5, 0.3, '#fff', true],
         closeBtn : [2 , true],
@@ -1744,6 +1754,7 @@
 	var urgentAmount = toussItem.urgentAmount;
 	var tousseRemark = toussItem.tousseRemark;
 	var urgentLevel = toussItem.urgentLevel?toussItem.urgentLevel:"";
+	var errorDamageQmKey = toussItem.errorDamageQmKey?toussItem.errorDamageQmKey:"";
 	var b = true;
 	$('#tousseItemTable').children().first().children().each(function(i,element){
          if($('#tousseName'+i).val() == tousseName){
@@ -1822,6 +1833,7 @@
                    '<input type="hidden" id="tousseRemark'+row+'" name="tousseRemark'+row+'" value="'+tousseRemark+'"/>'+
                    '<input type="hidden" id="hiddenErrorRemark'+row+'" name="hiddenErrorRemark'+row+'" value="'+errorRemark+'"/>'+
                    '<input type="hidden" id="hiddenDamageRemark'+row+'" name="hiddenDamageRemark'+row+'" value="'+damageRemark+'"/>'+
+                   '<input type="hidden" id="hiddenErrorDamageQmKey'+row+'" name="hiddenErrorDamageQmKey'+row+'" value="'+errorDamageQmKey+'"/>'+
                    '<div class="tousseDetailTable"><table id="tousseDetailTable'+row+'" border="0" cellpadding="0" cellspacing="0"><tr><td>' + 
                    urgentAmountElement + '</td><td>' +
                    
@@ -1832,8 +1844,8 @@
                    reduceButton +
                    '<td><input id="loadedAmount'+row+'" name="loadedAmount'+row+'" type="text" readonly="readonly" class="input-b" value="'+loadedAmount+'"/></td>'+
                    '<td><a href="javascript:void(0);" class="btn-a" id="intoBasketBtn'+row+'" style="display:block;" onclick="putTousseInTheBasket('+row+');">入筐</a></td>'+
-                   '<td><a href="javascript:void(0);" id="recyclingErrorButton'+row+'" class="btn-b" onclick="openRecyclingErrorPage('+row+');">丢失</a></td>'+
-                   '<td><a href="javascript:void(0);" id="recyclingDamageButton'+row+'" class="btn-c" onclick="openRecyclingDamagePage('+row+',\''+encodeAll(tousseName)+'\',\''+tousseItemId+'\');">报损</a></td>'+
+                   '<td><a href="javascript:void(0);" id="recyclingErrorButton'+row+'" class="btn-b" onclick="openRecyclingErrorPage('+row+',\''+errorDamageQmKey+'\');">丢失</a></td>'+
+                   '<td><a href="javascript:void(0);" id="recyclingDamageButton'+row+'" class="btn-c" onclick="openRecyclingDamagePage('+row+',\''+encodeAll(tousseName)+'\',\''+tousseItemId+'\',\'' + errorDamageQmKey + '\');">报损</a></td>'+
                    '<td><a href="javascript:void(0);" class="btn-d" onclick="deleteConfirm(\'是否要删除器械包【' + tousseName + '】？\',\'deleteTousse\','+row+',\'\',\'\',\'\');">删除</a></td></tr>';
          trStr += '<tr id="errorMaterialsTr'+row+'" class="recycleRemarkTr"><td>&nbsp;</td><td colspan=10><div class="recycleRemark" id="errorMaterials' + row +  '"></div></td></tr>';
          trStr += '<tr id="errorRemarkTr'+row+'" class="recycleRemarkTr"><td>&nbsp;</td><td colspan=10><div class="recycleRemark" id="errorRemark' + row +  '"></div></td></tr>';
@@ -1917,7 +1929,23 @@
 	layer.close(layerIndex);
 	layerIndex = null;
 }
+var qmLayerIndex = null;
+function setQmLayerIndex(layerIndex){
+	qmLayerIndex = layerIndex;
+}
+function closeQmLayer(){
+	layer.close(qmLayerIndex);
+	qmLayerIndex = null;
+}
 
+var materialMsg;
+function setMaterialMsg(mMsg){
+	materialMsg = mMsg;
+}
+function getMaterialMsg(){
+	return materialMsg;
+}
+
 //打开编辑数量页面
 var openElement;
 function openUpdateAmount(obj,row){
@@ -2024,13 +2052,15 @@
             var errorRemark = $('#hiddenErrorRemark'+index).val();
             var damageRemark = $('#hiddenDamageRemark'+index).val();
             var urgentLevel = $('#urgentLevel'+index).val();
+            var errorDamageQmKey = $('#hiddenErrorDamageQmKey'+index).val();
         	recyclingItemJsonArray.push({
           		tousseName:tousseName,
           		tousseDefinitionID:tousseDefinitionID,
           		tousseRemark:tousseRemark,
           		errorRemark:errorRemark,
           		damageRemark:damageRemark,
-          		urgentLevel:urgentLevel
+          		urgentLevel:urgentLevel,
+          		errorDamageQmKey:errorDamageQmKey
           	});
         }
 	});
@@ -2425,7 +2455,7 @@
 	height = size.height;
 	
 	offsetTop = offsetTop*zoomRatio;
-	layerIndex=layer.open({
+	qmLayerIndex=layer.open({
         type : 2,
         title : ['添加质量监测记录',true],
         content : 'addQualityMonitoring.jsp?resolution='+resolution+'&width='+width+'&height='+height,
@@ -2586,6 +2616,8 @@
                 	$("#tousseItemTable").empty();
                 	if(dataArray.length > 0){
                 		for(var i = (dataArray.length -1) ; i >= 0; i--){
+                			var timeStr = new Date().getTime();
+           					var errorDamageQmKey = td.id + "_" + timeStr;
                 			var toussItem = {
                						row: i,
                						tousseItemId: '',
@@ -2599,7 +2631,8 @@
                						isThereIdentificationCard: dataArray[i].isThereIdentificationCard,
                						isApplyEntireTousse: dataArray[i].isApplyEntireTousse,
                						urgentAmount : 0,
-               						tousseRemark : ''
+               						tousseRemark : '',
+               						errorDamageQmKey : errorDamageQmKey
                				};
                				addToussItem(toussItem);
                 		}
@@ -2631,7 +2664,6 @@
         RecyclingApplicationTableManager.getRecyclingApplicationForRecycle(recyclingApplicationId,function(application){
             if(application == null)
             	return;
-            
            	if(application.recyclingRecordId != null){
            		loadRecyclingRecordById(application.recyclingRecordId);
            	}else{
@@ -2668,6 +2700,11 @@
                				if(recycleAmount == null){
                					recycleAmount = item.amount;
                				}
+               				var errorDamageQmKey = item.errorDamageQmKey;
+               				if(isUndefinedOrNullOrEmpty(errorDamageQmKey)){
+               					var timeStr = new Date().getTime();
+                   				errorDamageQmKey = item.tousseDefinitionId + "_" + timeStr;
+               				}
                				var toussItem = {
                						row: row,
                						tousseItemId: '',
@@ -2684,7 +2721,8 @@
                						errorRemark : item.errorRemark,
                						damageRemark : item.damageRemark,
                						urgentLevel : item.urgentLevel,
-               						tousseRemark:''
+               						tousseRemark : '',
+               						errorDamageQmKey : errorDamageQmKey
                				};
                				addToussItem(toussItem);
                				canTerminateTousseItemIds.push(item.id);
@@ -2721,7 +2759,6 @@
         });
         DWREngine.setAsync(true);
     }
-    
     var id = params_id;
     if(!isUndefinedOrNullOrEmpty(id)){
     	loadRecyclingRecordById(id);
@@ -2850,6 +2887,11 @@
                 		   }
                 	   }
                    }
+                   var errorDamageQmKey = tousseItem.errorDamageQmKey;
+      				if(isUndefinedOrNullOrEmpty(errorDamageQmKey)){
+      					var timeStr = new Date().getTime();
+          				errorDamageQmKey = tousseItem.tousseDefinitionId + "_" + timeStr;
+      				}
                    var toussItem = {
       						row: row,
       						tousseItemId: tousseItem.id,
@@ -2866,7 +2908,8 @@
       						errorRemark : tousseItem.errorRemark,
       						damageRemark : tousseItem.damageRemark,
       						urgentLevel : tousseItem.urgentLevel,
-      						tousseRemark : tousseItem.remark
+      						tousseRemark : tousseItem.remark,
+      						errorDamageQmKey : errorDamageQmKey
       				};
                    var successAdd = addToussItem(toussItem);
                    if(!successAdd){
@@ -2888,7 +2931,8 @@
                             	amount: error.amount,
                             	errorType: error.errorType,
                             	tousseBarcode:error.tousseBarcode,
-                            	intoBasketAmount:error.amount
+                            	intoBasketAmount:error.amount,
+                            	errorDamageQmKey : error.errorDamageQmKey
                 	        };
                         	recyclingErrorJsonArray.push(errorObj);
                         }
@@ -2912,7 +2956,8 @@
                             	materialDefinitionId: damage.materialDefinitionId,
                             	materialName: damage.materialName,
                             	tousseBarcode:damage.tousseBarcode,
-                            	amount: damage.amount
+                            	amount: damage.amount,
+                            	errorDamageQmKey : damage.errorDamageQmKey
                             };
                         	recyclingDamageJsonArray.push(item);
                         }
@@ -2952,6 +2997,11 @@
             		 }
             		 if(!recycled && recyclingStatus != "已回收"){
             			 if(applicationitems[i].diposable == '否' && applicationitems[i].tousseType != '敷料包' && applicationitems[i].tousseType != '自制物品'){
+            				var errorDamageQmKey = applicationitems[i].errorDamageQmKey;
+               				if(isUndefinedOrNullOrEmpty(errorDamageQmKey)){
+               					var timeStr = new Date().getTime();
+                   				errorDamageQmKey = applicationitems[i].tousseDefinitionId + "_" + timeStr;
+               				}
             				 var toussItem = {
                 						row: row,
                 						tousseItemId: '',
@@ -2965,7 +3015,8 @@
                 						isThereIdentificationCard: applicationitems[i].isThereIdentificationCard,
                 						isApplyEntireTousse: applicationitems[i].isApplyEntireTousse,
                 						urgentAmount : applicationitems[i].urgentAmount,
-                						tousseRemark : ''
+                						tousseRemark : '',
+                						errorDamageQmKey : errorDamageQmKey
                 				};
             				 addToussItem(toussItem);
             				 canTerminateTousseItemIds.push(applicationitems[i].id);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
===================================================================
diff -u -r18479 -r18578
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java	(.../TousseItem.java)	(revision 18479)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java	(.../TousseItem.java)	(revision 18578)
@@ -158,6 +158,10 @@
 	 * 报损原因说明.默认为从使用记录转换而来。可以修改
 	 */
 	private String damageRemark;
+	/**
+	 * 丢失报损添加质量监测的key
+	 */
+	private String errorDamageQmKey;
 	
 	public TousseItem(){
 		
@@ -630,9 +634,17 @@
 	public String getDamageRemark() {
 		return damageRemark;
 	}
+	
 
 	public void setDamageRemark(String damageRemark) {
 		this.damageRemark = damageRemark;
 	}
-	
+
+	public String getErrorDamageQmKey() {
+		return errorDamageQmKey;
+	}
+
+	public void setErrorDamageQmKey(String errorDamageQmKey) {
+		this.errorDamageQmKey = errorDamageQmKey;
+	}
 }
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r18422 -r18578
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 18422)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 18578)
@@ -270,6 +270,7 @@
 				recyclingItem.setErrorRemark(vo.getErrorRemark());
 				recyclingItem.setDamageRemark(vo.getDamageRemark());
 				recyclingItem.setUrgentLevel(vo.getUrgentLevel());
+				recyclingItem.setErrorDamageQmKey(vo.getErrorDamageQmKey());
 			}
 			objectDao.saveOrUpdate(recyclingItem);
 			updateRelativeTousseInstanceRecyclingItemId(recyclingItem);
@@ -342,6 +343,8 @@
 					vo.setErrorRemark(json.optString("errorRemark"));
 					vo.setDamageRemark(json.optString("damageRemark"));
 					vo.setUrgentLevel(json.optString("urgentLevel"));
+					vo.setUrgentLevel(json.optString("errorDamageQmKey"));
+					vo.setErrorDamageQmKey(json.optString("errorDamageQmKey"));
 					map.put(tousseDefinitionId, vo);
 				}
 			}
@@ -371,6 +374,7 @@
 				String materialName = obj.optString("materialName");
 				String itemType = obj.optString("itemType");
 				String tousseBarcode = obj.optString("tousseBarcode");
+				String errorDamageQmKey = obj.optString("errorDamageQmKey");
 				
 				if(!DatabaseUtil.isPoIdValid(tousseDefinitionID)){
 					throw new RuntimeException("参数错误");
@@ -434,6 +438,7 @@
 					detail.setIsUnionToussInstance(false);
 					detail.setTousseBarcode(tousseBarcode);
 					detail.setTousseDefinitionId(tousseDefinitionID);
+					detail.setErrorDamageQmKey(errorDamageQmKey);
 					if(detail.isIDCard() && detail.getAmount() > 1){
 						toSplitIdCardMap.put(recyclingItem, detail);
 					}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
===================================================================
diff -u -r18159 -r18578
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 18159)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 18578)
@@ -1,19 +1,28 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <%@ page contentType="text/html; charset=UTF-8"%>
+<%@page import="com.forgon.disinfectsystem.common.*"%>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>材料丢失</title>
 <script type="text/javascript" src="js/select2css.js"></script>
 <script type="text/javascript" src="js/jquery-min.js" ></script>
 <script src="${ctx}/js/magnificPopup/jquery.magnific-popup.js"></script>
-<script type="text/javascript" src="layer/layer.min.js"></script>
+<script type="text/javascript" src="layer-v3.0.3/layer/layer.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="commonRecycle.js"></script>
 <script type="text/javascript" src="${ctx}/js/common.js"></script>
 
 <link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css">
 </head>
+<%
+    boolean haveRecycleAddQualityMonitoring = CssdUtils.getSystemSetConfigByNameBool("recycleAddQualityMonitoring");
+    if(haveRecycleAddQualityMonitoring == true){
+    	session.setAttribute("recycleAddQualityMonitoring", "display: block");
+    }else{
+    	session.setAttribute("recycleAddQualityMonitoring", "display: none");
+    }
+%>
 <style type="text/css">
 body {
 	background: #f0f0f0;
@@ -25,11 +34,14 @@
 <script type="text/javascript">
 	var WWWROOT = '${ctx}';
 	var row = '${param.row}';
+	var resolution = '${param.resolution}';
 	var tousseName = '${param.tousseName}';
 	var tousseDefinitionID = '${param.tousseDefinitionID}';
 	var tousseCount = '${param.tousseCount}';
 	var isEditIDCardError = '${param.isEditIDCardError}';
 	var errorRemark = '${param.errorRemark}';
+	var errorDamageQmKey = '${param.errorDamageQmKey}';
+	errorDamageQmKey = errorDamageQmKey + "_error";
 	var params_recordType = '${param.recordType}';
 	//动态加载JS和CSS
 	document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/style.css" rel="stylesheet" type="text/css" />');
@@ -123,7 +135,8 @@
 	                	amount: amount,
 	                	errorType: errorType,
 	                	tousseBarcode : tousseBarcode,
-	                	intoBasketAmount : 0
+	                	intoBasketAmount : 0,
+	                	errorDamageQmKey : errorDamageQmKey
 		            };
 					newJsonArray.push(item);
 				}
@@ -139,7 +152,64 @@
 		window.parent.setTousseItemRecyclingError(row,JSON.stringify(newJsonArray),$('#errorRemark').val());
 		closeLayer();
 	}
-
+	// 获取丢失的材料信息，添加质量监测用
+	function getMaterialMsg(){
+		var retArray = new Array(); 
+		var length = $("#recyclingErrorTable tbody tr").length;
+		for ( var i = 0; i < length; i++) {
+			var amount = parseInt($('#errorAmount' + i).html());
+			var materialDefinitionId = $('#materialDefinitionId' + i).attr('value');
+			var tousseBarcode = $('#tousseBarcode' + i).val();
+			var materialName = $('#materialName' + i).attr('value');
+			var errorType = $('#errorType' + i).val();
+			if(amount > 0){
+				var item = {
+                	materialName: materialName,
+                	amount: amount,
+                	errorType: errorType
+	            };
+				retArray.push(item);
+			}
+		}
+		return retArray;
+	}
+	// 添加质量监测记录
+	function addQM(){
+		
+		var width = 780;
+		var height = 650;
+		var designedTousseWidth = 1080;
+		var designedTousseHeight = 770;
+		var designedWidth = 1920;
+		var designedHeight = 1080;
+		var actualWidth = window.screen.availWidth;
+		var actualHeight = window.screen.availHeight;
+		var offsetTop = 100;
+		var heightExtra = 10;
+		if(resolution == '1980'){
+			width = 1380;
+			height = 830;
+		}
+		var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight);
+		var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
+		
+		width = size.width;
+		height = size.height;
+		
+		offsetTop = offsetTop*zoomRatio;
+		var mMsg = getMaterialMsg();
+		parent.setMaterialMsg(mMsg);
+		var index= parent.layer.open({
+	        type : 2,
+	        title : ['添加质量监测记录',true],
+	        content : 'addQualityMonitoring.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&errorDamageQmKey='+errorDamageQmKey,
+	        area : [ width + 'px' , height +heightExtra+ 'px'],
+	        border : [5, 0.3, '#fff', true],
+	        closeBtn : [2 , true],
+	        offset : [offsetTop+'px','']
+	    });
+		parent.setQmLayerIndex(index);
+	}
 	function openMaterialImage(materialName) {
 		$.ajax({
 			type : 'get',
@@ -305,6 +375,7 @@
 			<table width="50%" border="0" align="center" cellpadding="0"
 				cellspacing="0">
 				<tr>
+					<td><a href="javascript:void(0);" class="addQMDamgerError" id="addQMDamgerErrorButton" onclick="addQM();" style="${recycleAddQualityMonitoring}"></a></td>
 					<td><a href="javascript:void(0);" class="submit" id="errorSubmitButton" onclick="submit();">确定</a></td>
 					<td><a href="javascript:void(0);" class="cancel" onclick="closeLayer();">取消</a></td>
 				</tr>
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java
===================================================================
diff -u -r18166 -r18578
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java	(.../QualityMonitoringInstance.java)	(revision 18166)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/qualitymonitoringmanager/qualitymonitoring/QualityMonitoringInstance.java	(.../QualityMonitoringInstance.java)	(revision 18578)
@@ -140,6 +140,10 @@
 	 */
 	private Long parentId;
 	/**
+	 * 丢失报损关联质量监测的key
+	 */
+	private String errorDamageQmKey;
+	/**
 	 * 冗余字段 ,质量监测器械包和材料数据转移使用，标识数据是否已经迁移
 	 */
 	private String isMoveTousseAndMaterial = "否";
@@ -155,7 +159,15 @@
 			List<QualityMonitoringGoods> qualityMonitoringGoodsList) {
 		this.qualityMonitoringGoodsList = qualityMonitoringGoodsList;
 	}
+	
+	public String getErrorDamageQmKey() {
+		return errorDamageQmKey;
+	}
 
+	public void setErrorDamageQmKey(String errorDamageQmKey) {
+		this.errorDamageQmKey = errorDamageQmKey;
+	}
+
 	public String getIsMoveTousseAndMaterial() {
 		return isMoveTousseAndMaterial;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r18541 -r18578
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 18541)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 18578)
@@ -13,6 +13,7 @@
 var formDefinitionStore;
 var frequencyStore;
 var materialCountRecords;
+var materialMsg = null;
 var tousseInstanceInfo = "";
 var recycleQM = false;
 
@@ -23,7 +24,7 @@
 function closeQMWindow(){
 	if(recycleQM == true){
 		// 回收页面进来
-		closeLayer();
+		closeQMLayer();
 	}else{
 		qualityMonitoringWin.close();
 	}
@@ -407,7 +408,7 @@
 			qualityMonitoringSterilizationID : qualityMonitoringSterilizationID,
 			qualityMonitoringWRRecordID : qualityMonitoringWRRecordID,
 			tousseInstanceInfo : tousseInstanceInfo 
-		},
+		},	
 		method : 'POST',
 		waitMsg : '正在保存数据，请稍候',
 		waitTitle : '提交表单',
@@ -421,6 +422,7 @@
 				qualityMonitoringSterilizationID = 0;
 				qualityMonitoringWRRecordID = 0;
 				materialCountRecords = null;
+				materialMsg = null;
 				if(recycleQM == true){
 					addQMAgain();
 				}else{
@@ -591,6 +593,7 @@
 					Ext.getCmp('addExtractCheckTousse').setVisible(false);
 					Ext.getCmp('addExtractCheckMaterial').setVisible(true);
 					addMaterialAndAmount();
+					addMaterialMsg();
 				}else if(result.data.scope == "灭菌炉记录"){
 					Ext.getCmp('sterilizationRecordInfo').setVisible(true);
 					// 如果监测范围为灭菌炉记录，隐藏器械包信息
@@ -611,6 +614,7 @@
 					Ext.getCmp('addExtractCheckMaterial').setVisible(true);
 					// 添加抽检器械和数量
 					addMaterialAndAmount();
+					addMaterialMsg();
 				}else if(result.data.scope == "无"){
 					Ext.getCmp('sterilizationRecordInfo').setVisible(false);
 					Ext.getCmp('tousseInfoFieldSet').setVisible(true);
@@ -669,6 +673,29 @@
 		}
 	}
 }
+
+//回收页面进来，添加材料和数量
+function addMaterialMsg(){
+	if(materialMsg != null && materialMsg != 'undefined' && materialMsg.length > 0){
+		var maerialName = Ext.getCmp('material').getValue();
+		if( !isUndefinedOrNullOrEmpty(maerialName) ){
+			// 如果已经打开了，再选择其他的监测项，不再添加材料数据
+			return ;
+		}
+		for(var i = 0 ; i < materialMsg.length ; i++){
+			var materialName = materialMsg[i].materialName;
+			var count = materialMsg[i].amount;
+			if( i == 0 ){
+				// 第一条记录
+				Ext.getCmp('material').setValue(materialName);
+				Ext.getCmp('materialAmount').setValue(count);
+			}else{
+				addExtractCheckMaterial(false,materialName,count);
+			}
+		}
+	}
+}
+
 function allTousseOfSterileChecked(){
 	var isAll = Ext.getCmp('isAllTousseOfSterile').getValue();   //是否整炉
 	if(isAll == '是'){
@@ -1416,6 +1443,7 @@
 					Ext.getCmp('srDateTime').setValue(result.data.sterilizerDate);
 					Ext.getCmp('sterilizerName').setValue(result.data.sterilizerName);
 					Ext.getCmp('sterilizerFre').setValue(result.data.sterilizerFrequency);
+					Ext.getCmp('errorDamageQmKey').setValue(result.data.errorDamageQmKey);
 					if(result.data.name == "无"){
 						Ext.getCmp("formDefinitionId").setValue(0);
 					}else{
@@ -2140,6 +2168,10 @@
 				xtype:'hidden',
 				name:'isAllTousseOfSterile',
 				id:'isAllTousseOfSterile'
+			},{
+				xtype:'hidden',
+				name:'errorDamageQmKey',
+				id:'errorDamageQmKey'
 			},
 			varibaleContent1,
 			varibaleContent2,
@@ -2678,7 +2710,7 @@
 	});
 	return formPanel;
 }
-function recycleAddQualityMonitoringDo(){
+function recycleAddQualityMonitoringDo(errorDamageQmKey){
 	setStartDate(Ext, 'yyyy/MM/dd HH:mm', 'dateTime');  //（设置抽检时间，取服务器时间 cjr）
 	disableRecycleAndRepacking();
 	var responPartName = "回收清点";
@@ -2691,7 +2723,11 @@
 		formDefinitionStore.baseParams.responsiblePerson = responPartName;
 		formDefinitionStore.load();
 	}
-	
+	if(!isUndefinedOrNullOrEmpty(errorDamageQmKey)){
+		Ext.getCmp("errorDamageQmKey").setValue(errorDamageQmKey);
+	}else{
+		Ext.getCmp("errorDamageQmKey").setValue("");
+	}
 //	formDefinitionStore.baseParams.responsiblePerson = "回收清点";
 //	formDefinitionStore.load();
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialerrordamage/MaterialErrorDamageDetail.java
===================================================================
diff -u -r18116 -r18578
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialerrordamage/MaterialErrorDamageDetail.java	(.../MaterialErrorDamageDetail.java)	(revision 18116)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/materialerrordamage/MaterialErrorDamageDetail.java	(.../MaterialErrorDamageDetail.java)	(revision 18578)
@@ -220,6 +220,10 @@
 	 * 回收项Id(基本上不用此字段了)
 	 */
 	private Long recyclingItemId;
+	/**
+	 * 丢失报损记录关联的质量监测key
+	 */
+	private String errorDamageQmKey;
 	
 	/**
 	 * 是否已关联上包实例（未补充装配时用到）
@@ -235,7 +239,15 @@
 	public void setId(Long id) {
 		this.id = id;
 	}
+	
+	public String getErrorDamageQmKey() {
+		return errorDamageQmKey;
+	}
 
+	public void setErrorDamageQmKey(String errorDamageQmKey) {
+		this.errorDamageQmKey = errorDamageQmKey;
+	}
+
 	public String getErrorType() {
 		return errorType;
 	}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java
===================================================================
diff -u -r18232 -r18578
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java	(.../RecyclingItem.java)	(revision 18232)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/recyclingrecord/RecyclingItem.java	(.../RecyclingItem.java)	(revision 18578)
@@ -76,6 +76,10 @@
 	 */
 	private String urgentLevel;
 	/**
+	 * 丢失报损添加质量监测的key
+	 */
+	private String errorDamageQmKey;
+	/**
 	 * 丢失报损明细
 	 */
 	private List<MaterialErrorDamageDetail> errorDamageDetails = new ArrayList<MaterialErrorDamageDetail>();
@@ -89,7 +93,7 @@
 	public void setId(Long id) {
 		this.id = id;
 	}
-
+	
 	public String getTousseName() {
 		return tousseName;
 	}
@@ -340,5 +344,12 @@
 	public void setUrgentLevel(String urgentLevel) {
 		this.urgentLevel = urgentLevel;
 	}
-	
+
+	public String getErrorDamageQmKey() {
+		return errorDamageQmKey;
+	}
+
+	public void setErrorDamageQmKey(String errorDamageQmKey) {
+		this.errorDamageQmKey = errorDamageQmKey;
+	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r18336 -r18578
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 18336)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 18578)
@@ -178,6 +178,8 @@
 .clds-box .minus:hover{ background-position:-72px -751px; }
 .clds-box .send{ margin-top:15px;}
 .clds-box .send td{ text-align:center;}
+.clds-box .send .addQMDamgerError{ display:block; width:177px; height:63px; background:url(addQualityMonitoring.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.clds-box .send .addQMDamgerError:hover{ display:block; width:177px; height:63px; background:url(addQualityMonitoringHovert.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
 .clds-box .send .submit{ display:block; width:137px; height:63px; background:url(btn_save.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
 .clds-box .send .submit:hover{ display:block; width:137px; height:63px; background:url(btn_save1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
 .clds-box .send .cancel{ display:block; width:137px; height:63px; background:url(btn_cancel.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
===================================================================
diff -u -r18351 -r18578
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java	(.../MaterialErrorDamageDetailManagerImpl.java)	(revision 18351)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java	(.../MaterialErrorDamageDetailManagerImpl.java)	(revision 18578)
@@ -1,5 +1,6 @@
 package com.forgon.disinfectsystem.materialerrordamage.service;
 
+import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -32,6 +33,7 @@
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail;
 import com.forgon.disinfectsystem.entity.packing.PackingTask;
+import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance;
 import com.forgon.disinfectsystem.entity.recyclingerror.SupplementMaterialDetail;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingItem;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
@@ -282,7 +284,6 @@
 			MaterialErrorDamageDetail detail = getDetailById(id);
 			if (detail != null && detail.getAmount() != null
 					&& detail.getAdditionalAmount() != null) {
-
 				String description = String.format("器械报损【%s,%s个】被删除！",
 						detail.getMaterialName(), detail.getAmount());
 
@@ -298,10 +299,43 @@
 				objectDao.flush();
 				
 				rollBackUnionData(detail, description, -(detail.getAdditionalAmount()),details);
-				
+				deleteErrorDamageQuqlityMonitoringRecord(detail.getErrorDamageQmKey());
 			}
 		}
 	}
+	/**
+	 * 删除丢失报损记录关联的质量监测记录
+	 * @param errorDamageQmKey
+	 */
+	private void deleteErrorDamageQuqlityMonitoringRecord(String errorDamageQmKey){
+		if(StringUtils.isBlank(errorDamageQmKey)){
+			return ;
+		}
+		// 如果同一条回收记录关联的丢失报损记录还存在，不删除
+		String sql = " select count(*) from MaterialErrorDamageDetail med "
+					+ " where med.errorDamageQmKey = '" + errorDamageQmKey + "'";
+		Integer amount = 0;
+		ResultSet resultSet = objectDao.executeSql(sql);
+		try {
+			while (resultSet.next()) {
+				amount = resultSet.getInt(1);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			DatabaseUtil.closeResultSetAndStatement(resultSet);
+		}
+		// 丢失报损记录已经全部删除，则删除质量监测记录
+		if(amount == 0){
+			String findSql = " where po.errorDamageQmKey = '" + errorDamageQmKey + "'";
+			List<QualityMonitoringInstance> list = objectDao.findBySql(QualityMonitoringInstance.class.getSimpleName(), findSql);
+			if(CollectionUtils.isNotEmpty(list)){
+				for(QualityMonitoringInstance qmi : list){
+					objectDao.delete(qmi);
+				}
+			}
+		}
+	}
 
 	@Override
 	public boolean delete(MaterialErrorDamageDetail detail) {
