From 0f90dffd6b69ef059bba82457eae2175556efe41 Mon Sep 17 00:00:00 2001
From: "Zhang.WH" <zhangwh@ccbjb.com.cn>
Date: Wed, 19 Mar 2025 09:12:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../openhis/common/enums/ItemCategory.java    | 54 -------------------
 .../com/openhis/common/enums/ItemType.java    | 40 ++++++++++++++
 2 files changed, 40 insertions(+), 54 deletions(-)
 delete mode 100644 openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ItemCategory.java
 create mode 100644 openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java

diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ItemCategory.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ItemCategory.java
deleted file mode 100644
index 5377f70a..00000000
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ItemCategory.java
+++ /dev/null
@@ -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;
-    }
-}
diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ItemType.java
new file mode 100644
index 00000000..e66b023a
--- /dev/null
+++ b/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;
+
+}

From cfc82078a188fc8fbf85ea2b5b061168e3043d33 Mon Sep 17 00:00:00 2001
From: "Zhang.WH" <zhangwh@ccbjb.com.cn>
Date: Wed, 19 Mar 2025 09:12:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B8=B8=E9=87=8F=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/CommonConstants.java      | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java
index 29afa93c..b1d27e7f 100644
--- a/openhis-server/openhis-common/src/main/java/com/openhis/common/constant/CommonConstants.java
+++ b/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";
     }
 
     /**