From 72e0670e28132398acaf06e12e8d9c343209de4f Mon Sep 17 00:00:00 2001 From: liu Date: Thu, 21 Dec 2023 13:19:38 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=9D=E6=AD=A5=E8=AF=8A=E6=96=AD=E6=98=BE=E7=A4=BAnull?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervision/service/impl/AskPrimaryServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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) {