1: 增加查询病历基本信息接口

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);
+    }
+
 
 
 }

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<MedicalRecInfoReqVo.MedicalExtendInfo> reqExtendInfo = medicalRecInfo.getExtendInfoList();
+        List<MedicalRecInfoReVo.MedicalExtendInfo> 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<MedicalRecInfoReqVo.MedicalExtendInfo> medicalExtendInfos = new ArrayList<>();
+        List<MedicalRecInfoReVo.MedicalExtendInfo> 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);
         }
     }
 

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;

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);
 }

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<MedicalExtendItem> 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(), "初步诊断不能为空");