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

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

@@ -137,6 +137,21 @@ public class CommonConstants {
          * 患者姓名
          */
         String PatientName = "patient_name";
+
+        /**
+         * 请求状态
+         */
+        String requestStatus = "request_status";
+
+        /**
+         * 创建时间
+         */
+        String createTime = "create_time";
+
+        /**
+         * 请求基于什么的ID
+         */
+        String basedOnId = "based_on_id";
     }
 
     /**

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

@@ -14,40 +14,29 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum ChargeItemContext {
+public enum ChargeItemContext implements HisEnumInterface {
 
     /**
      * 采购
      */
-    PURCHASE(1, "采购"),
+    PURCHASE(1, "1", "采购"),
 
     /**
      * 药品
      */
-    MEDICATION(2, "药品"),
+    MEDICATION(2, "2", "药品"),
 
     /**
      * 耗材
      */
-    DEVICE(3, "耗材"),
+    DEVICE(3, "3", "耗材"),
 
     /**
      * 项目
      */
-    ACTIVITY(4, "项目");
+    ACTIVITY(4, "4", "项目");
 
-    private Integer value;
-    private String info;
-
-    public static ChargeItemContext getByValue(Integer value) {
-        if (value == null) {
-            return null;
-        }
-        for (ChargeItemContext val : values()) {
-            if (val.getValue().equals(value)) {
-                return val;
-            }
-        }
-        return null;
-    }
+    private final Integer value;
+    private final String code;
+    private final String info;
 }

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

@@ -46,15 +46,4 @@ public enum ChargeItemStatus implements HisEnumInterface {
     private final String code;
     private final String info;
 
-    public static ChargeItemStatus getByValue(Integer value) {
-        if (value == null) {
-            return null;
-        }
-        for (ChargeItemStatus val : values()) {
-            if (val.getValue().equals(value)) {
-                return val;
-            }
-        }
-        return null;
-    }
 }

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

@@ -0,0 +1,32 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 身份证件类型
+ *
+ * @author liuhr
+ * @date 2025/3/18
+ */
+
+@Getter
+@AllArgsConstructor
+public enum IdentityDocumentType implements HisEnumInterface {
+
+    RESIDENT_ID_CARD(1, "residentIdCard", "居民身份证"),
+    HOUSEHOLD_REGISTER(2, "householdRegister", "居民户口簿"),
+    PASSPORT(3, "passport", "护照"),
+    OFFICER_CERTIFICATE(4, "officerCertificate", "军官证"),
+    DRIVING_LICENSE(5, "drivingLicense", "驾驶证"),
+    HONGKONG_MACAO_PASS(6, "hongkongMacaoPass", "港澳居民来往内地通行证"),
+    TAIWAN_PASS(7, "taiwanPass", "台湾居民来往内地通行证"),
+    OTHER(99, "other", "其他身份证件");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+}