From f7a036deb0937558f20f3c0a8e33645f474bb8f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=B3=E7=BE=BD?= <关羽@gentronhealth.com>
Date: Sat, 16 May 2026 14:15:49 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#461:=20[=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=89=A7=E8=A1=8C=E7=A7=91=E5=AE=A4?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE]=20=E4=BF=9D=E5=AD=98=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8E=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=9B=9E=E6=98=BE=E4=B8=BAID=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E6=98=BE=E7=A4=BA=E6=AD=A3=E7=A1=AE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

**后端开发重点**：优先搜索 Java/Spring 后端代码。
关键词：Controller, Service, Mapper, API, 接口, 数据查询
搜索目录：openhis-server-new/src/, his-repo/src/

在 getOrgLocPage 方法中手动填充 activityDefinitionId_dictText，
确保前端能正确回显项目名称而非 ID 码。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
---
 .../impl/OrganizationLocationAppServiceImpl.java     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 5dfa1c295..3bf2ac301 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
@@ -121,6 +121,18 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
         // 查询机构位置分页列表
         Page<OrgLocQueryDto> orgLocQueryDtoPage =
             HisPageUtils.selectPage(organizationLocationMapper, queryWrapper, pageNo, pageSize, OrgLocQueryDto.class);
+        // 手动填充项目名称字典翻译，确保前端能正确回显项目名称
+        if (orgLocQueryDtoPage != null && !orgLocQueryDtoPage.getRecords().isEmpty()) {
+            for (OrgLocQueryDto dto : orgLocQueryDtoPage.getRecords()) {
+                if (dto.getActivityDefinitionId() != null) {
+                    ActivityDefinition activityDef =
+                        activityDefinitionMapper.selectById(dto.getActivityDefinitionId());
+                    if (activityDef != null && activityDef.getName() != null) {
+                        dto.setActivityDefinitionId_dictText(activityDef.getName());
+                    }
+                }
+            }
+        }
         return R.ok(orgLocQueryDtoPage);
     }