|
|
|
@ -5,6 +5,8 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
|
|
import cn.hutool.core.lang.Assert;
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
|
import com.alibaba.druid.sql.visitor.functions.If;
|
|
|
|
|
import com.sun.media.sound.AiffFileReader;
|
|
|
|
|
import com.supervision.exception.BusinessException;
|
|
|
|
|
import com.supervision.model.*;
|
|
|
|
|
import com.supervision.model.Process;
|
|
|
|
@ -255,7 +257,12 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
|
|
|
|
|
}
|
|
|
|
|
// 找到process对应的所有的初步诊断
|
|
|
|
|
List<DiagnosisPrimaryVO> diagnosisPrimaryVOS = diagnosisPrimaryService.queryAskPrimaryList(processId);
|
|
|
|
|
Map<String, String> diseaseNameMap = diagnosisPrimaryVOS.stream().collect(Collectors.toMap(DiagnosisPrimaryVO::getId, DiagnosisPrimaryVO::getPrimaryDiseaseName));
|
|
|
|
|
Map<String, String> diseaseNameMap = diagnosisPrimaryVOS.stream().peek(vo -> {
|
|
|
|
|
if (StrUtil.isEmpty(vo.getPrimaryDiseaseName())) {
|
|
|
|
|
vo.setPrimaryDiseaseName("");
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.collect(Collectors.toMap(DiagnosisPrimaryVO::getId, DiagnosisPrimaryVO::getPrimaryDiseaseName));
|
|
|
|
|
// 查询诊疗记录对应的所有检查记录
|
|
|
|
|
List<DiagnosisPrimaryRelation> relationList = diagnosisPrimaryRelationService.lambdaQuery().eq(DiagnosisPrimaryRelation::getProcessId, processId).list();
|
|
|
|
|
// 根据relationId进行分组
|
|
|
|
|