Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r18578 -r18585
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 18578)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 18585)
@@ -2763,7 +2763,6 @@
     if(!isUndefinedOrNullOrEmpty(id)){
     	loadRecyclingRecordById(id);
     }else{
-    	
     	$("#recyclingTime").val(today);
     	
     	var recyclePageCheckUserDefaultCurrentUser = true;
@@ -2792,6 +2791,10 @@
         		$("#operator").val(sessionOperator);
         	}
     	}
+    	//如果有传递科室参数,那设置回收科室,并加载模板
+    	if(!isUndefinedOrNullOrEmpty(params_departCoding)){
+    		selectDepart(params_departName,params_departCoding);
+    	}
     }
     
     if(isSecondSupplyRoom && id == "" && params_appId == ""){
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r18328 -r18585
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 18328)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 18585)
@@ -135,6 +135,8 @@
 var params_barcode = '${param.barcode}';
 var params_id = '${param.id}';
 var params_recordType = '${param.recordType}';
+var params_departName = '${param.departName}';
+var params_departCoding = '${param.departCoding}';
 var params_type = ${supplyRoomType};
 
 layer.config({
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r18465 -r18585
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 18465)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 18585)
@@ -240,9 +240,12 @@
     location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&id="+id + "&recordType=" + "history&rememberRecycleUser=" + rememberRecycleUser;   //添加recordType,表示是历史记录
 }
 
-function newRecyclingRecord(){
+function newRecyclingRecord(departName,departCoding){
+	var departName = isUndefinedOrNullOrEmpty(departName)?"":departName;
+	var departCoding = isUndefinedOrNullOrEmpty(departCoding)?"":departCoding;
 	var rememberRecycleUser= CookieManager.getCookie("rememberRecycleUser");
-	location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&rememberRecycleUser=" + rememberRecycleUser;
+	location.href = "recycleForTouchScreen.jsp?resolution=${param.resolution}&rememberRecycleUser=" 
+			+ rememberRecycleUser + "&departName=" + departName + "&departCoding=" + departCoding;
 }
 
 function cancel(){
@@ -782,7 +785,7 @@
             			var applyTimeOrder = $("#applyTimeOrder").val();
             			var orgUnitCoding = msg.orgUnitCoding;
             			var operationRoom = CookieManager.getCookie("operationRoom");
-            			loadApplicationData(id,appType,applyTimeOrder,orgUnitCoding,operationRoom,true);
+            			loadApplicationData(id,appType,applyTimeOrder,orgUnitCoding,operationRoom,true,msg.departMent);
             		}else{
             			if(msg.isIdCardBarcode){
             				selectIdCardBarcode(barcode);
@@ -897,7 +900,7 @@
 	loadApplicationData(id,appType,applyTimeOrder,orgUnitCoding,operationRoom,false);
 }
 
-function loadApplicationData(groupId,appType,applyTimeOrder,orgUnitCoding,operationRoom,isOpenApplication){
+function loadApplicationData(groupId,appType,applyTimeOrder,orgUnitCoding,operationRoom,isOpenApplication,orgUnitName){
 	$.ajax({
         type:'post',
         url:WWWROOT + '/disinfectSystem/recyclingRecordAction!getAwaitForRecyclingInvoicePlan.do',
@@ -913,9 +916,15 @@
         	if(isOpenApplication && jsonData.length == 1){
         		// 该科室的回收单的数量为1，直接打开该回收单
         		recycleTheApplication(jsonData[0].id,null);
-        	}else{
+        	}else if(jsonData.length > 1){
         		$("#awaitForRecycleTable").empty();
         		getData(jsonData);
+        	}else{
+        		if(sstsConfig.newRecyclingApplicationWhenScanNoApplicationDepart 
+        				&& !isUndefinedOrNullOrEmpty(orgUnitCoding)){
+        			//没有申请单,新建
+            		newRecyclingRecord(orgUnitName,orgUnitCoding);
+        		}
         	}
         },
         error:function(){}