发药代码格式修改

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

@@ -0,0 +1,96 @@
+package com.openhis.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 药品请求状态
+ *
+ * @author wangyang
+ * @date 2025-03-14
+ */
+@Getter
+@AllArgsConstructor
+public enum DispenseStatus implements HisEnumInterface {
+
+    /**
+     * 草稿
+     */
+    DRAFT(1, "DR", "草稿"),
+
+    /**
+     * 待配药
+     */
+    PREPARATION(2, "PR", "待配药"),
+
+    /**
+     * 待发药
+     */
+    IN_PROGRESS(3, "IN", "待发药"),
+
+    /**
+     * 已发药
+     */
+    COMPLETED(4, "CO", "已发药"),
+
+    /**
+     * 暂停
+     */
+    ON_HOLD(5, "ON", "暂停"),
+
+    /**
+     * 停止
+     */
+    STOPPED(6, "ST", "停止"),
+
+    /**
+     * 拒绝发药
+     */
+    DECLINED(7, "DE", "拒绝发药 已退药"),
+
+    /**
+     * 已汇总
+     */
+    SUMMARIZED(8, "SR", "已汇总"),
+
+    /**
+     * 部分发药
+     */
+    PART_COMPLETED(9, "PC", "部分发药"),
+
+    /**
+     * 部分退药
+     */
+    PART_REFUND(10, "PR", "部分退药"),
+
+    /**
+     * 退药中
+     */
+    IN_REFUND(11, "IR", "退药中"),
+
+    /**
+     * 已退药
+     */
+    REFUNDED(12, "RE", "已退药"),
+
+    /**
+     * 未知
+     */
+    UNKNOWN(13, "UN", "未知");
+
+    private Integer value;
+    private String code;
+    private String info;
+
+    public static DispenseStatus getByValue(Integer value) {
+        if (value == null) {
+            return null;
+        }
+        for (DispenseStatus val : values()) {
+            if (val.getValue().equals(value)) {
+                return val;
+            }
+        }
+        return null;
+    }
+}

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

@@ -1,71 +0,0 @@
-package com.openhis.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 药品请求状态
- *
- * @author wangyang
- * @date 2025-03-14
- */
-@Getter
-@AllArgsConstructor
-public enum DispenseStatusEnum implements HisEnumInterface {
-
-    /**
-     * 草稿
-     */
-    DRAFT(0, "DR", "草稿"),
-
-    /**
-     * 待配药
-     */
-    PREPARATION(1, "PR", "待配药"),
-
-    /**
-     * 待发药
-     */
-    IN_PROGRESS(2, "IN", "待发药"),
-
-    /**
-     * 已发药
-     */
-    COMPLETED(3, "CO", "已发药"),
-
-    /**
-     * 暂停
-     */
-    ON_HOLD(4, "ON", "暂停"),
-
-    /**
-     * 停止
-     */
-    STOPPED(5, "ST", "停止"),
-
-    /**
-     * 未知
-     */
-    UNKNOWN(6, "UN", "未知"),
-
-    /**
-     * 拒绝发药 已汇总，部分发药，部分退药，已退药
-     */
-    DECLINED(7, "DE", "拒绝发药 已汇总，部分发药，部分退药，已退药");
-
-    private Integer value;
-    private String code;
-    private String info;
-
-    public static DispenseStatusEnum getByValue(Integer value) {
-        if (value == null) {
-            return null;
-        }
-        for (DispenseStatusEnum val : values()) {
-            if (val.getValue().equals(value)) {
-                return val;
-            }
-        }
-        return null;
-    }
-}

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

@@ -23,37 +23,42 @@ public enum RequestStatus implements HisEnumInterface {
     /**
      * 已发送
      */
-    COMPLETED(2, "completed", "已发送"),
+    ACTIVE(2, "active", "已发送"),
+
+    /**
+     * 已完成
+     */
+    COMPLETED(3, "completed", "已完成"),
 
     /**
      * 暂停
      */
-    ON_HOLD(3, "on_hold", "暂停"),
+    ON_HOLD(4, "on_hold", "暂停"),
 
     /**
      * 撤回
      */
-    CANCELLED(4, "cancelled", "撤回"),
+    CANCELLED(5, "cancelled", "撤回"),
 
     /**
      * 停止
      */
-    STOPPED(5, "stopped", "停止"),
+    STOPPED(6, "stopped", "停止"),
 
     /**
      * 不可用
      */
-    ENDED(6, "ended", "不可用"),
-
-    /**
-     * 未知
-     */
-    UNKNOWN(7, "unknown", "未知"),
+    ENDED(7, "ended", "不可用"),
 
     /**
      * 已汇总
      */
-    SUMMARIZED(8, "summarized", "已汇总");
+    SUMMARIZED(8, "summarized", "已汇总"),
+
+    /**
+     * 未知
+     */
+    UNKNOWN(9, "unknown", "未知");
 
     @EnumValue
     private final Integer value;