Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r34928 -r34930
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 34928)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 34930)
@@ -5010,10 +5010,14 @@
}
} else if (dataIndex == 'name') {
tableHtml += "
" + foreignTousseVoList[k][dataIndex] + " | ";
- } else if (dataIndex == 'supplierName' || dataIndex == 'tousseAmount') {
+ } else if (dataIndex == 'supplierName') {
if (k == 0) {
tableHtml += "" + details[j][dataIndex] + " | ";
}
+ } else if (dataIndex == 'tousseAmount') {
+ if (k == 0) {
+ tableHtml += "" + foreignTousseVoList[k][dataIndex] + " | ";
+ }
} else {
if (j == 0 && k == 0) {
tableHtml += "" + printObj.data[i][dataIndex] + " | ";
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js
===================================================================
diff -u -r34927 -r34930
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js (.../modifyPatientOfForeignTousseInfoForm.js) (revision 34927)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/modifyPatientOfForeignTousseInfoForm.js (.../modifyPatientOfForeignTousseInfoForm.js) (revision 34930)
@@ -860,10 +860,14 @@
}
} else if (dataIndex == 'name') {
tableHtml += "" + foreignTousseVoList[k][dataIndex] + " | ";
- } else if (dataIndex == 'supplierName' || dataIndex == 'tousseAmount') {
+ } else if (dataIndex == 'supplierName') {
if (k == 0) {
tableHtml += "" + details[j][dataIndex] + " | ";
}
+ }else if (dataIndex == 'tousseAmount') {
+ if (k == 0) {
+ tableHtml += "" + foreignTousseVoList[k][dataIndex] + " | ";
+ }
} else {
if (j == 0 && k == 0) {
tableHtml += "" + printObj.data[i][dataIndex] + " | ";