Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js
===================================================================
diff -u -r38239 -r38241
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js	(.../invoicePrint.js)	(revision 38239)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js	(.../invoicePrint.js)	(revision 38241)
@@ -423,6 +423,18 @@
 			myObj.beforeBatchPrintInvoices(invoicesInfo);
 		}
 	}
+	var foreignGoodsArray = [];
+	// NFYY-104：外来器械包
+	if(invoicesInfo.foreignGoods && invoicesInfo.foreignGoods.length > 0){
+		foreignGoodsArray = invoicesInfo.foreignGoods;
+	}
+	if(invoicesInfo.foreignGoodsList && invoicesInfo.foreignGoodsList.length > 0){
+		foreignGoodsArray = invoicesInfo.foreignGoodsList;
+	}
+	if(invoicesInfo.foreignTousseList && invoicesInfo.foreignTousseList.length > 0){
+		foreignGoodsArray = invoicesInfo.foreignTousseList;
+	}
+	
     if(true == sstsConfig.mergePrintInvoiceGoods){ 
     	//合并打印
     	var goods = [];
@@ -444,16 +456,11 @@
 			if(invoicesInfo.goods.length > 0){
 				printInvoiceInfo_local(invoicesInfo, printType);
 			}
-			
 		}else{
 			// NFYY-104：外来器械包
-			if(invoicesInfo.foreignGoods && invoicesInfo.foreignGoods.length > 0){
-				goods = goods.concat(invoicesInfo.foreignGoods);
+			if(foreignGoodsArray.length > 0){
+				goods = goods.concat(foreignGoodsArray);
 			}
-			// NFYY-104：外来器械包
-			if(invoicesInfo.foreignGoodsList && invoicesInfo.foreignGoodsList.length > 0){
-				goods = goods.concat(invoicesInfo.foreignGoodsList);
-			}
 			invoicesInfo.goods = goods;
 			printInvoiceInfo_local(invoicesInfo, printType);
 		}
@@ -500,60 +507,35 @@
     		invoicesInfo.goods = invoicesInfo.expensiveGoods;
     		printInvoiceInfo_local(invoicesInfo, printType);
     	}
-		// NFYY-104：外来器械包 - 批量打印
-		if(invoicesInfo.foreignGoods && invoicesInfo.foreignGoods.length > 0){
-			invoicesInfo.formTypeOfPrinted = 'batchPrintInvoices';
-			var tousseObj = printConfig['batchPrintInvoice_foreignTousse'];
-			if(!isUndefinedOrNullOrEmpty(tousseObj)){
-				invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_foreignTousse';
-			}
-			invoicesInfo.goods = invoicesInfo.foreignGoods;
-			printInvoiceInfo_local(invoicesInfo, printType);
-		}
 		// NFYY-104：外来器械包
-		if(invoicesInfo.foreignGoodsList && invoicesInfo.foreignGoodsList.length > 0){
+		if(foreignGoodsArray.length > 0){
 			invoicesInfo.formTypeOfPrinted = 'batchPrintInvoices';
 			var tousseObj = printConfig['batchPrintInvoice_foreignTousse'];
 			if(!isUndefinedOrNullOrEmpty(tousseObj)){
 				invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_foreignTousse';
 			}
-			invoicesInfo.goods = invoicesInfo.foreignGoodsList;
+			invoicesInfo.goods = foreignGoodsArray;
 			printInvoiceInfo_local(invoicesInfo, printType);
 		}
     }
 	
 	//DGSDBZXYY-47 外来器械发货单打印格式优化
 	if(true == sstsConfig.mergePrintForeignTousseInvoiceByApplication){
-		if(invoicesInfo.foreignTousseList && invoicesInfo.foreignTousseList.length > 0){
+		if(foreignGoodsArray.length > 0){
 			var foreignTousseObj = printConfig['batchPrintInvoice_foreignGoods'];
 			if(!isUndefinedOrNullOrEmpty(foreignTousseObj)){
 				if(!isUndefinedOrNullOrEmpty(foreignTousseObj)){
 					invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_foreignGoods';
 				}
 
-				for(var i = 0;i < invoicesInfo.foreignTousseList.length; i++){
-					var tempInvoicesInfo = invoicesInfo.foreignTousseList[i];
+				for(var i = 0;i < foreignGoodsArray.length; i++){
+					var tempInvoicesInfo = foreignGoodsArray[i];
 					invoicesInfo.goods = tempInvoicesInfo.tousseJson;
 					invoicesInfo.goodsTitle = tempInvoicesInfo;
 					printInvoiceInfo_local(invoicesInfo, printType);
 				}
 			}
 		}
-		if(invoicesInfo.foreignGoods && invoicesInfo.foreignGoods.length > 0){
-			var foreignTousseObj = printConfig['batchPrintInvoice_foreignGoods'];
-			if(!isUndefinedOrNullOrEmpty(foreignTousseObj)){
-				if(!isUndefinedOrNullOrEmpty(foreignTousseObj)){
-					invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_foreignGoods';
-				}
-
-				for(var i = 0;i < invoicesInfo.foreignGoods.length; i++){
-					var tempInvoicesInfo = invoicesInfo.foreignGoods[i];
-					invoicesInfo.goods = tempInvoicesInfo.tousseJson;
-					invoicesInfo.goodsTitle = tempInvoicesInfo;
-					printInvoiceInfo_local(invoicesInfo, printType);
-				}
-			}
-		}
 	}	
 }