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

# Conflicts:
#	openhis-server/openhis-common/src/main/java/com/openhis/common/constant/PromptMsgConstant.java
#	openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IChargeItemService.java

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

@@ -6,7 +6,7 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public enum AccountBillingStatus {
+public enum AccountBillingStatus implements HisEnumInterface {
 
     OPEN (1, "open", "可用"),
 

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

@@ -6,7 +6,7 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public enum ChargeItemStatus {
+public enum ChargeItemStatus implements HisEnumInterface {
     PLANNED (1, "planned", "待收费"),
 
     BILLABLE(2, "billable", "待结算"),

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

@@ -0,0 +1,25 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 过敏与不耐受中临床状况
+ *
+ * @author liuhr
+ * @date 2025/3/6
+ */
+@Getter
+@AllArgsConstructor
+public enum ClinicalStatus implements HisEnumInterface  {
+    ACTIVE(1, "active", "阳性"),
+    INACTIVE(2, "inactive", "阴性"),
+    RESOLVED(3, "resolved", "已解决");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+
+}

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

@@ -1,12 +1,13 @@
 package com.openhis.common.enums;
+
 import com.baomidou.mybatisplus.annotation.EnumValue;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-
 @Getter
 @AllArgsConstructor
-public enum EncounterLocationStatus {
+public enum EncounterLocationStatus implements HisEnumInterface {
     PLANNED(1, "planned", "已安排"),
 
     ACTIVE(2, "active", "使用中"),

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

@@ -6,7 +6,7 @@ import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public enum EncounterType {
+public enum EncounterType implements HisEnumInterface {
 
     INITIAL(1, "initial", "初诊"),
     FOLLOW_UP(2, "follow-up", "复诊");

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

@@ -5,5 +5,6 @@ package com.openhis.common.enums;
  */
 public interface HisEnumInterface {
     Integer getValue();
+    String getCode();
     String getInfo();
 }

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

@@ -1,18 +1,20 @@
 package com.openhis.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public enum LocationBedStatus {
-    C (1, "C", "关闭"),
-    H (2, "H", "整理"),
-    O (3, "O", "占用"),
-    U (4, "U", "空闲"),
-    K (5, "K", "污染"),
-    I (6, "I", "隔离");
+public enum LocationBedStatus implements HisEnumInterface {
+    C(1, "C", "关闭"),
+    H(2, "H", "整理"),
+    O(3, "O", "占用"),
+    U(4, "U", "空闲"),
+    K(5, "K", "污染"),
+    I(6, "I", "隔离");
+
     @EnumValue
     private final Integer value;
     private final String code;

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

@@ -1,35 +1,39 @@
 package com.openhis.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public enum LocationForm {
+public enum LocationForm implements HisEnumInterface {
 
     SITE(1, "si", "集合点A collection of buildings or other locations such as a site or a campus."),
-    BUILDING(2, "bu", "建筑Any Building or structure. This may contain rooms, corridors, wings, etc. It might not have walls, or a roof, but is considered a defined/allocated space."),
+    BUILDING(2, "bu",
+        "建筑Any Building or structure. This may contain rooms, corridors, wings, etc. It might not have walls, or a roof, but is considered a defined/allocated space."),
     WING(3, "wi", "连廊A Wing within a Building, this often contains levels, rooms and corridors."),
     WARD(4, "wa", "病区A Ward is a section of a medical facility that may contain rooms and other types of location."),
     LEVEL(5, "lvl", "楼层A Level in a multi-level Building/Structure."),
     CORRIDOR(6, "co", "走廊Any corridor within a Building, that may connect rooms."),
     ROOM(7, "ro", "诊室A space that is allocated as a room, it may have walls/roof etc., but does not require these."),
-    BED(8, "bd", "床A space that is allocated for sleeping/laying on. This is not the physical bed/trolley that may be moved about, but the space it may occupy."),
+    BED(8, "bd",
+        "床A space that is allocated for sleeping/laying on. This is not the physical bed/trolley that may be moved about, but the space it may occupy."),
     VEHICLE(9, "ve", "运输工具A means of transportation."),
     HOUSE(10, "ho", "病房A residential dwelling. Usually used to reference a location that a person/patient may reside."),
     CABINET(11, "ca", "库房A container that can store goods, equipment, medications or other items."),
     ROAD(12, "rd", "路A defined path to travel between 2 points that has a known name."),
     AREA(13, "area", "区域A defined physical boundary of something, such as a flood risk zone, region, postcode"),
-    JURISDICTION(14, "jdn", "适用范围A wide scope that covers a conceptual domain, such as a Nation (Country wide community or Federal Government - e.g. Ministry of Health), Province or State (community or Government), Business (throughout the enterprise), Nation with a business scope of an agency (e.g. CDC, FDA etc.) or a Business segment (UK Pharmacy), not just an physical boundary"),
+    JURISDICTION(14, "jdn",
+        "适用范围A wide scope that covers a conceptual domain, such as a Nation (Country wide community or Federal Government - e.g. Ministry of Health), Province or State (community or Government), Business (throughout the enterprise), Nation with a business scope of an agency (e.g. CDC, FDA etc.) or a Business segment (UK Pharmacy), not just an physical boundary"),
     VIRTUAL(15, "vi", "虚拟A location that is virtual in nature, such as a conference call or virtual meeting space");
 
-//    PHARMACY(16, "ph", "药房"),
-//    PHARMACY_WINDOW(17, "phw", "发药窗口"),
-//    PHARMACY_TABLE(18, "dt", "摆药台"),
-//    NURSE_STATION(19, "ns", "护士站"),
-//    PERSON_STORE(20, "ps", "个人储物柜"),
-//    DOCTOR_TABLE(21, "dt", "医生诊台");
+    // PHARMACY(16, "ph", "药房"),
+    // PHARMACY_WINDOW(17, "phw", "发药窗口"),
+    // PHARMACY_TABLE(18, "dt", "摆药台"),
+    // NURSE_STATION(19, "ns", "护士站"),
+    // PERSON_STORE(20, "ps", "个人储物柜"),
+    // DOCTOR_TABLE(21, "dt", "医生诊台");
     @EnumValue
     private final Integer value;
     private final String code;

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

@@ -1,13 +1,14 @@
 package com.openhis.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public enum LocationMode {
-    INSTANCE (1, "instance", "具体"),
+public enum LocationMode implements HisEnumInterface {
+    INSTANCE(1, "instance", "具体"),
 
     KIND(2, "Kind", "种类");
 

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

@@ -1,17 +1,19 @@
 package com.openhis.common.enums;
 
 import com.baomidou.mybatisplus.annotation.EnumValue;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public enum LocationStatus {
-    ACTIVE (1, "active", "有效"),
+public enum LocationStatus implements HisEnumInterface {
+    ACTIVE(1, "active", "有效"),
 
     INACTIVE(2, "inactive", "无效"),
 
     SUSPENDED(3, "suspended", "临时关闭");
+
     @EnumValue
     private final Integer value;
     private final String code;

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

@@ -0,0 +1,34 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 参与者类型
+ */
+@Getter
+@AllArgsConstructor
+public enum ParticipantType implements HisEnumInterface {
+    ADMITTER(1, "1", "首诊医生"),
+
+    ATTENDER(2, "2", "责任护士"),
+
+    CONTACT(3, "3", "联系人"),
+
+    CONSULTANT(4, "4", "顾问"),
+
+    DISCHARGER(5, "5", "出院办理人"),
+
+    ESCORT(6, "6", "护送人"),
+
+    REFERRER(7, "7", "推荐人"),
+
+    EMERGENCY(8, "8", "紧急联系人");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+}

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

@@ -0,0 +1,24 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 参与者角色
+ */
+@Getter
+@AllArgsConstructor
+public enum PractitionerRole implements HisEnumInterface {
+    DOCTOR(1, "doctor", "医生"),
+
+    NURSE(2, "nurse", "护士"),
+
+    PHARMACIST(3, "pharmacist", "药师");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+}

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

@@ -1,13 +1,13 @@
 package com.openhis.common.enums;
+
 import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
-
 @Getter
 @AllArgsConstructor
-public enum PublicationStatus {
+public enum PublicationStatus implements HisEnumInterface {
 
     DRAFT(1, "draft", "草稿"),
 

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

@@ -0,0 +1,25 @@
+package com.openhis.common.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 过敏与不耐受中验证状态
+ *
+ * @author liuhr
+ * @date 2025/3/6
+ */
+@Getter
+@AllArgsConstructor
+public enum VerificationStatus implements HisEnumInterface  {
+    UNCONFIRMED(1, "unconfirmed", "未确认"),
+    CONFIRMED(2, "confirmed", "已确认"),
+    REFUTED(3, "refuted", "已反驳"),
+    ENTERED_IN_ERROR(4, "entered-in-error", "输入错误");
+
+    @EnumValue
+    private final Integer value;
+    private final String code;
+    private final String info;
+}