Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r34876 -r34881
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 34876)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 34881)
@@ -5006,7 +5006,7 @@
 						var align = configObj.goodsTable.columns[m].align;
 						if (header == '序号') {
 							if (j == 0 && k == 0) {
-								tableHtml += "<td style='width:" + width + "px;text-align:" + align + ";font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + (i + 1) + "</td>";
+								tableHtml += "<td style='width:" + width + "px;text-align:" + align + ";font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + (i + 1) + "</td>";
 							}
 						} else if (dataIndex == 'name') {
 							tableHtml += "<td style='width:" + width + "px;font-size: " + fontSize + "px;text-align:" + align + "'>" + foreignTousseVoList[k][dataIndex] + "</td>";
@@ -5016,7 +5016,7 @@
 							}
 						} else {
 							if (j == 0 && k == 0) {
-								tableHtml += "<td style='width:" + width + "px;font-size: " + fontSize + "px;text-align:" + align + "' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i][dataIndex] + "</td>";
+								tableHtml += "<td style='width:" + width + "px;font-size: " + fontSize + "px;text-align:" + align + "' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i][dataIndex] + "</td>";
 							}
 						}
 					}
@@ -5053,8 +5053,8 @@
 		tableHtml += "<td style='width:50px;font-size: " + fontSize + "px;'>病人姓名</td>";
 		tableHtml += "<td style='width:60px;font-size: " + fontSize + "px;'>手术名称</td>";
 		tableHtml += "<td style='width:80px;font-size: " + fontSize + "px;'>供应商</td>";
-		tableHtml += "<td style='width:80px;font-size: " + fontSize + "px;'>外来器械包名称</td>";
-		tableHtml += "<td style='width:80px;font-size: " + fontSize + "px;'>拆分总包数</td>";
+		tableHtml += "<td style='width:80px;font-size: " + fontSize + "px;'>物品名称</td>";
+		tableHtml += "<td style='width:80px;font-size: " + fontSize + "px;'>灭菌包数量</td>";
 		tableHtml += "</tr>";
 		tableHtml += "</thead>";
 		tableHtml += "<tbody>";
@@ -5065,25 +5065,25 @@
 				for (var k = 0; k < foreignTousseVoList.length; k++) {
 					tableHtml += "<tr height='" + rowHeight + "px' style='width:100%;font-size: " + fontSize + "px;text-align:center;'>";
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:35px;text-align:center;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + (i + 1) + "</td>";
+						tableHtml += "<td style='width:35px;text-align:center;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + (i + 1) + "</td>";
 					}
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:70px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i]['applicationTime'] + "</td>";
+						tableHtml += "<td style='width:70px;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i]['applicationTime'] + "</td>";
 					}
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:70px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i]['depart'] + "</td>";
+						tableHtml += "<td style='width:70px;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i]['depart'] + "</td>";
 					}
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:70px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i]['ascriptionDepartment'] + "</td>";
+						tableHtml += "<td style='width:70px;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i]['ascriptionDepartment'] + "</td>";
 					}
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:40px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i]['hospitalNumber'] + "</td>";
+						tableHtml += "<td style='width:40px;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i]['hospitalNumber'] + "</td>";
 					}
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:50px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i]['patient'] + "</td>";
+						tableHtml += "<td style='width:50px;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i]['patient'] + "</td>";
 					}
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:60px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i]['surgery'] + "</td>";
+						tableHtml += "<td style='width:60px;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i]['surgery'] + "</td>";
 					}
 					if (k == 0) {
 						tableHtml += "<td style='width:80px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + details[j]['supplierName'] + "</td>";
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js
===================================================================
diff -u -r34876 -r34881
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js	(.../modifyPatientOfForeignTousseInfoForm.js)	(revision 34876)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js	(.../modifyPatientOfForeignTousseInfoForm.js)	(revision 34881)
@@ -856,7 +856,7 @@
 						var align = configObj.goodsTable.columns[m].align;
 						if (header == '序号') {
 							if (j == 0 && k == 0) {
-								tableHtml += "<td style='width:" + width + "px;text-align:" + align + ";font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + (i + 1) + "</td>";
+								tableHtml += "<td style='width:" + width + "px;text-align:" + align + ";font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + (i + 1) + "</td>";
 							}
 						} else if (dataIndex == 'name') {
 							tableHtml += "<td style='width:" + width + "px;font-size: " + fontSize + "px;text-align:" + align + "'>" + foreignTousseVoList[k][dataIndex] + "</td>";
@@ -866,7 +866,7 @@
 							}
 						} else {
 							if (j == 0 && k == 0) {
-								tableHtml += "<td style='width:" + width + "px;font-size: " + fontSize + "px;text-align:" + align + "' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i][dataIndex] + "</td>";
+								tableHtml += "<td style='width:" + width + "px;font-size: " + fontSize + "px;text-align:" + align + "' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i][dataIndex] + "</td>";
 							}
 						}
 					}
@@ -915,25 +915,25 @@
 				for (var k = 0; k < foreignTousseVoList.length; k++) {
 					tableHtml += "<tr height='" + rowHeight + "px' style='width:100%;font-size: " + fontSize + "px;text-align:center;'>";
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:35px;text-align:center;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + (i + 1) + "</td>";
+						tableHtml += "<td style='width:35px;text-align:center;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + (i + 1) + "</td>";
 					}
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:70px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i]['applicationTime'] + "</td>";
+						tableHtml += "<td style='width:70px;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i]['applicationTime'] + "</td>";
 					}
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:70px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i]['depart'] + "</td>";
+						tableHtml += "<td style='width:70px;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i]['depart'] + "</td>";
 					}
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:70px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i]['ascriptionDepartment'] + "</td>";
+						tableHtml += "<td style='width:70px;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i]['ascriptionDepartment'] + "</td>";
 					}
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:40px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i]['hospitalNumber'] + "</td>";
+						tableHtml += "<td style='width:40px;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i]['hospitalNumber'] + "</td>";
 					}
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:50px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i]['patient'] + "</td>";
+						tableHtml += "<td style='width:50px;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i]['patient'] + "</td>";
 					}
 					if (j == 0 && k == 0) {
-						tableHtml += "<td style='width:60px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + printObj.data[i]['surgery'] + "</td>";
+						tableHtml += "<td style='width:60px;font-size: " + fontSize + "px;' rowspan=" + printObj.data[i].tousseAmount + ">" + printObj.data[i]['surgery'] + "</td>";
 					}
 					if (k == 0) {
 						tableHtml += "<td style='width:80px;font-size: " + fontSize + "px;' rowspan=" + foreignTousseVoList.length + ">" + details[j]['supplierName'] + "</td>";