打印皮试自备提示

src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -587,6 +587,7 @@ public class MzPharmacyController {
                 map.put("tryResult", chargeDetail.getTryResult());//皮试结果
                 map.put("tryFlag", chargeDetail.getTryFlag());//是否需要皮试
                 YpZdDict ypZdDict = ypZdDictService.queryYpZdDictByCodeAndSerial(chargeDetail.getChargeItemCode(), chargeDetail.getSerial());
+                map.put("ybZfFlag",chargeDetail.getYbZfFlag());//皮试自备
                 map.put("drugName", ypZdDict.getName());//药品名称
                 map.put("specification", ypZdDict.getSpecification());//规格
                 map.put("drugFlag", ypZdDict.getDrugFlag());//毒麻标志

src/main/java/cn/hnthyy/thmz/entity/his/mz/MzChargeDetail.java

@@ -169,7 +169,7 @@ public class MzChargeDetail implements Serializable,Comparable<MzChargeDetail> {
     private String deptNo;
     //
     private BigDecimal glPercentFt;
-    //医保支付标记
+    //医保支付标记 (皮试自备)
     private String ybZfFlag;
     //实际价格 实收金额
     private BigDecimal origPrice;

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

@@ -1036,7 +1036,7 @@ public interface MzChargeDetailMapper {
     @Select({"<script>" +
             "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.jz_flag,instruction_text,try_result,try_flag,  " +
+            "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,  " +
             " (case when y.class_code = '210100' then 1 else 0 end ) as is_rad_send" +
             "    FROM mz_charge_detail c,yp_zd_dict y" +
             " where  1=1 " +

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

@@ -472,7 +472,9 @@ function printPrescription(patientId, times, orderNo) {
                     }else if(list[i].psFlag == 1 && list[i].tryFlag == 0){//药品需要皮试，处方未点需要皮试
                         tryResult = '<span style="color: red">(免试)</span>';
                     }
-                    if(list[i].tryFlag == 1){
+                    if(list[i].ybZfFlag == 1){
+                        tryFlag = '<span style="color: red">(皮试自备一支)</span>';
+                    }else if(list[i].tryFlag == 1){
                         tryFlag = '<span style="color: red">(需皮试)</span>';
                     }
                     var number = i + 1;
@@ -480,7 +482,7 @@ function printPrescription(patientId, times, orderNo) {
                     tr += '<tr>\n' +
                         '                                <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' + number + "." +
                         '</td>\n' +
-                        '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 260px;font-size: 14px;">\n' + tryResult + tryFlag + list[i].drugName +
+                        '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 260px;font-size: 14px;">\n' + tryResult + list[i].drugName +
                         '                                </td>\n' +
                         '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 120px;text-align: right;font-size: 14px;">' + list[i].specification +
                         '</td>\n' +
@@ -493,7 +495,7 @@ function printPrescription(patientId, times, orderNo) {
                         '                            <tr>\n' +
                         '                                <td style="margin-bottom: 5px;width: 10px;font-size: 14px;" align="left" valign="top">' +
                         '</td>\n' +
-                        '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 260px;font-size: 14px;">\n' + manufactoryName +
+                        '                                <td style="margin-bottom: 5px;vertical-align: middle !important;width: 260px;font-size: 14px;">\n' + manufactoryName + tryFlag +
                         '                                </td>\n' +
                         '                                <td colspan="4" style="padding-left:0px;margin-bottom: 5px;vertical-align: middle !important;text-align: left;font-size: 14px;">用法：' + list[i].drugQuan+"&nbsp;" + list[i].drugUnitName + '/次&nbsp;&nbsp;' + list[i].frequency + '&nbsp;&nbsp;' + printName +
                         '</td>\n' +