From 85e95420b73a12edc0d67d184ec558b36fdd65ad Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Tue, 19 May 2026 15:06:22 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#547:=20=E6=89=A7=E8=A1=8C=E7=A7=91?= =?UTF-8?q?=E5=AE=A4=E9=85=8D=E7=BD=AE=E4=BF=9D=E5=AD=98=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E6=A3=80=E6=B5=8B=E5=BA=94=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E5=B7=B2=E8=A2=AB=E8=BD=AF=E5=88=A0=E9=99=A4=E7=A7=91=E5=AE=A4?= =?UTF-8?q?=E7=9A=84=E5=AD=A4=E8=84=8F=E8=AE=B0=E5=BD=95=20=E2=80=94=20?= =?UTF-8?q?=E6=A0=B9=E5=9B=A0=EF=BC=9A=E6=97=B6=E9=97=B4=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=9C=AA=E6=8E=92=E9=99=A4=E7=A7=91=E5=AE=A4?= =?UTF-8?q?=E5=B7=B2=E5=88=A0=E9=99=A4=E7=9A=84=20OrganizationLocation=20?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=B7=B2=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=9A=84=E7=A7=91=E5=AE=A4=E4=BB=8D=E4=BC=9A?= =?UTF-8?q?=E9=98=BB=E6=96=AD=E6=96=B0=E9=85=8D=E7=BD=AE=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 --- .../appservice/impl/OrganizationLocationAppServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java index 9427f655..d9ab38c8 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java @@ -169,9 +169,11 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation if (DateTimeUtils.isOverlap(organizationLocation.getStartTime(), organizationLocation.getEndTime(), orgLoc.getStartTime(), orgLoc.getEndTime())) { Organization org = organizationService.getById(organizationLocation.getOrganizationId()); - String organizationName = org != null ? org.getName() : "已删除科室(ID:" + organizationLocation.getOrganizationId() + ")"; + if (org == null) { + continue; + } return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime() - + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + organizationName + "时间冲突"); + + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + org.getName() + "时间冲突"); } if (orgLocQueryDto.getId() != null) {