Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r28503 -r28507
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 28503)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 28507)
@@ -115,6 +115,16 @@
 	});
 }
 loadApplicationTousseSplitByOrgUnit();
+if(basketsStr !== ''){
+	getBasketsCode();
+}
+//重新加载所有篮筐
+function getBasketsCode(){
+	var basketsArray = basketsStr.split(',');
+	basketsArray.forEach(function(e){
+		loadBarcodeDevice(e);
+	});
+}
 //添加或删除器械包
 function addOrDelTousse(item){
 	var classifiedItemId = item.classifiedItemId;
@@ -3887,6 +3897,26 @@
 
 //是否进行清点确认 false 为保存，true 为清点确认
 var IntheBoxState = false;
+//合并数组并去重
+function MergeArray(arr1,arr2){
+    var _arr = new Array();
+    for(var i=0;i<arr1.length;i++){
+       _arr.push(arr1[i]);
+    }
+    for(var i=0;i<arr2.length;i++){
+        var flag = true;
+        for(var j=0;j<arr1.length;j++){
+            if(arr2[i].barcode==arr1[j].barcode){
+                flag=false;
+                break;
+            }
+        }
+        if(flag){
+            _arr.push(arr2[i]);
+        }
+    }
+    return _arr;
+}
 
 /**
  * 提交回收记录.
@@ -3921,7 +3951,6 @@
 		recyclingUserDefault = false;
 	}
 	var submitUrl = WWWROOT + "/disinfectSystem/recyclingRecordAction!saveRecyclingRecord.do";
-
 	$.ajax({
         url : submitUrl,
         type : "POST",
@@ -3976,7 +4005,25 @@
         			voluntarilyUrgentItemsString = JSON.stringify(voluntarilyUrgentItems);
         		}
         		if(saveAndNew){
-        			location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
+					if(sstsConfig.loadWashBasketsAfterSaveAndCreateNewRecyclingRecord){
+						if(jSONe.tousseIntoBasketInfo.length > 0){
+							var newArr = [];
+							var basketsArray = [];
+							for(var i=0;i<jSONe.tousseIntoBasketInfo.length;i++){
+								var arr = jSONe.tousseIntoBasketInfo[i].baskets;
+								newArr = MergeArray(newArr,arr);
+							}
+							for(var i=0;i<newArr.length;i++){
+								basketsArray.push(newArr[i].barcode);
+							}
+							var basketsStr = basketsArray.join(',');
+							location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser+"&basketsStr="+basketsStr;
+						}else {
+							location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
+						}
+					}else {
+						location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
+					}
         		}else{
         			location.href = encodeURI("awaitForRecycleList.jsp?resolution=" + resolution + "&voluntarilyUrgentItems=" + voluntarilyUrgentItemsString);
         		}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r28468 -r28507
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 28468)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 28507)
@@ -197,6 +197,7 @@
 }
 
 var rememberRecycleUser = '${param.rememberRecycleUser}';
+var basketsStr = '${param.basketsStr}';
 var today = '<%=request.getAttribute("today")%>';
 var userName = '<%=request.getAttribute("userName")%>';
 var secondOrgUnitCoding = '<%=request.getAttribute("orgUnitCoding")%>';
Index: ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/config.js
===================================================================
diff -u -r28407 -r28507
--- ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/config.js	(.../config.js)	(revision 28407)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/config.js	(.../config.js)	(revision 28507)
@@ -143,5 +143,7 @@
   //是否启用拍摄功能
   showCameraPhoto:true,
   //是否灭菌时打印标签
-  printLabelWhenSterilizing:true
+  printLabelWhenSterilizing:true,
+  //保存并新建回收单时自动加载上次的清洗篮筐
+  loadWashBasketsAfterSaveAndCreateNewRecyclingRecord:true
 }
\ No newline at end of file