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 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); }