Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js
===================================================================
diff -u -r22653 -r22696
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js	(.../config.js)	(revision 22653)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js	(.../config.js)	(revision 22696)
@@ -41,6 +41,8 @@
   recycleAllTousseIntoBasket : true,
   //回收时，申请数量与回收数量不一致，是否要确认
   confirmRecyclingAmount:false,
+  //回收时是否可以修改申请单备注
+  modifyRemarkInRecycling:true,
   // 高值耗材自助入库验收后是否发货，默认为否
   checkedAfterSubmitInvoice : false
 }
\ No newline at end of file
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java
===================================================================
diff -u -r22653 -r22696
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java	(.../RecyclingContext.java)	(revision 22653)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/RecyclingContext.java	(.../RecyclingContext.java)	(revision 22696)
@@ -47,6 +47,10 @@
 	 */
 	private String depart;
 	/**
+	 * 备注。如果启用回收备注修改功能,那就保存时修改申请单的备注
+	 */
+	private String remark;
+	/**
 	 * 回收时间
 	 */
 	private String recyclingTime;
@@ -141,6 +145,12 @@
 	public void setDepart(String depart) {
 		this.depart = depart;
 	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
 	/**
 	 * 获取回收时间,如果为空,则取系统当前时间
 	 * @return
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r22653 -r22696
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 22653)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 22696)
@@ -2724,6 +2724,7 @@
         	recyclingUserDefault : recyclingUserDefault,
         	autoReturnTheBorrowingTousse : autoReturnTheBorrowingTousse,
         	recyclingAmountConfirm:recyclingAmountConfirm,
+        	remark:$('#remarkText').text(),
         	communicationUserName:$('#communicationUserName').val(),
         	communicationUserCode:$('#communicationUserCode').val()
         },
@@ -2950,6 +2951,53 @@
         offset : [offsetTop+'px','']
     });
 }
+//输入备注
+function openInputRemark(){
+	if(!sstsConfig.modifyRemarkInRecycling){
+		return;
+	}
+	var width = 780;
+	var height = 100;
+	var designedTousseWidth = 1080;
+	var designedTousseHeight = 100;
+	var designedWidth = 1920;
+	var designedHeight = 1080;
+	var actualWidth = window.screen.availWidth;
+	var actualHeight = window.screen.availHeight;
+	var offsetTop = 400;
+	
+	if(resolution == '1980'){
+		width = 1380;
+		height = 100;
+	}
+	var zoomRatio = calculateZoomRatio(designedWidth,designedHeight,actualWidth,actualHeight);
+	var size = calculateSizeAfterZoom(designedTousseWidth,designedTousseHeight,zoomRatio);
+	
+	var width = 980;
+	var height = 330;
+	var heightExtra = 10;
+	
+	offsetTop = offsetTop*zoomRatio;
+	layerIndex=layer.open({
+        type : 2,
+        title : ['输入备注',true],
+        content : 'inputRemark.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&remark=' + encodeURIComponent($('#remarkText').text()),
+        area : [ width + 'px' , height +heightExtra+ 'px'],
+        border : [5, 0.3, '#fff', true],
+        closeBtn : [2 , true],
+        offset : [offsetTop+'px','']
+    });
+}
+/**
+ * 设置申请单备注
+ * @param remark
+ */
+function setRemark(remark){
+	if(isUndefinedOrNullOrEmpty(remark)){
+		remark = "";
+	}
+	$('#remarkText').text(remark);
+}
 // 添加质量监测记录
 function addQM(){
 	
@@ -3291,7 +3339,7 @@
            		
            		$("#appType").val(application.type);
            		$("#applyTime").val(application.submitTime);
-           		$("#remark").html($("#remark").html() + (application.remark == null ? "" : application.remark));
+           		$("#remarkText").text($("#remarkText").html() + (application.remark == null ? "" : application.remark));
            		//备注添加申请人
            		addApplicantToRemark(application);
            		
@@ -3478,16 +3526,14 @@
 function addApplicantToRemark(application){
 	var confirmRecyclingAmount = getSystemSetConfig('confirmRecyclingAmount',true);
 	if(confirmRecyclingAmount){
-			var rmk = $("#remark").text();
-			var rmks = $("#remark").html();
-			rmk = rmk.replace('备注：','');
+			var rmk = $("#remarkText").text();
 			if(!isUndefinedOrNullOrEmpty(rmk)){
-				rmks += ";";
+				rmk += ";";
 			}
 			if(!isUndefinedOrNullOrEmpty(application.applicant)){
-				rmks += '申请人:' + application.applicant;
+				rmk += '申请人:' + application.applicant;
 			}
-			$("#remark").html(rmks);
+			$("#remarkText").text(rmk);
 		}
 }
 /**
@@ -3518,7 +3564,7 @@
                 
                 $("#appType").val(application.type);
            		$("#applyTime").val(dateObjFormat(application.submitTime));
-           		$("#remark").html($("#remark").html() + (application.remark == null ? "" : application.remark));
+           		$("#remarkText").text($("#remarkText").text() + (application.remark == null ? "" : application.remark));
            		addApplicantToRemark(application);
             }
             userName = record.operator;
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r22694 -r22696
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 22694)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 22696)
@@ -1209,6 +1209,13 @@
 			if(CssdUtils.getSystemSetConfigByNameBool("showRecyclingPrintDetail")){
 				recyclingContext.setRecyclingPrintData(loadRecyclingPrintData(recyclingRecord));
 			}
+			if(CssdUtils.getSystemSetConfigByNameBool("modifyRemarkInRecycling")){
+				InvoicePlan ip = recyclingRecord.getRecyclingApplication();
+				if(ip != null){
+					ip.setRemark(recyclingContext.getRemark());
+					objectDao.save(ip);
+				}
+			}
 			
 			//设置此次回收自动加急的物品信息（返回给前台对用户进行提示）
 			recyclingContext.setVoluntarilyUrgentItems(recyclingContext.getJsonParamObject().optJSONArray("voluntarilyUrgentItems"));
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/inputRemark.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/inputRemark.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/inputRemark.jsp	(revision 22696)
@@ -0,0 +1,82 @@
+<!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"%>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>输入备注</title>
+<style type="text/css">
+.body {margin:0 auto;}
+.search .input{ width:96%; height:150px; line-height:45px; overflow:hidden; padding:0 10px; border:1px solid #ccc; font-size:26px;}
+.search .btn{background:url(${param.resolution}/images/pic_bg.jpg) no-repeat -177px -417px; width:143px; height:62px; border:none; margin-right:10px; font-size: 27px;}
+.search .btn:hover{ background-position:-177px -480px;}
+.btn-box{text-align:center;margin-top:10px;}
+</style>
+</head>
+<script>
+//动态加载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 backSpaceInputText(){
+		var currentValue = document.getElementById('spellingCode').value;
+		if(currentValue == ""){
+			openFocus();
+			return;
+		}
+		document.getElementById('spellingCode').value = currentValue.substring(0,currentValue.length - 1);
+		openFocus();
+    }
+	
+    function cleanInputText(){
+        document.getElementById('spellingCode').value = "";
+        serchValue = '';
+        openFocus();
+    }
+	function openFocus(){
+		document.getElementById('spellingCode').focus();
+	}
+	function save(){
+		var input = document.getElementById('spellingCode').value;
+		if(typeof parent.setRemark == 'function'){
+			parent.setRemark(input);
+		}
+		closeLayer();
+	}
+	function getQueryString(name) {
+		var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)","i");
+		var r = window.location.search.substr(1).match(reg);
+		if (r!=null) 
+			return decodeURIComponent(r[2]);
+		return null;
+	}
+	function init(){
+		var remark = getQueryString('remark');
+		document.getElementById('spellingCode').value = remark;
+		spellingCode
+	}
+</script>
+
+<body onload="init();">
+<div class="search">
+	<div><TEXTAREA id="spellingCode" name="" type="text" class="input"></TEXTAREA></div>
+	<div class="btn-box">
+		<input type="button" class="btn" value="退格" onclick="backSpaceInputText();"/>
+	    <input type="button" class="btn" value="重置" onclick="cleanInputText();"/>
+	    <input type="button" class="btn" value="保存" onclick="save();"/>
+	</div>
+</div>
+</body>
+</html>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r22653 -r22696
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 22653)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 22696)
@@ -170,6 +170,9 @@
     if (notInWhiteList(sstsConfig, 'tousseSplitRecycle')) {
     	$("#customIntoBasketDiv").hide();
 	}
+    $('#remark').click(function(){
+    	openInputRemark();
+    });
 });
 
 var PACKAGE_TYPE_INSIDE = '<%=TousseDefinition.PACKAGE_TYPE_INSIDE%>';
@@ -233,7 +236,7 @@
             <div class="add2" id="customIntoBasketDiv" onclick="openCustomIntoBasketPage();"></div>
             <div class="add"><a href="javascript:void(0);" id="add-bao" onclick="openSelectTousse();">添加器械包</a></div>
             <div class="addQM"><a href="javascript:void(0);" id="add-QM" onclick="addQM();" style="${recycleAddQualityMonitoring}"></a></div>
-            <div class="remark" id="remark" name="remark"><font color="#3B5B67">备注：</font></div>
+            <div class="remark" id="remark" name="remark"><font color="#3B5B67">备注：</font><span id="remarkText"></span></div>
             <div class="communicationUserName">&nbsp;&nbsp;&nbsp;沟通人&nbsp;&nbsp;<input id="communicationUserName" name="communicationUserName" type="text" readonly="readonly" class="input" onclick="selectCommunicationUser(this.id);"/></div>
         </form>
     </div>