diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java index 883133db..c2c9dc8d 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/AskPrimaryServiceImpl.java @@ -137,7 +137,11 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { List physicalList = physicalHistoryList.stream().map(e -> { ChooseNode chooseNode = new ChooseNode(); 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; }).collect(Collectors.toList()); resVO.setPhysicalList(physicalList); @@ -163,7 +167,7 @@ public class AskPrimaryServiceImpl implements AskPrimaryService { String processId = any.get().getProcessId(); // 校验,如果没有填写病历,那么就不允许诊毕 Integer count = processMedicalService.lambdaQuery().eq(ProcessMedical::getProcessId, processId).count(); - if(count < 1){ + if (count < 1) { throw new BusinessException("电子病历未填写,请填写电子病例后诊毕"); } for (PrimaryConfirmReqVO reqVO : reqVOList) {