From 6123761dacd7c88bfc3e64f433d71e46abf8c030 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Fri, 17 May 2024 17:58:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E4=BD=8F=E9=99=A2=E3=80=81=E5=9C=A8?= =?UTF-8?q?=E9=99=A2=E6=82=A3=E8=80=85=E7=8A=B6=E6=80=81=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/patientvisitrecord/PatientVisitRecord.java | 4 ++++ .../patientvisitrecord/PatientVisitRecordInfoSaveDto.java | 7 ++++--- .../impl/PatientVisitRecordServiceImpl.java | 2 +- .../PatientPreHospitalizationMapper.xml | 6 +++--- .../manage/patientvisitrecord/PatientVisitRecordMapper.xml | 5 +++++ 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java index 13553315..be645d1a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java @@ -38,6 +38,10 @@ public class PatientVisitRecord extends BaseEntity { @Excel(name = "患者表id") private Long patientId; + @ApiModelProperty(value = "预住院患者表id") + @Excel(name = "预住院患者表id") + private Long patientPreHospitalizationId; + /** 身份证号 */ @ApiModelProperty(value = "身份证号") @Excel(name = "身份证号") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java index cf30fa08..29ef4fe6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordInfoSaveDto.java @@ -26,6 +26,9 @@ public class PatientVisitRecordInfoSaveDto { @NotNull(message = "患者数据不能为空") private Long patientId; + @ApiModelProperty(value = "预住院患者表id") + private Long patientPreHospitalizationId; + /** * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL */ @@ -99,11 +102,11 @@ public class PatientVisitRecordInfoSaveDto { /** 出院时间 */ @ApiModelProperty(value = "出院时间") - @NotNull(message = "出院时间不能为空") @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime dischargeTime; @ApiModelProperty(value = "住院/门诊号") + @NotNull(message = "住院/门诊号不能为空") private String inHospitalNumber; /** 入院病历信息，存储患者入院的整个病历信息 */ @@ -117,12 +120,10 @@ public class PatientVisitRecordInfoSaveDto { /** 手术名称 */ @ApiModelProperty(value = "手术名称") - @Excel(name = "手术名称") private String surgicalName; /** 手术记录 */ @ApiModelProperty(value = "手术记录") - @Excel(name = "手术记录") private String surgicalRecord; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java index 782115d4..b5b3370e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java @@ -236,7 +236,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService PatientInfo patientInfo = patientMapper.selectPatientInfoById(saveDto.getPatientId()); BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); patientInfo.setId(saveDto.getPatientId()); - patientInfo.setPatientPreHospitalizationId(null); + //patientInfo.setPatientPreHospitalizationId(null); // 设置患者类型 setPatientType(patientInfo, patientVisitRecord); patientInfo.setPatientVisitRecordId(patientVisitRecord.getId()); diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml index 2b3f3ba9..7a264561 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientprehospitalization/PatientPreHospitalizationMapper.xml @@ -292,10 +292,10 @@ patient.patient_phone,patient.card_no,patient.sex, patient.birth_date,patient.family_member_phone,patient.address, p.main_diagnosis,p.hospital_agency_id,p.hospital_agency_name, - p.campus_agency_name, - p.department_name,p.ward_name, + p.campus_agency_id,p.campus_agency_name, + p.department_id,p.department_name,p.ward_id,p.ward_name, p.appointment_treatment_group,p.registration_no,p.registration_date, - p.appointment_date, p.certificate_issuing_doctor_id,p.certificate_issuing_doctor_name, patient.create_time + p.appointment_date, p.certificate_issuing_doctor_id,p.certificate_issuing_doctor_name, p.responsible_nurse,patient.create_time from patient_info patient left join patient_pre_hospitalization p on p.patient_id = patient.id p.del_flag = 0 and patient.patient_type = 'PRE_HOSPITALIZED_PATIENT' diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml index d0cdae96..2155ba94 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml @@ -8,6 +8,7 @@ + @@ -117,6 +118,8 @@ patient_id, + patient_pre_hospitalization_id, + card_no, patient_name, @@ -207,6 +210,8 @@ #{patientId}, + #{patientPreHospitalizationId}, + #{cardNo}, #{patientName},