Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
===================================================================
diff -u -r40339 -r40341
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 40339)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 40341)
@@ -1196,8 +1196,20 @@
 			var rowspan = Object.keys(tableBody[itemName]).length;
 			var tdHtml = "";
 			var arr = tableBody[itemName][goodsName];
-			var newAmount = arr[0].amount;
-			var newRegisterMaterialAmount = arr[0].registerMaterialAmount;
+			var newAmount = 0;
+			var newRegisterMaterialAmount = 0;
+			var goodsNameMap = {};
+			for (var z = 0; z < arr.length; z++) {
+				var goodsName2 = arr[z].goodsName;
+				if (!goodsNameMap[goodsName2]) {
+					if (subTableType == "器械包副表") {
+						newAmount += arr[z].amount;
+					} else {
+						newRegisterMaterialAmount += arr[z].registerMaterialAmount;
+					}
+					goodsNameMap[goodsName2] = true;
+				}
+			}
 			if (subTableType == "器械包副表") {
 				tdHtml += "<td align='center' style='font-size:12px;border: 1px solid #000;word-break: break-all;height:30px;'>" + newAmount + "</td>";
 				amount1 += newAmount;
@@ -1388,11 +1400,7 @@
 								if (attributeName !== '') {
 									if (tableBodyMap[attributeName]) {
 										if (tableBodyMap[attributeName][tousseName]) {
-											if (result.scope == '器械包') {
-												tableBodyMap[attributeName][tousseName][0].amount += arr[j].amount;
-											}else {
-												tableBodyMap[attributeName][tousseName][0].registerMaterialAmount += arr[j].registerMaterialAmount;
-											}
+											tableBodyMap[attributeName][tousseName].push(arr[j]);
 										} else {
 											tableBodyMap[attributeName][tousseName] = [];
 											tableBodyMap[attributeName][tousseName].push(arr[j]);
@@ -1419,12 +1427,7 @@
 									if (attributeName !== '') {
 										if (tableBodyMap[attributeName]) {
 											if (tableBodyMap[attributeName][tousseName]) {
-												if (result.scope == '器械包副表') {
-													tableBodyMap[attributeName][tousseName][0].amount += arr[j].amount;
-												}else {
-													tableBodyMap[attributeName][tousseName][0].registerMaterialAmount += arr[j].registerMaterialAmount;
-												}
-												tableBodyMap[attributeName][tousseName][0].amount += arr[j].amount;
+												tableBodyMap[attributeName][tousseName].push(arr[j]);
 											} else {
 												tableBodyMap[attributeName][tousseName] = [];
 												tableBodyMap[attributeName][tousseName].push(arr[j]);