From 1b6c3a28c3b41a124854724b92daf771b8ace89d Mon Sep 17 00:00:00 2001 From: liu Date: Wed, 6 Mar 2024 13:54:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=84=E5=88=86=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=92=8C=E5=9B=BE=E8=B0=B1=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/supervision/pojo/vo/RadarChartResVO.java | 4 ++++ .../service/impl/AskDiagnosisResultServiceImpl.java | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/RadarChartResVO.java b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/RadarChartResVO.java index 5911d657..daacae2b 100644 --- a/virtual-patient-web/src/main/java/com/supervision/pojo/vo/RadarChartResVO.java +++ b/virtual-patient-web/src/main/java/com/supervision/pojo/vo/RadarChartResVO.java @@ -1,5 +1,6 @@ package com.supervision.pojo.vo; +import com.supervision.model.ProcessEvaluation; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,4 +24,7 @@ public class RadarChartResVO { // 临床思维=前面几项和或平均值 @ApiModelProperty("临床思维") private ChartNodeVO clinicalThinking; + + @ApiModelProperty("考核评估") + private ProcessEvaluation processEvaluation; } 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 2b5b3e75..40df6d1f 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 @@ -45,6 +45,8 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService private final ProcessService processService; + private final ProcessEvaluationService processEvaluationService; + private final DiseaseService diseaseService; private final TreatmentPlanRecordService treatmentPlanRecordService; @@ -330,6 +332,11 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService chartNodeVO.setUnCorrect(NumberUtil.add(askChart.getUnCorrect(), physicalChart.getUnCorrect(), ancillaryChart.getUnCorrect(), treatmentPlanChart.getUnCorrect()).intValue()); chartNodeVO.setStandard(NumberUtil.add(askChart.getStandard(), physicalChart.getStandard(), ancillaryChart.getStandard(), treatmentPlanChart.getStandard()).intValue()); radarChartResVO.setClinicalThinking(chartNodeVO); + + // 查询考核评估内容 + ProcessEvaluation processEvaluation = processEvaluationService.lambdaQuery().eq(ProcessEvaluation::getProcessId, processId).one(); + radarChartResVO.setProcessEvaluation(processEvaluation); + return radarChartResVO;