From 47eaa282023c68c3d8ac678b04803bbc11c12dfe Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Tue, 25 Feb 2025 19:21:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=97=85=E4=BA=BA=E4=BF=A1=E6=81=AF=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientInformationController.java | 120 +++++++++++++++++- .../web/patientmanage/dto/PatientListDto.java | 16 +++ .../openhis/common/enums/BloodTypeABO.java | 29 +++++ .../com/openhis/common/enums/BloodTypeRH.java | 26 ++++ .../common/enums/FamilyRelationshipType.java | 107 ++++++++++++++++ 5 files changed, 294 insertions(+), 4 deletions(-) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientListDto.java create mode 100644 openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java create mode 100644 openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java create mode 100644 openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java index 611844c7..8da7636b 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java @@ -1,5 +1,7 @@ package com.openhis.web.patientmanage.controller; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -17,7 +19,9 @@ import com.core.common.utils.bean.BeanUtils; import com.openhis.administration.domain.Patient; import com.openhis.administration.service.IPatientService; import com.openhis.common.constant.PromptMsgConstant; +import com.openhis.common.enums.*; import com.openhis.web.patientmanage.dto.PatientInformationDto; +import com.openhis.web.patientmanage.dto.PatientListDto; import com.openhis.web.patientmanage.mapper.PatientManageMapper; import lombok.extern.slf4j.Slf4j; @@ -48,6 +52,114 @@ public class PatientInformationController { // todo 暂且机构ID写死，后续从登录里取得 private final Long organizationId = 91L; + /** + * 获取婚姻状态列表 + */ + @GetMapping("/list-maritalstatus") + public R getMaritalStatus() { + // 获取婚姻状态 + List statusList = Arrays.asList(MaritalStatus.values()); + List dtos = new ArrayList<>(); + // 取得更新值 + for (MaritalStatus status : statusList) { + PatientListDto dto = new PatientListDto(); + dto.setValue(status.getValue()); + dto.setInfo(status.getInfo()); + dtos.add(dto); + } + return R.ok(dtos); + } + + /** + * 获取职业编码列表 + */ + @GetMapping("/list-occupationtype") + public R getOccupationType() { + // 获取职业编码 + List statusList = Arrays.asList(OccupationType.values()); + List dtos = new ArrayList<>(); + // 取得更新值 + for (OccupationType status : statusList) { + PatientListDto dto = new PatientListDto(); + dto.setValue(status.getValue()); + dto.setInfo(status.getInfo()); + dtos.add(dto); + } + return R.ok(dtos); + } + + /** + * 获取性别列表 + */ + @GetMapping("/list-administrativegender") + public R getAdministrativeGender() { + // 获取性别 + List statusList = Arrays.asList(AdministrativeGender.values()); + List dtos = new ArrayList<>(); + // 取得更新值 + for (AdministrativeGender status : statusList) { + PatientListDto dto = new PatientListDto(); + dto.setValue(status.getValue()); + dto.setInfo(status.getInfo()); + dtos.add(dto); + } + return R.ok(dtos); + } + + /** + * 获取ABO血型列表 + */ + @GetMapping("/list-bloodtypeabo") + public R getBloodTypeABO() { + // 获取ABO血型 + List statusList = Arrays.asList(BloodTypeABO.values()); + List dtos = new ArrayList<>(); + // 取得更新值 + for (BloodTypeABO status : statusList) { + PatientListDto dto = new PatientListDto(); + dto.setValue(status.getValue()); + dto.setInfo(status.getInfo()); + dtos.add(dto); + } + return R.ok(dtos); + } + + /** + * 获取RH血型列表 + */ + @GetMapping("/list-bloodtypearh") + public R getBloodTypeRH() { + // 获取RH血型 + List statusList = Arrays.asList(BloodTypeRH.values()); + List dtos = new ArrayList<>(); + // 取得更新值 + for (BloodTypeRH status : statusList) { + PatientListDto dto = new PatientListDto(); + dto.setValue(status.getValue()); + dto.setInfo(status.getInfo()); + dtos.add(dto); + } + return R.ok(dtos); + } + + /** + * 获取家庭关系列表 + */ + @GetMapping("/list-familyrelationshiptype") + public R getFamilyRelationshipType() { + // 获取RH血型 + List statusList = Arrays.asList(FamilyRelationshipType.values()); + List dtos = new ArrayList<>(); + // 取得更新值 + for (FamilyRelationshipType status : statusList) { + PatientListDto dto = new PatientListDto(); + dto.setValue(status.getValue()); + dto.setInfo(status.getInfo()); + dtos.add(dto); + } + return R.ok(dtos); + } + /** * 添加病人信息 * @@ -71,8 +183,8 @@ public class PatientInformationController { // 设置五笔首拼 patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName())); // 设置地址 - String fullAddress = stringUtils.joinStrings(patient.getAddress(),patient.getAddressProvince(), patient.getAddressCity(), - patient.getAddressDistrict(), patient.getAddressStreet()); + String fullAddress = stringUtils.joinStrings(patient.getAddress(), patient.getAddressProvince(), + patient.getAddressCity(), patient.getAddressDistrict(), patient.getAddressStreet()); patient.setAddress(fullAddress); // 调用服务层保存病人信息 @@ -103,8 +215,8 @@ public class PatientInformationController { // 设置五笔首拼 patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName())); // 设置地址 - String fullAddress = stringUtils.joinStrings(patient.getAddress(),patient.getAddressProvince(), patient.getAddressCity(), - patient.getAddressDistrict(), patient.getAddressStreet()); + String fullAddress = stringUtils.joinStrings(patient.getAddress(), patient.getAddressProvince(), + patient.getAddressCity(), patient.getAddressDistrict(), patient.getAddressStreet()); patient.setAddress(fullAddress); // 调用服务层更新病人信息 diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientListDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientListDto.java new file mode 100644 index 00000000..7f4f4116 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientListDto.java @@ -0,0 +1,16 @@ +package com.openhis.web.patientmanage.dto; + +import lombok.Data; + +/** + * 状态列表 + * + * @author liuhr + * @date 2025/2/25 + */ +@Data +public class PatientListDto { + + private Integer value; + private String info; +} 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 new file mode 100644 index 00000000..06d359c3 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeABO.java @@ -0,0 +1,29 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 血型ABO + * + * @author liuhr + * @date 2025/2/25 + */ +@Getter +@AllArgsConstructor +public enum BloodTypeABO { + + TYPE_A(1, "typeA", "A 型"), + TYPE_B(2, "typeB", "B 型"), + TYPE_O(3, "typeO", "O 型"), + TYPE_AB(4, "typeAB", "AB 型"), + OTHER(5, "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/BloodTypeRH.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java new file mode 100644 index 00000000..796cd0a2 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/BloodTypeRH.java @@ -0,0 +1,26 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 血型RH + * + * @author liuhr + * @date 2025/2/25 + */ +@Getter +@AllArgsConstructor +public enum BloodTypeRH { + + TYPE_RH_NEGATIVEB(1, "typeRHNegative", "Rh 阴性"), + TYPE_RH_POSITIVE(2, "typeRHPositive", "Rh 阳性"), + OTHER(3, "other", "不详"), + UNKNOWN(4, "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/FamilyRelationshipType.java b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java new file mode 100644 index 00000000..4a3634b4 --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/FamilyRelationshipType.java @@ -0,0 +1,107 @@ +package com.openhis.common.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 家庭关系 + * + * @author liuhr + * @date 2025/2/25 + */ +@Getter +@AllArgsConstructor +public enum FamilyRelationshipType { + + SELF(1, "01", "本人"), + HOUSEHOLDER(2, "02", "户主"), + SPOUSE(10, "10", "配偶"), + HUSBAND(11, "11", "夫"), + WIFE(12, "12", "妻"), + SON(20, "20", "子"), + ONLY_SON(21, "21", "独生子"), + ELDEST_SON(22, "22", "长子"), + SECOND_SON(23, "23", "次子"), + THIRD_SON(24, "24", "三子"), + FOURTH_SON(25, "25", "四子"), + FIFTH_SON(26, "26", "五子"), + ADOPTED_OR_STEPSON(27, "27", "养子或继子"), + SON_IN_LAW(28, "28", "女婿"), + OTHER_SON(29, "29", "其他儿子"), + DAUGHTER(30, "30", "女"), + ONLY_DAUGHTER(31, "31", "独生女"), + ELDEST_DAUGHTER(32, "32", "长女"), + SECOND_DAUGHTER(33, "33", "次女"), + THIRD_DAUGHTER(34, "34", "三女"), + FOURTH_DAUGHTER(35, "35", "四女"), + FIFTH_DAUGHTER(36, "36", "五女"), + ADOPTED_OR_STEPDAUGHTER(37, "37", "养女或继女"), + DAUGHTER_IN_LAW(38, "38", "儿媳"), + OTHER_DAUGHTER(39, "39", "其他女儿"), + GRANDCHILD(40, "40", "孙子、孙女、外孙子、外孙女"), + GRANDSON(41, "41", "孙子"), + GRANDDAUGHTER(42, "42", "孙女"), + GRANDSON_IN_LAW(43, "43", "外孙子"), + GRANDDAUGHTER_IN_LAW(44, "44", "外孙女"), + GRANDSONS_DAUGHTER_IN_LAW(45, "45", "孙媳妇或外孙媳妇"), + GRANDDAUGHTERS_SON_IN_LAW(46, "46", "孙女婿或外孙女婿"), + GREAT_GRANDSON(47, "47", "曾孙子或外曾孙子"), + GREAT_GRANDDAUGHTER(48, "48", "曾孙女或外曾孙女"), + OTHER_GRANDCHILD(49, "49", "其他孙子、孙女、外孙子、外孙女"), + PARENTS(50, "50", "父母"), + FATHER(51, "51", "父亲"), + MOTHER(52, "52", "母亲"), + FATHER_IN_LAW(53, "53", "公公"), + MOTHER_IN_LAW(54, "54", "婆婆"), + FATHER_IN_LAW_OF_SPOUSE(55, "55", "岳父"), + MOTHER_IN_LAW_OF_SPOUSE(56, "56", "岳母"), + STEP_OR_FOSTER_FATHER(57, "57", "继父或养父"), + STEP_OR_FOSTER_MOTHER(58, "58", "继母或养母"), + OTHER_PARENT(59, "59", "其他父母关系"), + GRANDPARENTS(60, "60", "祖父母、外祖父母"), + GRANDFATHER(61, "61", "祖父"), + GRANDMOTHER(62, "62", "祖母"), + GRANDFATHER_IN_LAW(63, "63", "外祖父"), + GRANDMOTHER_IN_LAW(64, "64", "外祖母"), + GRANDPARENTS_OF_SPOUSE(65, "65", "配偶的祖父母、外祖父母"), + GREAT_GRANDFATHER(66, "66", "曾祖父"), + GREAT_GRANDMOTHER(67, "67", "曾祖母"), + GREAT_GRANDPARENTS_OF_SPOUSE(68, "68", "配偶的曾祖父母、外曾祖父母"), + OTHER_GRANDPARENT(69, "69", "其他祖父母和外祖父母关系"), + SIBLINGS(70, "70", "兄、弟、姐、妹"), + BROTHER(71, "71", "兄"), + SISTER_IN_LAW(72, "72", "嫂"), + YOUNGER_BROTHER(73, "73", "弟"), + YOUNGER_BROTHERS_WIFE(74, "74", "弟媳"), + OLDER_SISTER(75, "75", "姐姐"), + OLDER_SISTERS_HUSBAND(76, "76", "姐夫"), + YOUNGER_SISTER(77, "77", "妹妹"), + YOUNGER_SISTERS_HUSBAND(78, "78", "妹夫"), + OTHER_SIBLINGS(79, "79", "其他兄弟姐妹"), + OTHER_RELATIVES(80, "80", "其他"), + UNCLE(81, "81", "伯父"), + AUNT(82, "82", "伯母"), + UNCLE_ON_FATHERS_SIDE(83, "83", "叔父"), + AUNT_ON_FATHERS_SIDE(84, "84", "婶母"), + UNCLE_ON_MOTHERS_SIDE(85, "85", "舅父"), + AUNT_ON_MOTHERS_SIDE(86, "86", "舅母"), + FOSTER_UNCLE(87, "87", "姨父"), + FOSTER_AUNT(88, "88", "姨母"), + FOSTER_UNCLE_ON_FATHERS_SIDE(89, "89", "姑父"), + FOSTER_AUNT_ON_FATHERS_SIDE(90, "90", "姑母"), + COUSINS(91, "91", "堂兄弟、堂姐妹"), + COUSINS_ON_MOTHERS_SIDE(92, "92", "表兄弟、表姐妹"), + NEPHEW(93, "93", "侄子"), + NEPHEW_DAUGHTER(94, "94", "侄女"), + NIECE(95, "95", "外甥"), + NIECE_DAUGHTER(96, "96", "外甥女"), + OTHER_RELATIVE(97, "97", "其他亲属"), + NON_RELATIVE(99, "99", "非亲属"); + + @EnumValue + private final Integer value; + private final String code; + private final String info; + +} \ No newline at end of file