diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/processrecord/ProcessRecordController.java b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/processrecord/ProcessRecordController.java index 62f5fa9a..c46829f0 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/controller/processrecord/ProcessRecordController.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/controller/processrecord/ProcessRecordController.java @@ -29,4 +29,10 @@ public class ProcessRecordController { public ProcessEvaluation saveOrUpdateProcessEvaluation(@RequestBody ProcessEvaluation processEvaluation){ return processRecordService.saveOrUpdateProcessEvaluation(processEvaluation); } + + @ApiOperation("查询考核病案评估") + @GetMapping("queryProcessEvaluation") + public ProcessEvaluation queryProcessEvaluation(String processId){ + return processRecordService.queryProcessEvaluation(processId); + } } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/ProcessRecordService.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/ProcessRecordService.java index fc82989d..f9dbc4bb 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/ProcessRecordService.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/ProcessRecordService.java @@ -10,4 +10,6 @@ public interface ProcessRecordService { IPage queryProcessRecordPage(String studentName, String medicalRecNo, String diseaseType, Integer pageNum, Integer pageSize); ProcessEvaluation saveOrUpdateProcessEvaluation(ProcessEvaluation processEvaluation); + + ProcessEvaluation queryProcessEvaluation(String processId); } diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ProcessRecordServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ProcessRecordServiceImpl.java index 60095b74..5b0f498b 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ProcessRecordServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/ProcessRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.supervision.manage.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; @@ -96,4 +97,10 @@ public class ProcessRecordServiceImpl implements ProcessRecordService { return processEvaluation; } + @Override + public ProcessEvaluation queryProcessEvaluation(String processId) { + Assert.notEmpty(processId,() -> new BusinessException("流程ID不能为空")); + return processEvaluationService.lambdaQuery().eq(ProcessEvaluation::getProcessId,processId).last(" limit 1").one(); + } + } diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java b/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java index 62d2ce2d..acdba171 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/AskController.java @@ -1,5 +1,7 @@ package com.supervision.controller; +import cn.hutool.json.JSONUtil; +import com.supervision.pojo.paddlespeech.req.TtsReqDTO; import com.supervision.pojo.vo.TalkReqVO; import com.supervision.pojo.vo.TalkResultResVO; import com.supervision.pojo.vo.TalkVideoReqVO; @@ -43,4 +45,5 @@ public class AskController { + } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java index f3462217..903f866d 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/MedicalRecordServiceImpl.java @@ -94,7 +94,7 @@ public class MedicalRecordServiceImpl implements MedicalRecordService { // 3.1 体格检查 List askPhysicalHistoryResVOS = diagnosisPhysicalRecordService.queryAskPhysicalHistory(processId); resultVo.setPhysicalDiagnosisNameList( - askPhysicalHistoryResVOS.stream().map(AskPhysicalHistoryResVO::getToolName).distinct().collect(Collectors.toList())); + askPhysicalHistoryResVOS.stream().map(e -> e.getToolName() + " " + e.getLocationName()).distinct().collect(Collectors.toList())); // 3.2 辅助检查 List askAncillaryHistoryResVOS = diagnosisAncillaryRecordService.queryAncillaryRecord(processId); resultVo.setAncillaryDiagnosisNameList(