bugfix:修复体温计不能正确查询到结果的问题

dev_2.0.0
liu 2 years ago
parent 3d741b282e
commit ef4a3fc96b

@ -54,26 +54,25 @@ public class AskPhysicalServiceImpl implements AskPhysicalService {
ConfigPhysicalTool tool = Optional.ofNullable(toolService.getById(reqVO.getToolId())).orElseThrow(() -> new BusinessException("工具不支持")); ConfigPhysicalTool tool = Optional.ofNullable(toolService.getById(reqVO.getToolId())).orElseThrow(() -> new BusinessException("工具不支持"));
// 是否需要具体的部位,0否1是 // 是否需要具体的部位,0否1是
ConfigPhysicalLocation location = new ConfigPhysicalLocation(); ConfigPhysicalLocation location = new ConfigPhysicalLocation();
DiseasePhysical result = new DiseasePhysical();
if (1 == tool.getRequireLocation() && StrUtil.isBlank(reqVO.getLocationCode())) {
throw new BusinessException("请选择对应的位置");
}
if (1 == tool.getRequireLocation()) { if (1 == tool.getRequireLocation()) {
if (StrUtil.isBlank(reqVO.getLocationCode())) {
throw new BusinessException("请选择对应的位置");
} else {
location = locationService.lambdaQuery().eq(ConfigPhysicalLocation::getCode, reqVO.getLocationCode()).last("limit 1") location = locationService.lambdaQuery().eq(ConfigPhysicalLocation::getCode, reqVO.getLocationCode()).last("limit 1")
.oneOpt().orElseGet(ConfigPhysicalLocation::new); .oneOpt().orElseGet(ConfigPhysicalLocation::new);
} }
if (1 == tool.getRequireLocation() && StrUtil.isEmpty(location.getId())) { }
result.setResult("无相关资讯");
} else { DiseasePhysical result = diseasePhysicalService.lambdaQuery().eq(DiseasePhysical::getDiseaseId, process.getDiseaseId())
result = diseasePhysicalService.lambdaQuery().eq(DiseasePhysical::getDiseaseId, process.getMedicalRecId()) .eq(DiseasePhysical::getToolId, tool.getId())
.eq(DiseasePhysical::getToolId, tool.getId()).eq(StrUtil.isNotBlank(location.getId()), DiseasePhysical::getLocationId, location.getId()).last("limit 1") .eq(StrUtil.isNotBlank(location.getId()), DiseasePhysical::getLocationId, location.getId()).last("limit 1")
.oneOpt() .oneOpt()
.orElseGet(() -> { .orElseGet(() -> {
DiseasePhysical diseasePhysical = new DiseasePhysical(); DiseasePhysical diseasePhysical = new DiseasePhysical();
diseasePhysical.setResult("无相关资讯"); diseasePhysical.setResult("无相关资讯");
return diseasePhysical; return diseasePhysical;
}); });
}
// 检查记录保存到数据库中 // 检查记录保存到数据库中
DiagnosisPhysicalRecord diagnosisPhysicalRecord = new DiagnosisPhysicalRecord(); DiagnosisPhysicalRecord diagnosisPhysicalRecord = new DiagnosisPhysicalRecord();

Loading…
Cancel
Save