wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix Bug #475: 【住院医生工作站】开立检查申请单报错后仍生成申请记录

Browse Source 
根因：saveRequestForm方法的预校验循环和主循环分别独立查询activityOrganizationConfig获取positionId，
存在数据不一致风险——预校验通过但主循环中positionId查找失败时，RequestForm已被保存导致脏数据。

修复：将预校验循环中查到的positionId缓存到Map中，主循环直接使用缓存结果，
避免重复查询导致的数据不一致问题。确保所有校验通过后再执行任何数据库操作。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
关羽
2026-05-14 11:14:11 +08:00
parent a7a33eb5f6
commit d43a06c343
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
View File

@@ -87,8 +87,11 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
throw new ServiceException("请先配置当前时间段的执行科室"); throw new ServiceException("请先配置当前时间段的执行科室");
} }
// 逐个校验activityList中的项目是否都配置了执行科室，避免部分通过后在循环中抛异常导致事务复杂化 // 逐个校验activityList中的项目是否都配置了执行科室，并收集positionId供后续使用
// 必须在任何数据库操作之前完成全部校验，避免部分保存后异常导致脏数据
List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList(); List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList();
// 缓存校验结果，避免主循环中重复查询和可能出现的数据不一致
java.util.Map<Long, Long> activityIdToPositionIdMap = new java.util.HashMap<>();
if (activityList != null && !activityList.isEmpty()) { if (activityList != null && !activityList.isEmpty()) {
for (ActivitySaveDto activitySaveDto : activityList) { for (ActivitySaveDto activitySaveDto : activityList) {
Long positionId = activityOrganizationConfig.stream() Long positionId = activityOrganizationConfig.stream()
@@ -97,6 +100,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
if (positionId == null) { if (positionId == null) {
throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室"); throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
} }
activityIdToPositionIdMap.put(activitySaveDto.getAdviceDefinitionId(), positionId);
} }
} }
@@ -179,9 +183,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
serviceRequest.setEncounterId(encounterId); // 就诊id serviceRequest.setEncounterId(encounterId); // 就诊id
serviceRequest.setAuthoredTime(curDate); // 请求签发时间 serviceRequest.setAuthoredTime(curDate); // 请求签发时间
Long positionId = activityOrganizationConfig.stream() Long positionId = activityIdToPositionIdMap.get(activitySaveDto.getAdviceDefinitionId());
.filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
.map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
if (positionId == null) { if (positionId == null) {
throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室"); throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
} }