Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java

@@ -70,4 +70,21 @@ public class PromptMsgConstant {
         String M00001 = "apl.inventory.M00001";
 
     }
+
+    /**
+     * 退费
+     */
+    public interface ChargeRefund {
+
+        /**
+         * 该收费单相关{0}已经发出，请先退药后再进行退费
+         */
+        String M00001 = "apl.chargeRefund.M00001";
+
+        /**
+         * 该收费单相关诊疗项目已经执行，请等待医技科室审批完成后再进行退费
+         */
+        String M00002 = "apl.chargeRefund.M00002";
+
+    }
 }

openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java

@@ -29,7 +29,7 @@ public enum AssignSeqEnum {
     /**
      * 处方号
      */
-    PRESCRIPTION_NO("4", "处方号", "P"),
+    PRESCRIPTION_NO("4", "处方号", "PR"),
 
     /**
      * 药品请求编码

openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java

@@ -37,10 +37,25 @@ public enum ChargeItemStatus implements HisEnumInterface {
      */
     ERROR(6, "entered-in-error", "错误"),
 
+    /**
+     * 退费中
+     */
+    REFUNDING(7, "refunding", "退费中"),
+
+    /**
+     * 全部退费
+     */
+    REFUNDED(8, "refunded", "全部退费"),
+
+    /**
+     * 部分退费
+     */
+    PART_REFUND(9, "part-refund", "部分退费"),
+
     /**
      * 未知
      */
-    UNKNOWN(7, "unknown", "未知");
+    UNKNOWN(10, "unknown", "未知");
 
     private final Integer value;
     private final String code;

openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ContractCategory.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 合同类型
+ *
+ * @author zwh
+ * @date 2025-03-29
+ */
+@Getter
+@AllArgsConstructor
+public enum ContractCategory implements HisEnumInterface{
+
+    /**
+     * 自费
+     */
+    SELF_CHARGE(1, "1", "自费"),
+
+    /**
+     * 公费
+     */
+    PUBLIC_CHARGE(2, "2", "公费"),
+
+    /**
+     * 省医保
+     */
+    PROVINCIAL_INSURANCE(3, "3", "省医保"),
+
+    /**
+     * 市医保
+     */
+    MUNICIPAL_INSURANCE(4, "4", "市医保"),
+
+    /**
+     * 职工医保
+     */
+    WORKER_INSURANCE(5, "5", "职工医保");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+}

openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DispenseStatus.java

@@ -46,7 +46,7 @@ public enum DispenseStatus implements HisEnumInterface {
     /**
      * 拒绝发药
      */
-    DECLINED(7, "DE", "拒绝发药 已退药"),
+    DECLINED(7, "DE", "拒绝发药"),
 
     /**
      * 已汇总

openhis-server/openhis-common/src/main/java/com/openhis/common/enums/NotPerformedReason.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright ©2023 CJB-CNIT Team. All rights reserved
+ */
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 未执行原因
+ *
+ * @author zwh
+ * @date 2025-03-29
+ */
+@Getter
+@AllArgsConstructor
+public enum NotPerformedReason {
+
+    /**
+     * 退费
+     */
+    REFUND(1, "1", "退费"),
+
+    /**
+     * 异常
+     */
+    ERROR(9, "9", "异常");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+}

openhis-server/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java

@@ -36,9 +36,9 @@ public enum RequestStatus implements HisEnumInterface {
     ON_HOLD(4, "on_hold", "暂停"),
 
     /**
-     * 撤回
+     * 取消
      */
-    CANCELLED(5, "cancelled", "撤回"),
+    CANCELLED(5, "cancelled", "取消"),
 
     /**
      * 停止