web : 1. 创建预期诊断结果,最终结果进行判空处理

2. 添加完成问诊增加初诊结果判断
release_1.0.0
xueqingkun 1 year ago
parent c7565c4682
commit 104885d174

@ -1,6 +1,7 @@
package com.supervision.service.impl; package com.supervision.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.supervision.exception.BusinessException; import com.supervision.exception.BusinessException;
import com.supervision.model.*; import com.supervision.model.*;
@ -54,6 +55,9 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
.eq(DiagnosisPrimary::getProcessId, reqVO.getProcessId()) .eq(DiagnosisPrimary::getProcessId, reqVO.getProcessId())
.eq(DiagnosisPrimary::getDeleteFlag, 0) .eq(DiagnosisPrimary::getDeleteFlag, 0)
.list(); .list();
if (CollectionUtil.isNotEmpty(list)){
throw new BusinessException("您还未进行有效的初步诊断!");
}
diagnosisResult.setFinalDiagnosis(list.stream().map(DiagnosisPrimary::getPrimaryDiagnosisId).collect(Collectors.toList())); diagnosisResult.setFinalDiagnosis(list.stream().map(DiagnosisPrimary::getPrimaryDiagnosisId).collect(Collectors.toList()));
diagnosisResult.setTreatmentPlanType(reqVO.getTreatmentPlanType()); diagnosisResult.setTreatmentPlanType(reqVO.getTreatmentPlanType());
diagnosisResult.setTreatmentPlan(reqVO.getTreatmentPlan()); diagnosisResult.setTreatmentPlan(reqVO.getTreatmentPlan());
@ -221,7 +225,8 @@ public class AskDiagnosisResultServiceImpl implements AskDiagnosisResultService
ExpertDiagnosisResultResVO expertDiagnosisResultResVO = new ExpertDiagnosisResultResVO(); ExpertDiagnosisResultResVO expertDiagnosisResultResVO = new ExpertDiagnosisResultResVO();
expertDiagnosisResultResVO.setDiagnosis(medicalRec.getExpectDiagnosisResult()); expertDiagnosisResultResVO.setDiagnosis(medicalRec.getExpectDiagnosisResult());
Set<String> expertDiseaseIdSet = diseasesList.stream().map(Disease::getId).collect(Collectors.toSet()); Set<String> expertDiseaseIdSet = diseasesList.stream().map(Disease::getId).collect(Collectors.toSet());
List<Disease> userDiagnosisDiseaseList = diseaseService.listByIds(diagnosisResult.getFinalDiagnosis()); List<Disease> userDiagnosisDiseaseList = CollUtil.isEmpty(diagnosisResult.getFinalDiagnosis()) ? CollUtil.newArrayList()
: diseaseService.listByIds(diagnosisResult.getFinalDiagnosis());
// 用户的诊断 // 用户的诊断
expertDiagnosisResultResVO.setUserDiagnosisResult(userDiagnosisDiseaseList.stream().map(e -> { expertDiagnosisResultResVO.setUserDiagnosisResult(userDiagnosisDiseaseList.stream().map(e -> {
DiagnosisDiseaseResultNodeVO userNode = new DiagnosisDiseaseResultNodeVO(); DiagnosisDiseaseResultNodeVO userNode = new DiagnosisDiseaseResultNodeVO();

Loading…
Cancel
Save