Merge branch 'dev-1.1.4' of https://172.16.32.165/hurugang/thmz_system into dev-1.1.4

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

@@ -409,7 +409,7 @@ public class YfWardPrescriptionServiceImpl implements YfWardPrescriptionService
                     ypZyPatient.setSectionCode(yzYpZyOrder.getExecUnit());
                     ypZyPatient.setAcctSign("2");
                 } else {
-                    ypZyPatient.setAcctSign(yzYpZyOrder.getAmount() == 0 ? "2" : "0");
+                    ypZyPatient.setAcctSign((yzYpZyOrder.getAmount() == 0 || yzYpZyOrder.getPageClass().equals("HT")) ? "2" : "0");
                     ypZyPatient.setSectionCode("");//必须为空或null，会导致医嘱查不到已发药单
                 }
                 ypZyPatient.setOutSeri(i + 1);

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

@@ -1570,6 +1570,8 @@ function printLabelLongTime(datas, isMx, LODOP) {
                 }
                 if (flag) {
                     $('.sjh').remove();
+                    let w_code = $("#wardCode").find("option:selected").text();
+                    $(".wardName").text(w_code.substring(0, w_code.lastIndexOf("(")));
                     $(".inpatientNo").text($.trim(data.inpatientNo));
                     $(".bedNo").text($.trim(data.bedNo));
                     $(".name").text($.trim(data.name));