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

患者血型信息 改为枚举

Browse Source
This commit is contained in:
liuhongrui
2025-02-27 15:20:47 +08:00
parent 01d960828f
commit f7fc5d9a53
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ 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.*;
@@ -11,10 +12,6 @@ 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;
@@ -183,8 +180,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.getAddressProvince(),
patient.getAddressCity(), patient.getAddressDistrict(), patient.getAddressStreet(),patient.getAddress());
patient.setAddress(fullAddress);
// 调用服务层保存病人信息
@@ -215,8 +212,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.getAddressProvince(),
patient.getAddressCity(), patient.getAddressDistrict(), patient.getAddressStreet(),patient.getAddress());
patient.setAddress(fullAddress);
// 调用服务层更新病人信息

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

@@ -35,19 +35,19 @@ public class PatientInformationDto {
private String busNo;
/** 性别编码 */
private AdministrativeGender genderEnum;
private Integer genderEnum;
/** 生日 */
private Date birthDate;
/** 死亡时间 */
private Date deceasedDate;
private String deceasedDate;
/** 婚姻状态 */
private MaritalStatus maritalStatusEnum;
private Integer maritalStatusEnum;
/** 职业编码 */
private OccupationType prfsEnum;
private Integer prfsEnum;
/** 电话 */
private String phone;
@@ -83,10 +83,10 @@ public class PatientInformationDto {
private String wbStr;
/** 血型ABO */
private String bloodAbo;
private Integer bloodAbo;
/** 血型RH */
private String bloodRh;
private Integer bloodRh;
/** 工作单位 */
private String workCompany;

12
openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Patient.java
View File

@@ -1,16 +1,13 @@
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.AdministrativeGender;
import com.openhis.common.enums.MaritalStatus;
import com.openhis.common.enums.OccupationType;
import com.openhis.common.enums.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -95,10 +92,10 @@ public class Patient extends HisBaseEntity {
private String wbStr;
/** 血型ABO */
private String bloodAbo;
private BloodTypeABO bloodAbo;
/** 血型RH */
private String bloodRh;
private BloodTypeRH bloodRh;
/** 工作单位 */
private String workCompany;
@@ -124,5 +121,4 @@ public class Patient extends HisBaseEntity {
/** 机构Id */
private Long organizationId;
}