Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
===================================================================
diff -u -r39856 -r40477
--- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js	(.../printConfig.js)	(revision 39856)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js	(.../printConfig.js)	(revision 40477)
@@ -407,6 +407,67 @@
 			}
 		}
 
+		if (!myObj.goodsTable.donotPrintTotal) {
+			// 打印合计信息
+			tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight, myObj.goodsTable.fontSize);
+			var style = getTableTdStyle(myObj.goodsTable, 0);
+			tableHtml += "<td style=" + style + " align='center'>合计</td>";
+			for (var i = 1; i < columnCount; i++) {
+				var item = myObj.goodsTable.content[i];
+				var style = getTableTdStyle(myObj.goodsTable, i);
+				var value = "";
+				var indexName = item.dataIndex;
+				tableHtml += "<td align=";
+				if (indexName == "goodsAmount" || indexName.toLowerCase().indexOf("count") >= 0 || indexName == "amount") {
+					value = printSummaryObj.totalGoodsAmount;
+					if (typeof (sstsConfig.alignForTotalAndAmountWithPrint) != "undefined" && sstsConfig.alignForTotalAndAmountWithPrint == true && typeof (isPrintForGoodsWithBtn) != "undefined" && isPrintForGoodsWithBtn == true) {
+						//江门中心市医院要求金额和数量右对齐
+						tableHtml += "'right'" + " style=" + "'BORDER: #000000 1px solid; padding-right:0px;'>";
+						tableHtml += value;
+					} else if (sstsConfig.printDisinfectionGoodsAmountByPackage) {
+						tableHtml += "'right'" + " style=" + "'BORDER: #000000 1px solid; padding-right:0px;'>";
+						tableHtml += value;
+					}
+					else {
+						tableHtml += "'center'";
+						tableHtml += " style=" + style + ">" + value;
+					}
+				}
+				else if (indexName == "applyAmount") {
+					value = printSummaryObj.totalApplyAmount;
+					tableHtml += item.align;
+					tableHtml += " style=" + style + ">" + value;
+				}
+				else if (indexName == "recyclingAmount") {
+					value = printSummaryObj.totalRecyclingAmount;
+					tableHtml += item.align;
+					tableHtml += " style=" + style + ">" + value;
+				}
+				else if (indexName == "rowPrice" || indexName == "totalPrice") {
+					value = formatMoney(printSummaryObj.totalPrice);
+					if (typeof (sstsConfig.alignForTotalAndAmountWithPrint) != "undefined" && sstsConfig.alignForTotalAndAmountWithPrint == true && typeof (isPrintForGoodsWithBtn) != "undefined" && isPrintForGoodsWithBtn == true) {
+						//江门中心市医院要求金额和数量右对齐
+						tableHtml += "'right'" + " style=" + "'BORDER: #000000 1px solid; padding-right:0px;'>";
+						tableHtml += value;
+					} else if (sstsConfig.printDisinfectionGoodsAmountByPackage) {
+						tableHtml += "'right'" + " style=" + "'BORDER: #000000 1px solid; padding-right:0px;'>";
+						tableHtml += value;
+					}
+					else {
+						tableHtml += "'center'";
+						tableHtml += " style=" + style + ">" + value;
+					}
+				}
+				else {
+					tableHtml += item.align;
+					tableHtml += " style=" + style + ">" + value;
+				}
+				tableHtml += "</td>";
+			}
+
+			tableHtml += "</tr>";
+		}
+
 		tableHtml += "</table>";
 
 		LODOP.ADD_PRINT_TABLE(myObj.goodsTable.position[0], myObj.goodsTable.position[1], myObj.goodsTable.position[2], myObj.goodsTable.position[3], tableHtml);