diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java index 6948cd48d..2e09c86bc 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java @@ -90,18 +90,26 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer // 逐个校验activityList中的项目是否都配置了执行科室,并收集positionId供后续使用 // 必须在任何数据库操作之前完成全部校验,避免部分保存后异常导致脏数据 + // 🔧 Bug #516: 优先使用前端传入的positionId(用户手动选择的发往科室),仅在未选择时使用配置的执行科室 List activityList = requestFormSaveDto.getActivityList(); // 缓存校验结果,避免主循环中重复查询和可能出现的数据不一致 java.util.Map activityIdToPositionIdMap = new java.util.HashMap<>(); if (activityList != null && !activityList.isEmpty()) { for (ActivitySaveDto activitySaveDto : activityList) { - Long positionId = activityOrganizationConfig.stream() + // 优先使用前端传入的positionId(用户手动选择的科室) + Long frontendPositionId = activitySaveDto.getPositionId(); + if (frontendPositionId != null) { + activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), frontendPositionId); + continue; + } + // 前端未传入时,使用配置的执行科室 + Long configPositionId = activityOrganizationConfig.stream() .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId())) .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null); - if (positionId == null) { + if (configPositionId == null) { throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室"); } - activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), positionId); + activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), configPositionId); } }