Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js
===================================================================
diff -u -r26764 -r26778
--- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js	(.../config.js)	(revision 26764)
+++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js	(.../config.js)	(revision 26778)
@@ -231,5 +231,7 @@
   //是否开启打印灭菌温度压力曲线 
   printSterileTPLineData:true,
   //灭菌炉、温度曲线图页面是否显示数据温度压力数据,true显示，false或者没有配置不显示
-  sterilizerLineChartIsShowTable:true
+  sterilizerLineChartIsShowTable:true,
+  //在回收界面显示科室自送人输入框,true显示,false或者没有配置不显示
+  showSelfTransportorInRecycleForm:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r26616 -r26778
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 26616)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 26778)
@@ -123,6 +123,10 @@
     if(sstsConfig.enbaleRecoveryCheckLeftKeyboard){
     	$('#btnBoxGoods').show();
 	}
+	//自送人显示
+	if(sstsConfig.showSelfTransportorInRecycleForm){
+		$('.departmentSender').show();
+	}
 });
 /**
  * 刷新当前页面
@@ -1394,14 +1398,36 @@
                 	checkLoadedAmount();
                 }else if(msg.user != null){
                 	userNameByBarcode = msg.user.fullName;
-                	//点击选中回收人员或是清点人员
+					var departCode = $('#departCode').val();
+					var userOrgUnit = msg.user.userOrgUnit;					
+					
+                	//点击选中回收人员或是清点人员或者自送人
                		if(currentUserType == userType_recycling){
                			$('#recyclingUser').val(userNameByBarcode);
                			currentUserType = userType_operator;
                		}else if(currentUserType == userType_operator){
                			$('#operator').val(userNameByBarcode);
                			currentUserType = userType_recycling;
-               		}
+               		}else if(currentUserType == userType_departmentSender){
+						if(departCode == ""){//手工添加的回收申请单，如果先扫描科室自送人，则自动填写回收单的申请科室
+							if(userOrgUnit){
+								$("#departmentSender").val(userNameByBarcode);
+								$("#depart").val(userOrgUnit.orgUnitName);
+								$('#departCode').val(userOrgUnit.orgUnitNameCode);
+								currentUserType = userType_recycling;
+							}
+						}else{
+							if(userOrgUnit){			
+								//扫描的科室自送人必须是该申请单的申请科室下的人员	
+								if(userOrgUnit.orgUnitNameCode != departCode){
+									alertDiv('科室自送人与回收科室不一致!');
+									return;
+								}
+								$("#departmentSender").val(userNameByBarcode);
+								currentUserType = userType_recycling;
+							}		
+						}
+					}
                		selectUserType(currentUserType);
                 }else{
                 	alertDiv('没有找到该条码所对应的信息。');
@@ -1428,7 +1454,6 @@
 	$('#operator').val(userNameByBarcode);
 }
 
-
 function openselectRecyclingApplication(){
     var width = 740;
 	var height = 400;
@@ -3109,6 +3134,7 @@
 	var app_id = document.getElementById('recyclingApplicationId').value;
 	var departCode = document.getElementById('departCode').value;
 	var recyclingUser = document.getElementById('recyclingUser').value;
+	var departmentSender = document.getElementById('departmentSender').value;
 	var operator = document.getElementById('operator').value;
 	var depart = document.getElementById('depart').value;
 	var recyclingTime = document.getElementById('recyclingTime').value;
@@ -3130,6 +3156,7 @@
         	invoicePlanVersion : $("#invoicePlanVersion").val(),
         	departCode : departCode,
         	recyclingUser : recyclingUser,
+			departmentSender:departmentSender,
         	operator : operator,
         	depart : depart,
         	recyclingTime : recyclingTime,
@@ -3212,6 +3239,7 @@
 	var app_id = document.getElementById('recyclingApplicationId').value;
 	var departCode = document.getElementById('departCode').value;
 	var recyclingUser = document.getElementById('recyclingUser').value;
+	var departmentSender = document.getElementById('departmentSender').value;
 	var operator = document.getElementById('operator').value;
 	var depart = document.getElementById('depart').value;
 	var recyclingTime = document.getElementById('recyclingTime').value;
@@ -3232,6 +3260,7 @@
         	invoicePlanVersion : $("#invoicePlanVersion").val(),
         	departCode : departCode,
         	recyclingUser : recyclingUser,
+			departmentSender:departmentSender,
         	operator : operator,
         	depart : depart,
         	recyclingTime : recyclingTime,
@@ -3834,8 +3863,13 @@
 	$("#" + currentElementId).css("background","#DDDDDD");
 	if(currentElementId == userType_recycling){
 		$("#operator").css("background","white");
+		$("#departmentSender").css("background","white");
 	}else if(currentElementId == userType_operator){
 		$("#recyclingUser").css("background","white");
+		$("#departmentSender").css("background","white");
+	}else if(currentElementId == userType_departmentSender){
+		$("#recyclingUser").css("background","white");
+		$("#operator").css("background","white");
 	}
 }
 //选择科室
@@ -4047,6 +4081,7 @@
                     success:function(dataArray){
                     	document.getElementById('depart').value = departName;
                         document.getElementById('departCode').value = departCode;
+						$("#departmentSender").val("");//清空自送人
                     	emptyTousseItemTable();
 //                    	$("#tousseItemTable").empty();
                     	if(dataArray.length > 0){
@@ -4376,6 +4411,7 @@
             $("#id").val(record.id);
             $("#depart").val(record.depart);
             $("#recyclingUser").val(record.recyclingUser);
+			$("#departmentSender").val(record.departmentSender);
             $("#operator").val(record.operator);
             $("#departCode").val(record.departCode);
             $("#recyclingTime").val(dateObjFormat(record.recyclingTime));
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r26616 -r26778
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 26616)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 26778)
@@ -105,6 +105,8 @@
 .data-table .tousseDetailTable td{ padding:0px;text-align:left;vertical-align:middle;}
 .data-table .tousseDetailTable .input-a{padding:0 2px;width:335px;}
 .zhuangzai-table .list-item .totalnum{ display:inline-block;text-align:center;float:right; width:86px;height:58px;overflow:hidden;margin: 0px;}
+.add-form .departmentSender{top: -97px;left: -114px;font-size: 23px;color: #3B5B67;}
+.departmentSender{display: none;}
 </style>
 
 <!-- alertDIV -->
@@ -161,7 +163,11 @@
 
 var userType_recycling = 'recyclingUser';
 var userType_operator = 'operator';
+var userType_departmentSender = 'departmentSender';
 var currentUserType = userType_recycling;
+if(sstsConfig.showSelfTransportorInRecycleForm){
+	currentUserType = userType_departmentSender;
+}
 
 var rememberRecycleUser = '${param.rememberRecycleUser}';
 var today = '<%=request.getAttribute("today")%>';
@@ -266,7 +272,7 @@
         </center>
         <center id="idBoxCenterUserType" style="display:none;">
             <input type="button" onclick="selectRecyclingUser();closeDiv();" style="width:100px;text-align:center;height:50px;font-size:18px;" value="回收人员" />
-            <input type="button" onclick="selectOperator();closeDiv();" style="width:100px;text-align:center;height:50px;font-size:18px;" value="清点人员" />
+            <input type="button" onclick="selectOperator();closeDiv();" style="width:100px;text-align:center;height:50px;font-size:18px;" value="清点人员" />			 
         </center>
     </dd>
 </dl>
@@ -281,6 +287,7 @@
     <!--操作 start-->
     <div class="add-form">
         <form id="recyclingRecordForm" method="post" action="${ctx}/disinfectSystem/recyclingRecordAction!saveRecyclingRecord.do">
+			<div class="departmentSender">自送人&nbsp;<input id="departmentSender" name="departmentSender" type="text" readonly="readonly" class="input" onclick="selectUserType(this.id);" style="background: rgb(221, 221, 221);"/></div>
             <input type="hidden" id="id" name="id"/>
             <input type="hidden" id="resolution" name="resolution" value="${param.resolution}"/>
             <input type="hidden" id="recyclingApplicationId" name="recyclingApplicationId"/>
@@ -289,10 +296,10 @@
             <input type="hidden" id="recyclingStatus" name="recyclingStatus"/>
             <input type="hidden" id="useRecordId" name="useRecordId"/>
             <input type="hidden" id="communicationUserCode" name="communicationUserCode"/>
-            <div class="name">回收人&nbsp;&nbsp;<input id="recyclingUser" name="recyclingUser" type="text" readonly="readonly" class="input" onclick="selectUserType(this.id);"/></div>
+            <div class="name">回收人&nbsp;<input id="recyclingUser" name="recyclingUser" type="text" readonly="readonly" class="input" onclick="selectUserType(this.id);" style="margin-left: -2px;"/></div>
             <div class="operator">清点人&nbsp;&nbsp;<input id="operator" name="operator" type="text" readonly="readonly" class="input" onclick="selectUserType(this.id);"/></div>
             <div class="recyclingTime">回收时间&nbsp;&nbsp;<input id="recyclingTime" name="recyclingTime" type="text" readonly="readonly" class="input"/></div>
-            <div class="depart">科&nbsp;&nbsp;&nbsp;室&nbsp;&nbsp;<input id="depart" name="depart" type="text" class="input" readonly="readonly" onclick='openSelectDepart();' /></div>
+            <div class="depart">科&nbsp;&nbsp;&nbsp;室&nbsp;<input id="depart" name="depart" type="text" class="input" readonly="readonly" onclick='openSelectDepart();' /></div>
             <div class="appType">类&nbsp;&nbsp;型&nbsp;&nbsp;&nbsp;<input id="appType" name="appType" type="text" readonly="readonly" class="input"/></div>
             <div class="applyTime">申请时间&nbsp;&nbsp;<input id="applyTime" name="applyTime" type="text" readonly="readonly" class="input"/></div>
             <c:if test="${param.resolution != 1980}">
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r26112 -r26778
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 26112)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 26778)
@@ -28,7 +28,7 @@
 .blank40 {clear:both; height:40px; display:block; font-size:1px;overflow:hidden;}
 
 .mbody{ background:url(body_bg.jpg) no-repeat; width:1980px; height:1080px; margin:0 auto; position:relative;margin-top: -16px;margin-left:40px;}
-.add-form{ position:absolute; width:995px; height:151px; top:123px; left:175px}
+.add-form{ position:absolute; width:995px; height:151px; top:123px; left:167px}
 .add-form div{ position:absolute;}
 .add-form .input{ background:url(pic_bg.jpg) no-repeat 0 -614px; width:251px; height:42px; border:0px; font-size:24px; padding:10px 10px; line-height:40px;}