From c2548a115bb083b6d609eb637d36186e8da80289 Mon Sep 17 00:00:00 2001 From: liu Date: Fri, 22 Dec 2023 14:37:54 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E5=A4=8D=E6=9C=80=E7=BB=88?= =?UTF-8?q?=E8=AF=8A=E6=96=AD=E9=A2=84=E6=9C=9F=E8=AF=8A=E6=96=AD=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/supervision/pojo/vo/ExpertDiagnosisResultResVO.java | 2 +- .../service/impl/AskDiagnosisResultServiceImpl.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ExpertDiagnosisResultResVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ExpertDiagnosisResultResVO.java index 320f23c3..f82f1444 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/ExpertDiagnosisResultResVO.java +++ b/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("用户诊断结果") 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 f549b29a..63449689 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 @@ -240,7 +240,7 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService */ private ExpertDiagnosisResultResVO creatExpertDiagnosisResult(MedicalRec medicalRec, List diseasesList, String processId) { ExpertDiagnosisResultResVO expertDiagnosisResultResVO = new ExpertDiagnosisResultResVO(); - expertDiagnosisResultResVO.setDiagnosis(medicalRec.getSymptoms()); + expertDiagnosisResultResVO.setDiagnosis(diseasesList.stream().map(Disease::getDiseaseNameAlias).collect(Collectors.joining(";"))); Set expertDiseaseIdSet = diseasesList.stream().map(Disease::getId).collect(Collectors.toSet()); // 从vp_diagnosis_primary中找到确认诊断时,确认的 List 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()));