Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js
===================================================================
diff -u -r38244 -r38245
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js	(.../invoicePrint.js)	(revision 38244)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js	(.../invoicePrint.js)	(revision 38245)
@@ -521,21 +521,30 @@
 	
 	//DGSDBZXYY-47 外来器械发货单打印格式优化
 	if(true == sstsConfig.mergePrintForeignTousseInvoiceByApplication){
-		if(foreignGoodsArray.length > 0){
+		if(invoicesInfo.foreignTousseList && invoicesInfo.foreignTousseList.length > 0){
 			var foreignTousseObj = printConfig['batchPrintInvoice_foreignGoods'];
 			if(!isUndefinedOrNullOrEmpty(foreignTousseObj)){
 				if(!isUndefinedOrNullOrEmpty(foreignTousseObj)){
 					invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_foreignGoods';
 				}
 
-				for(var i = 0;i < foreignGoodsArray.length; i++){
-					var tempInvoicesInfo = foreignGoodsArray[i];
+				for(var i = 0;i < invoicesInfo.foreignTousseList.length; i++){
+					var tempInvoicesInfo = invoicesInfo.foreignTousseList[i];
 					invoicesInfo.goods = tempInvoicesInfo.tousseJson;
 					invoicesInfo.goodsTitle = tempInvoicesInfo;
 					printInvoiceInfo_local(invoicesInfo, printType);
 				}
 			}
 		}
+		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);
+		}
 	}	
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js
===================================================================
diff -u -r38209 -r38245
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js	(.../invoicePrintModule.js)	(revision 38209)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrintModule.js	(.../invoicePrintModule.js)	(revision 38245)
@@ -39,6 +39,11 @@
 		return mask;
 	}
 	this.batchPrintInvoiceWithType = function(ids,type){
+		var tousseObj = printConfig['batchPrintInvoice_foreignTousse'];
+		var isCustomPrintForeignTousse = false;
+		if(!isUndefinedOrNullOrEmpty(tousseObj)){
+			isCustomPrintForeignTousse = true
+		}
 		getMask();
 		mask.msg = '正在处理打印请求，请稍候...';
 		mask.show();
@@ -53,7 +58,7 @@
 		  Ext.Ajax.request({
 			  timeout: 300*1000,
 		      url : WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadPrintData.do',
-		      params : {ids : ids,type:type,isMergeRemark:isMergeRemark,isCustomPrintForeignTousse:true},
+		      params : {ids : ids,type:type,isMergeRemark:isMergeRemark,isCustomPrintForeignTousse:isCustomPrintForeignTousse},
 		      success : function(response){
 		    	  var result = Ext.decode(response.responseText);
 		    	  if(!result.success){
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r38209 -r38245
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 38209)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 38245)
@@ -1543,11 +1543,16 @@
 			}
 		}
 	}
+	var tousseObj = printConfig['batchPrintInvoice_foreignTousse'];
+	var isCustomPrintForeignTousse = false;
+	if(!isUndefinedOrNullOrEmpty(tousseObj)){
+		isCustomPrintForeignTousse = true
+	}
 	Ext.Ajax.timeout = 300000;
 	Ext.Ajax.request({
 		timeout: 300000,
 		url: WWWROOT + '/disinfectSystem/invoiceAction!mergeLoadToussePrintData.do',
-		params: { ids: ids ,isMergeRemark:isMergeRemark,isCustomPrintForeignTousse:true },
+		params: { ids: ids ,isMergeRemark:isMergeRemark,isCustomPrintForeignTousse:isCustomPrintForeignTousse },
 		success: function (response) {
 			var result = Ext.decode(response.responseText);
 			if (result.success == true) {