免发标记

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzChargeDetailMapper.java

@@ -936,7 +936,7 @@ public interface MzChargeDetailMapper {
             "SELECT c.patient_id,c.times,c.receipt_no,c.order_no,c.real_no,c.bill_item_code," +
             "c.group_no,c.charge_item_code,c.serial,c.warn_dept,c.price_time,c.doctor_code,c.confirm_id," +
             "c.quantity,c.drug_quan,c.frequency,c.charge_item_code,c.drug_unit,c.supply_code,c.doctor_code," +
-            "c.unit_price,c.yb_zf_flag,c.jz_flag,instruction_text,try_result,try_flag,  " +
+            "c.unit_price,c.yb_zf_flag,c.jz_flag,instruction_text,try_result,try_flag,c.pay_self,  " +
             " (case when y.class_code = '210100' then 1 else 0 end ) as is_hide,c.print_flag,c.drug_win,cy_jssm,cy_mtjs,cy_jsl,cy_zql,cy_fj,cy_ffcs,cy_fysm,rtrim(cy_dj)cy_dj" +
             "    FROM mz_charge_detail c WITH(NOLOCK) ,yp_zd_dict y WITH(NOLOCK) " +
             " where  1=1 " +

src/main/resources/static/js/mz/west_pharmacy_dispensing.js

@@ -707,11 +707,12 @@ function getXyPrintHtml(list) {
         } else if (list[i].psFlag == 1 && list[i].tryFlag == 0) {//药品需要皮试，处方未点需要皮试
             tryResult = '<span style="color: red">(免试)</span>';
         }
-        if (list[i].ybZfFlag == 1) {
-            tryFlag = '<span style="color: red">(皮试自备一支)</span>';
-        } else if (list[i].tryFlag == 1) {
+        if (list[i].tryFlag == 1) {
             tryFlag = '<span style="color: red">(需皮试)</span>';
         }
+        if (list[i].paySelf == 1) {
+            tryFlag = tryFlag+'(免发)';
+        }
         var number = i + 1;
         let manufactoryName = list[i].manufactoryName == null || list[i].manufactoryName == '' ? '' : '(' + list[i].manufactoryName + ')';
         tr += '<tr>' +