优化是否打印标签逻辑

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YfWardPrescriptionServiceImpl.java

@@ -845,7 +845,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
         List<YfWardVo> yfWardVos = new ArrayList<>();
         String[] pageNos = pageNo.split("/");
         for (String no : pageNos) {
-            List<YfWardVo> t = queryYzYpOrderDetail(no, "0", "0,1,2,3,4");
+            List<YfWardVo> t = queryYzYpOrderDetail(no, "0", submitFlag==3?"0":"1,3,4");
             if (t.size() > 0) {
                 yfWardVos.addAll(t);
             }

src/main/resources/static/js/yf/ward_prescription.js

@@ -1508,7 +1508,7 @@ function printLabel(datas, isMx) {
             let data = datas[i];
             for (let j = 0; j < tableDatas.length; j++) {
                 if (tableDatas[j].fybz.indexOf("发药") != -1 && tableDatas[j].chargeCode == data.chargeCode
-                    && tableDatas[j].serial == data.serial && (tableDatas[j].occTime == data.occTime || isMx == 0)) {
+                    && tableDatas[j].serial == data.serial && ((tableDatas[j].inpatientNo == data.inpatientNo && tableDatas[j].occTime == data.occTime) || isMx == 0)) {
                     /*let w_code = $("#wardCode").find("option:selected").text();
                     $(".wardName").text(w_code.substring(0, w_code.lastIndexOf("(")));*/
                     $(".wardName").text(data.wardName);
@@ -1523,11 +1523,11 @@ function printLabel(datas, isMx) {
                     $(".dose").text(data.dose + data.doseUnit);
                     $(".dosage").text(data.dosage.replace(".0", ""));
                     $(".instruction").text(data.instruction);
+                    LODOP.ADD_PRINT_HTM("1mm", "3mm", "RightMargin:1mm", "BottomMargin:3mm", strStyle + document.getElementById("bqdy_table_div").innerHTML);
+                    LODOP.NewPageA();
                     break;
                 }
             }
-            LODOP.ADD_PRINT_HTM("1mm", "3mm", "RightMargin:1mm", "BottomMargin:3mm", strStyle + document.getElementById("bqdy_table_div").innerHTML);
-            LODOP.NewPageA();
         }
         LODOP.PRINT();
         /*LODOP.NewPageA();*/