Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
===================================================================
diff -u -r33251 -r33253
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 33251)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 33253)
@@ -124,8 +124,8 @@
 			html += getHeadTd('合计', 60, 1, 1);
 		}
 		if (sstsConfig.enableTheSizeDisplayOfTheForeignTousseApplicationReport) {
-			html += getHeadTd('大包', 60, 1, 1);
-			html += getHeadTd('小包', 60, 1, 1);
+			html += getHeadTd('大筐', 60, 1, 1);
+			html += getHeadTd('小筐', 60, 1, 1);
 		}
 		html += '</tr>';
 		is2Column = true;
@@ -169,14 +169,6 @@
 				var invoiceSendTimeStr = tousseItems[j].invoiceSendTimeStr || '';
 				var supplierName = tousseItems[j].supplierName || '';
 				var used = tousseItems[j].used || '';
-				var packageSize = tousseItems[j].packageSize || '';
-				var packageSizeBig = '';
-				var packageSizeSmall = '';
-				if (packageSize == '大包') {
-					packageSizeBig = 1;
-				} else if (packageSize == '小包') {
-					packageSizeSmall = 1
-				}
 
 				var toolAmount = tousseItems[j].toolAmount || 0;
 				var implantAmount = tousseItems[j].implantAmount || 0;
@@ -188,12 +180,10 @@
 				if (tousseInstanceAmount !== '') {
 					sumTousseInstanceAmount += tousseInstanceAmount;
 				}
-				if (packageSizeBig !== '') {
-					sumPackageSizeBig += parseInt(packageSizeBig)
-				}
-				if (packageSizeSmall !== '') {
-					sumPackageSizeSmall += parseInt(packageSizeSmall)
-				}
+				var bigTousseAmount = (data[i].bigTousseAmount == null) ? 0 : data[i].bigTousseAmount;
+				var smallTousseAmount = (data[i].smallTousseAmount == null) ? 0 : data[i].smallTousseAmount;
+				sumPackageSizeBig += parseInt(bigTousseAmount);
+				sumPackageSizeSmall += parseInt(smallTousseAmount);
 				sumToolAmount += parseInt(toolAmount);
 				sumImplantAmount += parseInt(implantAmount);
 				resultSumCount += parseInt(sumCount);
@@ -221,8 +211,8 @@
 						html += getBodyTd(sumCount, 1, 1, '#EAFFFF');
 					}
 					if (sstsConfig.enableTheSizeDisplayOfTheForeignTousseApplicationReport) {
-						html += getBodyTd(packageSizeBig, 1, 1, '#EAFFFF');
-						html += getBodyTd(packageSizeSmall, 1, 1, '#EAFFFF');
+						html += getBodyTd(bigTousseAmount, tousseItems.length, 1, '#EAFFFF');
+						html += getBodyTd(smallTousseAmount, tousseItems.length, 1, '#EAFFFF');
 					}
 					html += getBodyTd(tousseInstanceAmount, 1, 1, '#EAFFFF');
 					html += getBodyTd(newPrice, 1, 1, '#EAFFFF');
@@ -246,10 +236,6 @@
 						html += getBodyTd(implantAmount, 1, 1, '#EAFFFF');
 						html += getBodyTd(sumCount, 1, 1, '#EAFFFF');
 					}
-					if (sstsConfig.enableTheSizeDisplayOfTheForeignTousseApplicationReport) {
-						html += getBodyTd(packageSizeBig, 1, 1, '#EAFFFF');
-						html += getBodyTd(packageSizeSmall, 1, 1, '#EAFFFF');
-					}
 					html += getBodyTd(tousseInstanceAmount, 1, 1, '#EAFFFF');
 					html += getBodyTd(newPrice, 1, 1, '#EAFFFF');
 					html += getBodyTd(invoiceSendTimeStr, 1, 1, '#EAFFFF');
@@ -274,31 +260,22 @@
 			var invoiceSendTimeStr = tousseItems[0].invoiceSendTimeStr || '';
 			var supplierName = tousseItems[0].supplierName || '';
 			var used = tousseItems[0].used || '';
-			var packageSize = tousseItems[0].packageSize || '';
-			var packageSizeBig = '';
-			var packageSizeSmall = '';
-			if (packageSize == '大包') {
-				packageSizeBig = 1;
-			} else if (packageSize == '小包') {
-				packageSizeSmall = 1
-			}
 
 			var toolAmount = tousseItems[0].toolAmount || 0;
 			var implantAmount = tousseItems[0].implantAmount || 0;
 			var sumCount = parseInt(toolAmount) + parseInt(implantAmount);
 
+			var bigTousseAmount = (data[i].bigTousseAmount == null) ? 0 : data[i].bigTousseAmount;
+			var smallTousseAmount = (data[i].smallTousseAmount == null) ? 0 : data[i].smallTousseAmount;
+			sumPackageSizeBig += parseInt(bigTousseAmount);
+			sumPackageSizeSmall += parseInt(smallTousseAmount);
+
 			if (tousseInstanceAmount !== '') {
 				sumTousseInstanceAmount += tousseInstanceAmount;
 			}
 			if (price !== '') {
 				sumPrice += price;
 			}
-			if (packageSizeBig !== '') {
-				sumPackageSizeBig += parseInt(packageSizeBig)
-			}
-			if (packageSizeSmall !== '') {
-				sumPackageSizeSmall += parseInt(packageSizeSmall)
-			}
 			sumToolAmount += parseInt(toolAmount);
 			sumImplantAmount += parseInt(implantAmount);
 			resultSumCount += parseInt(sumCount);
@@ -325,8 +302,8 @@
 				html += getBodyTd(sumCount, 1, 1, '#EAFFFF');
 			}
 			if (sstsConfig.enableTheSizeDisplayOfTheForeignTousseApplicationReport) {
-				html += getBodyTd(packageSizeBig, 1, 1, '#EAFFFF');
-				html += getBodyTd(packageSizeSmall, 1, 1, '#EAFFFF');
+				html += getBodyTd(bigTousseAmount, 1, 1, '#EAFFFF');
+				html += getBodyTd(smallTousseAmount, 1, 1, '#EAFFFF');
 			}
 			html += getBodyTd(tousseInstanceAmount, 1, 1, '#EAFFFF');
 			html += getBodyTd(newPrice, 1, 1, '#EAFFFF');