LIJU 1 týždeň pred
rodič
commit
f99acba4d5

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

@@ -747,7 +747,8 @@ public interface MzPharmacyMapper {
             "         a.manu_no," +
             "         a.hosp_appr_flag," +
             "         c.rx_flag," +
-            "         c.cl_flag" +
+            "         c.cl_flag," +
+            "         c.drug_kind" +
             "    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" +

+ 2 - 0
src/main/java/cn/hnthyy/thmz/vo/MzSendMedicineVo.java

@@ -149,4 +149,6 @@ public class MzSendMedicineVo implements Serializable {
     private String certno;
     // 人员姓名
     private String psnName;
+    //药品类别
+    private String drugKind;
 }

+ 9 - 0
src/main/resources/static/js/mz/west_pharmacy_send.js

@@ -1585,6 +1585,15 @@ function prescriptionDetail(realNo, orderNo, receiptNo, times, patientId, confir
                 field: 'employeeName',
                 title: '医生姓名',
                 visible: false  // 隐藏列,仅用于数据传递
+            }, {
+                field: 'drugKind',
+                title: '药品类别',
+                align: "center",
+                valign: 'middle',
+                visible: false,  // 隐藏列,不显示给用户
+                formatter: function (value, row, index) {
+                    return value || '-';
+                }
             }
         ],
         /**