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<String> expertDiseaseIdSet = diseasesList.stream().map(Disease::getId).collect(Collectors.toSet());
-        List<Disease> userDiagnosisDiseaseList = diseaseService.listByIds(diagnosisResult.getFinalDiagnosis());
+        List<Disease> userDiagnosisDiseaseList = CollUtil.isEmpty(diagnosisResult.getFinalDiagnosis()) ? CollUtil.newArrayList()
+                : diseaseService.listByIds(diagnosisResult.getFinalDiagnosis());
         // 用户的诊断
         expertDiagnosisResultResVO.setUserDiagnosisResult(userDiagnosisDiseaseList.stream().map(e -> {
             DiagnosisDiseaseResultNodeVO userNode = new DiagnosisDiseaseResultNodeVO();