Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js
===================================================================
diff -u -r38209 -r38239
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js	(.../invoicePrint.js)	(revision 38209)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js	(.../invoicePrint.js)	(revision 38239)
@@ -446,6 +446,15 @@
 			}
 			
 		}else{
+			// NFYY-104：外来器械包
+			if(invoicesInfo.foreignGoods && invoicesInfo.foreignGoods.length > 0){
+				goods = goods.concat(invoicesInfo.foreignGoods);
+			}
+			// NFYY-104：外来器械包
+			if(invoicesInfo.foreignGoodsList && invoicesInfo.foreignGoodsList.length > 0){
+				goods = goods.concat(invoicesInfo.foreignGoodsList);
+			}
+			invoicesInfo.goods = goods;
 			printInvoiceInfo_local(invoicesInfo, printType);
 		}
     }else{
@@ -530,6 +539,21 @@
 				}
 			}
 		}
+		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);
+				}
+			}
+		}
 	}	
 }