Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
===================================================================
diff -u -r33406 -r33407
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js (.../qualityMonitoringView.js) (revision 33406)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js (.../qualityMonitoringView.js) (revision 33407)
@@ -253,21 +253,6 @@
var arr = tableBody[dateTime][goodsName][materialName];
var newAmount = arr[0].amount;
var newRegisterMaterialAmount = arr[0].registerMaterialAmount;
- if (dateTime !== '合计') {
- if (result.scope == "材料和器械包") {
- tdHtml += "| " + arr[0].materialName + " | ";
- tdHtml += "" + newAmount + " | ";
- tdHtml += "" + newRegisterMaterialAmount + " | ";
- amount1 += newAmount;
- amount2 += newRegisterMaterialAmount;
- } else if (result.scope == "器械包") {
- tdHtml += "" + newAmount + " | ";
- amount1 += newAmount;
- } else if (result.scope == "材料") {
- tdHtml += "" + newRegisterMaterialAmount + " | ";
- amount2 += newRegisterMaterialAmount;
- }
- }
if (result.dataType == '监测范围为材料和器械包的质量监测数据') {
tdHtml += "" + arr[0].positionMsg + " | ";
} else {
@@ -325,6 +310,24 @@
tableHtml += "" + sumAmount + " | ";
}
}
+ if (result.scope == "材料和器械包") {
+ tableHtml += "" + arr[0].materialName + " | ";
+ if (rowspan > 1 && index == 1) {
+ tableHtml += "" + newAmount + " | ";
+ amount1 += newAmount;
+ } else if (rowspan == 1) {
+ tableHtml += "" + newAmount + " | ";
+ amount1 += newAmount;
+ }
+ tableHtml += "" + newRegisterMaterialAmount + " | ";
+ amount2 += newRegisterMaterialAmount;
+ } else if (result.scope == "器械包") {
+ tableHtml += "" + newAmount + " | ";
+ amount1 += newAmount;
+ } else if (result.scope == "材料") {
+ tableHtml += "" + newRegisterMaterialAmount + " | ";
+ amount2 += newRegisterMaterialAmount;
+ }
tableHtml += trHtml;
tableHtml += "";
}