yeguodong 1 month ago
parent
commit
9cc33d8cd8

+ 1 - 1
src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzPharmacyMapper.java

@@ -745,7 +745,7 @@ public interface MzPharmacyMapper {
             "    FROM mz_charge_detail a WITH(NOLOCK)" +
             "    JOIN yp_base_yf b WITH(NOLOCK) ON a.charge_item_code = b.charge_code AND a.serial = b.serial" +
             "    JOIN yp_zd_dict c WITH(NOLOCK) ON a.charge_item_code = c.code AND a.serial = c.serial" +
-            "    inner join yp_zd_group_name f where f.yf_flag = '1' and isnull(f.del_flag, '0') = '0' and a.group_no = f.group_no " +
+            "    inner join yp_zd_group_name f on f.yf_flag = '1' and isnull(f.del_flag, '0') = '0' and a.group_no = f.group_no " +
             "    LEFT JOIN yp_zd_manufactory d WITH(NOLOCK) ON c.manu_code = d.code" +
             "    WHERE a.patient_id = #{patientId} and" +
             "          a.times = #{times} and" +

+ 1 - 1
src/main/resources/static/js/yf/ward_prescription.js

@@ -22,7 +22,7 @@ $(function () {
     $('#submitFlagSearch').html("");
     let submitFlagHtml = '';
     if (nfdPrintIndex == null) {
-        return errorMesageSimaple('未设置内服袋打印机,请在发药参数设置中设置');
+        // return errorMesageSimaple('未设置内服袋打印机,请在发药参数设置中设置');
     }
     if (groupNo == null) {
         return errorMesageSimaple('当前药房未设置,请在发药参数设置中设置');