解决给药方式没有括号说明问题

src/main/java/cn/hnthyy/thmz/controller/CommonController.java

@@ -34,6 +34,8 @@ public class CommonController {
     private YshZdPartCodeService yshZdPartCodeService;
     @Autowired
     private JcZdClassService jcZdClassService;
+    @Autowired
+    private MzZdSupplyTypeService mzZdSupplyTypeService;
     //websocket 地址前半部分
     @Value("${webSocketHost}")
     private String webSocketHost;
@@ -457,16 +459,17 @@ public class CommonController {
         try {
             resultMap.put("code", 0);
             resultMap.put("message", "查询所有给药方式成功");
-            List<Map<String, Object>> data = new ArrayList<>();
-            Arrays.stream(SupplyTypeEnum.values()).forEach(supplyTypeEnum -> {
-                Map<String, Object> temp = new HashMap<>();
-                temp.put("code", supplyTypeEnum.code);
-                temp.put("name", supplyTypeEnum.name);
-                temp.put("pyCode", supplyTypeEnum);
-                temp.put("groupNo", supplyTypeEnum.groupNo);
-                data.add(temp);
-            });
-            resultMap.put("data", data);
+//            List<Map<String, Object>> data = new ArrayList<>();
+//
+//            Arrays.stream(SupplyTypeEnum.values()).forEach(supplyTypeEnum -> {
+//                Map<String, Object> temp = new HashMap<>();
+//                temp.put("code", supplyTypeEnum.code);
+//                temp.put("name", supplyTypeEnum.name);
+//                temp.put("pyCode", supplyTypeEnum);
+//                temp.put("groupNo", supplyTypeEnum.groupNo);
+//                data.add(temp);
+//            });
+            resultMap.put("data", mzZdSupplyTypeService.queryMzZdSupplyTypeInUsed());
             return resultMap;
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -11,6 +11,8 @@ public class MzZdSupplyType {
     private String supplyCode;
     //名称
     private String supplyName;
+    //药房 71 西药费 81 中药房
+    private String supplyOcc;
     //1：停用
     private Integer delFlag;
     //排序码

src/main/java/cn/hnthyy/thmz/enums/SupplyTypeEnum.java

@@ -1,167 +1,167 @@
-package cn.hnthyy.thmz.enums;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 给药方式枚举
- */
-public enum SupplyTypeEnum {
-    KF("001","口服","71"),
-    JZ("002","肌注","71"),
-    JMZSBZ20("003","静脉注射","71"),
-    TWSJMZS("155","弹丸式静脉注射","71"),
-    JMSY("005","静脉输液","71"),
-    //XEJMSYY6("006","小儿静脉输液（6岁以下儿童)"),
-    PS("007","皮试","71"),
-    PXZS("008","皮下注射","71"),
-    PNZS("009","皮内注射","71"),
-    XETPJMSY("011","小儿头皮静脉输液","71"),
-    QNZS("014","鞘内注射","71"),
-    QJMXZS("015","球结膜下注射","71"),
-    TDZS("016","痛点注射","71"),
-    GJZS("017","宫颈注射","71"),
-    TMZS("018","脱敏注射","71"),
-    QJMZS("020","脐静脉注射","71"),
-    XWZS("021","穴位注射","71"),
-    XQNZS("022","胸腔内注射","71"),
-    XNZS("023","心内注射","71"),
-    QHZS("024","球后注射","71"),
-    PGGZ("028","膀胱灌注","71"),
-    PGCX("029","膀胱冲洗","71"),
-    YDGZ("030","阴道灌注","71"),
-    ZY("038","坐浴","71"),
-    CG("039","冲管","71"),
-    HYMX("040","会阴抹洗","71"),
-    WHXR("041","雾化吸入","71"),
-    CSWH("042","超声雾化","71"),
-    WY("043","外用","71"),
-    FY("044","副药","71"),
-    CYDY("045","出院带药","71"),
-    PY("047","喷用","71"),
-    JM("049","局麻","71"),
-    SG("050","塞肛","71"),
-    SXHF("051","舌下含服","71"),
-    CTY("052","CT用","71"),
-    ZQGJY("053","支气管镜用","71"),
-    SKY("054","漱口用","71"),
-    LY("055","领药","71"),
-    ASMFHZYZ("056","按说明服(或遵医嘱）","71"),
-    WGBS("057","胃管鼻饲","71"),
-    CCY("059","穿刺用","71"),
-    DYY("060","滴眼用","71"),
-    ZYY("061","造影用","71"),
-    GCY("062","灌肠用","71"),
-    CXY("063","冲洗用","71"),
-    TXY("064","透析用","71"),
-    SRF("065","湿热敷","71"),
-    GQZS("067","宫腔注射","71"),
-    TYK("068","退药(款)","71"),
-    DEY("069","滴耳用","71"),
-    DBY("070","滴鼻用","71"),
-    SXFY("071","舌下服用","71"),
-    WT("072","外贴","71"),
-    XWY("073","洗胃用","71"),
-    XTY("074","吸痰用","71"),
-    XYY("075","吸氧用","71"),
-    FQGZ("076","腹腔灌注","71"),
-    SX("078","输血","71"),
-    SZY("082","术中用","71"),
-    JF("084","嚼服","71"),
-    JBFB("085","局部封闭","71"),
-    XY ("090","吸氧","71"),
-    XDJH("091","心电监护","71"),
-    KQHL("093","口腔护理","71"),
-    JZSZ("101","肌注(术中)","71"),
-    SYSZ("102","输液(术中)","71"),
-    SXSZ("103","输血(术中)","71"),
-    PXZZ("104","皮下自注","71"),
-    JMZS("105","静注","71"),
-    JF107("107","煎服","81"),
-    GJQZS("111","关节腔注射","71"),
-    DH("112","带回","71"),
-    XWZS113("113","穴位注射","71"),
-    CXPGCX("116","持续膀胱冲洗","71"),
-    GC("117","灌肠","71"),
-    QJGC("118","清洁灌肠","71"),
-    ZQWHXR("119","蒸汽雾化吸入","71"),
-    YLGCX("120","引流管冲洗","71"),
-    JMCX("121","静脉采血","71"),
-    CXGJCX("123","持续关节冲洗","71"),
-    CXHYY("124","拆线换药用","71"),
-    ZYZY("125","遵医嘱用","71"),
-    JYLGZY("126","经引流管注药","71"),
-    XSEQJMTZ("127","新生儿脐静脉推注或注射","71"),
-    CQLGY("128","侧穹窿给药","71"),
-    FY129("129","副药","71"),
-    ZYYJFYGB("130","坐浴（仅发药给病人）","71"),
-    MZJMSY("131","门诊静脉输液","71"),
-    PSSBHFYY("139","皮试（不含费用）","71"),
-    PNZSBHFY("143","皮内注射(不含费用)","71"),
-    MZJMSYYM("144","门诊静脉输液（免费）","71"),
-    WHXRMF("195","雾化吸入(免费)","71"),
-    YHWH("148","氧化雾化","71"),
-    TYJY("149","涂眼睑用","71"),
-    XRYFJ("150","吸入用（粉剂）","71"),
-    YDGY("151","阴道给药","71"),
-    JMZSBHFY("152","静脉注射(不含费用)","71"),
-    TMZSMF("153","脱敏注射(免费)","71"),
-    JMMMFF("154","局麻（免费）","71"),
-    JBZS("156","局部注射","71"),
-    DDYL("157","胆道引流","71"),
-    DDYLLFYY("158","胆道引流（副药）","71"),
-//    GYBWHXRR("160","高压泵雾化吸入（7岁以下儿童）"),
-//    JRZSS7SY("162","肌肉注射（7岁以下儿童）"),
-    GYBWHXR("159","高压泵雾化吸入","71"),
-    JMSX("114","静脉输血","71"),
-    BYSY("115","必要时用","71"),
-    YDGZZZDD("140","阴道灌注（自带）","71"),
-    JMSYBHFY("141","静脉输液(不含费用)","71"),
-    JZBHFY("142","肌注(不含费用)","71"),
-    DJ("145","代煎","81"),
-    DJJYSS("146","代煎（延时）","81"),
-    DJJMFF("147","代煎（免费）","81");
-//    PXZS7SYX("163","皮下注射-7岁以下儿童"),
-//    PNZS7SYX("164","皮内注射-7岁以下儿童"),
-//    JMCX7SYX ("165","静脉采血-7岁以下儿童"),
-//    JMCX7SYX("166","静脉采血-7岁以下儿童");
-
-    public String code;
-    public String name;
-    public String groupNo;
-
-    SupplyTypeEnum(String code, String name,String groupNo){
-        this.code=code;
-        this.name=name;
-        this.groupNo=groupNo;
-    }
-
-    /**
-     * 根据编码查询对应的类型
-     * @param code
-     * @return
-     */
-    public static SupplyTypeEnum getSupplyTypeByCode(String code){
-        List<SupplyTypeEnum> gongnksEnums= Arrays.asList(values());
-        for (SupplyTypeEnum gongnksEnum:gongnksEnums){
-            if(gongnksEnum.code.equals(code)){
-                return gongnksEnum;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 获取所有的给药方式的编码
-     * @return
-     */
-    public static List<String> getAllSupplyTypeCode(){
-        List<String> resultList = new ArrayList<>();
-        List<SupplyTypeEnum> gongnksEnums= Arrays.asList(values());
-        for (SupplyTypeEnum gongnksEnum:gongnksEnums){
-            resultList.add(gongnksEnum.code);
-        }
-        return resultList;
-    }
-}
+//package cn.hnthyy.thmz.enums;
+//
+//import java.util.ArrayList;
+//import java.util.Arrays;
+//import java.util.List;
+//
+///**
+// * 给药方式枚举
+// */
+//public enum SupplyTypeEnum {
+//    KF("001","口服","71"),
+//    JZ("002","肌注","71"),
+//    JMZSBZ20("003","静脉注射","71"),
+//    TWSJMZS("155","弹丸式静脉注射","71"),
+//    JMSY("005","静脉输液","71"),
+//    //XEJMSYY6("006","小儿静脉输液（6岁以下儿童)"),
+//    PS("007","皮试","71"),
+//    PXZS("008","皮下注射","71"),
+//    PNZS("009","皮内注射","71"),
+//    XETPJMSY("011","小儿头皮静脉输液","71"),
+//    QNZS("014","鞘内注射","71"),
+//    QJMXZS("015","球结膜下注射","71"),
+//    TDZS("016","痛点注射","71"),
+//    GJZS("017","宫颈注射","71"),
+//    TMZS("018","脱敏注射","71"),
+//    QJMZS("020","脐静脉注射","71"),
+//    XWZS("021","穴位注射","71"),
+//    XQNZS("022","胸腔内注射","71"),
+//    XNZS("023","心内注射","71"),
+//    QHZS("024","球后注射","71"),
+//    PGGZ("028","膀胱灌注","71"),
+//    PGCX("029","膀胱冲洗","71"),
+//    YDGZ("030","阴道灌注","71"),
+//    ZY("038","坐浴","71"),
+//    CG("039","冲管","71"),
+//    HYMX("040","会阴抹洗","71"),
+//    WHXR("041","雾化吸入","71"),
+//    CSWH("042","超声雾化","71"),
+//    WY("043","外用","71"),
+//    FY("044","副药","71"),
+//    CYDY("045","出院带药","71"),
+//    PY("047","喷用","71"),
+//    JM("049","局麻","71"),
+//    SG("050","塞肛","71"),
+//    SXHF("051","舌下含服","71"),
+//    CTY("052","CT用","71"),
+//    ZQGJY("053","支气管镜用","71"),
+//    SKY("054","漱口用","71"),
+//    LY("055","领药","71"),
+//    ASMFHZYZ("056","按说明服(或遵医嘱）","71"),
+//    WGBS("057","胃管鼻饲","71"),
+//    CCY("059","穿刺用","71"),
+//    DYY("060","滴眼用","71"),
+//    ZYY("061","造影用","71"),
+//    GCY("062","灌肠用","71"),
+//    CXY("063","冲洗用","71"),
+//    TXY("064","透析用","71"),
+//    SRF("065","湿热敷","71"),
+//    GQZS("067","宫腔注射","71"),
+//    TYK("068","退药(款)","71"),
+//    DEY("069","滴耳用","71"),
+//    DBY("070","滴鼻用","71"),
+//    SXFY("071","舌下服用","71"),
+//    WT("072","外贴","71"),
+//    XWY("073","洗胃用","71"),
+//    XTY("074","吸痰用","71"),
+//    XYY("075","吸氧用","71"),
+//    FQGZ("076","腹腔灌注","71"),
+//    SX("078","输血","71"),
+//    SZY("082","术中用","71"),
+//    JF("084","嚼服","71"),
+//    JBFB("085","局部封闭","71"),
+//    XY ("090","吸氧","71"),
+//    XDJH("091","心电监护","71"),
+//    KQHL("093","口腔护理","71"),
+//    JZSZ("101","肌注(术中)","71"),
+//    SYSZ("102","输液(术中)","71"),
+//    SXSZ("103","输血(术中)","71"),
+//    PXZZ("104","皮下自注","71"),
+//    JMZS("105","静注","71"),
+//    JF107("107","煎服","81"),
+//    GJQZS("111","关节腔注射","71"),
+//    DH("112","带回","71"),
+//    XWZS113("113","穴位注射","71"),
+//    CXPGCX("116","持续膀胱冲洗","71"),
+//    GC("117","灌肠","71"),
+//    QJGC("118","清洁灌肠","71"),
+//    ZQWHXR("119","蒸汽雾化吸入","71"),
+//    YLGCX("120","引流管冲洗","71"),
+//    JMCX("121","静脉采血","71"),
+//    CXGJCX("123","持续关节冲洗","71"),
+//    CXHYY("124","拆线换药用","71"),
+//    ZYZY("125","遵医嘱用","71"),
+//    JYLGZY("126","经引流管注药","71"),
+//    XSEQJMTZ("127","新生儿脐静脉推注或注射","71"),
+//    CQLGY("128","侧穹窿给药","71"),
+//    FY129("129","副药","71"),
+//    ZYYJFYGB("130","坐浴（仅发药给病人）","71"),
+//    MZJMSY("131","门诊静脉输液","71"),
+//    PSSBHFYY("139","皮试（不含费用）","71"),
+//    PNZSBHFY("143","皮内注射(不含费用)","71"),
+//    MZJMSYYM("144","门诊静脉输液（免费）","71"),
+//    WHXRMF("195","雾化吸入(免费)","71"),
+//    YHWH("148","氧化雾化","71"),
+//    TYJY("149","涂眼睑用","71"),
+//    XRYFJ("150","吸入用（粉剂）","71"),
+//    YDGY("151","阴道给药","71"),
+//    JMZSBHFY("152","静脉注射(不含费用)","71"),
+//    TMZSMF("153","脱敏注射(免费)","71"),
+//    JMMMFF("154","局麻（免费）","71"),
+//    JBZS("156","局部注射","71"),
+//    DDYL("157","胆道引流","71"),
+//    DDYLLFYY("158","胆道引流（副药）","71"),
+////    GYBWHXRR("160","高压泵雾化吸入（7岁以下儿童）"),
+////    JRZSS7SY("162","肌肉注射（7岁以下儿童）"),
+//    GYBWHXR("159","高压泵雾化吸入","71"),
+//    JMSX("114","静脉输血","71"),
+//    BYSY("115","必要时用","71"),
+//    YDGZZZDD("140","阴道灌注（自带）","71"),
+//    JMSYBHFY("141","静脉输液(不含费用)","71"),
+//    JZBHFY("142","肌注(不含费用)","71"),
+//    DJ("145","代煎","81"),
+//    DJJYSS("146","代煎（延时）","81"),
+//    DJJMFF("147","代煎（免费）","81");
+////    PXZS7SYX("163","皮下注射-7岁以下儿童"),
+////    PNZS7SYX("164","皮内注射-7岁以下儿童"),
+////    JMCX7SYX ("165","静脉采血-7岁以下儿童"),
+////    JMCX7SYX("166","静脉采血-7岁以下儿童");
+//
+//    public String code;
+//    public String name;
+//    public String groupNo;
+//
+//    SupplyTypeEnum(String code, String name,String groupNo){
+//        this.code=code;
+//        this.name=name;
+//        this.groupNo=groupNo;
+//    }
+//
+//    /**
+//     * 根据编码查询对应的类型
+//     * @param code
+//     * @return
+//     */
+//    public static SupplyTypeEnum getSupplyTypeByCode(String code){
+//        List<SupplyTypeEnum> gongnksEnums= Arrays.asList(values());
+//        for (SupplyTypeEnum gongnksEnum:gongnksEnums){
+//            if(gongnksEnum.code.equals(code)){
+//                return gongnksEnum;
+//            }
+//        }
+//        return null;
+//    }
+//
+//    /**
+//     * 获取所有的给药方式的编码
+//     * @return
+//     */
+//    public static List<String> getAllSupplyTypeCode(){
+//        List<String> resultList = new ArrayList<>();
+//        List<SupplyTypeEnum> gongnksEnums= Arrays.asList(values());
+//        for (SupplyTypeEnum gongnksEnum:gongnksEnums){
+//            resultList.add(gongnksEnum.code);
+//        }
+//        return resultList;
+//    }
+//}

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

@@ -7,13 +7,29 @@ import org.apache.ibatis.annotations.Select;
 import java.util.List;
 
 public interface MzZdSupplyTypeMapper {
+
+    /**
+     * 查询在使用的给药方式
+     * @return
+     */
+    @Select("select rtrim(supply_code) supply_code,rtrim(supply_name) supply_name,rtrim(supply_occ) supply_occ,rtrim(del_flag) del_flag,sort_code,rtrim(class_code) class_code,rtrim(print_name) print_name" +
+            ",rtrim(py_code) py_code,rtrim(d_code) wb_code,rtrim(child_code) child_code,rtrim(try_flag) try_flag from mz_zd_supply_type where ISNULL(del_flag, 0) =0 ")
+    List<MzZdSupplyType> selectMzZdSupplyTypeInUsed();
+
+    /**
+     * 查询在使用的给药方式编码
+     * @return
+     */
+    @Select("select rtrim(supply_code) supply_code from mz_zd_supply_type where ISNULL(del_flag, 0) =0 ")
+    List<String> selectMzZdSupplyTypeCodeInUsed();
+
     /**
      * 根据编码查询门诊给药方式字典信息
      *
      * @param code
      * @return
      */
-    @Select("select rtrim(supply_code) supply_code,rtrim(supply_name) supply_name,rtrim(del_flag) del_flag,sort_code,rtrim(class_code) class_code,rtrim(print_name) print_name" +
+    @Select("select rtrim(supply_code) supply_code,rtrim(supply_name) supply_name,rtrim(supply_occ) supply_occ,rtrim(del_flag) del_flag,sort_code,rtrim(class_code) class_code,rtrim(print_name) print_name" +
             ",rtrim(py_code) py_code,rtrim(d_code) wb_code,rtrim(child_code) child_code,rtrim(try_flag) try_flag from mz_zd_supply_type WITH(NOLOCK) where supply_code = #{code,jdbcType=VARCHAR}")
     MzZdSupplyType selectMzZdSupplyTypeByCode(@Param("code") String code);
 
@@ -24,7 +40,7 @@ public interface MzZdSupplyTypeMapper {
      * @return
      */
     @Select({"<script>",
-            "select rtrim(supply_code) supply_code,rtrim(supply_name) supply_name,rtrim(del_flag) del_flag,sort_code,rtrim(class_code) class_code,rtrim(print_name) print_name",
+            "select rtrim(supply_code) supply_code,rtrim(supply_name) supply_name,rtrim(supply_occ) supply_occ,rtrim(del_flag) del_flag,sort_code,rtrim(class_code) class_code,rtrim(print_name) print_name",
             ",rtrim(py_code) py_code,rtrim(d_code) wb_code,rtrim(child_code) child_code,rtrim(try_flag) try_flag from mz_zd_supply_type WITH(NOLOCK) ",
             "<when test='codes!=null'>",
             " where supply_code in",

src/main/java/cn/hnthyy/thmz/service/his/mz/MzZdSupplyTypeService.java

@@ -5,6 +5,11 @@ import cn.hnthyy.thmz.entity.his.mz.MzZdSupplyType;
 import java.util.List;
 
 public interface MzZdSupplyTypeService {
+    /**
+     * 查询在使用的给药方式
+     * @return
+     */
+    List<MzZdSupplyType> queryMzZdSupplyTypeInUsed();
     /**
      * 根据编码查询门诊给药方式字典信息
      *

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzChargeDetailServiceImpl.java

@@ -163,6 +163,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
     @SuppressWarnings("all")
     @Autowired
     private MzZyReqMapper mzZyReqMapper;
+    @SuppressWarnings("all")
+    @Autowired
+    private MzZdSupplyTypeMapper mzZdSupplyTypeMapper;
     //是否加收开关
     @Value("${setUnitPrice}")
     private boolean setUnitPrice;
@@ -1241,8 +1244,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         OrderFrequencyEnum orderFrequencyEnum = OrderFrequencyEnum.getOrderFrequencyByCode(mzChargeDetail.getFrequency());
                         tempMap.put("frequency", orderFrequencyEnum != null ? orderFrequencyEnum.name : "");
                         tempMap.put("cyJssm", mzChargeDetail.getCyJssm() != null ? mzChargeDetail.getCyJssm() : "");
-                        SupplyTypeEnum supplyTypeEnum = SupplyTypeEnum.getSupplyTypeByCode(mzChargeDetail.getCyDj());
-                        tempMap.put("cyDj", supplyTypeEnum != null ? supplyTypeEnum.name : "");
+                        //SupplyTypeEnum supplyTypeEnum = SupplyTypeEnum.getSupplyTypeByCode(mzChargeDetail.getCyDj());
+                        MzZdSupplyType mzZdSupplyType=mzZdSupplyTypeMapper.selectMzZdSupplyTypeByCode(mzChargeDetail.getCyDj());
+                        tempMap.put("cyDj", mzZdSupplyType != null ? mzZdSupplyType.getSupplyName() : "");
                         CyFysmEnum cyFysmEnum = CyFysmEnum.geteCyFysmByCode(mzChargeDetail.getCyFysm() == null ? null : mzChargeDetail.getCyFysm().toString());
                         tempMap.put("cyFysm", cyFysmEnum != null ? cyFysmEnum.name : "");
                         tempMap.put("detail", new ArrayList<>());
@@ -1268,7 +1272,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         continue;
                     }
                     if (supplyChargeItemCodeSet == null) {
-                        List<MzZdSupplyCharge> mzZdSupplyChargeList = mzZdSupplyChargeService.queryMzZdSupplyChargeByCodeList(SupplyTypeEnum.getAllSupplyTypeCode());
+                        List<MzZdSupplyCharge> mzZdSupplyChargeList = mzZdSupplyChargeService.queryMzZdSupplyChargeByCodeList(mzZdSupplyTypeMapper.selectMzZdSupplyTypeCodeInUsed());
                         if (mzZdSupplyChargeList != null && mzZdSupplyChargeList.size() > 0) {
                             supplyChargeItemCodeSet = mzZdSupplyChargeList.stream().map(s -> s.getChargeCode()).collect(Collectors.toSet());
                         }
@@ -1375,9 +1379,10 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     name += mzChargeDetail.getQuantity() + UnitTypeEnum.getUnitTypeByCode(ypZdDict.getPackUnit()).name;
                     // name += " 共" + mzChargeDetail.getQuantity() + UnitTypeEnum.getUnitTypeByCode(ypZdDict.getPackUnit()).name;
                     if (StringUtils.isNotBlank(mzChargeDetail.getSupplyCode())) {
-                        SupplyTypeEnum supplyTypeEnum = SupplyTypeEnum.getSupplyTypeByCode(mzChargeDetail.getSupplyCode());
-                        if (supplyTypeEnum != null) {
-                            name += " 用法：" + supplyTypeEnum.name;
+                        MzZdSupplyType mzZdSupplyType=mzZdSupplyTypeMapper.selectMzZdSupplyTypeByCode(mzChargeDetail.getSupplyCode());
+                        //SupplyTypeEnum supplyTypeEnum = SupplyTypeEnum.getSupplyTypeByCode(mzChargeDetail.getSupplyCode());
+                        if (mzZdSupplyType != null) {
+                            name += " 用法：" + mzZdSupplyType.getSupplyName();
                             name += " " + mzChargeDetail.getDrugQuan() + unitDesc;
                         }
                     }
@@ -1950,9 +1955,10 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         mzChargeDetail.setSupplyAmount(mzChargeDetail.getOrderDays() * OrderFrequencyEnum.getOrderFrequencyByCode(mzChargeDetail.getFrequency()).times);
                         if (setEmrProcess) {
                             xyIndex++;
-                            SupplyTypeEnum supplyType = SupplyTypeEnum.getSupplyTypeByCode(mzChargeDetail.getSupplyCode());
+                            MzZdSupplyType mzZdSupplyType=mzZdSupplyTypeMapper.selectMzZdSupplyTypeByCode(mzChargeDetail.getSupplyCode());
+                            //SupplyTypeEnum supplyType = SupplyTypeEnum.getSupplyTypeByCode(mzChargeDetail.getSupplyCode());
                             OrderFrequencyEnum orderFrequency = OrderFrequencyEnum.getOrderFrequencyByCode(mzChargeDetail.getFrequency());
-                            String value = xyIndex + "." + mzChargeDetail.getTcName() + " " + mzChargeDetail.getQuantity() + ypZdDict.getPackUnit() + " 用法：" + (supplyType != null ? supplyType.name : "") + " 频次：" + (orderFrequency != null ? orderFrequency.name : "") + " ";
+                            String value = xyIndex + "." + mzChargeDetail.getTcName() + " " + mzChargeDetail.getQuantity() + ypZdDict.getPackUnit() + " 用法：" + (mzZdSupplyType != null ? mzZdSupplyType.getSupplyName() : "") + " 频次：" + (orderFrequency != null ? orderFrequency.name : "") + " ";
                             if (xyzlContent == null) {
                                 xyzlContent = "西药治疗：" + value;
                             } else {
@@ -2473,7 +2479,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             StringBuilder sbd = new StringBuilder();
             if (mzChargeDetailList != null && mzChargeDetailList.size() > 0) {
                 if (supplyChargeItemCodeSet == null) {
-                    List<MzZdSupplyCharge> mzZdSupplyChargeList = mzZdSupplyChargeService.queryMzZdSupplyChargeByCodeList(SupplyTypeEnum.getAllSupplyTypeCode());
+                    List<MzZdSupplyCharge> mzZdSupplyChargeList = mzZdSupplyChargeService.queryMzZdSupplyChargeByCodeList(mzZdSupplyTypeMapper.selectMzZdSupplyTypeCodeInUsed());
                     if (mzZdSupplyChargeList != null && mzZdSupplyChargeList.size() > 0) {
                         supplyChargeItemCodeSet = mzZdSupplyChargeList.stream().map(s -> s.getChargeCode()).collect(Collectors.toSet());
                     }

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzZdSupplyTypeServiceImpl.java

@@ -12,6 +12,12 @@ public class MzZdSupplyTypeServiceImpl implements MzZdSupplyTypeService {
     @SuppressWarnings("all")
     @Autowired
     private MzZdSupplyTypeMapper mzZdSupplyTypeMapper;
+
+    @Override
+    public List<MzZdSupplyType> queryMzZdSupplyTypeInUsed() {
+        return mzZdSupplyTypeMapper.selectMzZdSupplyTypeInUsed();
+    }
+
     @Override
     public MzZdSupplyType selectMzZdSupplyTypeByCode(String code) {
         return mzZdSupplyTypeMapper.selectMzZdSupplyTypeByCode(code);

src/main/resources/application-dev.yml

@@ -117,7 +117,7 @@ setUnitPrice: false
 #haiciServiceUrl: "https://sapi.med.gzhc365.com/openapi/health"
 
 #泰和微信开放服务地址测试环境
-haiciServiceUrl: "http://172.16.30.26:8805/wxserver"
+haiciServiceUrl: "http://172.16.30.26/wxserver"
 
 #泰和微信缴费服务地址测试环境
 wxPayOrderServiceUrl: "http://172.16.30.26:8706"

src/main/resources/application-prod.yml

@@ -115,7 +115,7 @@ setUnitPrice: false
 #haiciServiceUrl: "https://api.med.gzhc365.com/openapi/health"
 
 #泰和微信开放服务地址生产环境
-haiciServiceUrl: "http://192.168.200.3:8805/wxserver"
+haiciServiceUrl: "http://192.168.200.3/wxserver"
 
 #泰和微信缴费服务地址生产环境
 wxPayOrderServiceUrl: "http://webhis.thyy.cn:8706"

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

@@ -2322,8 +2322,8 @@ function initSupplyTypes() {
             }
             var html = '';
             $.each(res.data, function (commentIndex, comment) {
-                if (comment.groupNo === "71") {
-                    html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + ')' + '</option>';
+                if (comment.supplyOcc === "71") {
+                    html += '<option value="' + comment.supplyCode + '">' + comment.supplyName + '[' + comment.pyCode + ']' + '</option>';
                 }
             });
             $('#supplyType').empty();
@@ -2352,9 +2352,9 @@ function initZySupplyTypes(id, async) {
             }
             var html = '';
             $.each(res.data, function (commentIndex, comment) {
-                if (comment.groupNo === "81") {
+                if (comment.supplyOcc === "81") {
                     // html += '<option value="' + comment.code + '">' + comment.name + '</option>';
-                    html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + ')' + '</option>';
+                    html += '<option value="' + comment.supplyCode + '">' + comment.supplyName + '[' + comment.pyCode + ']' + '</option>';
                 }
             });
             $('#' + id).empty();
@@ -2463,7 +2463,7 @@ function saveWesternMedicine(calculateTotalAmountFlag) {
     var supplyType = $("#supplyType").val();
     //用法描述
     var supplyTypeText = $('#supplyType option:selected').text();
-    supplyTypeText = supplyTypeText.substring(0, supplyTypeText.indexOf("("));
+    supplyTypeText = supplyTypeText.substring(0, supplyTypeText.indexOf("["));
     //药品默认单次使用剂量
     var drugWinDb = $("#drugWinDb").val();
     //处方实际单次使用剂量