Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
===================================================================
diff -u -r28602 -r28751
--- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 28602)
+++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 28751)
@@ -20,6 +20,9 @@
 	printParams.printScope.printByOriginalApplications = config.printByOriginalApplications;
 	printParams.printScope.isPrintToSendGood = config.isPrintToSendGood;
 	printParams.printScope.customProject = config.customProject;
+	if(printConfig.isMergePrint){
+		printParams.printScope.isMergePrint = printConfig.isMergePrint;
+	}
 	return printParams;
 }
 //批量打印发货计划
@@ -164,7 +167,6 @@
 		}else{
 			print(printSummaryObj);
 		}
-		
 	    if(printType == 0){//直接打印
 	        LODOP.PRINT();
 	    }else{//打印预览
@@ -298,22 +300,27 @@
  * @param isBatchPrint 是否是批量打印,如果是批量打印,将根据后台传过来的summary中的printTemplate属性重新设置formTypeOfPrinted。printTemplate的默认值为invoicePlan
  */
 function printByJsonPrintObject(printObj, msgBox, isNotSupplyRoomUser,printType,isBatchPrint){
-		var totalPageAmount = printObj.totalPageAmount;
+	var totalPageAmount = printObj.totalPageAmount;
     var count = 0;
     for (var i=0;i<printObj.data.length;i++){
     	var summary = printObj.data[i];
     	var pages = summary.pages;
     	if(isBatchPrint){
     		formTypeOfPrinted = summary.printTemplate;
-    	}
-    	for (var j=0;j<pages.length;j++){
-    		count++;
-    		if (msgBox != null){
-    			msgBox.updateProgress( count/totalPageAmount,'正在打印第' + count + '页,共' + totalPageAmount +  '页');
-    		}
-    		summary.pageIndex = j;
+		}
+		if(printType == 0){
+			for (var j=0;j<pages.length;j++){
+				count++;
+				if (msgBox != null){
+					msgBox.updateProgress( count/totalPageAmount,'正在打印第' + count + '页,共' + totalPageAmount +  '页');
+				}
+				summary.pageIndex = j;
+				printApplicationGoods(printType, summary);
+			};
+		}else {
+			summary.pageIndex = 0;
     		printApplicationGoods(printType, summary);
-    	};
+		}
     	if (!isNotSupplyRoomUser && printType == 0){
             var tousseItemIds = [];
             top.Ext4.Array.each(summary.pages, function(page){
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js
===================================================================
diff -u -r28737 -r28751
--- ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js	(.../printConfig.js)	(revision 28737)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js	(.../printConfig.js)	(revision 28751)
@@ -1131,6 +1131,91 @@
 		LODOP.PRINT();
 	}
 }
+
+//张家界批量打印发货单独有的打印格式
+var customPrintinvoicePlanPrintConfig = {
+	customPrint:customPrintinvoicePlanPrintConfig
+}
+
+function customPrintinvoicePlanPrintConfig(obj){
+	var rows = obj.pages[0].rows;
+	var newDate = new Date();
+	var year = newDate.getFullYear();
+	var mouth = (newDate.getMonth()+1>9)?(newDate.getMonth()+1):'0'+(newDate.getMonth()+1);
+	var day = newDate.getDate()>9?newDate.getDate():'0'+newDate.getDate();
+	var today = year+'-'+mouth+'-'+day;
+	if(rows.length == 0){
+		alert('发货计划单为空!');
+		return;
+	}
+	doGetLodop();
+	var tableHtml = "<div style='width:100%;text-align:center;height:30px;padding:10px 0;'>张家界市人民医院供应室器械清洗单统计</div>";
+	tableHtml += "<div style='width:95%;height:20px;margin:0 auto;margin-bottom:10px'>";
+	tableHtml += "<div style='float:left'>";
+	tableHtml += "<span style='float: left;'>班次名称：</span>";
+	tableHtml += "<span style='border-bottom: 1px solid #555;width: 200px;height: 22px;display: block;float: left;'>"+obj.header+"</span>";
+	tableHtml += "</div>";
+	tableHtml += "<div style='float: right;'>";
+	tableHtml += "<span style='float: left;'>发放人：</span>";
+	tableHtml += "<span style='border-bottom: 1px solid #555;width: 100px;height: 22px;display: block;float: left;'></span>";
+	tableHtml += "<span style='float: left;margin-left: 20px;'>下送人：</span>";
+	tableHtml += "<span style='border-bottom: 1px solid #555;width: 100px;height: 22px;display: block;float: left;'></span>";
+	tableHtml += "</div>";
+	tableHtml += "</div>";
+	tableHtml += "<table border ='1' align='center' cellspacing=0 style='width:95%;margin:0 auto'>";
+	tableHtml += "<thead>";
+	tableHtml += "<tr><td align='center' width='50px'>序号</td><td align='center' width='80px'>科室名称</td><td align='center' width='80px'>包裹名称</td><td align='center' width='70px'>清洗费用(元)</td><td align='center' width='70px'>包裹数量</td><td align='center' width='50px'>首签</td><td align='center' width='50px'>补签</td><td align='center' width='100px'>备注</td></tr>";
+	tableHtml += "</thead>";
+	tableHtml += "<tbody>";
+	var departs = [];
+	var isTrue = false;
+	for(var i=0;i<rows.length;i++){
+		if(departs.length > 0){
+			for(var j=0;j<departs.length;j++){
+				if(departs[j].applicationDepart == rows[i].applicationDepart){
+					departs[j].count = parseInt(departs[j].count)+1;
+					isTrue = false;
+				}else {
+					isTrue = true;
+					continue;
+				}
+			}
+			if(isTrue){
+				departs.push({
+					applicationDepart:rows[i].applicationDepart,
+					count:1
+				})
+				isTrue = false;
+			}
+
+		}else {
+			departs.push({
+				applicationDepart:rows[0].applicationDepart,
+				count:1
+			})
+		}
+	}
+	var value = '';
+	for(var i=0;i<rows.length;i++){
+		tableHtml += "<tr>";
+		tableHtml += "<td align='center'>"+(i+1)+"</td>";
+		if(value !== rows[i].applicationDepart){
+			for(var j=0;j<departs.length;j++){
+				if(departs[j].applicationDepart == rows[i].applicationDepart){
+					tableHtml += "<td align='center' rowspan='"+departs[j].count+"'>"+rows[i].applicationDepart+"</td>";
+				}
+			}
+		}
+		tableHtml += "<td align='center'>"+rows[i].goodsName+"</td><td align='center'>"+rows[i].price+"</td><td align='center'>"+rows[i].goodsAmount+"</td><td></td><td></td><td></td>";
+		tableHtml += "</tr>";
+		value = rows[i].applicationDepart;
+	}
+	tableHtml += "</tbody>";
+	tableHtml += "</table>";
+	tableHtml += "<div style='height:20px;margin:0 auto;float:right;margin-top:10px'><span style='float: left;'>制单时间：</span><span style='border-bottom: 1px solid #555;width: 200px;height: 22px;display: block;float: left;'>"+today+"</span></div>";
+
+	LODOP.ADD_PRINT_HTM(0,0,"95%","100%","<body leftmargin='8px' topmargin=0>"+tableHtml+"</body>");
+}
 /**
  * 器械包管理界面的包定义材料清单
  */
@@ -1167,7 +1252,8 @@
 }
 var printConfig = {
     //发货计划单
-    invoicePlan : invoicePlanPrintConfig,
+	invoicePlan : customPrintinvoicePlanPrintConfig,
+	isMergePrint:true,//合并多科室的物品
     batchPrintInvoices: batchPrintInvoicesConfig,
     batchPrintMaterialInvoices:batchPrintMaterialInvoicesConfig,
     //批量打印发货单(器械包),如果没有配置,则跟batchPrintInvoices一样
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r28694 -r28751
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 28694)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 28751)
@@ -2095,8 +2095,8 @@
 					//如需打印看效果需要 设一下 repeat = true;
 					printParams.printScope.reprintTodayPrintedTousseItem = repeat;
 				    RecyclingApplicationTableManager.findPrintRecyclingGoods(JSON.stringify(printParams) , function(result){
-				    	var obj = JSON.parse(result);
-				    	//如果批量打印发货计划的版本为1时
+						var obj = JSON.parse(result);
+						//如果批量打印发货计划的版本为1时
 						if(sstsConfig.batchPrintInvoicePlanVersion == 1){
 							commonEquipmentDeliveryPlanList(obj);
 							if (!isIE6OrIE7){
@@ -2125,9 +2125,12 @@
 								progress:true,
 								closable:false
 							});
-
 							formTypeOfPrinted = "invoicePlan";
-							printByJsonPrintObject(obj, newP,false,0,true);
+							if(printConfig.isMergePrint){
+								printByJsonPrintObject(obj, newP,false,1,true);
+							}else {
+								printByJsonPrintObject(obj, newP,false,0,true);
+							}
 				    	}
 				    	else{
 				    		showResult(obj.message);