diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/Assembler/AdmissionAssembler.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/Assembler/AdmissionAssembler.java new file mode 100644 index 00000000..4c945baf --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/Assembler/AdmissionAssembler.java @@ -0,0 +1,4 @@ +package com.openhis.web.inpatientManage.Assembler; + +public class AdmissionAssembler { +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/controller/AdmissionController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/controller/AdmissionController.java new file mode 100644 index 00000000..4dbdea01 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/controller/AdmissionController.java @@ -0,0 +1,27 @@ +package com.openhis.web.inpatientManage.controller; + +import com.openhis.administration.service.IEncounterService; +import com.openhis.administration.service.IPatientService; +import com.openhis.web.inpatientManage.dto.AdmissionDto; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/inpatient-manage") +@Slf4j +@AllArgsConstructor +public class AdmissionController { + private final IEncounterService encounterService; + private final IPatientService patientService; + + //办理入院 + @PostMapping("admission") + public void addSupplyRequest(@Validated @RequestBody AdmissionDto admission) { + + } +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/dto/AdmissionDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/dto/AdmissionDto.java new file mode 100644 index 00000000..913a251e --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/dto/AdmissionDto.java @@ -0,0 +1,4 @@ +package com.openhis.web.inpatientManage.dto; + +public class AdmissionDto { +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/dto/AdmissionInitPageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/dto/AdmissionInitPageDto.java new file mode 100644 index 00000000..31606c4e --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/dto/AdmissionInitPageDto.java @@ -0,0 +1,4 @@ +package com.openhis.web.inpatientManage.dto; + +public class AdmissionInitPageDto { +} diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java index 689e4f40..7c8bc7fa 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inventorymanage/controller/PurchaseInventoryController.java @@ -48,6 +48,7 @@ import lombok.extern.slf4j.Slf4j; @RequestMapping("/inventory-manage-purchase") @Slf4j public class PurchaseInventoryController { + @Autowired private ISupplyRequestService supplyRequestService; @Autowired diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java new file mode 100644 index 00000000..2ebadf6d --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountBillingStatus.java @@ -0,0 +1,27 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum AccountBillingStatus { + + OPEN (1, "open", "可用"), + + CARECOMPLETE_NOTBILLED(2, "carecomplete-notbilled", "已出院未结账"), + + CLOSED_BADDEBT(3, "closed-baddebt", "坏账"), + + CLOSED_VOIDED(4, "closed-voided", "不再记账"), + + CLOSED_COMPLETED(5, "closed-completed", "已结账"), + + CLOSED_COMBINED(6, "closed-combined", "已合并"); + + @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/AccountStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.java new file mode 100644 index 00000000..e19d2c55 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AccountStatus.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 AccountStatus { + + ACTIVE (1, "active", "有效"), + + INACTIVE(2, "inactive", "无效"), + + ERROR(3, "entered-in-error", "错误"), + + ON_HOLD(4, "on-hold", "冻结"), + + UNKNOWN(5, "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/ActPriority.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java new file mode 100644 index 00000000..053823eb --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ActPriority.java @@ -0,0 +1,32 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ActPriority { + + ASAP(1, "A", "尽快，仅次于紧急状况后的最高优先级。"), + CALLBACK_RESULTS(2, "CR", "结果一出，应立即通知申请者，即使是初步结果。（在HL7 2.3版的报告优先级中为'C'。）"), + ELECTIVE(3, "EL", "对患者有益但不是生存所必需的。"), + EMERGENCY(4, "EM", "一种未预见的情况组合或由此产生的需要立即采取行动的状态。"), + PREOP(5, "P", "表示某项服务将在计划手术之前执行。在订购服务并使用术前优先级时，会检查执行服务所需的时间。下达订单时，可以生成一条消息，指示所需的服务时间，以避免与计划手术的时间冲突。"), + AS_NEEDED(6, "PRN", "'按需'订单应附带构成需求的描述。此描述由作为先决条件的观察服务谓词表示。"), + ROUTINE(7, "R", "常规服务，在正常工作时间进行。"), + RUSH_REPORTING(8, "RR", "应尽快准备并发送报告。"), + STAT(9, "S", "最高优先级（例如，紧急情况）。"), + TIMING_CRITICAL(10, "T", "尽可能接近请求的时间至关重要（例如，对于通过抗菌水平）。"), + USE_AS_DIRECTED(11, "UD", "药物应按处方者的指示使用。"), + URGENT(12, "UR", "需要迅速采取行动。"), + CALLBACK_FOR_SCHEDULING(13, "CS", "填写者应联系申请者（或目标）以安排服务。（在HL7 2.3版的TQ-优先级组件中为'C'。）"), + CALLBACK_PLACER_FOR_SCHEDULING(14, "CSP", "填写者应联系申请者以安排服务。（在HL7 2.3版的TQ-优先级组件中为'C'。）"), + CONTACT_RECIPIENT_FOR_SCHEDULING(15, "CSR", "填写者应联系服务接受者（目标）以安排服务。（在HL7 2.3版的TQ-优先级组件中为'C'。）"); + + @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/AdministrativeGender.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.java new file mode 100644 index 00000000..5b4c196a --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/AdministrativeGender.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 AdministrativeGender { + MALE(1, "male", "男性"), + FEMALE(2, "female", "女性"), + OTHER(3, "other", "其他"), + UNKNOWN(9, "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/ChargeItemStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java new file mode 100644 index 00000000..ec27b381 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ChargeItemStatus.java @@ -0,0 +1,28 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ChargeItemStatus { + PLANNED (1, "planned", "待收费"), + + BILLABLE(2, "billable", "待结算"), + + NOT_BILLABLE(3, "not-billable", "不可收费"), + + ABORTED(4, "aborted", "终止"), + + BILLED (5, "billed ", "已结算"), + + ERROR(6, "entered-in-error", "错误"), + + UNKNOWN(7, "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/DeviceCategory.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.java new file mode 100644 index 00000000..82c62551 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceCategory.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 DeviceCategory { + ACTIVE (1, "active", "有源的"), + COMMUNICATING(2, "communicating", "通讯类"), + HOMEUSE(3, "communicating", "非院内使用"), + IMPLANTABLE(4, "implantable", "植入类"), + IN_VITRO(5, "in-vitro", "试管类"), + POINT_OF_CARE(6, "point-of-care", "床旁类"), + SINGLE_USE(7, "single-use", "单次消耗类"), + REUSABLE(8, "reusable", "可重用的"), + SOFTWARE(9, "software", "软件类"), + DME(10, "dme", "治疗设备"); + @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/DeviceSafety.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java new file mode 100644 index 00000000..00f69fd6 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceSafety.java @@ -0,0 +1,28 @@ +package com.openhis.common.enums; +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + + +@Getter +@AllArgsConstructor +public enum DeviceSafety { + + Magnetic_Resonance_Conditional(1, "C106046", "在MR环境中已证明安全的设备，在定义条件下。至少应解决静态磁场、切换梯度磁场和射频场的条件。可能需要包括物品特定配置在内的其他条件。参见ASTM F2503"), + + Magnetic_Resonance_Safe(2, "C106045", "该设备在暴露于任何MR环境时不会造成已知危害。MR安全物品由非导电、非金属和非磁性材料组成。请参阅ASTM F2503"), + + Magnetic_Resonance_Unsafe(3, "C106047", "对患者、医务人员或MR环境内其他人员构成不可接受风险的设备。参见ASTM F2503"), + + LABELING_DOES_NOT_CONTAIN_MRI_SAFETY_INFORMATION(4, "C113844", "标签者未在标签中提供使用设备在磁共振（MR）环境中的安全信息"), + + LABELED_AS_CONTAINING_NATURAL_RUBBER_LATEX(5, "C101673", "该设备标签表明天然橡胶乳胶是其成分之一。"), + + NOT_MADE_WITH_NATURAL_RUBBER_LATEX(6, "C106038", "该产品的材料组成不含有天然橡胶乳胶。"); + + + @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/DeviceStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.java new file mode 100644 index 00000000..5d22eef6 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/DeviceStatus.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 DeviceStatus { + ACTIVE (1, "active", "有效"), + + INACTIVE(2, "inactive", "无效"), + + ERROR(3, "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/EncounterClass.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java new file mode 100644 index 00000000..d249b892 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterClass.java @@ -0,0 +1,26 @@ +package com.openhis.common.enums; +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + + +@Getter +@AllArgsConstructor +public enum EncounterClass { + IMP(1, "IMP", "住院"), + + AMB(2, "AMB", "门诊"), + + OBSENC(3, "OBSENC", "留观"), + + EMER(4, "EMER", "急诊"), + + VR(5, "VR", "线上"), + + HH(6, "HH", "家庭"); + + @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/EncounterLocationStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterLocationStatus.java new file mode 100644 index 00000000..8c9cb495 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterLocationStatus.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 EncounterLocationStatus { + PLANNED(1, "planned", "已安排"), + + ACTIVE(2, "active", "使用中"), + + RESERVED(3, "reserved", "已保留"), + + COMPLETED(4, "completed", "已用完"); + + @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/EncounterStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java new file mode 100644 index 00000000..585a7cc8 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterStatus.java @@ -0,0 +1,32 @@ +package com.openhis.common.enums; +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + + +@Getter +@AllArgsConstructor +public enum EncounterStatus { + PLANNED(1, "draft", "已安排"), + + IN_PROGRESS(2, "in-progress", "进行中"), + + ON_HOLD(3, "on-hold", "暂离"), + + DISCHARGED(4, "on-discharged", "诊毕,出院"), + + COMPLETED(5, "completed", "完成,已结算"), + + CANCELLED(6, "cancelled", "已取消"), + + DISCONTINUED(7, "discontinued", "已中断"), + + IN_ERROR(8, "entered-in-error", "错误"), + + UNKNOWN(9, "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/EncounterSubjectStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.java new file mode 100644 index 00000000..b3a3507a --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterSubjectStatus.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 EncounterSubjectStatus { + PLANNED(1, "arrived", "已到达"), + + TRIAGED(2, "triaged", "已分诊"), + + RECEIVING_CARE(3, "receiving-care", "已看诊"), + + ON_LEAVE(4, "on-leave", "已离开"), + + DEPARTED(5, "departed", "已完成"); + + + @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/EncounterType.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.java new file mode 100644 index 00000000..5219e2b2 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterType.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 EncounterType { + + INITIAL(1, "initial", "初诊"), + FOLLOW_UP(2, "follow-up", "复诊"); + + @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/EncounterYbClass.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java new file mode 100644 index 00000000..2b0e593a --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/EncounterYbClass.java @@ -0,0 +1,76 @@ +package com.openhis.common.enums; +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/*代码值 代码名称 对应7.28医疗类别med_type 在2203接口用到此信息 + 25 异地住院 + 26 单病种住院 + 27 自主就医 + 81 意外伤害门诊 + 15 特药 + 28 日间手术 + 61 照护保险 + 11 普通门诊 + 12 门诊挂号 + 13 急诊 + 14 门诊慢特病 + 990404 门诊特检特治（限吉林市） + 21 普通住院 + 22 外伤住院 + 23 转外诊治住院 + 24 急诊转住院 + 41 定点药店购药 + 51 生育门诊 + 52 生育住院 + 5212 生育新生儿费用 + 16 中医特色门诊 + 29 起付线治疗 + 9107 体检 + 3101 低自付住院 + 3102 低自付门诊 + 140104 门诊慢病 + 140201 门诊特病 + 2114 舒缓疗护住院*/ +@Getter +@AllArgsConstructor +public enum EncounterYbClass { + // 住院服务 + ORDINARY_HOSPITALIZATION(21, "21" , "普通住院"), + FOREIGN_HOSPITALIZATION(25,"25", "异地住院"), + SINGLE_DIAGNOSIS_HOSPITALIZATION(26,"26", "单病种住院"), + INJURY_HOSPITALIZATION(22,"22", "外伤住院"), + TRANSFER_HOSPITALIZATION(23,"23", "转外诊治住院"), + EMERGENCY_TRANSFER_HOSPITALIZATION(24,"24", "急诊转住院"), + PALLIATIVE_CARE_HOSPITALIZATION(2114,"2114", "舒缓疗护住院"), + LOW_COPAY_HOSPITALIZATION(3101,"3101", "低自付住院"), + + // 门诊服务 + ORDINARY_OUTPATIENT(11,"11", "普通门诊"), + OUTPATIENT_REGISTRATION(12,"12", "门诊挂号"), + EMERGENCY(13,"13", "急诊"), + CHRONIC_SPECIAL_OUTPATIENT(14,"14", "门诊慢特病"), + SPECIAL_MEDICATION(15,"15", "特药"), + TRADITIONAL_CHINESE_MEDICINE_OUTPATIENT(16,"16", "中医特色门诊"), + OUTPATIENT_SPECIAL_EXAMINATION_TREATMENT(990404,"990404", "门诊特检特治（限吉林市）"), + CHRONIC_DISEASE_OUTPATIENT(140104,"140104", "门诊慢病"), + SPECIAL_DISEASE_OUTPATIENT(140201,"140201", "门诊特病"), + LOW_COPAY_OUTPATIENT(3102,"3102", "低自付门诊"), + + // 其他服务 + SELF_MEDICATION(27,"27", "自主就医"), + ACCIDENTAL_INJURY_OUTPATIENT(81,"81", "意外伤害门诊"), + DAY_SURGERY(28,"28", "日间手术"), + NURSING_INSURANCE(61,"61", "照护保险"), + PHARMACY_PURCHASE(41,"41", "定点药店购药"), + MATERNITY_OUTPATIENT(51,"51", "生育门诊"), + MATERNITY_HOSPITALIZATION(52,"52", "生育住院"), + MATERNITY_NEWBORN_COST(5212,"5212", "生育新生儿费用"), + DEDUCTIBLE_TREATMENT(29,"29", "起付线治疗"), + PHYSICAL_EXAMINATION(9107,"9107", "体检"); + + @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/InvoiceStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.java new file mode 100644 index 00000000..9e8a4a81 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/InvoiceStatus.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 InvoiceStatus { + DRAFT(1, "draft", "发票已经准备好了，但尚未定稿。"), + + ISSUED(2, "issued", "发票已定稿并发给了收款人。"), + + BALANCED(2, "balanced", "发票已结清/完全付清了。"), + + CANCELLED(2, "cancelled", "这张发票作废了。"), + + ERROR(3, "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/LocationBedStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.java new file mode 100644 index 00000000..87829b40 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationBedStatus.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 LocationBedStatus { + 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; + private final String info; +} diff --git a/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java new file mode 100644 index 00000000..87b06a73 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationForm.java @@ -0,0 +1,37 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum LocationForm { + + 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."), + 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."), + 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"), + 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", "医生诊台"); + @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/LocationMode.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.java new file mode 100644 index 00000000..6ab2fe9e --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationMode.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 LocationMode { + INSTANCE (1, "instance", "具体"), + + KIND(2, "Kind", "种类"); + + @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/LocationStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.java new file mode 100644 index 00000000..7ddd2bc0 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/LocationStatus.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 LocationStatus { + ACTIVE (1, "active", "有效"), + + INACTIVE(2, "inactive", "无效"), + + SUSPENDED(3, "suspended", "临时关闭"); + @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/MaritalStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.java new file mode 100644 index 00000000..ba14aaec --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/MaritalStatus.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 MaritalStatus { + + UNMARRIED(10, "10", "未婚"), + MARRIED(20, "20", "已婚"), + FIRST_MARRIAGE(21, "21", "初婚"), + SECOND_MARRIAGE(22, "22", "再婚"), + REMARRIED(23, "23", "复婚"), + WIDOWED(30, "30", "丧偶"), + DIVORCED(40, "40", "离婚"), + UNSPECIFIED(90, "90", "未说明的婚姻状况"); + + @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/OccupationType.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java new file mode 100644 index 00000000..25c6f732 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OccupationType.java @@ -0,0 +1,27 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum OccupationType { + STATE_CIVIL_SERVANT(11, "11", "国家公务员"), + PROFESSIONAL(13, "13", "专业技术人员"), + CLERK(17, "17", "职员"), + BUSINESS_MANAGER(21, "21", "企业管理人员"), + WORKER(24, "24", "工人"), + FARMER(27, "27", "农民"), + STUDENT(31, "31", "学生"), + ACTIVE_MILITARY(37, "37", "现役军人"), + FREELANCER(51, "51", "自由职业者"), + SELF_EMPLOYED(54, "54", "个体经营者"), + UNEMPLOYED(70, "70", "无业人员"), + RETIREE(80, "80", "退（离）休人员"), + OTHER(90, "90", "其他"); + @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/OrganizationClass.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java new file mode 100644 index 00000000..2221875a --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OrganizationClass.java @@ -0,0 +1,23 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum OrganizationClass { + CLINIC(1, "clinic", "门诊"), + INPATIENT(2, "inpatient", "住院"), + PHARMACY(3, "pharmacy", "药房"), + STORAGE(4, "storage", "库房"), + FIN(5, "fin", "财务"), + NS(6, "ns", "护士站"), + MANAGER(7, "manager", "管理部门"), + SUPPORT(8, "support", "后勤部门"), + OTHER(9, "other", "其他"); + @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/OrganizationType.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java new file mode 100644 index 00000000..15498d23 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/OrganizationType.java @@ -0,0 +1,50 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum OrganizationType { + // Healthcare Provider + HEALTHCARE_PROVIDER(1, "Healthcare Provider", "An organization that provides healthcare services."), + + // Hospital Department + HOSPITAL_DEPARTMENT(2, "Hospital Department", "A department or ward within a hospital (Generally is not applicable to top level organizations)"), + + // Organizational team + ORGANIZATIONAL_TEAM(3, "Organizational team", "An organizational team is usually a grouping of practitioners that perform a specific function within an organization (which could be a top level organization, or a department)."), + + // Government + GOVERNMENT(4, "Government", "A political body, often used when including organization records for government bodies such as a Federal Government, State or Local Government."), + + // Insurance Company + INSURANCE_COMPANY(5, "Insurance Company", "A company that provides insurance to its subscribers that may include healthcare related policies."), + + // Payer + PAYER(6, "Payer", "A company, charity, or governmental organization, which processes claims and/or issues payments to providers on behalf of patients or groups of patients."), + + // Educational Institute + EDUCATIONAL_INSTITUTE(7, "Educational Institute", "An educational institution that provides education or research facilities."), + + // Religious Institution + RELIGIOUS_INSTITUTION(8, "Religious Institution", "An organization that is identified as a part of a religious institution."), + + // Clinical Research Sponsor + CLINICAL_RESEARCH_SPONSOR(9, "Clinical Research Sponsor", "An organization that is identified as a Pharmaceutical/Clinical Research Sponsor."), + + // Community Group + COMMUNITY_GROUP(10, "Community Group", "An un-incorporated community group."), + + // Non-Healthcare Business or Corporation + NON_HEALTHCARE_BUSINESS(11, "Non-Healthcare Business or Corporation", "An organization that is a registered business or corporation but not identified by other types."), + + // Network + NETWORK(12, "Network", "A healthcare provider insurance network"); + + @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/PublicationStatus.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java new file mode 100644 index 00000000..c7272fd2 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/PublicationStatus.java @@ -0,0 +1,23 @@ +package com.openhis.common.enums; +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + + +@Getter +@AllArgsConstructor +public enum PublicationStatus { + + DRAFT(1, "draft", "草稿"), + + ACTIVE(2, "active", "有效"), + + RETIRED(3, "retired", "停用"), + + UNKNOWN(4, "unknown", "未知"); + + @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/Account.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java index d5848f8b..bee7c914 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java @@ -1,13 +1,14 @@ package com.openhis.administration.domain; import java.math.BigDecimal; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; +import com.openhis.common.enums.AccountBillingStatus; +import com.openhis.common.enums.AccountStatus; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -29,10 +30,10 @@ public class Account extends HisBaseEntity { private Long id; /** 状态枚举 */ - private Integer statusEnum; + private AccountStatus statusEnum; /** 结账状态枚举 */ - private Integer billingStatusEnum; + private AccountBillingStatus billingStatusEnum; /** 账户类型编码 */ private String typeCode; @@ -59,4 +60,4 @@ public class Account extends HisBaseEntity { private BigDecimal limitAccount; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java index d7852d48..09228322 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItem.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.ChargeItemStatus; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -29,7 +30,7 @@ public class ChargeItem extends HisBaseEntity { private Long id; /** 状态 */ - private Integer statusEnum; + private ChargeItemStatus statusEnum; /** 层级 */ private String busNo; @@ -106,6 +107,9 @@ public class ChargeItem extends HisBaseEntity { /** 索赔结果 */ private Integer claimStateEnum; + /** 打印次数 */ + private Integer printCount; + /** 关联账户ID */ private Long accountId; @@ -113,4 +117,4 @@ public class ChargeItem extends HisBaseEntity { private Integer orgId; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java index 59eb01d1..adbfdd2a 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/ChargeItemDefinition.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.PublicationStatus; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -35,7 +36,7 @@ public class ChargeItemDefinition extends HisBaseEntity { private String title; /** 状态 */ - private Integer statusEnum; + private PublicationStatus statusEnum; /** 机构编码 */ private String orgCode; @@ -66,6 +67,4 @@ public class ChargeItemDefinition extends HisBaseEntity { /** 基础价格 */ private BigDecimal price; - - -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java index 389d2453..5907cd0b 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.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.DeviceCategory; +import com.openhis.common.enums.DeviceSafety; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -68,10 +70,10 @@ public class Device extends HisBaseEntity { private String partNumber; /** 器材种类 */ - private Integer categoryEnum; + private DeviceCategory categoryEnum; /** 器材类型 */ - private Integer typeEnum; + private String typeCode; /** 器材版本 */ private String version; @@ -89,7 +91,7 @@ public class Device extends HisBaseEntity { private String support; /** 器材安全 */ - private Integer safetyEnum; + private DeviceSafety safetyEnum; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java index 18c895ff..191c5fcc 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/DeviceDefinition.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.DeviceCategory; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -41,10 +42,10 @@ public class DeviceDefinition extends HisBaseEntity { private String wbStr; /** 器材分类 */ - private String deviceCode; + private DeviceCategory categoryEnum; /** 器材种类 */ - private String deviceTypeCode; + private String typeCode; /** 包装单位 */ private String unitCode; @@ -107,4 +108,4 @@ public class DeviceDefinition extends HisBaseEntity { private Integer allergenFlag; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java index a28eeaea..c6748277 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java @@ -1,6 +1,5 @@ package com.openhis.administration.domain; -import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; @@ -8,6 +7,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.*; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -16,7 +16,6 @@ import lombok.experimental.Accessors; * 就诊管理Entity实体 * * @author system - * @date 2025-02-20 */ @Data @TableName("adm_encounter") @@ -38,10 +37,10 @@ public class Encounter extends HisBaseEntity { private String busNo; /** 状态编码 */ - private String statusCode; + private EncounterStatus statusEnum; /** 类别编码 */ - private Integer classEnum; + private EncounterClass classEnum; /** 类别医保编码 */ private Integer ybClassEnum; @@ -50,16 +49,16 @@ public class Encounter extends HisBaseEntity { private String classJson; /** 优先级编码 */ - private Integer priorityEnum; + private ActPriority priorityEnum; /** 分类编码 */ - private Integer typeEnum; + private EncounterType typeEnum; /** 服务ID */ private Long serviceTypeId; /** 就诊对象状态 */ - private Integer subjectStatusEnum; + private EncounterSubjectStatus subjectStatusEnum; /** 开始时间 */ private Date startTime; @@ -73,4 +72,4 @@ public class Encounter extends HisBaseEntity { /** 就诊序号 */ private Integer displayOrder; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java index f92e20a7..22632b74 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterLocation.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.EncounterLocationStatus; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -35,7 +36,7 @@ public class EncounterLocation extends HisBaseEntity { private Long locationId; /** 状态枚举 */ - private Integer statusEnum; + private EncounterLocationStatus statusEnum; /** 物理形式枚举 */ private Integer formEnum; @@ -47,4 +48,4 @@ public class EncounterLocation extends HisBaseEntity { private Date endTime; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java new file mode 100644 index 00000000..53a0c9f4 --- /dev/null +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/IdentifierUse.java @@ -0,0 +1,19 @@ +package com.openhis.administration.domain; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum IdentifierUse { + USUAL(1, "USUAL", "Usual item"), + OFFICIAL(2, "OFFICIAL", "Official item"), + TEMP(3, "TEMP", "Temporary item"), + SECONDARY(4, "SECONDARY", "Secondary item"), + OLD(5, "OLD", "Old item"); + @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/Invoice.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java index 925c5ad6..035ec800 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.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.InvoiceStatus; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -32,7 +33,7 @@ public class Invoice extends HisBaseEntity { private Long patientId; /** 状态 */ - private Integer statusEnum; + private InvoiceStatus statusEnum; /** 类别 */ private String typeCode; @@ -65,4 +66,4 @@ public class Invoice extends HisBaseEntity { private String pictureUrl; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java index a0f8f565..eebdb494 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Location.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.LocationBedStatus; +import com.openhis.common.enums.LocationForm; +import com.openhis.common.enums.LocationMode; +import com.openhis.common.enums.LocationStatus; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -35,13 +39,16 @@ public class Location extends HisBaseEntity { private String name; /** 状态编码 */ - private Integer statusEnum; + private LocationStatus statusEnum; /** 操作状态 */ - private Integer operationalEnum; + private LocationBedStatus operationalEnum; /** 模式编码 */ - private Integer modeEnum; + private LocationMode modeEnum; + + /** 模式编码 */ + private String typeCode; /** 功能编码 */ private String typeJson; @@ -53,7 +60,7 @@ public class Location extends HisBaseEntity { private String wbStr; /** 物理形式枚举 */ - private String formEnum; + private LocationForm formEnum; /** 机构编码 */ private Long organizationId; @@ -62,4 +69,4 @@ public class Location extends HisBaseEntity { private Integer displayOrder; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java index 0dfb31f5..474103d6 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Organization.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.OrganizationClass; +import com.openhis.common.enums.OrganizationType; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -38,10 +40,10 @@ public class Organization extends HisBaseEntity { private Integer activeFlag; /** 机构类型枚举 */ - private Integer typeEnum; + private OrganizationType typeEnum; /** 机构分类枚举 */ - private Integer classEnum; + private OrganizationClass classEnum; /** 拼音码 */ private String pyStr; @@ -59,4 +61,4 @@ public class Organization extends HisBaseEntity { private Integer displayOrder; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java index 0025d404..a2885815 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java @@ -8,6 +8,9 @@ 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 com.openhis.common.enums.MaritalStatus; +import com.openhis.common.enums.OccupationType; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -44,7 +47,7 @@ public class Patient extends HisBaseEntity { private String busNo; /** 性别编码 */ - private Integer genderEnum; + private AdministrativeGender genderEnum; /** 生日 */ private Date birthDate; @@ -53,10 +56,10 @@ public class Patient extends HisBaseEntity { private Date deceasedDate; /** 婚姻状态 */ - private Integer maritalStatusEnum; + private MaritalStatus maritalStatusEnum; /** 职业编码 */ - private Integer prfsEnum; + private OccupationType prfsEnum; /** 电话 */ private String phone; @@ -122,4 +125,4 @@ public class Patient extends HisBaseEntity { private Long organizationId; -} \ No newline at end of file +} diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java index b9f7db4d..96baa5db 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java @@ -35,7 +35,7 @@ public class PatientIdentifier extends HisBaseEntity { private String identifierNo; /** 标识状态枚举 */ - private Integer stateEnum; + private IdentifierUse stateEnum; /** 有效时间Start */ private Date startTime; @@ -44,4 +44,4 @@ public class PatientIdentifier extends HisBaseEntity { private Date endTime; -} \ No newline at end of file +}