Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js
===================================================================
diff -u -r13125 -r13898
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js	(.../invoicePrint.js)	(revision 13125)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js	(.../invoicePrint.js)	(revision 13898)
@@ -413,23 +413,53 @@
     DWREngine.setAsync(true);
     invoicesInfo.unitName = unitName;
     invoicesInfo.printConfigObj_default = batchPrintInvoicesConfig_default;
-	// 器械包
-	if(invoicesInfo.tousse.length > 0){
-		invoicesInfo.goods = invoicesInfo.tousse;
-		printInvoiceInfo_local(invoicesInfo, printType);
+    var myObj = printConfig[invoicesInfo.formTypeOfPrinted];
+	if(!isUndefinedOrNullOrEmpty(myObj)){
+		/**
+		 * 在默认打印之前调用的方法,可以对结果数据进行一些处理,如合并，排序
+		 */
+		var beforeBatchPrintInvoicesFunction = typeof(myObj.beforeBatchPrintInvoices)
+		if(beforeBatchPrintInvoicesFunction != undefined && beforeBatchPrintInvoicesFunction != 'undefined'){
+			myObj.beforeBatchPrintInvoices(invoicesInfo);
+		}
 	}
-	// 一次性物品
-	if(invoicesInfo.diposableGoods.length > 0){
-		//invoicesInfo.applicationType = "一次性物品申请单";
-		invoicesInfo.goods = invoicesInfo.diposableGoods;
+    if(true == sstsConfig.mergePrintInvoiceGoods){
+    	//合并打印
+    	var goods = [];
+    	// 器械包
+    	if(invoicesInfo.tousse.length > 0){
+    		goods = goods.concat(invoicesInfo.tousse);
+    	}
+    	// 一次性物品
+    	if(invoicesInfo.diposableGoods.length > 0){
+    		goods = goods.concat(invoicesInfo.diposableGoods);
+    	}
+    	// 消毒物品
+    	if(invoicesInfo.disinfectGoods.length > 0){
+    		goods = goods.concat(invoicesInfo.disinfectGoods);
+    	}
+    	invoicesInfo.goods = goods;
 		printInvoiceInfo_local(invoicesInfo, printType);
-	}
-	// 消毒物品
-	if(invoicesInfo.disinfectGoods.length > 0){
-		//invoicesInfo.applicationType = "消毒物品申请单";
-		invoicesInfo.goods = invoicesInfo.disinfectGoods;
-		printInvoiceInfo_local(invoicesInfo, printType);
-	}
+    	
+    }else{
+    	// 器械包
+    	if(invoicesInfo.tousse.length > 0){
+    		invoicesInfo.goods = invoicesInfo.tousse;
+    		printInvoiceInfo_local(invoicesInfo, printType);
+    	}
+    	// 一次性物品
+    	if(invoicesInfo.diposableGoods.length > 0){
+    		//invoicesInfo.applicationType = "一次性物品申请单";
+    		invoicesInfo.goods = invoicesInfo.diposableGoods;
+    		printInvoiceInfo_local(invoicesInfo, printType);
+    	}
+    	// 消毒物品
+    	if(invoicesInfo.disinfectGoods.length > 0){
+    		//invoicesInfo.applicationType = "消毒物品申请单";
+    		invoicesInfo.goods = invoicesInfo.disinfectGoods;
+    		printInvoiceInfo_local(invoicesInfo, printType);
+    	}
+    }
 }
 
 function printInvoiceInfo_local(invoicesInfo, type){