From 104885d1740f6027873343fc160d6634ce242960 Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Thu, 16 Nov 2023 11:20:40 +0800 Subject: [PATCH] =?UTF-8?q?web=20:=201.=20=E5=88=9B=E5=BB=BA=E9=A2=84?= =?UTF-8?q?=E6=9C=9F=E8=AF=8A=E6=96=AD=E7=BB=93=E6=9E=9C=EF=BC=8C=E6=9C=80?= =?UTF-8?q?=E7=BB=88=E7=BB=93=E6=9E=9C=E8=BF=9B=E8=A1=8C=E5=88=A4=E7=A9=BA?= =?UTF-8?q?=E5=A4=84=E7=90=86=20=20=20=20=20=20=202.=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=97=AE=E8=AF=8A=E5=A2=9E=E5=8A=A0=E5=88=9D?= =?UTF-8?q?=E8=AF=8A=E7=BB=93=E6=9E=9C=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AskDiagnosisResultServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java index 6267fda9..a04f970c 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java @@ -1,6 +1,7 @@ package com.supervision.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.supervision.exception.BusinessException; import com.supervision.model.*; @@ -54,6 +55,9 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService .eq(DiagnosisPrimary::getProcessId, reqVO.getProcessId()) .eq(DiagnosisPrimary::getDeleteFlag, 0) .list(); + if (CollectionUtil.isNotEmpty(list)){ + throw new BusinessException("您还未进行有效的初步诊断！"); + } diagnosisResult.setFinalDiagnosis(list.stream().map(DiagnosisPrimary::getPrimaryDiagnosisId).collect(Collectors.toList())); diagnosisResult.setTreatmentPlanType(reqVO.getTreatmentPlanType()); diagnosisResult.setTreatmentPlan(reqVO.getTreatmentPlan()); @@ -221,7 +225,8 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService ExpertDiagnosisResultResVO expertDiagnosisResultResVO = new ExpertDiagnosisResultResVO(); expertDiagnosisResultResVO.setDiagnosis(medicalRec.getExpectDiagnosisResult()); Set expertDiseaseIdSet = diseasesList.stream().map(Disease::getId).collect(Collectors.toSet()); - List userDiagnosisDiseaseList = diseaseService.listByIds(diagnosisResult.getFinalDiagnosis()); + List userDiagnosisDiseaseList = CollUtil.isEmpty(diagnosisResult.getFinalDiagnosis()) ? CollUtil.newArrayList() + : diseaseService.listByIds(diagnosisResult.getFinalDiagnosis()); // 用户的诊断 expertDiagnosisResultResVO.setUserDiagnosisResult(userDiagnosisDiseaseList.stream().map(e -> { DiagnosisDiseaseResultNodeVO userNode = new DiagnosisDiseaseResultNodeVO();