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-03-03 14:42:35 +08:00
parent 94b06a84d2
commit 69556927eb
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,10 +184,6 @@ public class PatientInformationController {
patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patient.getName())); patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patient.getName()));
// 设置五笔首拼 // 设置五笔首拼
patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(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); boolean savePatientSuccess = patientService.save(patient);
@@ -216,10 +212,6 @@ public class PatientInformationController {
patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patient.getName())); patient.setPyStr(ChineseConvertUtils.toPinyinFirstLetter(patient.getName()));
// 设置五笔首拼 // 设置五笔首拼
patient.setWbStr(ChineseConvertUtils.toWBFirstLetter(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) return patientService.updateById(patient)

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.core.common.core.domain.HisBaseEntity; import com.core.common.core.domain.HisBaseEntity;
import com.openhis.common.enums.*;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -44,7 +43,7 @@ public class Patient extends HisBaseEntity {
private String busNo; private String busNo;
/** 性别编码 */ /** 性别编码 */
private AdministrativeGender genderEnum; private Integer genderEnum;
/** 生日 */ /** 生日 */
private Date birthDate; private Date birthDate;
@@ -53,10 +52,10 @@ public class Patient extends HisBaseEntity {
private Date deceasedDate; private Date deceasedDate;
/** 婚姻状态 */ /** 婚姻状态 */
private MaritalStatus maritalStatusEnum; private Integer maritalStatusEnum;
/** 职业编码 */ /** 职业编码 */
private OccupationType prfsEnum; private Integer prfsEnum;
/** 电话 */ /** 电话 */
private String phone; private String phone;
@@ -92,10 +91,10 @@ public class Patient extends HisBaseEntity {
private String wbStr; private String wbStr;
/** 血型ABO */ /** 血型ABO */
private BloodTypeABO bloodAbo; private Integer bloodAbo;
/** 血型RH */ /** 血型RH */
private BloodTypeRH bloodRh; private Integer bloodRh;
/** 工作单位 */ /** 工作单位 */
private String workCompany; private String workCompany;
@@ -110,7 +109,7 @@ public class Patient extends HisBaseEntity {
private String linkName; private String linkName;
/** 联系人关系 */ /** 联系人关系 */
private FamilyRelationshipType linkRelationCode; private Integer linkRelationCode;
/** 联系人电话 */ /** 联系人电话 */
private String linkTelcom; private String linkTelcom;