From 75e49f0237b4097b9696fe43127e566d1af13b87 Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Tue, 19 May 2026 09:06:30 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#547:=20=E6=97=B6=E9=97=B4=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E6=A0=A1=E9=AA=8C=E4=B8=AD"=E6=9C=AA=E7=9F=A5?= =?UTF-8?q?=E7=A7=91=E5=AE=A4"=E6=8F=90=E7=A4=BA=E6=94=B9=E8=BF=9B=20?= =?UTF-8?q?=E2=80=94=20=E5=BD=93=E5=86=B2=E7=AA=81=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E7=A7=91=E5=AE=A4=E5=B7=B2=E8=A2=AB?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=EF=BC=8C=E5=B0=86=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E7=9A=84"=E6=9C=AA=E7=9F=A5=E7=A7=91=E5=AE=A4"=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=98=BE=E7=A4=BA=E5=85=B7=E4=BD=93=E7=A7=91=E5=AE=A4?= =?UTF-8?q?ID=E5=8F=8A"=E5=B7=B2=E5=88=A0=E9=99=A4"=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E4=BE=BF=E4=BA=8E=E8=BF=90=E7=BB=B4=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=EF=BC=9B=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E6=B8=85=E7=90=86=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD14?= =?UTF-8?q?=E6=9D=A1organization=5Fid=E6=8C=87=E5=90=91=E5=B7=B2=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=A7=91=E5=AE=A4=E7=9A=84=E5=AD=A4=E8=84=8F=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b207decf..68ede237 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,7 +169,7 @@ 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() : "未知科室"; + String organizationName = org != null ? org.getName() : ("科室[" + organizationLocation.getOrganizationId() + "]已删除"); return R.fail("当前诊疗：" + activityName + CommonConstants.Common.DASH + orgLoc.getStartTime() + CommonConstants.Common.DASH + orgLoc.getEndTime() + "与" + organizationName + "时间冲突"); }