Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r31957 -r31958
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 31957)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 31958)
@@ -216,7 +216,6 @@
 //根据配置的表单打印信息，以及从服务器取到的物品信息数据，打印表单
 function print2(printSummaryObj){
 	doGetLodop();
-	
 	var myObj = printConfig[formTypeOfPrinted];
 	if(isUndefinedOrNullOrEmpty(myObj)){
 		if(!isUndefinedOrNull(printSummaryObj.printConfigObj_default)){
@@ -2185,17 +2184,27 @@
 			formTypeOfPrinted = "recyclingGoodsDetail";
 			setPrinterByConfig();
 			//如果打印回收清单的类型为2(目前仅广医口腔有此配置),则按申请单的打印格式进行配置
-			if(sstsConfig.recyclingPrintContent == 2 || (sstsConfig.showRecyclingSaveAndPrintActionButton && recyclingPrintData.recyclingApplicationType !== '外来器械包申请单')){
+			if(sstsConfig.showRecyclingSaveAndPrintActionButton || sstsConfig.showRecyclingSaveAndPrintAndNewActionButton){
 				if(recyclingPrintData && recyclingPrintData.pages && recyclingPrintData.pages.length > 0){
 					for(var i = 0;i < recyclingPrintData.pages.length;i++){
 						recyclingPrintData.pageIndex = i;
 						print3(recyclingPrintData);
 						LODOP.PRINT();
 					}
 				}
-			}else{
-				print2(recyclingPrintData);
-				LODOP.PRINT();
+			}else if(sstsConfig.showRecyclingPrintDetail){
+				if(recyclingPrintData.recyclingApplicationType == '外来器械包申请单' && sstsConfig.recyclingPrintContent == 2){
+					if(recyclingPrintData && recyclingPrintData.pages && recyclingPrintData.pages.length > 0){
+						for(var i = 0;i < recyclingPrintData.pages.length;i++){
+							recyclingPrintData.pageIndex = i;
+							print3(recyclingPrintData);
+							LODOP.PRINT();
+						}
+					}
+				}else {
+					print2(recyclingPrintData);
+					LODOP.PRINT();
+				}
 			}
 		}
 	}