Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r29899 -r30001
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 29899)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 30001)
@@ -351,11 +351,16 @@
 	return top.Ext.getCmp('depart').getValue();
 }
 
+//获取结算科室
+function getSettleAccountsDepart(){
+	return top.Ext.getCmp('settleAccountsDepart').getValue();
+}
+
 //扫描条码加载物品
 function loadReturnDiposableGoodsItem() {
 	var barcode = top.Ext.getCmp('barcode').getValue();
 	top.Ext.getCmp("barcode").setValue('');// 清除条码
-	var depart = getCurrentDepart();
+	var depart = getSettleAccountsDepart();
 
 	if (isUndefinedOrNullOrEmpty(barcode)) {
 		showResult("条码不能为空!");
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp
===================================================================
diff -u -r29513 -r30001
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp	(.../addQualityMonitoring.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addQualityMonitoring.jsp	(.../addQualityMonitoring.jsp)	(revision 30001)
@@ -43,6 +43,11 @@
 var PACKAGE_TYPE_FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>';
 var PACKAGE_TYPE_SPLIT = '<%=TousseDefinition.PACKAGE_TYPE_SPLIT%>';
 var errorDamageQmKey = '${param.errorDamageQmKey}';
+var tousseName = '${param.tousseName}';
+var depart = '${param.depart}';
+var recyclingUser = '${param.recyclingUser}';
+var circuitNurse = '${param.circuitNurse}';
+var operationRoom = '${param.operationRoom}';
 //扫描篮筐允许的篮筐状态集合
 var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>';
 var moduleNameArr = new Array("<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_RECYCLING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_WASH%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_PACKING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_REVIEW%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_STERILIZATION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INVOICE%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_USERECORD%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_ROXYDISINFECTION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INFECTIONPART%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_OTHERPART%>");
@@ -66,7 +71,7 @@
 		Ext.getCmp('basketBarcodeC').setVisible(false);
 		Ext.getCmp('positionC').setVisible(false);
 		otherPartAddQM = true;
-		recycleAddQualityMonitoringDo(errorDamageQmKey);
+		recycleAddQualityMonitoringDo(errorDamageQmKey,tousseName,recyclingUser,depart,circuitNurse,operationRoom);
 		var viewport = new Ext.Viewport( {
 			layout : 'border',
 			items : [{
Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r29993 -r30001
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 29993)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 30001)
@@ -4933,7 +4933,7 @@
 	});
 	return formPanel;
 }
-function recycleAddQualityMonitoringDo(errorDamageQmKey){
+function recycleAddQualityMonitoringDo(errorDamageQmKey,tousseName,recyclingUser,depart,circuitNurse,operationRoom){
 	setStartDate(Ext, 'yyyy/MM/dd HH:mm', 'dateTime');  //（设置抽检时间，取服务器时间 cjr）
 	disableRecycleAndRepacking();
 	var responPartName = "回收清点";
@@ -4951,6 +4951,30 @@
 	}else{
 		Ext.getCmp("errorDamageQmKey").setValue("");
 	}
+	if((tousseName || '') !== ''){
+		Ext.getCmp("tousseNameBasics").setValue(tousseName);
+		Ext.getCmp("tousseNameBasics").disable();
+	}
+	if((recyclingUser || '') !== ''){
+		Ext.getCmp("recyclePerson").setValue(recyclingUser);
+		Ext.getCmp("recyclePerson").disable();
+	}
+	if((depart || '') !== ''){
+		Ext.getCmp("recycleDepartments").setValue(depart);
+		Ext.getCmp("recycleDepartments").disable();
+	}
+	if((userName || '') !== ''){
+		Ext.getCmp("responsiblePerson").setValue(userName);
+		Ext.getCmp("responsiblePerson").disable();
+	}
+	if((circuitNurse || '') !== ''){
+		Ext.getCmp("nurse").setValue(circuitNurse);
+		Ext.getCmp("nurse").disable();
+	}
+	if((operationRoom || '') !== ''){
+		Ext.getCmp("operationRoom").setValue(operationRoom);
+		Ext.getCmp("operationRoom").disable();
+	}
 //	formDefinitionStore.baseParams.responsiblePerson = "回收清点";
 //	formDefinitionStore.load();
 }
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
===================================================================
diff -u -r29608 -r30001
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp	(.../recyclingDamage.jsp)	(revision 29608)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp	(.../recyclingDamage.jsp)	(revision 30001)
@@ -35,14 +35,18 @@
 <script type="text/javascript">
 var WWWROOT = '${ctx}';
 var row = '${param.row}';
-var tousseName = '${param.tousseName}';
 var tousseDefinitionID = '${param.tousseDefinitionID}';
 var tousseCount = '${param.tousseCount}';
 var tousseItemId = '${param.tousseItemId}';
 var damageRemark = '${param.damageRemark}';
 var params_recordType = '${param.recordType}';
 var resolution = '${param.resolution}';
 var errorDamageQmKey = '${param.errorDamageQmKey}';
+var tousseName = '${param.tousseName}';
+var depart = '${param.depart}';
+var recyclingUser = '${param.recyclingUser}';
+var circuitNurse = '${param.circuitNurse}';
+var operationRoom = '${param.operationRoom}';
 errorDamageQmKey = errorDamageQmKey + "_damage";
 var dep = '${param.depart}';//$('depart').val();
 $('depart').val(dep);
@@ -272,7 +276,8 @@
 	var index= parent.layer.open({
         type : 2,
         title : ['添加质量监测记录',true],
-        content : 'addQualityMonitoring.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&errorDamageQmKey='+errorDamageQmKey,
+        content : 'addQualityMonitoring.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&errorDamageQmKey='+errorDamageQmKey+'&tousseName='+tousseName
+			+'&depart='+depart+'&recyclingUser='+recyclingUser,
         area : [ width + 'px' , height +heightExtra+ 'px'],
         border : [5, 0.3, '#fff', true],
         closeBtn : [2 , true],
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
===================================================================
diff -u -r29607 -r30001
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 29607)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 30001)
@@ -44,6 +44,11 @@
 	var errorDamageQmKey = '${param.errorDamageQmKey}';
 	errorDamageQmKey = errorDamageQmKey + "_error";
 	var params_recordType = '${param.recordType}';
+	var tousseName = '${param.tousseName}';
+	var depart = '${param.depart}';
+	var recyclingUser = '${param.recyclingUser}';
+	var circuitNurse = '${param.circuitNurse}';
+	var operationRoom = '${param.operationRoom}';
 	//动态加载JS和CSS
 	document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/style.css" rel="stylesheet" type="text/css" />');
 
@@ -286,14 +291,14 @@
 		
 		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,
+			content : 'addQualityMonitoring.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&errorDamageQmKey='+errorDamageQmKey+'&tousseName='+tousseName
+			+'&depart='+depart+'&recyclingUser='+recyclingUser+'&circuitNurse='+circuitNurse+'&operationRoom='+operationRoom,
 	        area : [ width + 'px' , height +heightExtra+ 'px'],
 	        border : [5, 0.3, '#fff', true],
 	        closeBtn : [2 , true],
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r29866 -r30001
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29866)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 30001)
@@ -2147,7 +2147,9 @@
 	var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
 	var errorRemark = $('#hiddenErrorRemark'+row).val();
 	var depart = $('#depart').text();
-
+	var recyclingUser = $('#recyclingUser').val();
+	var circuitNurse = $('#circuitNurse'+row).val();
+	var operationRoom = $('#operationRoom'+row).val();
   var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1;
 
   if(!isLessIE11){
@@ -2164,9 +2166,9 @@
         title : ['材料丢失',true],
         content : 'recyclingErrors.jsp?resolution='+resolution+'&isEditIDCardError='+isEditIDCardError+'&width='+width+'&height='+height
         	+'&row='+row+'&tousseDefinitionID='+$('#tousseDefinitionID'+row).val()+'&tousseName='+encodeAll(tousseName)
-        	+'&recordType=' + params_recordType
+        	+'&recordType=' + params_recordType+'&circuitNurse=' + encodeAll(circuitNurse)+'&operationRoom=' + encodeAll(operationRoom)
         	+'&tousseCount='+($('#recycleAmount'+row).val()==''?0:$('#recycleAmount'+row).val()) + '&errorRemark=' + errorRemark
-        	+'&errorDamageQmKey=' + errorDamageQmKey + '&depart='+encodeAll(depart),
+        	+'&errorDamageQmKey=' + errorDamageQmKey + '&depart='+encodeAll(depart)+'&recyclingUser='+encodeAll(recyclingUser),
         area : [ width + 'px' , height +heightExtra + 'px'],
         border : [5, 0.3, '#fff', true],
         closeBtn : [2 , true],  
@@ -2194,13 +2196,16 @@
 	var heightExtra = 10;
     var depart = $('#depart').text();
     var departCode = $('#departCode').val();
-    var damageRemark = $('#hiddenDamageRemark' + row).val();
+	var damageRemark = $('#hiddenDamageRemark' + row).val();
+	var recyclingUser = $('#recyclingUser').val();
     if(resolution == '1980'){
         width = 980;
         height = 700;
     }
     var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight);
 	var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
+	var circuitNurse = $('#circuitNurse'+row).val();
+	var operationRoom = $('#operationRoom'+row).val();
 
   var isLessIE11 = navigator.userAgent.indexOf('compatible') > -1 && navigator.userAgent.indexOf('MSIE') > -1;
 
@@ -2216,11 +2221,11 @@
         type : 2,
         title : ['材料报损',true],
         content : 'recyclingDamage.jsp?resolution='+resolution+'&width='+width+'&height='+height
-        	+'&row='+row+'&tousseDefinitionID='+$('#tousseDefinitionID'+row).val()+'&tousseName='+tousseName
+        	+'&row='+row+'&tousseDefinitionID='+$('#tousseDefinitionID'+row).val()+'&tousseName='+encodeAll(tousseName)
         	+'&tousseItemId='+tousseItemId+'&tousseCount='+$('#recycleAmount'+row).attr('value')
-        	+'&recordType=' + params_recordType
+        	+'&recordType=' + params_recordType+'&circuitNurse=' + encodeAll(circuitNurse)+'&operationRoom=' + encodeAll(operationRoom)
         	+'&depart='+encodeURI(depart)+'&departCode='+departCode+ '&damageRemark=' + damageRemark
-        	+'&errorDamageQmKey=' + errorDamageQmKey,
+        	+'&errorDamageQmKey=' + errorDamageQmKey+'&recyclingUser='+encodeAll(recyclingUser),
         area : [ width + 'px' , height +heightExtra + 'px'],
         border : [5, 0.3, '#fff', true],
         closeBtn : [2 , true],
@@ -3463,6 +3468,8 @@
 	var isCleanedEntirely = toussItem.isCleanedEntirely;
 	var isApplyEntireTousse = toussItem.isApplyEntireTousse;
 	var tousseType = toussItem.tousseType;
+	var circuitNurse = toussItem.circuitNurse || '';
+	var operationRoom = toussItem.operationRoom || '';
 	var isThereIdentificationCard = toussItem.isThereIdentificationCard;
 	var tousseDefinitionID = toussItem.tousseDefinitionID;
 	var urgentAmount = toussItem.urgentAmount;
@@ -3620,7 +3627,9 @@
                    '<input type="hidden" id="hiddenDamageRemark'+row+'" name="hiddenDamageRemark'+row+'" value="'+damageRemark+'"/>'+
                    '<input type="hidden" id="hiddenErrorDamageQmKey'+row+'" name="hiddenErrorDamageQmKey'+row+'" value="'+errorDamageQmKey+'"/>'+
                    '<input type="hidden" id="tousseOrIDCardInstanceBarcodes'+row+'" name="tousseOrIDCardInstanceBarcodes'+row+'" value="'+barcode+'"/>'+
-                   '<input type="hidden" id="spelling'+row+'" name="spelling'+row+'" value="'+spelling+'"/>'+
+				   '<input type="hidden" id="spelling'+row+'" name="spelling'+row+'" value="'+spelling+'"/>'+
+				   '<input type="hidden" id="circuitNurse'+row+'" name="circuitNurse'+row+'" value="'+circuitNurse+'"/>'+
+				   '<input type="hidden" id="operationRoom'+row+'" name="operationRoom'+row+'" value="'+operationRoom+'"/>'+
                    '<div class="tousseDetailTable"><table id="tousseDetailTable'+row+'" border="0" cellpadding="0" cellspacing="0"><tr><td>' +
                    urgentAmountElement + '</td><td>' +
                    '<button id="showTousseName'+row+'" name="showTousseName'+row+'" type="button" readonly="readonly"  onfocus="this.blur();" class="input-a" onclick="amendDisinfectionTousse('+row+');" style="overflow: hidden;line-height:'+lineHeight+'px;padding-left: 5px;text-align: left;font-size:'+fontSize+'px">'+showTousseName+'</button></td>'+
@@ -5785,15 +5794,14 @@
 	}
 	
 	selectUserType(currentUserType);
-	
 	document.onkeydown = showKeyDown;
     var recyclingApplicationId = params_appId;
     var barcode = params_barcode;
     var recyclingStatus = null;
     if(!isUndefinedOrNullOrEmpty(recyclingApplicationId)){
         DWREngine.setAsync(false);
         RecyclingApplicationTableManager.getRecyclingApplicationForRecycle(recyclingApplicationId,function(application){
-            if(application == null)
+			if(application == null)
             	return;
             recyclingStatus = application.recyclingStatus;
             if(application.useRecordId != null){
@@ -5845,28 +5853,33 @@
 							
                				var errorDamageQmKey = item.errorDamageQmKey;
                				if(isUndefinedOrNullOrEmpty(errorDamageQmKey)){
-               					var timeStr = new Date().getTime();
-                   				errorDamageQmKey = item.tousseDefinitionId + "_" + timeStr;
-               				}
+							var timeStr = new Date().getTime();
+							errorDamageQmKey = item.tousseDefinitionId + "_" + timeStr;
+							}
+							
+							var circuitNurse = item.circuitNurse || '';
+							var operationRoom = item.operationRoom || '';
                				var toussItem = {
-               						row: row,
-               						tousseItemId: '',
-               						tousseName: item.tousseName,
-               						tousseDefinitionID: item.tousseDefinitionId,
-               						applicationAmount: item.amount,
-               						recycleAmount: recycleAmount,
-               						loadedAmount: 0,
-               						isCleanedEntirely: item.isCleanedEntirely,
-               						tousseType: item.tousseType,
-               						isThereIdentificationCard: item.isThereIdentificationCard,
-               						isApplyEntireTousse: item.isApplyEntireTousse,
-               						urgentAmount : item.urgentAmount,
-               						errorRemark : item.errorRemark,
-               						damageRemark : item.damageRemark,
-               						urgentLevel : item.urgentLevel,
-               						tousseRemark : '',
-               						errorDamageQmKey : errorDamageQmKey,
-                                	spelling : item.spelling
+								row: row,
+								tousseItemId: '',
+								tousseName: item.tousseName,
+								tousseDefinitionID: item.tousseDefinitionId,
+								applicationAmount: item.amount,
+								recycleAmount: recycleAmount,
+								loadedAmount: 0,
+								isCleanedEntirely: item.isCleanedEntirely,
+								tousseType: item.tousseType,
+								isThereIdentificationCard: item.isThereIdentificationCard,
+								isApplyEntireTousse: item.isApplyEntireTousse,
+								urgentAmount : item.urgentAmount,
+								errorRemark : item.errorRemark,
+								damageRemark : item.damageRemark,
+								urgentLevel : item.urgentLevel,
+								tousseRemark : '',
+								errorDamageQmKey : errorDamageQmKey,
+								spelling : item.spelling,
+								circuitNurse:circuitNurse,
+								operationRoom:operationRoom
                				};
                				addToussItem(toussItem,false);
                				canTerminateTousseItemIds.push(item.id);