优化评分规则和图谱展示

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;
 }

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;