bug 467 569

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

@@ -29,9 +29,9 @@ public enum DispenseStatus implements HisEnumInterface {
     IN_PROGRESS(3, "IN", "待发药"),
 
     /**
-     * 已发药
+     * 已发药/已完成
      */
-    COMPLETED(4, "CO", "已发放"),
+    COMPLETED(4, "CO", "已发药/已完成"),
 
     /**
      * 暂停
@@ -91,7 +91,17 @@ public enum DispenseStatus implements HisEnumInterface {
     /**
      * 已退药
      */
-    RETURNED(17, "RT", "已退药");
+    RETURNED(17, "RT", "已退药"),
+
+    /**
+     * 已执行
+     */
+    EXECUTED(11, "EX", "已执行"),
+
+    /**
+     * 已提交
+     */
+    SUBMITTED(18, "SB", "已提交");
 
     private Integer value;
     private String code;

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

@@ -25,9 +25,9 @@ public enum RequestStatus implements HisEnumInterface {
     ACTIVE(2, "active", "已发送"),
 
     /**
-     * 已完成
+     * 已校对
      */
-    COMPLETED(3, "completed", "已完成"),
+    COMPLETED(3, "completed", "已校对"),
 
     /**
      * 暂停
@@ -72,7 +72,12 @@ public enum RequestStatus implements HisEnumInterface {
     /**
      * 已接收（检查申请：医技科室已接单）
      */
-    CHECK_RECEIVED(12, "check_received", "已接收");
+    CHECK_RECEIVED(12, "check_received", "已接收"),
+
+    /**
+     * 已完成（药品发药完成）
+     */
+    DISPENSE_COMPLETED(20, "dispense_completed", "已完成");
 
     @EnumValue
     private final Integer value;