From 49412f3ba1b4642869a3c4a29d51b51e95d32b24 Mon Sep 17 00:00:00 2001 From: haown <454902499@qq.com> Date: Fri, 29 Mar 2024 17:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=B1=E8=AF=8A=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patientinfo/PatientInfoController.java | 4 ++-- .../patientvisitrecord/PatientVisitRecord.java | 9 +++------ .../manage/domain/residentinfo/ResidentInfo.java | 11 +++++------ .../PatientVisitRecordSaveDto.java | 4 ++-- .../service/patientinfo/IPatientInfoService.java | 2 +- .../patientinfo/impl/PatientInfoServiceImpl.java | 5 +++-- .../impl/PatientPreHospitalizationServiceImpl.java | 7 ++----- .../impl/PatientVisitRecordServiceImpl.java | 14 +++++++++----- .../PatientVisitRecordMapper.xml | 4 ++-- 9 files changed, 29 insertions(+), 31 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java index 3071a896..4e17302b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientinfo/PatientInfoController.java @@ -88,8 +88,8 @@ public class PatientInfoController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:patientInfo:edit')") @Log(title = "患者信息", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody PatientInfo patientInfo) { - return toAjax(patientInfoService.updatePatientInfo(patientInfo)); + public R edit(@RequestBody PatientInfo patientInfo) { + return R.ok(patientInfoService.updatePatientInfo(patientInfo)); } /** 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 437563c8..13553315 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 @@ -11,7 +11,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; /** * 患者就诊记录基本信息对象 patient_visit_record @@ -92,7 +91,7 @@ public class PatientVisitRecord extends BaseEntity { /** 就诊时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @Excel(name = "就诊时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd") private LocalDateTime visitDate; @@ -168,15 +167,13 @@ public class PatientVisitRecord extends BaseEntity { /** 入院时间 */ @ApiModelProperty(value = "入院时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @Excel(name = "入院时间", width = 30, dateFormat = "yyyy-MM-dd") private LocalDateTime admissionTime; /** 出院时间 */ @ApiModelProperty(value = "出院时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") @Excel(name = "出院时间", width = 30, dateFormat = "yyyy-MM-dd") private LocalDateTime dischargeTime; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java index 8cd45557..d55ecabd 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/residentinfo/ResidentInfo.java @@ -5,7 +5,7 @@ import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; +import java.time.LocalDate; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -43,11 +43,10 @@ public class ResidentInfo extends BaseEntity { @Excel(name = "家属电话") private String familyMemberPhone; - /** 出生日期，格式：yyyy-MM-dd */ - @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "出生日期，格式：yyyy-MM-dd", width = 30, dateFormat = "yyyy-MM-dd") - private Date birthDate; + /** 出生日期，格式：yyyy-MM-dd */ + @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private LocalDate birthDate; /** 身份证号 */ @ApiModelProperty(value = "身份证号") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java index 38728a2d..d42102d7 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java @@ -111,12 +111,12 @@ public class PatientVisitRecordSaveDto { /** 入院时间 */ @ApiModelProperty(value = "入院时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime admissionTime; /** 出院时间 */ @ApiModelProperty(value = "出院时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime dischargeTime; /** _记录时间（入院记录） */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java index 2d4d5f7f..c8f70f83 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/IPatientInfoService.java @@ -41,7 +41,7 @@ public interface IPatientInfoService { * @param patientInfo 患者信息 * @return 结果 */ - public int updatePatientInfo(PatientInfo patientInfo); + public PatientInfo updatePatientInfo(PatientInfo patientInfo); /** * 批量删除患者信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java index c753e220..16070f4f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java @@ -97,7 +97,7 @@ public class PatientInfoServiceImpl implements IPatientInfoService { * @return 结果 */ @Override - public int updatePatientInfo(PatientInfo patientInfo) { + public PatientInfo updatePatientInfo(PatientInfo patientInfo) { ResidentInfo residentInfo = new ResidentInfo(); if (patientInfo.getResidentId() != null) { residentInfo = residentInfoMapper.selectResidentInfoById(patientInfo.getResidentId()); @@ -125,7 +125,8 @@ public class PatientInfoServiceImpl implements IPatientInfoService { patientInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientInfo.setUpdateTime(LocalDateTime.now()); patientInfo.setDelFlag(0); - return patientInfoMapper.updatePatientInfo(patientInfo); + patientInfoMapper.updatePatientInfo(patientInfo); + return patientInfo; } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java index 5c9561c2..934ceb68 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientprehospitalization/impl/PatientPreHospitalizationServiceImpl.java @@ -101,11 +101,8 @@ public class PatientPreHospitalizationServiceImpl implements IPatientPreHospital Long patientId = patientInfo.getId(); BeanUtils.copyBeanProp(patientInfo, preHospitalization); patientInfo.setId(patientId); - int flag = patientInfoService.updatePatientInfo(patientInfo); - if (flag >= 0) { - return preHospitalizationMapper.updateByPrimaryKeySelective(preHospitalization); - } - return flag; + patientInfoService.updatePatientInfo(patientInfo); + return preHospitalizationMapper.updateByPrimaryKeySelective(preHospitalization); } 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 2475234a..b63178ae 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 @@ -92,7 +92,7 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService @Transactional(rollbackFor = Exception.class) public void insertPatientVisitRecord(PatientVisitRecordSaveDto saveDto) { // 根据机构id、患者身份证号判断门诊/住院号是否重复 - PatientVisitRecord patientVisitRecord = patientVisitRecordMapper.judgeRepeat(saveDto.getHospitalAgencyId(), null, saveDto.getInHospitalNumber()); + PatientVisitRecord patientVisitRecord = patientVisitRecordMapper.judgeRepeat(saveDto.getHospitalAgencyId(), saveDto.getCardNo(), saveDto.getInHospitalNumber()); if (ObjectUtils.isNotEmpty(patientVisitRecord)) { throw new ServiceException("门诊/住院号重复，请确认后重新输入!"); } @@ -113,8 +113,9 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService patientInfo.setDelFlag(0); patientInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); patientInfo.setCreateTime(LocalDateTime.now()); - patientInfoService.insertPatientInfo(patientInfo); - saveBody.setPatientId(patientInfo.getId()); + PatientInfo patientSave = patientInfoService.insertPatientInfo(patientInfo); + saveBody.setPatientId(patientSave.getId()); + saveBody.setResidentId(patientSave.getResidentId()); } else { patientInfo = patientInfoList.get(0); Long patientId = patientInfo.getId(); @@ -163,11 +164,14 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService } // 修改患者基本信息 PatientInfo patientInfo = patientMapper.selectPatientInfoById(patientVisitRecord.getPatientId()); + Long residentId = patientInfo.getResidentId(); setVisitDate(patientVisitRecord); BeanUtils.copyBeanProp(patientInfo, patientVisitRecord); - patientInfoService.updatePatientInfo(patientInfo); + patientInfo.setId(patientVisitRecord.getPatientId()); + patientInfo.setResidentId(residentId); + PatientInfo afterUpd = patientInfoService.updatePatientInfo(patientInfo); // 修改就诊记录信息 - patientVisitRecord.setResidentId(patientInfo.getResidentId()); + patientVisitRecord.setResidentId(afterUpd.getResidentId()); return patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord); } 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 474242a4..30bc02e3 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml @@ -81,10 +81,10 @@ and in_hospital_number = #{inHospitalNumber} - and visit_date >= #{visitDateStart} + and date_format(visit_date,'%y%m%d') >= date_format(#{visitDateStart},'%y%m%d') - and visit_date <= #{visitDateEnd} + and date_format(visit_date,'%y%m%d') <= date_format(#{visitDateEnd},'%y%m%d') order by visit_date desc