Pārlūkot izejas kodu

优化中药分两行

hurugang 2 gadi atpakaļ
vecāks
revīzija
f4b5e75bb2
1 mainītis faili ar 8 papildinājumiem un 7 dzēšanām
  1. 8 7
      src/main/resources/static/js/mz/clinic.js

+ 8 - 7
src/main/resources/static/js/mz/clinic.js

@@ -9477,8 +9477,9 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                         if (zyPrescription != null && zyPrescription.length > 0) {
                             var html = "";
                             for (var i = 0; i < zyPrescription.length; i++) {
-                                if (i % 3 == 0) {
-                                    html += "<tr>";
+                                if (i % 2 == 0) {
+
+                                    html += "<tr><td></td><td></td></tr><tr>";
                                 }
                                 html += "<td>";
                                 html += zyPrescription[i].name;
@@ -9486,16 +9487,16 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                                 if (zyPrescription[i].instructionText != null) {
                                     html += "[" + zyPrescription[i].instructionText + "]";
                                 }
-                                if (i % 3 == 2) {
+                                if (i % 2 == 1) {
                                     html += "</td></tr>";
                                 } else {
                                     html += "</td>";
                                 }
                             }
-                            if (zyPrescription.length % 3 != 0) {
+                            if (zyPrescription.length % 2 != 0) {
                                 html += "</tr>";
                             }
-                            html += "<tr><td></td><td></td><td>X " + prescriptionDetailJson.zyPrescription[0].zyfs + "付</td></tr>";
+                            html += "<tr><td></td><td>X " + prescriptionDetailJson.zyPrescription[0].zyfs + "付</td></tr>";
                             var cyMtjs = prescriptionDetailJson.zyPrescription[0].cyMtjs;
                             if (cyMtjs == null || cyMtjs == "null") {
                                 cyMtjs = "";
@@ -9530,8 +9531,8 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                             } else {
                                 cyDj = "(" + cyDj + ")";
                             }
-                            html += "<tr><td colspan='3'>每天" + cyMtjs + "剂," + cyJssm + cyJsl + "ml,煮取量" + cyZql + "ml,复煎" + cyFj + "次。分" + cyFfcs + "次" + cyFysm + " " + cyDj + "。</td></tr>";
-                            html += "<tr><td colspan='3'>&nbsp;&nbsp;&nbsp;&nbsp;------(以下空白)------</td></tr>";
+                            html += "<tr><td colspan='2'>每天" + cyMtjs + "剂," + cyJssm + cyJsl + "ml,煮取量" + cyZql + "ml,复煎" + cyFj + "次。分" + cyFfcs + "次" + cyFysm + " " + cyDj + "。</td></tr>";
+                            html += "<tr><td colspan='2'>&nbsp;&nbsp;&nbsp;&nbsp;------(以下空白)------</td></tr>";
                             if (index > 0) {
                                 LODOP.NewPageA();
                             }