Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r41206 -r41235
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 41206)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 41235)
@@ -293,7 +293,7 @@
 	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:80px'>数量</td>";
 	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:100px'>单价</td>";
 	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:100px'>总计(元)</td>";
-	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:100px'>总价(元)</td>";
+	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:100px'>总计(元)</td>";
 	tableHtml += "</tr>";
 	tableHtml += "</thead>";
 	is2Column = false;
@@ -385,14 +385,25 @@
 			isShowWeightScore = true;
 		}
 	}
+	//CDSLQYQYYY-138：更改汇总样式
+	var singleDepartSum = false;
+	if (dataForPatternOfReport.length > 1) {
+		if (Ext.getCmp('patternOfReport') && Ext.getCmp('patternOfReport').getRawValue() == '按科室合计汇总样式') {
+			singleDepartSum = true;
+		}
+	} else if (dataForPatternOfReport.length == 1) {
+		if (dataForPatternOfReport[0][0] == 'singleDepartSum') {
+			singleDepartSum = true;
+		}
+	}
 	var tableHtml = '';
 	var tableWidth = 'auto'
 	var sumAmount = 0;
 	var sumPrice = 0;
 	var colspan1 = 1;
 	var colspan2 = 1;
 	var countTd = 12;
-	if (isShowTousseGroup) {
+	if (isShowTousseGroup && !singleDepartSum) {
 		countTd += 1;
 	}
 	tableHtml += "<table id='frameTable' border='0' width='" + tableWidth + "' style='empty-cells:show; border-collapse:collapse;' align='center' cellspacing=0 cellpadding=0>";
@@ -406,82 +417,104 @@
 	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:80px'>类型</td>";
 	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:100px'>外部编码</td>";
 	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:150px'>物品名称</td>";
-	if (isShowTousseGroup) {
+	if (isShowTousseGroup && !singleDepartSum) {
 		tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:120px'>器械包分组</td>";
 	}
 	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:100px'>数量</td>";
 	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:100px'>批次</td>";
 	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:100px'>单价(元)</td>";
-	if (sstsConfig.showSupplierNameInDetailedAccountingMonthlyReport) {
+	if (sstsConfig.showSupplierNameInDetailedAccountingMonthlyReport && !singleDepartSum) {
 		tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:140px'>生产厂家</td>";
 	}
 	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:140px'>失效日期</td>";
-	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:120px'>总价(元)</td>";
-	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:120px'>总价(元)</td>";
-	if (isShowTechnicalDifficulty) {
+	tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:120px'>总计(元)</td>";
+	if (!singleDepartSum) {
+		tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:120px'>总计(元)</td>";
+	}
+	if (isShowTechnicalDifficulty && !singleDepartSum) {
 		tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:120px'>技术难度</td>";
 	}
-	if (isShowWeightScore) {
+	if (isShowWeightScore && !singleDepartSum) {
 		tableHtml += "<td align='center' style='background-color: #F0F8FF;font-size:" + fontSize + ";height:30px;border: 1px solid #000;word-break: break-all;text-align: center;width:120px'>权重分</td>";
 	}
 	tableHtml += "</tr>";
 	tableHtml += "</thead>";
 	tableHtml += "<tbody>";
 	for (var i = 0; i < data.length; i++) {
 		var items = data[i].items;
+		var departHtml = '';
+		if (singleDepartSum) {
+			colspan1 = 1;
+			sumAmount = 0;
+			colspan2 = 1;
+			sumPrice = 0;
+		}
 		for (var j = 0; j < items.length; j++) {
-			tableHtml += "<tr>";
+			departHtml += "<tr>";
 			if (j == 0) {
-				tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' rowspan=" + items.length + ">" + data[i].applicationDepart + "</td>";
-				tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' rowspan=" + items.length + ">" + data[i].depart + "</td>";
+				departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' rowspan=" + items.length + ">" + data[i].applicationDepart + "</td>";
+				departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' rowspan=" + items.length + ">" + data[i].depart + "</td>";
 			}
 			var goodsName = items[j].goodsName.split(" ").join("&nbsp;");
-			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].type + "</td>";
-			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].externalCode + "</td>";
-			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + goodsName + "</td>";
+			departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].type + "</td>";
+			departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].externalCode + "</td>";
+			departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + goodsName + "</td>";
 			colspan1 = 4;
 			sumAmount += parseInt(items[j].amount);
 			sumPrice += parseFloat(items[j].settlementPrice);
-			if (isShowTousseGroup) {
-				tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].tousseGroupName + "</td>";
+			if (isShowTousseGroup && !singleDepartSum) {
+				departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].tousseGroupName + "</td>";
 				colspan1++
 			}
-			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].amount + "</td>";
-			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].batchNumber + "</td>";
-			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + parseFloat(items[j].price).toFixed(moneyDigitCount) + "</td>";
-			if (sstsConfig.showSupplierNameInDetailedAccountingMonthlyReport) {
-				tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].supplierName + "</td>";
+			departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].amount + "</td>";
+			departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].batchNumber + "</td>";
+			departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + parseFloat(items[j].price).toFixed(moneyDigitCount) + "</td>";
+			if (sstsConfig.showSupplierNameInDetailedAccountingMonthlyReport && !singleDepartSum) {
+				departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].supplierName + "</td>";
 				colspan2 = 5;
 			} else {
 				colspan2 = 4;
 			}
-			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].expDate + "</td>";
-			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + parseFloat(items[j].settlementPrice).toFixed(moneyDigitCount) + "</td>";
-			if (j == 0) {
-				tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' rowspan=" + items.length + ">" + parseFloat(data[i].totalPrice).toFixed(moneyDigitCount) + "</td>";
+			departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + items[j].expDate + "</td>";
+			departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + parseFloat(items[j].settlementPrice).toFixed(moneyDigitCount) + "</td>";
+			if (j == 0 && !singleDepartSum) {
+				departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' rowspan=" + items.length + ">" + parseFloat(data[i].totalPrice).toFixed(moneyDigitCount) + "</td>";
 			}
-			if (isShowTechnicalDifficulty) {
-				tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + (items[j].technicalDifficulty || '') + "</td>";
+			if (isShowTechnicalDifficulty && !singleDepartSum) {
+				departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + (items[j].technicalDifficulty || '') + "</td>";
 			}
-			if (isShowWeightScore) {
-				tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + (items[j].weightScore || '') + "</td>";
+			if (isShowWeightScore && !singleDepartSum) {
+				departHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + (items[j].weightScore || '') + "</td>";
 			}
+			departHtml += "</tr>";
+		}
+		tableHtml += departHtml;
+		if (singleDepartSum) {
+			tableHtml += "<tr>";
+			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' colspan = 2>合计</td>";
+			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' colspan=" + (colspan1 - 1) + "></td>";
+			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + sumAmount + "</td>";
+			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' colspan=" + (colspan2 - 1) + "></td>";
+			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + parseFloat(sumPrice).toFixed(moneyDigitCount) + "</td>";
 			tableHtml += "</tr>";
 		}
 	}
-	tableHtml += "<tr>";
-	tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>合计</td>";
-	tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' colspan=" + colspan1 + "></td>";
-	tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + sumAmount + "</td>";
-	tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' colspan=" + colspan2 + "></td>";
-	tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + parseFloat(sumPrice).toFixed(moneyDigitCount) + "</td>";
-	if (isShowTechnicalDifficulty) {
-		tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'></td>";
+	if (!singleDepartSum) {
+		tableHtml += "<tr>";
+		tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>合计</td>";
+		tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' colspan=" + colspan1 + "></td>";
+		tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + sumAmount + "</td>";
+		tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;' colspan=" + colspan2 + "></td>";
+		tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'>" + parseFloat(sumPrice).toFixed(moneyDigitCount) + "</td>";
+		if (isShowTechnicalDifficulty) {
+			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'></td>";
+		}
+		if (isShowWeightScore) {
+			tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'></td>";
+		}
+		tableHtml += "</tr>";
 	}
-	if (isShowWeightScore) {
-		tableHtml += "<td style='font-size:" + fontSize + ";border: 1px solid #000;word-break: break-all;text-align: center;padding: 0 5px;'></td>";
-	}
-	tableHtml += "</tr>";
+
 	tableHtml += "</tbody>";
 	tableHtml += "</table>";
 	return tableHtml;
@@ -522,6 +555,8 @@
 				reportType = 'singleDepart';
 			} else if (reportName == '详细日期明细核算月报') {
 				reportType = 'detailedDate';
+			} else if (reportName == '按科室合计汇总样式') {
+				reportType = 'singleDepartSum';
 			} else {
 				continue;
 			}
@@ -1867,9 +1902,7 @@
 		var departSearch = Ext.getCmp('invoicePlanDepartSearch');
 		departSearch.setValue(orgUnitName);
 	}
-
 	//reloadReport();
-
 	if (dataForPatternOfReport.length < 1) {
 		Ext.getCmp("patternOfReportLable").setVisible(false);
 		if (urgentLevelBox) {