wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up

Browse Source
This commit is contained in:
liuhongrui
2025-03-03 15:27:19 +08:00
parent 5fce7d604a
commit 45b5b83a10
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/controller/PatientInformationController.java
View File

@@ -244,17 +244,17 @@ public class PatientInformationController {
patientInformationPage.setRecords(listPatients); patientInformationPage.setRecords(listPatients);
patientInformationPage.getRecords().forEach(e -> { 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枚举类回显赋值 // 血型ABO枚举类回显赋值
e.setBloodAbo_text(EnumUtils.getInfoByValue(BloodTypeABO.class, e.getBloodAbo())); e.setBloodAbo_text(EnumUtils.getInfoByValue(BloodTypeABO.class, e.getBloodAbo()));
// 血型RH枚举类回显赋值 // 血型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); return R.ok(patientInformationPage);
} }

10
openhis-server/openhis-application/src/main/java/com/openhis/web/patientmanage/dto/PatientInformationDto.java
View File

@@ -43,7 +43,7 @@ public class PatientInformationDto {
/** 性别编码 */ /** 性别编码 */
private Integer genderEnum; private Integer genderEnum;
private String genderEnum_text; private String genderEnum_enumText;
/** 生日 */ /** 生日 */
private Date birthDate; private Date birthDate;
@@ -53,11 +53,11 @@ public class PatientInformationDto {
/** 婚姻状态 */ /** 婚姻状态 */
private Integer maritalStatusEnum; private Integer maritalStatusEnum;
private String maritalStatusEnum_text; private String maritalStatusEnum_enumText;
/** 职业编码 */ /** 职业编码 */
private Integer prfsEnum; private Integer prfsEnum;
private String prfsEnum_text; private String prfsEnum_enumText;
/** 电话 */ /** 电话 */
@NotNull(message = "电话不能为空") @NotNull(message = "电话不能为空")
@@ -105,7 +105,7 @@ public class PatientInformationDto {
/** 血型RH */ /** 血型RH */
private Integer bloodRh; private Integer bloodRh;
private String bloodRh_text; private String bloodRh_enumText;
/** 工作单位 */ /** 工作单位 */
private String workCompany; private String workCompany;
@@ -121,7 +121,7 @@ public class PatientInformationDto {
/** 联系人关系 */ /** 联系人关系 */
private Integer linkRelationCode; private Integer linkRelationCode;
private String linkRelationCode_text; private String linkRelationCode_enumText;
/** 联系人电话 */ /** 联系人电话 */
@Size(min = 11, max = 11, message = "电话长度必须为11位") @Size(min = 11, max = 11, message = "电话长度必须为11位")