Index: ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js
===================================================================
diff -u -r29093 -r29186
--- ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js	(.../printConfig.js)	(revision 29093)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjjsrmyy/print/printConfig.js	(.../printConfig.js)	(revision 29186)
@@ -1139,6 +1139,7 @@
 
 function customPrintinvoicePlanPrintConfig(obj){
 	var rows = obj.pages[0].rows;
+	var totalAmount = obj.pages[0].totalAmount;
 	var newDate = new Date();
 	var year = newDate.getFullYear();
 	var mouth = (newDate.getMonth()+1>9)?(newDate.getMonth()+1):'0'+(newDate.getMonth()+1);
@@ -1196,20 +1197,30 @@
 		}
 	}
 	var value = '';
+	var k = 0;
 	for(var i=0;i<rows.length;i++){
 		tableHtml += "<tr>";
-		tableHtml += "<td align='center' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'>"+(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+"' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'>"+(k+1)+"</td>";
 					tableHtml += "<td align='center' rowspan='"+departs[j].count+"' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'>"+rows[i].applicationDepart+"</td>";
+					k++;
 				}
 			}
 		}
 		tableHtml += "<td align='center' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'>"+rows[i].goodsName+"</td><td align='center' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'>"+rows[i].price+"</td><td align='center' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'>"+rows[i].goodsAmount+"</td><td style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'></td><td style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'></td><td style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'></td>";
 		tableHtml += "</tr>";
 		value = rows[i].applicationDepart;
 	}
+	tableHtml += "<tr>";
+	tableHtml += "<td align='center' rowspan='2' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'>"+(k+1)+"</td>";
+	tableHtml += "<td align='center' rowspan='2' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'>合计</td>";
+	tableHtml += "<td align='center' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'>湿化瓶</td><td align='center' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'></td><td align='center' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'>"+(totalAmount[0] || 0)+"</td><td style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'></td><td style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'></td><td style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'></td>";
+	tableHtml += "</tr>";
+	tableHtml += "<tr>";
+	tableHtml += "<td align='center' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'>压脉带</td><td align='center' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'></td><td align='center' style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'>"+(totalAmount[1] || 0)+"</td><td style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'></td><td style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'></td><td style='border-top:0;border-right: 1px black solid ;border-bottom:1px black solid ;border-left:0;'></td>";
+	tableHtml += "</tr>";
 	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>";