98 门诊管理-》门诊划价：选项增加‘西药’和‘中成药’

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

@@ -31,10 +31,20 @@ public enum ChargeItemContext implements HisEnumInterface {
      */
     ACTIVITY(3, "3", "项目"),
 
+    /**
+     * 西药
+     */
+    WESTERN_MEDICINE(5, "5", "西药"),
+
+    /**
+     * 中成药
+     */
+    CHINESE_PATENT_MEDICINE(6, "6", "中成药"),
+
     /**
      * 挂号
      */
-    REGISTER(4, "4", "挂号");
+    REGISTER(7, "7", "挂号");
 
     private final Integer value;
     private final String code;

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

@@ -86,7 +86,12 @@ public enum DispenseStatus implements HisEnumInterface {
     /**
      * 待退药
      */
-    PENDING_REFUND(16, "PRD", "待退药");
+    PENDING_REFUND(16, "PRD", "待退药"),
+
+    /**
+     * 已退药
+     */
+    RETURNED(17, "RT", "已退药");
 
     private Integer value;
     private String code;