diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java new file mode 100644 index 00000000..5a9d429c --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ClaimType.java @@ -0,0 +1,19 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ClaimType { + INSTITUTIONAL(1, "Institutional", "医院、诊所和通常的住院索赔。"), + ORAL(2, "Oral", "牙科、假牙和口腔卫生索赔。"), + PHARMACY(3, "Pharmacy", "药品和服务的药店索赔。"), + PROFESSIONAL(4, "Professional", "通常是来自医生、心理学家、脊椎治疗师、物理治疗师、言语病理学家、康复专家、咨询师的门诊索赔。"), + VISION(5, "Vision", "视力索赔，包括专业服务和产品，如眼镜和隐形眼镜。"); + @EnumValue + private final Integer value; + private final String code; + private final String info; +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java new file mode 100644 index 00000000..06ad0b29 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ClaimUse.java @@ -0,0 +1,18 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ClaimUse { + CLAIM(1, "claim", "治疗已完成，这代表服务的索赔。"), + PREAUTHORIZATION(2, "preauthorization", "治疗已提议，这代表服务的预授权。"), + PREDETERMINATION(3, "predetermination", "治疗已提议，这代表服务的预决定。"); + + @EnumValue + private final Integer value; + private final String code; + private final String info; +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java new file mode 100644 index 00000000..d10f6870 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionCategory.java @@ -0,0 +1,16 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ConditionCategory { + PROBLEM(1, "problem-list-item", "问题列表"), + DIAGNOSIS(2, "encounter-diagnosis", "就诊诊断"); + @EnumValue + private final Integer value; + private final String code; + private final String info; +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java new file mode 100644 index 00000000..27a8d6ff --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionClinicalStatus.java @@ -0,0 +1,22 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ConditionClinicalStatus { + ACTIVE(1, "ACTIVE", "活跃The disease is currently active."), + RECURRENCE(2, "RECURRENCE", "复发The disease has recurred after a period of remission."), + RELAPSE(3, "RELAPSE", "再发The disease has relapsed after a period of improvement."), + INACTIVE(4, "INACTIVE", "不活跃The disease is currently inactive."), + REMISSION(5, "REMISSION", "体验复发风险The disease is in remission."), + RESOLVED(6, "RESOLVED", "康复The disease has been resolved."), + UNKNOWN(7, "UNKNOWN", "位置The disease status is unknown."); + + @EnumValue + private final Integer value; + private final String code; + private final String info; +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java new file mode 100644 index 00000000..8a2461dd --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionDefinitionSource.java @@ -0,0 +1,20 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ConditionDefinitionSource { + DISEASE_AND_DIAGNOSIS(1, "01", "疾病与诊断"), + CHRONIC_DISEASE_DIAGNOSIS_CATALOG(2, "02", "特慢病诊断目录"), + DIAGNOSIS_BY_DISEASE_CATALOG(3, "03", "按病种目录付费诊断"), + DAY_SURGERY_TREATMENT_DISEASE(4, "04", "日间手术治疗病种"), + TRADITIONAL_CHINESE_MEDICINE_DIAGNOSIS(5, "05", "中医诊断"), + TRADITIONAL_CHINESE_MEDICINE_SYNDROME_CATALOG(6, "06", "中医证候目录"); + @EnumValue + private final Integer value; + private final String code; + private final String info; +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java new file mode 100644 index 00000000..97caa076 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionSeverity.java @@ -0,0 +1,17 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ConditionSeverity { + SEVERE(1, "severe", "严重的"), + MIDGRADE(2, "midgrade", "中等的"), + MILD(3, "mild", "温和的"); + @EnumValue + private final Integer value; + private final String code; + private final String info; +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java new file mode 100644 index 00000000..5db32bd5 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ConditionVerificationStatus.java @@ -0,0 +1,21 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ConditionVerificationStatus { + UNCONFIRMED(1, "UNCONFIRMED", "未确诊The disease status is unconfirmed."), + PROVISIONAL(2, "PROVISIONAL", "疑似诊断The disease status is provisional."), + DIFFERENTIAL(3, "DIFFERENTIAL", "多个诊断选项之一The diagnosis is one of several possibilities."), + CONFIRMED(4, "CONFIRMED", "已确诊The disease status has been confirmed."), + REFUTED(5, "REFUTED", "已排除The disease status has been refuted."), + ENTERED_IN_ERROR(6, "ENTERED_IN_ERROR", "The disease status was entered in error."); + + @EnumValue + private final Integer value; + private final String code; + private final String info; +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.java new file mode 100644 index 00000000..c647e7aa --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EventStatus.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 EventStatus { + + PREPARATION(1, "PREP", "Preparation stage, gathering resources and planning."), + IN_PROGRESS(2, "IP", "Task is currently being worked on."), + NOT_DONE(3, "ND", "Task has not been completed."), + ON_HOLD(4, "OH", "Task is temporarily paused."), + STOPPED(5, "ST", "Task has been stopped."), + COMPLETED(6, "CMP", "Task has been completed."), + ENTERED_IN_ERROR(7, "EIE", "Task status was entered in error."), + UNKNOWN(8, "UNK", "Task status is unknown."); + + @EnumValue + private final Integer value; + private final String code; + private final String info; +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java new file mode 100644 index 00000000..03c74520 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FinancialResourceStatus.java @@ -0,0 +1,19 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum FinancialResourceStatus { + ACTIVE(1, "ACTIVE", "The status is active."), + CANCELLED(2, "CANCELLED", "The status has been cancelled."), + DRAFT(3, "DRAFT", "The status is in draft mode."), + IN_ERROR(4, "ENTERED_IN_ERROR", "The status was entered in error."); + + @EnumValue + private final Integer value; + private final String code; + private final String info; +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java new file mode 100644 index 00000000..b894ef58 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ProcedureCategory.java @@ -0,0 +1,25 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ProcedureCategory { + PSYCHIATRY(1, "24642003", "精神疗法A procedure or service related to psychiatry."), + COUNSELLING(2, "409063005", "咨询A form of advice or guidance, typically provided by a professional."), + EDUCATION(3, "409073007", "宣教The process of imparting or acquiring general knowledge, developing the powers of reasoning and judgment, and generally of preparing oneself or others intellectually for mature life."), + SURGICAL(4, "387713003", "手术A procedure involving a surgical operation."), + LABORATORY(5, "15220000", "化验A test performed in a laboratory setting to obtain information about the health of a patient."), + IMAGING(6, "363679005", "影像A procedure that involves the use of imaging technology to visualize internal structures of the body."), + MEASUREMENT(7, "122869004", "测量The action or process of measuring something."), + MANIPULATION(8, "46947000", "治疗A therapeutic procedure involving the manipulation of the spine or other parts of the body to alleviate pain or discomfort."), + SOCIAL_SERVICE(9, "410606002", "社会相关A procedure related to providing social services."); + + + @EnumValue + private final Integer value; + private final String code; + private final String info; +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java new file mode 100644 index 00000000..b81be822 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/SupplierType.java @@ -0,0 +1,18 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum SupplierType { + DRAFT(1, "1", "生产商"), + + ACTIVE(2, "2", "供应商"); + + @EnumValue + private final Integer value; + private final String code; + private final String info; +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java index 29163acc..61c22cd9 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Practitioner.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; +import com.openhis.common.enums.AdministrativeGender; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -38,7 +39,7 @@ public class Practitioner extends HisBaseEntity { private String nameJson; /** 性别编码 */ - private Integer genderEnum; + private AdministrativeGender genderEnum; /** 生日 */ private Date birthDate; @@ -83,4 +84,4 @@ public class Practitioner extends HisBaseEntity { private Long userId; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java index 7bf37aa1..991f6652 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Supplier.java @@ -58,5 +58,4 @@ public class Supplier extends HisBaseEntity { /** 机构编号 */ private Long orgId; - -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java index 1eb13d2d..68d23ec2 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Condition.java @@ -8,6 +8,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; +import com.openhis.common.enums.ConditionCategory; +import com.openhis.common.enums.ConditionClinicalStatus; +import com.openhis.common.enums.ConditionSeverity; +import com.openhis.common.enums.ConditionVerificationStatus; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -29,16 +33,16 @@ public class Condition extends HisBaseEntity { private Long id; /** 验证状态 */ - private Integer verificationStatusEnum; + private ConditionVerificationStatus verificationStatusEnum; /** 临床特征 */ - private Integer clinicalStatusEnum; + private ConditionClinicalStatus clinicalStatusEnum; /** 分类 */ - private Integer categoryEnum; + private ConditionCategory categoryEnum; /** 严重程度 */ - private Integer severityEnum; + private ConditionSeverity severityEnum; /** 疾病或诊断编码 */ private String busNo; @@ -89,4 +93,4 @@ public class Condition extends HisBaseEntity { private String ybNo; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java index 848f4ae5..4f45ddfe 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; +import com.openhis.common.enums.ConditionDefinitionSource; +import com.openhis.common.enums.PublicationStatus; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -29,7 +31,7 @@ public class ConditionDefinition extends HisBaseEntity { private Long id; /** 所属分类 */ - private Integer sourceEnum; + private ConditionDefinitionSource sourceEnum; /** 编码 */ private String condition_code; @@ -59,7 +61,7 @@ public class ConditionDefinition extends HisBaseEntity { private Integer ybMatchFlag; /** 状态 */ - private Integer statusEnum; + private PublicationStatus statusEnum; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java index 0e6bb320..06b11008 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/Procedure.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; +import com.openhis.common.enums.EventStatus; +import com.openhis.common.enums.ProcedureCategory; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -35,13 +37,13 @@ public class Procedure extends HisBaseEntity { private Long baseMedReqId; /** 当前状态 */ - private Integer statusEnum; + private EventStatus statusEnum; /** 当前状态原因 */ private String statusReasonText; /** 分类 */ - private Integer categoryEnum; + private ProcedureCategory categoryEnum; /** 手术编码 */ private String procedureCode; @@ -98,4 +100,4 @@ public class Procedure extends HisBaseEntity { private String followUpJson; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java index 686326cc..71a101cf 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/Claim.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; +import com.openhis.common.enums.ClaimUse; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -41,7 +42,7 @@ public class Claim extends HisBaseEntity { private String subtypeCode; /** 用途 */ - private Integer useEnum; + private ClaimUse useEnum; /** 索赔指向 */ private Integer insurerEnum; @@ -62,4 +63,4 @@ public class Claim extends HisBaseEntity { private Date billablePeriodEnd; -} \ No newline at end of file +}