From d4469607aa11a2e71dda577a5c32cbb4929a8372 Mon Sep 17 00:00:00 2001 From: guorui Date: Mon, 3 Mar 2025 10:22:01 +0800 Subject: [PATCH 1/7] 1 --- .../Assembler/AdmissionAssembler.java | 4 ---- .../web/inpatientManage/dto/AdmissionDto.java | 4 ---- .../dto/AdmissionInitPageDto.java | 4 ---- .../assembler/AdmissionAssembler.java | 3 +++ .../controller/AdmissionController.java | 16 +++++++++------- .../web/inpatientmanage/dto/AdmissionDto.java | 3 +++ .../dto/AdmissionInitPageDto.java | 3 +++ 7 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/Assembler/AdmissionAssembler.java delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/dto/AdmissionDto.java delete mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/dto/AdmissionInitPageDto.java create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/assembler/AdmissionAssembler.java rename openhis-server/openhis-application/src/main/java/com/openhis/web/{inpatientManage => inpatientmanage}/controller/AdmissionController.java (86%) create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionDto.java create mode 100644 openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionInitPageDto.java 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 deleted file mode 100644 index 4c945baf..00000000 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/Assembler/AdmissionAssembler.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.openhis.web.inpatientManage.Assembler; - -public class AdmissionAssembler { -} 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 deleted file mode 100644 index 913a251e..00000000 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/dto/AdmissionDto.java +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 31606c4e..00000000 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/dto/AdmissionInitPageDto.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.openhis.web.inpatientManage.dto; - -public class AdmissionInitPageDto { -} 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..f0cda0d5 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/assembler/AdmissionAssembler.java @@ -0,0 +1,3 @@ +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 similarity index 86% rename from openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientManage/controller/AdmissionController.java rename to openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/AdmissionController.java index 4dbdea01..ab33d7cf 100644 --- 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 @@ -1,16 +1,18 @@ -package com.openhis.web.inpatientManage.controller; +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; +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; + @RestController @RequestMapping("/inpatient-manage") @Slf4j @@ -19,7 +21,7 @@ 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..0beb823f --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionDto.java @@ -0,0 +1,3 @@ +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..91dff401 --- /dev/null +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/AdmissionInitPageDto.java @@ -0,0 +1,3 @@ +package com.openhis.web.inpatientmanage.dto; + +public class AdmissionInitPageDto {} From 4d1d2db8995be8e391f60380c2a05f00fcf1066e Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Mon, 3 Mar 2025 12:24:18 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HealthcareServiceController.java | 5 ++++ .../dto/HealthcareServiceDto.java | 1 + .../openhis/common/enums/AccountStatus.java | 2 +- .../com/openhis/common/enums/ValueEnum.java | 9 +++++++ .../com/openhis/common/utils/EnumUtils.java | 24 +++++++++++++++++++ 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ValueEnum.java create mode 100644 openhis-server/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java index af451290..0a5a97a2 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/controller/HealthcareServiceController.java @@ -17,6 +17,7 @@ import com.openhis.common.constant.CommonConstants; import com.openhis.common.constant.PromptMsgConstant; import com.openhis.common.enums.AccountStatus; import com.openhis.common.enums.WhetherContainUnknown; +import com.openhis.common.utils.EnumUtils; import com.openhis.common.utils.HisQueryUtils; import com.openhis.web.basicservice.dto.HealthcareServiceAddOrUpdateParam; import com.openhis.web.basicservice.dto.HealthcareServiceDto; @@ -106,6 +107,10 @@ public class HealthcareServiceController { new HashSet<>(Arrays.asList("name", "charge_name")), request); IPage healthcareServicePage = healthcareServiceBizMapper.getHealthcareServicePage( new Page<>(pageNo, pageSize), CommonConstants.TableName.ADM_HEALTHCARE_SERVICE, queryWrapper); + // 枚举类回显赋值 + healthcareServicePage.getRecords().forEach(e -> + e.setActiveFlag_enumText(EnumUtils.getInfoByValue(AccountStatus.class, e.getActiveFlag())) + ); return R.ok(healthcareServicePage, MessageUtils.createMessage(PromptMsgConstant.Common.M00009, null)); } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java index 1ab735fd..846d0743 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/basicservice/dto/HealthcareServiceDto.java @@ -21,6 +21,7 @@ public class HealthcareServiceDto { * 活动标记 */ private Integer activeFlag; + private String activeFlag_enumText; /** * 提供部门ID 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 e19d2c55..f73cd658 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 { +public enum AccountStatus implements ValueEnum { ACTIVE (1, "active", "有效"), 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/ValueEnum.java new file mode 100644 index 00000000..ec6948fa --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/enums/ValueEnum.java @@ -0,0 +1,9 @@ +package com.openhis.common.enums; + +/** + * 枚举类通用接口 + */ +public interface ValueEnum { + Integer getValue(); + String getInfo(); +} 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 new file mode 100644 index 00000000..6c6e2acf --- /dev/null +++ b/openhis-server/openhis-common/src/main/java/com/openhis/common/utils/EnumUtils.java @@ -0,0 +1,24 @@ +package com.openhis.common.utils; + +import com.openhis.common.enums.ValueEnum; + +import java.util.Arrays; + +public class EnumUtils { + + /** + * 根据 value 获取枚举的 info + * + * @param enumClass 枚举类 + * @param value 枚举的 value + * @param 枚举类型 + * @return 对应的 info，如果未找到则返回 null + */ + public static & ValueEnum> String getInfoByValue(Class enumClass, Integer value) { + return Arrays.stream(enumClass.getEnumConstants()) + .filter(e -> e.getValue().equals(value)) + .findFirst() + .map(ValueEnum::getInfo) + .orElse(null); + } +} From 94b06a84d223f842448d59411b66b134d3d2cb3d Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Mon, 3 Mar 2025 13:54:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=9F=A5=E8=AF=A2=E7=9B=B8=E5=85=B3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientInformationController.java | 46 +++++++++++++------ .../dto/PatientInformationDto.java | 31 ++++++++++--- .../patientmanage/PatientManageMapper.xml | 4 ++ .../common/enums/AdministrativeGender.java | 2 +- .../openhis/common/enums/BloodTypeABO.java | 2 +- .../com/openhis/common/enums/BloodTypeRH.java | 2 +- .../common/enums/FamilyRelationshipType.java | 2 +- .../openhis/common/enums/MaritalStatus.java | 2 +- .../openhis/common/enums/OccupationType.java | 2 +- .../service/impl/PatientServiceImpl.java | 6 +-- 10 files changed, 71 insertions(+), 28 deletions(-) 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 7d046023..e66f0795 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 @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.core.common.utils.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -12,11 +11,16 @@ import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.core.common.enums.AssignSeqEnum; +import com.core.common.utils.AssignSeqUtil; +import com.core.common.utils.ChineseConvertUtils; +import com.core.common.utils.MessageUtils; +import com.core.common.utils.StringUtils; 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.common.utils.EnumUtils; import com.openhis.web.patientmanage.dto.PatientInformationDto; import com.openhis.web.patientmanage.dto.PatientListDto; import com.openhis.web.patientmanage.mapper.PatientManageMapper; @@ -171,17 +175,18 @@ public class PatientInformationController { // 使用基础采番，设置病人ID String code = assignSeqUtil.getSeq(AssignSeqEnum.PATIENT_NUM.getPrefix()); patient.setBusNo(code); - // 设置生日 - patient.setBirthDate(patientService.extractBirthday(patient.getIdCard())); + // 设置机构ID patient.setOrganizationId(organizationId); + // 设置生日 + patient.setBirthDate(patientService.extractBirthday(patient.getIdCard())); // 设置拼音首拼 patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patient.getName())); // 设置五笔首拼 patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName())); // 设置地址 - String fullAddress = stringUtils.joinStrings(patient.getAddressProvince(), - patient.getAddressCity(), patient.getAddressDistrict(), patient.getAddressStreet(),patient.getAddress()); + String fullAddress = stringUtils.joinStrings(patient.getAddressProvince(), patient.getAddressCity(), + patient.getAddressDistrict(), patient.getAddressStreet(), patient.getAddress()); patient.setAddress(fullAddress); // 调用服务层保存病人信息 @@ -212,18 +217,15 @@ public class PatientInformationController { // 设置五笔首拼 patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName())); // 设置地址 - String fullAddress = stringUtils.joinStrings(patient.getAddressProvince(), - patient.getAddressCity(), patient.getAddressDistrict(), patient.getAddressStreet(),patient.getAddress()); + String fullAddress = stringUtils.joinStrings(patient.getAddressProvince(), patient.getAddressCity(), + patient.getAddressDistrict(), patient.getAddressStreet(), patient.getAddress()); patient.setAddress(fullAddress); // 调用服务层更新病人信息 - boolean updateSuccess = patientService.updateById(patient); + return patientService.updateById(patient) + ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"病人信息"})) + : R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); - if (!updateSuccess) { - return R.fail(MessageUtils.createMessage(PromptMsgConstant.Common.M00007, null)); - } - - return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00001, new Object[] {"病人信息"})); } /** @@ -249,6 +251,24 @@ public class PatientInformationController { Page patientInformationPage = new Page<>(pageNo, pageSize, total); patientInformationPage.setRecords(listPatients); + // 性别枚举类回显赋值 + patientInformationPage.getRecords().forEach( + e -> e.setGenderEnum_text(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()))); + // 婚姻状态枚举类回显赋值 + patientInformationPage.getRecords().forEach( + e -> e.setMaritalStatusEnum_text(EnumUtils.getInfoByValue(MaritalStatus.class, e.getMaritalStatusEnum()))); + // 职业编码枚举类回显赋值 + patientInformationPage.getRecords() + .forEach(e -> e.setPrfsEnum_text(EnumUtils.getInfoByValue(OccupationType.class, e.getPrfsEnum()))); + // 血型ABO枚举类回显赋值 + patientInformationPage.getRecords() + .forEach(e -> e.setBloodAbo_text(EnumUtils.getInfoByValue(BloodTypeABO.class, e.getBloodAbo()))); + // 血型RH枚举类回显赋值 + patientInformationPage.getRecords() + .forEach(e -> e.setBloodRh_text(EnumUtils.getInfoByValue(BloodTypeRH.class, e.getBloodRh()))); + // 家庭关系枚举类回显赋值 + patientInformationPage.getRecords().forEach(e -> e + .setLinkRelationCode_text(EnumUtils.getInfoByValue(FamilyRelationshipType.class, e.getLinkRelationCode()))); return R.ok(patientInformationPage); } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java index 396ddc02..c9fe28c7 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java @@ -2,9 +2,13 @@ package com.openhis.web.patientmanage.dto; import java.util.Date; -import com.openhis.common.enums.AdministrativeGender; -import com.openhis.common.enums.MaritalStatus; -import com.openhis.common.enums.OccupationType; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import lombok.Data; @@ -17,6 +21,8 @@ import lombok.Data; @Data public class PatientInformationDto { + /** ID */ + @JsonSerialize(using = ToStringSerializer.class) private Long id; /** 活动标记 */ @@ -26,6 +32,7 @@ public class PatientInformationDto { private Integer tempFlag; /** 患者姓名 */ + @NotBlank(message = "患者姓名不能为空") private String name; /** 患者其他名称 */ @@ -36,6 +43,7 @@ public class PatientInformationDto { /** 性别编码 */ private Integer genderEnum; + private String genderEnum_text; /** 生日 */ private Date birthDate; @@ -45,11 +53,17 @@ public class PatientInformationDto { /** 婚姻状态 */ private Integer maritalStatusEnum; + private String maritalStatusEnum_text; /** 职业编码 */ private Integer prfsEnum; + private String prfsEnum_text; /** 电话 */ + @NotNull(message = "电话不能为空") + @NotBlank(message = "电话不能为空") + @Size(min = 11, max = 11, message = "电话长度必须为11位") + @Pattern(regexp = "^1[3-9]\\d{9}$", message = "电话格式不正确") private String phone; /** 地址 */ @@ -74,6 +88,9 @@ public class PatientInformationDto { private String nationalityCode; /** 身份证号 */ + @NotNull(message = "身份证号不能为空") + @Size(min = 18, max = 18, message = "身份证号必须是18位") + @Pattern(regexp = "^[0-9Xx]{18}$", message = "身份证号格式不正确") private String idCard; /** 拼音码 */ @@ -84,9 +101,11 @@ public class PatientInformationDto { /** 血型ABO */ private Integer bloodAbo; + private String bloodAbo_text; /** 血型RH */ private Integer bloodRh; + private String bloodRh_text; /** 工作单位 */ private String workCompany; @@ -102,8 +121,11 @@ public class PatientInformationDto { /** 联系人关系 */ private Integer linkRelationCode; + private String linkRelationCode_text; /** 联系人电话 */ + @Size(min = 11, max = 11, message = "电话长度必须为11位") + @Pattern(regexp = "^1[3-9]\\d{9}$", message = "电话格式不正确") private String linkTelcom; /** 其他联系人 */ @@ -118,7 +140,4 @@ public class PatientInformationDto { /** 创建时间 */ private Date createTime; - /** 删除标识 */ - // 0 为未删除，1 为删除 - private String deleteFlag; } diff --git a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml index 74cd19fe..8c1afd73 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml @@ -1,6 +1,7 @@ + + + + \ No newline at end of file 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 5b4c196a..52a3a496 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 { +public enum AdministrativeGender implements ValueEnum { 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 06d359c3..0226551b 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 { +public enum BloodTypeABO implements ValueEnum { 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 796cd0a2..b984c490 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 { +public enum BloodTypeRH implements ValueEnum{ 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 4a3634b4..ac62720c 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 { +public enum FamilyRelationshipType implements ValueEnum { SELF(1, "01", "本人"), HOUSEHOLDER(2, "02", "户主"), 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 ba14aaec..ad946078 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 { +public enum MaritalStatus implements ValueEnum { 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 25c6f732..f8a819e6 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 { +public enum OccupationType implements ValueEnum{ STATE_CIVIL_SERVANT(11, "11", "国家公务员"), PROFESSIONAL(13, "13", "专业技术人员"), CLERK(17, "17", "职员"), diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java index ab2b7e2c..13e358f8 100644 --- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java +++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java @@ -1,6 +1,5 @@ package com.openhis.administration.service.impl; -import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; import java.time.format.DateTimeFormatter; @@ -39,8 +38,9 @@ public class PatientServiceImpl extends ServiceImpl impl // 将生日字符串转换为 LocalDate DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); LocalDate date = LocalDate.parse(birthdayStr, formatter); - // 使用系统默认时区,将 LocalDate 转换为 Date - return Date.from(Instant.from(date.atStartOfDay(ZoneId.systemDefault()))); + + // 将 LocalDate 转换为 java.util.Date + return Date.from(date.atStartOfDay(ZoneId.systemDefault()).toInstant()); } } \ No newline at end of file From 69556927eb349a6e99e5b06a7c5e290918329c79 Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Mon, 3 Mar 2025 14:42:35 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=97=85=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PatientInformationController.java | 8 -------- .../com/openhis/administration/domain/Patient.java | 13 ++++++------- 2 files changed, 6 insertions(+), 15 deletions(-) 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 e66f0795..7998e2dc 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 @@ -184,10 +184,6 @@ public class PatientInformationController { patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patient.getName())); // 设置五笔首拼 patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName())); - // 设置地址 - String fullAddress = stringUtils.joinStrings(patient.getAddressProvince(), patient.getAddressCity(), - patient.getAddressDistrict(), patient.getAddressStreet(), patient.getAddress()); - patient.setAddress(fullAddress); // 调用服务层保存病人信息 boolean savePatientSuccess = patientService.save(patient); @@ -216,10 +212,6 @@ public class PatientInformationController { patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patient.getName())); // 设置五笔首拼 patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(patient.getName())); - // 设置地址 - String fullAddress = stringUtils.joinStrings(patient.getAddressProvince(), patient.getAddressCity(), - patient.getAddressDistrict(), patient.getAddressStreet(), patient.getAddress()); - patient.setAddress(fullAddress); // 调用服务层更新病人信息 return patientService.updateById(patient) 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 0a779d3a..2923a91b 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 @@ -6,7 +6,6 @@ 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.*; import lombok.Data; import lombok.EqualsAndHashCode; @@ -44,7 +43,7 @@ public class Patient extends HisBaseEntity { private String busNo; /** 性别编码 */ - private AdministrativeGender genderEnum; + private Integer genderEnum; /** 生日 */ private Date birthDate; @@ -53,10 +52,10 @@ public class Patient extends HisBaseEntity { private Date deceasedDate; /** 婚姻状态 */ - private MaritalStatus maritalStatusEnum; + private Integer maritalStatusEnum; /** 职业编码 */ - private OccupationType prfsEnum; + private Integer prfsEnum; /** 电话 */ private String phone; @@ -92,10 +91,10 @@ public class Patient extends HisBaseEntity { private String wbStr; /** 血型ABO */ - private BloodTypeABO bloodAbo; + private Integer bloodAbo; /** 血型RH */ - private BloodTypeRH bloodRh; + private Integer bloodRh; /** 工作单位 */ private String workCompany; @@ -110,7 +109,7 @@ public class Patient extends HisBaseEntity { private String linkName; /** 联系人关系 */ - private FamilyRelationshipType linkRelationCode; + private Integer linkRelationCode; /** 联系人电话 */ private String linkTelcom; From 5c1bc76dee102ef37886548b9dcbfba114f8d14e Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Mon, 3 Mar 2025 14:50:34 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PatientInformationController.java | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) 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 7998e2dc..8e6d6ff7 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 @@ -242,25 +242,20 @@ public class PatientInformationController { // 创建Page对象并设置属性 Page patientInformationPage = new Page<>(pageNo, pageSize, total); patientInformationPage.setRecords(listPatients); - - // 性别枚举类回显赋值 - patientInformationPage.getRecords().forEach( - e -> e.setGenderEnum_text(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum()))); - // 婚姻状态枚举类回显赋值 - patientInformationPage.getRecords().forEach( - e -> e.setMaritalStatusEnum_text(EnumUtils.getInfoByValue(MaritalStatus.class, e.getMaritalStatusEnum()))); - // 职业编码枚举类回显赋值 - patientInformationPage.getRecords() - .forEach(e -> e.setPrfsEnum_text(EnumUtils.getInfoByValue(OccupationType.class, e.getPrfsEnum()))); - // 血型ABO枚举类回显赋值 - patientInformationPage.getRecords() - .forEach(e -> e.setBloodAbo_text(EnumUtils.getInfoByValue(BloodTypeABO.class, e.getBloodAbo()))); - // 血型RH枚举类回显赋值 - patientInformationPage.getRecords() - .forEach(e -> e.setBloodRh_text(EnumUtils.getInfoByValue(BloodTypeRH.class, e.getBloodRh()))); - // 家庭关系枚举类回显赋值 - patientInformationPage.getRecords().forEach(e -> e - .setLinkRelationCode_text(EnumUtils.getInfoByValue(FamilyRelationshipType.class, e.getLinkRelationCode()))); + patientInformationPage.getRecords().forEach(e -> { + // 性别枚举类回显赋值 + e.setGenderEnum_text(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum())); + // 婚姻状态枚举类回显赋值 + e.setMaritalStatusEnum_text(EnumUtils.getInfoByValue(MaritalStatus.class, e.getMaritalStatusEnum())); + // 职业编码枚举类回显赋值 + e.setPrfsEnum_text(EnumUtils.getInfoByValue(OccupationType.class, e.getPrfsEnum())); + // 血型ABO枚举类回显赋值 + e.setBloodAbo_text(EnumUtils.getInfoByValue(BloodTypeABO.class, e.getBloodAbo())); + // 血型RH枚举类回显赋值 + e.setBloodRh_text(EnumUtils.getInfoByValue(BloodTypeRH.class, e.getBloodRh())); + // 家庭关系枚举类回显赋值 + e.setLinkRelationCode_text(EnumUtils.getInfoByValue(FamilyRelationshipType.class, e.getLinkRelationCode())); + }); return R.ok(patientInformationPage); } From 5fce7d604a2a69fc4a76546adbb3862cf501f77e Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Mon, 3 Mar 2025 14:58:50 +0800 Subject: [PATCH 6/7] reName --- .../main/java/com/openhis/common/enums/AccountStatus.java | 2 +- .../java/com/openhis/common/enums/AdministrativeGender.java | 2 +- .../main/java/com/openhis/common/enums/BloodTypeABO.java | 2 +- .../src/main/java/com/openhis/common/enums/BloodTypeRH.java | 2 +- .../com/openhis/common/enums/FamilyRelationshipType.java | 2 +- .../common/enums/{ValueEnum.java => HisEnumInterface.java} | 2 +- .../main/java/com/openhis/common/enums/MaritalStatus.java | 2 +- .../main/java/com/openhis/common/enums/OccupationType.java | 2 +- .../src/main/java/com/openhis/common/utils/EnumUtils.java | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) rename openhis-server/openhis-common/src/main/java/com/openhis/common/enums/{ValueEnum.java => HisEnumInterface.java} (76%) 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); } } From 45b5b83a105a42922e892ae54fce90664b7c7bcc Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Mon, 3 Mar 2025 15:27:19 +0800 Subject: [PATCH 7/7] up --- .../controller/PatientInformationController.java | 10 +++++----- .../web/patientmanage/dto/PatientInformationDto.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) 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 8e6d6ff7..4b387c00 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 @@ -244,17 +244,17 @@ public class PatientInformationController { patientInformationPage.setRecords(listPatients); patientInformationPage.getRecords().forEach(e -> { // 性别枚举类回显赋值 - e.setGenderEnum_text(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum())); + e.setGenderEnum_enumText(EnumUtils.getInfoByValue(AdministrativeGender.class, e.getGenderEnum())); // 婚姻状态枚举类回显赋值 - e.setMaritalStatusEnum_text(EnumUtils.getInfoByValue(MaritalStatus.class, e.getMaritalStatusEnum())); + e.setMaritalStatusEnum_enumText(EnumUtils.getInfoByValue(MaritalStatus.class, e.getMaritalStatusEnum())); // 职业编码枚举类回显赋值 - e.setPrfsEnum_text(EnumUtils.getInfoByValue(OccupationType.class, e.getPrfsEnum())); + e.setPrfsEnum_enumText(EnumUtils.getInfoByValue(OccupationType.class, e.getPrfsEnum())); // 血型ABO枚举类回显赋值 e.setBloodAbo_text(EnumUtils.getInfoByValue(BloodTypeABO.class, e.getBloodAbo())); // 血型RH枚举类回显赋值 - e.setBloodRh_text(EnumUtils.getInfoByValue(BloodTypeRH.class, e.getBloodRh())); + e.setBloodRh_enumText(EnumUtils.getInfoByValue(BloodTypeRH.class, e.getBloodRh())); // 家庭关系枚举类回显赋值 - e.setLinkRelationCode_text(EnumUtils.getInfoByValue(FamilyRelationshipType.class, e.getLinkRelationCode())); + e.setLinkRelationCode_enumText(EnumUtils.getInfoByValue(FamilyRelationshipType.class, e.getLinkRelationCode())); }); return R.ok(patientInformationPage); } diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java index c9fe28c7..1b3a5c36 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java @@ -43,7 +43,7 @@ public class PatientInformationDto { /** 性别编码 */ private Integer genderEnum; - private String genderEnum_text; + private String genderEnum_enumText; /** 生日 */ private Date birthDate; @@ -53,11 +53,11 @@ public class PatientInformationDto { /** 婚姻状态 */ private Integer maritalStatusEnum; - private String maritalStatusEnum_text; + private String maritalStatusEnum_enumText; /** 职业编码 */ private Integer prfsEnum; - private String prfsEnum_text; + private String prfsEnum_enumText; /** 电话 */ @NotNull(message = "电话不能为空") @@ -105,7 +105,7 @@ public class PatientInformationDto { /** 血型RH */ private Integer bloodRh; - private String bloodRh_text; + private String bloodRh_enumText; /** 工作单位 */ private String workCompany; @@ -121,7 +121,7 @@ public class PatientInformationDto { /** 联系人关系 */ private Integer linkRelationCode; - private String linkRelationCode_text; + private String linkRelationCode_enumText; /** 联系人电话 */ @Size(min = 11, max = 11, message = "电话长度必须为11位")