diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java index f73cd658..0fb4a307 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java @@ -6,7 +6,7 @@ import lombok.Getter; @Getter @AllArgsConstructor -public enum AccountStatus implements ValueEnum { +public enum AccountStatus implements HisEnumInterface { ACTIVE (1, "active", "有效"), diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java index 52a3a496..f186bde9 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java @@ -6,7 +6,7 @@ import lombok.Getter; @Getter @AllArgsConstructor -public enum AdministrativeGender implements ValueEnum { +public enum AdministrativeGender implements HisEnumInterface { MALE(1, "male", "男性"), FEMALE(2, "female", "女性"), OTHER(3, "other", "其他"), diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java index 0226551b..295e7557 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java @@ -13,7 +13,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum BloodTypeABO implements ValueEnum { +public enum BloodTypeABO implements HisEnumInterface { TYPE_A(1, "typeA", "A 型"), TYPE_B(2, "typeB", "B 型"), diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java index b984c490..29a2e7ad 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java @@ -12,7 +12,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum BloodTypeRH implements ValueEnum{ +public enum BloodTypeRH implements HisEnumInterface { TYPE_RH_NEGATIVEB(1, "typeRHNegative", "Rh 阴性"), TYPE_RH_POSITIVE(2, "typeRHPositive", "Rh 阳性"), diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java index ac62720c..b0463df7 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java @@ -12,7 +12,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum FamilyRelationshipType implements ValueEnum { +public enum FamilyRelationshipType implements HisEnumInterface { SELF(1, "01", "本人"), HOUSEHOLDER(2, "02", "户主"), diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ValueEnum.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/HisEnumInterface.java similarity index 76% rename from openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ValueEnum.java rename to openhis-server/openhis-common/src/main/java/com/openhis/common/enums/HisEnumInterface.java index ec6948fa..b46d4564 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ValueEnum.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/HisEnumInterface.java @@ -3,7 +3,7 @@ package com.openhis.common.enums; /** * 枚举类通用接口 */ -public interface ValueEnum { +public interface HisEnumInterface { Integer getValue(); String getInfo(); } diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java index ad946078..8d5a60c2 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java @@ -6,7 +6,7 @@ import lombok.Getter; @Getter @AllArgsConstructor -public enum MaritalStatus implements ValueEnum { +public enum MaritalStatus implements HisEnumInterface { UNMARRIED(10, "10", "未婚"), MARRIED(20, "20", "已婚"), diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java index f8a819e6..054f1725 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java @@ -6,7 +6,7 @@ import lombok.Getter; @Getter @AllArgsConstructor -public enum OccupationType implements ValueEnum{ +public enum OccupationType implements HisEnumInterface { STATE_CIVIL_SERVANT(11, "11", "国家公务员"), PROFESSIONAL(13, "13", "专业技术人员"), CLERK(17, "17", "职员"), diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java index 6c6e2acf..535690a0 100644 --- a/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java @@ -1,6 +1,6 @@ package com.openhis.common.utils; -import com.openhis.common.enums.ValueEnum; +import com.openhis.common.enums.HisEnumInterface; import java.util.Arrays; @@ -14,11 +14,11 @@ public class EnumUtils { * @param 枚举类型 * @return 对应的 info,如果未找到则返回 null */ - public static & ValueEnum> String getInfoByValue(Class enumClass, Integer value) { + public static & HisEnumInterface> String getInfoByValue(Class enumClass, Integer value) { return Arrays.stream(enumClass.getEnumConstants()) .filter(e -> e.getValue().equals(value)) .findFirst() - .map(ValueEnum::getInfo) + .map(HisEnumInterface::getInfo) .orElse(null); } }