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

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

@@ -29,7 +29,17 @@ public class CommonConstants {
         /**
          * 逗号（用于拼接）
          */
-        String COMMA = "%s,%s";
+        String COMMA_FORMAT = "%s,%s";
+
+        /**
+         * 逗号
+         */
+        String COMMA = ",";
+
+        /**
+         * 3（用于字符串截位）
+         */
+        Integer THREE = 3;
     }
 
     /**
@@ -71,6 +81,21 @@ public class CommonConstants {
          * 发放请求
          */
         String WOR_SUPPLY_REQUEST = "wor_supply_request";
+
+        /**
+         * 药品请求
+         */
+        String MED_MEDICATION_REQUEST = "med_medication_request";
+
+        /**
+         * 服务请求
+         */
+        String WOR_SERVICE_REQUEST = "wor_service_request";
+
+        /**
+         * 耗材请求
+         */
+        String WOR_DEVICE_REQUEST = "wor_device_request";
     }
 
     /**

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

@@ -1,54 +0,0 @@
-/*
- * Copyright ©2023 CJB-CNIT Team. All rights reserved
- */
-package com.openhis.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 项目类型
- *
- * @author zwh
- * @date 2025-03-10
- */
-@Getter
-@AllArgsConstructor
-public enum ItemCategory implements HisEnumInterface {
-
-    /**
-     * 中药
-     */
-    CHINESE_MEDICINE(1, "1","中药"),
-
-    /**
-     * 西药
-     */
-    WESTERN_MEDICINE(2, "2","西药"),
-
-    /**
-     * 中成药
-     */
-    CHINESE_PATENT_MEDICINE(3, "3","中成药"),
-
-    /**
-     * 医疗耗材
-     */
-    MEDICAL_CONSUMABLES(4, "4","医疗耗材");
-
-    private Integer value;
-    private String code;
-    private String info;
-
-    public static ItemCategory getByValue(Integer value) {
-        if (value == null) {
-            return null;
-        }
-        for (ItemCategory val : values()) {
-            if (val.getValue().equals(value)) {
-                return val;
-            }
-        }
-        return null;
-    }
-}

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

@@ -0,0 +1,40 @@
+/*
+ * 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-10
+ */
+@Getter
+@AllArgsConstructor
+public enum ItemType implements HisEnumInterface {
+
+    /**
+     * 中药
+     */
+    MEDICINE(1, "1", "中药"),
+
+    /**
+     * 西药
+     */
+    DEVICE(2, "2", "西药"),
+
+    /**
+     * 医疗活动
+     */
+    ACTIVITY(3, "3", "医疗活动");
+
+    @EnumValue
+    private Integer value;
+    private String code;
+    private String info;
+
+}