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

Fix Bug #401: 门诊完诊审计日志错误：div_log 表中 pool_id 与 slot_id 存值与设计规范不符

Browse Source 
根因：DoctorStationMainAppServiceImpl.completeEncounter() 中获取 pool_id/slot_id 的逻辑有两处缺陷：
1. 当 queueItem 存在但 poolId 或 slotId 为 null 时，else if 分支因 queueItem != null 而跳过，
   导致未进入回退链路，最终 divPoolId 和 divSlotId 均为 null。
   修复：将 else if 拆为独立的 if 判断，确保 queueItem 值缺失时能正确回退。
2. 回退路径中先将 order.getSlotId() 赋给 divSlotId，再查询 ScheduleSlot 获取 poolId。
   若 Slot 查询失败（返回 null），则 divSlotId 有值但 divPoolId 为 null，产生不完整审计记录。
   修复：先查 Slot，成功后同时用 slot.getId() 和 slot.getPoolId() 赋值，保证数据一致性。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
关羽
2026-05-13 14:06:02 +08:00
committed by 赵云
parent da5e1704cf
commit e98901096e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
View File

@@ -307,13 +307,15 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
if (queueItem != null && queueItem.getPoolId() != null && queueItem.getSlotId() != null) {
divPoolId = queueItem.getPoolId();
divSlotId = queueItem.getSlotId();
} else if (encounter.getOrderId() != null) {
}
// 队列项 poolId/slotId 缺失时，通过 encounter.orderId → order_main.slot_id → adm_schedule_slot.pool_id 回退获取
if ((divPoolId == null || divSlotId == null) && encounter.getOrderId() != null) {
try {
Order order = iOrderService.getById(encounter.getOrderId());
if (order != null && order.getSlotId() != null) {
divSlotId = order.getSlotId();
ScheduleSlot slot = scheduleSlotMapper.selectById(divSlotId);
ScheduleSlot slot = scheduleSlotMapper.selectById(order.getSlotId());
if (slot != null) {
divSlotId = slot.getId();
divPoolId = slot.getPoolId();
}
}