bugfix:修复最终诊断预期诊断为空的问题

virtual-patient-web/src/main/java/com/supervision/pojo/vo/ExpertDiagnosisResultResVO.java

@@ -13,7 +13,7 @@ import java.util.List;
 @ApiModel
 public class ExpertDiagnosisResultResVO {
 
-    @ApiModelProperty("诊断/症状")
+    @ApiModelProperty("正确的诊断结果(就是这个病历实际的病症)")
     private String diagnosis;
 
     @ApiModelProperty("用户诊断结果")

virtual-patient-web/src/main/java/com/supervision/service/impl/AskDiagnosisResultServiceImpl.java

@@ -240,7 +240,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
      */
     private ExpertDiagnosisResultResVO creatExpertDiagnosisResult(MedicalRec medicalRec, List<Disease> diseasesList, String processId) {
         ExpertDiagnosisResultResVO expertDiagnosisResultResVO = new ExpertDiagnosisResultResVO();
-        expertDiagnosisResultResVO.setDiagnosis(medicalRec.getSymptoms());
+        expertDiagnosisResultResVO.setDiagnosis(diseasesList.stream().map(Disease::getDiseaseNameAlias).collect(Collectors.joining(";")));
         Set<String> expertDiseaseIdSet = diseasesList.stream().map(Disease::getId).collect(Collectors.toSet());
         // 从vp_diagnosis_primary中找到确认诊断时,确认的
         List<DiagnosisPrimary> userPrimaryDiseaseList = diagnosisPrimaryService.lambdaQuery()
@@ -253,7 +253,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
         // 用户的诊断
         expertDiagnosisResultResVO.setUserDiagnosisResult(userDiagnosisDiseaseList.stream().map(e -> {
             DiagnosisDiseaseResultNodeVO userNode = new DiagnosisDiseaseResultNodeVO();
-            userNode.setDiseaseName(e.getDiseaseName());
+            userNode.setDiseaseName(e.getDiseaseNameAlias());
             // 如果用户诊断在预期诊断里面,则正确,否则错误
             userNode.setCorrect(expertDiseaseIdSet.contains(e.getId()) ? 1 : 0);
             userNode.setDiseaseId(e.getId());
@@ -263,7 +263,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
         // 预期诊断
         expertDiagnosisResultResVO.setExpertDiagnosisResult(diseasesList.stream().map(e -> {
             DiagnosisDiseaseResultNodeVO node = new DiagnosisDiseaseResultNodeVO();
-            node.setDiseaseName(e.getDiseaseName());
+            node.setDiseaseName(e.getDiseaseNameAlias());
             node.setDiseaseId(e.getId());
             return node;
         }).collect(Collectors.toList()));