From 62dbc764fc7d566d0d9262f82d26e86c31c90eb3 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Tue, 18 Jun 2024 15:11:19 +0800 Subject: [PATCH] =?UTF-8?q?1:=20=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=97=85=E5=8E=86=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MedicalRecManageController.java | 8 +++++++- .../manage/dto/MedicalExtendInfoDTO.java | 15 ++++++++------- ...InfoReqVo.java => MedicalRecInfoReVo.java} | 2 +- .../service/MedicalRecManageService.java | 4 +++- .../impl/MedicalRecManageServiceImpl.java | 19 +++++++++++++++++-- 5 files changed, 36 insertions(+), 12 deletions(-) rename virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/{MedicalRecInfoReqVo.java => MedicalRecInfoReVo.java} (95%) diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java index 6f685903..2cea04fc 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/medicalrec/MedicalRecManageController.java @@ -146,10 +146,16 @@ public class MedicalRecManageController { @Operation(summary = "保存病历基本信息") @PostMapping("saveMedicalRec") - public String saveMedicalRec(@RequestBody MedicalRecInfoReqVo reqVO) { + public String saveMedicalRec(@RequestBody MedicalRecInfoReVo reqVO) { return medicalRecManageService.saveMedicalRec(reqVO); } + @Operation(summary = "查询病历基本信息") + @GetMapping("queryMedicalRecBaseInfo") + public MedicalRecInfoReVo queryMedicalRecBaseInfo(@Parameter(name = "medicalRecId", description = "病例id") String medicalRecId) { + return medicalRecManageService.queryMedicalRecBaseInfo(medicalRecId); + } + } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/dto/MedicalExtendInfoDTO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/dto/MedicalExtendInfoDTO.java index 3739e9a1..4f1e4407 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/dto/MedicalExtendInfoDTO.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/dto/MedicalExtendInfoDTO.java @@ -2,7 +2,7 @@ package com.supervision.manage.dto; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.supervision.manage.pojo.vo.MedicalRecInfoReqVo; +import com.supervision.manage.pojo.vo.MedicalRecInfoReVo; import com.supervision.model.MedicalExtendItem; import lombok.Data; @@ -45,9 +45,9 @@ public class MedicalExtendInfoDTO { - private MedicalRecInfoReqVo medicalRecInfo; + private MedicalRecInfoReVo medicalRecInfo; - public MedicalExtendInfoDTO(MedicalRecInfoReqVo medicalRecInfo) { + public MedicalExtendInfoDTO(MedicalRecInfoReVo medicalRecInfo) { this.medicalRecInfo = medicalRecInfo; } @@ -90,9 +90,9 @@ public class MedicalExtendInfoDTO { this.buildMedicalExtendItem(medicalRecInfo.getId(),patientSurgeryHistoryItemId,"手术史",patientSurgeryHistory)); } - List reqExtendInfo = medicalRecInfo.getExtendInfoList(); + List reqExtendInfo = medicalRecInfo.getExtendInfoList(); if (CollUtil.isNotEmpty(reqExtendInfo)){ - for (MedicalRecInfoReqVo.MedicalExtendInfo info : reqExtendInfo) { + for (MedicalRecInfoReVo.MedicalExtendInfo info : reqExtendInfo) { extendInfoList.add( this.buildMedicalExtendItem(medicalRecInfo.getId(), info.getItemId(), info.getName(), info.getItemContent())); @@ -113,10 +113,10 @@ public class MedicalExtendInfoDTO { return; } - List medicalExtendInfos = new ArrayList<>(); + List medicalExtendInfos = new ArrayList<>(); for (MedicalExtendItem extendItem : extendInfoList) { String itemId = extendItem.getItemId(); - MedicalRecInfoReqVo.MedicalExtendInfo medicalExtendInfo = new MedicalRecInfoReqVo.MedicalExtendInfo(); + MedicalRecInfoReVo.MedicalExtendInfo medicalExtendInfo = new MedicalRecInfoReVo.MedicalExtendInfo(); medicalExtendInfo.setMedicalId(medicalRecInfo.getId()); medicalExtendInfo.setName(extendItem.getName()); medicalExtendInfo.setItemContent(extendItem.getItemContent()); @@ -148,6 +148,7 @@ public class MedicalExtendInfoDTO { default: medicalExtendInfos.add(medicalExtendInfo); } + medicalRecInfo.setExtendInfoList(medicalExtendInfos); } } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoReqVo.java b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoReVo.java similarity index 95% rename from virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoReqVo.java rename to virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoReVo.java index 53a187ed..c170b648 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoReqVo.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoReVo.java @@ -8,7 +8,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Data -public class MedicalRecInfoReqVo extends MedicalRec { +public class MedicalRecInfoReVo extends MedicalRec { @Schema(description = "现病史") private String patientHistory; diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java index 1ecc2e50..ea18b227 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/MedicalRecManageService.java @@ -50,5 +50,7 @@ public interface MedicalRecManageService { String createMedicalRecBaseInfo(MedicalRecBaseInfoReqVo reqVO); - String saveMedicalRec(MedicalRecInfoReqVo reqVO); + String saveMedicalRec(MedicalRecInfoReVo reqVO); + + MedicalRecInfoReVo queryMedicalRecBaseInfo(String medicalRecId); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java index 2ca516b5..51a8d81c 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java @@ -438,7 +438,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { @Override @Transactional(rollbackFor = Exception.class) - public String saveMedicalRec(MedicalRecInfoReqVo reqVO) { + public String saveMedicalRec(MedicalRecInfoReVo reqVO) { // 必填校验 saveMedicalRecAssert(reqVO); @@ -454,7 +454,22 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService { return reqVO.getId(); } - private void saveMedicalRecAssert(MedicalRecInfoReqVo reqVO){ + @Override + public MedicalRecInfoReVo queryMedicalRecBaseInfo(String medicalRecId) { + + Assert.notEmpty(medicalRecId, "medicalRecId不能为空"); + + MedicalRec medicalRec = medicalRecService.getById(medicalRecId); + Assert.notNull(medicalRec, "未找到该病历"); + + List extendItems = medicalExtendItemService.lambdaQuery().eq(MedicalExtendItem::getMedicalId, medicalRecId).list(); + MedicalExtendInfoDTO medicalExtendInfoDTO = new MedicalExtendInfoDTO(BeanUtil.toBean(medicalRec, MedicalRecInfoReVo.class)); + medicalExtendInfoDTO.extendInfoListSetMedicalRecInfoReqVo(extendItems); + + return medicalExtendInfoDTO.getMedicalRecInfo(); + } + + private void saveMedicalRecAssert(MedicalRecInfoReVo reqVO){ Assert.notEmpty(reqVO.getId(), "id不能为空"); Assert.notEmpty(reqVO.getPatientId(),"病人id不能为空"); Assert.notEmpty(reqVO.getDiseaseId(), "初步诊断不能为空");