Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r31952 -r31965
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 31952)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 31965)
@@ -4721,14 +4721,22 @@
 					var appType = $('#appType').val();
 					for(var i = 0; i < result.recyclingPrintData.length;++i){
 						var recyclingPrintData = result.recyclingPrintData[i];
-						if(sstsConfig.recyclingPrintContent == 2 || (sstsConfig.showRecyclingSaveAndPrintActionButton && appType !== '外来器械包申请单')){
+						if(sstsConfig.showRecyclingSaveAndPrintActionButton || sstsConfig.showRecyclingSaveAndPrintAndNewActionButton){
 							if(recyclingPrintData && recyclingPrintData.pages && recyclingPrintData.pages.length > 0){
 								for(var i = 0;i < recyclingPrintData.pages.length;i++){
 									count++;
 								}
 							}
-						}else {
-							count++;
+						}else if(sstsConfig.showRecyclingPrintDetail){
+							if(appType == '外来器械包申请单' && sstsConfig.recyclingPrintContent == 2){
+								if(recyclingPrintData && recyclingPrintData.pages && recyclingPrintData.pages.length > 0){
+									for(var i = 0;i < recyclingPrintData.pages.length;i++){
+										count++;
+									}
+								}
+							}else {
+								count++;
+							}
 						}
 					}
 				}
@@ -4749,12 +4757,30 @@
 					if (sstsConfig.loadWashBasketsAfterSaveAndCreateNewRecyclingRecord) {
 						if (saveBasketsArr.length > 0) {
 							var basketsStr = saveBasketsArr.join(',');
-							location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser + "&basketsStr=" + basketsStr;
+							if(count > 0){
+								setTimeout(function(){
+									location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser + "&basketsStr=" + basketsStr;
+								}, 700*count);
+							}else {
+								location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser + "&basketsStr=" + basketsStr;
+							}
 						} else {
-							location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
+							if(count > 0){
+								setTimeout(function(){
+									location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
+								}, 700*count);
+							}else {
+								location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
+							}
 						}
 					} else {
-						location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
+						if(count > 0){
+							setTimeout(function(){
+								location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
+							}, 700*count);
+						}else {
+							location.href = "recycleForTouchScreen.jsp?resolution=" + resolution + "&rememberRecycleUser=" + rememberRecycleUser;
+						}
 					}
 				} else {
 					if(count > 0){