bugfix:修复新增初步诊断显示null的问题

dev_2.0.0
liu 1 year ago
parent c295051802
commit 72e0670e28

@ -137,7 +137,11 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
List<ChooseNode> physicalList = physicalHistoryList.stream().map(e -> { List<ChooseNode> physicalList = physicalHistoryList.stream().map(e -> {
ChooseNode chooseNode = new ChooseNode(); ChooseNode chooseNode = new ChooseNode();
chooseNode.setNodeId(e.getId()); chooseNode.setNodeId(e.getId());
chooseNode.setName(StrUtil.join(" | ", e.getToolName(), e.getLocationName())); if (StrUtil.isEmpty(e.getLocationName())) {
chooseNode.setName(e.getToolName());
} else {
chooseNode.setName(StrUtil.join(" | ", e.getToolName(), e.getLocationName()));
}
return chooseNode; return chooseNode;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
resVO.setPhysicalList(physicalList); resVO.setPhysicalList(physicalList);
@ -163,7 +167,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService {
String processId = any.get().getProcessId(); String processId = any.get().getProcessId();
// 校验,如果没有填写病历,那么就不允许诊毕 // 校验,如果没有填写病历,那么就不允许诊毕
Integer count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, processId).count(); Integer count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, processId).count();
if(count < 1){ if (count < 1) {
throw new BusinessException("电子病历未填写,请填写电子病例后诊毕"); throw new BusinessException("电子病历未填写,请填写电子病例后诊毕");
} }
for (PrimaryConfirmReqVO reqVO : reqVOList) { for (PrimaryConfirmReqVO reqVO : reqVOList) {

Loading…
Cancel
Save