From 3e06aa5893b4d6589f853f2826ac9c36e11ea85f Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Tue, 28 Nov 2023 09:22:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=97=85=E5=8E=86=E7=AE=A1=E7=90=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/pojo/vo/MedicalRecInfoVO.java        | 13 ++++++-------
 .../impl/MedicalRecManageServiceImpl.java       | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoVO.java b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoVO.java
index 34fab493..c59d875a 100644
--- a/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoVO.java
+++ b/virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoVO.java
@@ -1,14 +1,13 @@
 package com.supervision.manage.pojo.vo;
 
-import com.supervision.model.AskPatientAnswer;
-import com.supervision.model.MedicalRec;
-import com.supervision.model.Patient;
+import com.supervision.vo.manage.DiseaseAncillaryResVo;
+import com.supervision.vo.manage.DiseasePhysicalResVo;
+import com.supervision.vo.manage.TreatmentPlanResVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
@@ -17,12 +16,12 @@ import java.util.List;
 public class MedicalRecInfoVO extends MedicalRecManageVO {
 
     @ApiModelProperty("辅助检查")
-    private List<MedicalRecCheckResVO> ancillaryList;
+    private List<DiseaseAncillaryResVo> ancillaryList;
 
     @ApiModelProperty("体格检查")
-    private List<MedicalRecCheckResVO> physicalList;
+    private List<DiseasePhysicalResVo> physicalList;
 
     @ApiModelProperty("处置计划列表")
-    private List<MedicalRecTreatmentPlanResVO> treatmentPlanList;
+    private List<TreatmentPlanResVo> treatmentPlanList;
 
 }
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 2fec183e..ee49e9ed 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
@@ -10,6 +10,9 @@ import com.supervision.exception.BusinessException;
 import com.supervision.manage.pojo.vo.MedicalRecInfoVO;
 import com.supervision.manage.pojo.vo.MedicalRecManageVO;
 import com.supervision.manage.pojo.vo.MedicalRecQaVO;
+import com.supervision.manage.service.DiseaseAncillaryManageService;
+import com.supervision.manage.service.DiseasePhysicalManageService;
+import com.supervision.manage.service.DiseaseTreatmentPlanManageService;
 import com.supervision.model.*;
 import com.supervision.service.*;
 import com.supervision.vo.manage.MedicalRecPageResVO;
@@ -42,6 +45,12 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
 
     private final DiseaseQuestionService diseaseQuestionService;
 
+    private final DiseaseAncillaryManageService diseaseAncillaryManageService;
+
+    private final DiseasePhysicalManageService diseasePhysicalManageService;
+
+    private final DiseaseTreatmentPlanManageService diseaseTreatmentPlanManageService;
+
     public List<Disease> queryDiseaseListByKeyWord(String keyword) {
         // 注意,这里不支持查询复杂疾病,如果需要支持复杂疾病,这里需要单独进行改造
         return diseaseService.lambdaQuery().eq(Disease::getDiseaseType, 0).like(Disease::getDiseaseName, keyword).list();
@@ -86,7 +95,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
     public List<MedicalRecQaVO> queryQuestionListByCreat(String diseaseId) {
         // 去vp_disease_question获取
         List<DiseaseQuestion> list = diseaseQuestionService.lambdaQuery().eq(DiseaseQuestion::getDiseaseId, diseaseId).list();
-        if (CollUtil.isEmpty(list)){
+        if (CollUtil.isEmpty(list)) {
             return new ArrayList<>();
         }
         // 获取问题
@@ -162,11 +171,11 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
         // 病人基本信息
         medicalRecInfoVO.setPatient(patientService.getById(medicalRec.getPatientId()));
         // 辅助检查
-//        medicalRecInfoVO.setAncillaryList();
+        medicalRecInfoVO.setAncillaryList(diseaseAncillaryManageService.queryListByDiseaseId(medicalRec.getDiseaseId()));
         // 体格检查
-//        medicalRecInfoVO.setPhysicalList();
+        medicalRecInfoVO.setPhysicalList(diseasePhysicalManageService.queryListByDiseaseId(medicalRec.getDiseaseId()));
         // 处置计划
-//        medicalRecInfoVO.setTreatmentPlanList();
+        medicalRecInfoVO.setTreatmentPlanList(diseaseTreatmentPlanManageService.queryListByDiseaseId(medicalRec.getDiseaseId()));
         // 问答策略
         medicalRecInfoVO.setQaList(queryMedicalRecQaInfo(id));
         return medicalRecInfoVO;