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 
根因分析：
1. 候选池API（getCurrentDayEncounter）未返回 poolId/slotId 字段，导致护士从候选池
   添加患者到队列时 poolId/slotId 始终为 null
2. triage_queue_item 中 pool_id/slot_id 为 null 后，完诊时 div_log 也写入 null 值
3. 医生站完诊和护士站完诊各自独立写入 div_log，导致同一患者产生两条 COMPLETE 记录

修复方案：
1. CurrentDayEncounterTencentDto 新增 poolId/slotId 字段
2. TencentAppMapper.xml 通过 encounter.order_id → order_main.slot_id →
   adm_schedule_slot.pool_id 链路获取正确的号源信息
3. DoctorStationMainAppServiceImpl 增加防重复逻辑：队列项已为 COMPLETED 状态时
   不再重复写入 div_log（说明护士站已处理过）

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
关羽
2026-05-13 23:27:00 +08:00
parent 49df72121f
commit 96102e8b64
3 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -343,19 +343,24 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
}
// 写入 div_log 审计日志（独立于队列项，确保每次完诊都生成记录）
try {
LoginUser loginUser = SecurityUtils.getLoginUser();
DivLog divLog = new DivLog()
.setPoolId(divPoolId)
.setSlotId(divSlotId)
.setOpUserId(loginUser != null ? loginUser.getUserId() : null)
.setAction("COMPLETE")
.setCreateTime(LocalDateTime.now())
.setUpdateAt(LocalDateTime.now())
.setCreatedAt(LocalDateTime.now());
divLogService.save(divLog);
} catch (Exception e) {
log.error("写入div_log审计日志失败", e);
// 防重复：若队列项已是 COMPLETED 状态，说明护士站已处理过并写过分诊日志，不再重复写入
boolean queueAlreadyCompleted = queueItem != null
&& TriageQueueStatus.COMPLETED.getValue().equals(queueItem.getStatus());
if (!queueAlreadyCompleted) {
try {
LoginUser loginUser = SecurityUtils.getLoginUser();
DivLog divLog = new DivLog()
.setPoolId(divPoolId)
.setSlotId(divSlotId)
.setOpUserId(loginUser != null ? loginUser.getUserId() : null)
.setAction("COMPLETE")
.setCreateTime(LocalDateTime.now())
.setUpdateAt(LocalDateTime.now())
.setCreatedAt(LocalDateTime.now());
divLogService.save(divLog);
} catch (Exception e) {
log.error("写入div_log审计日志失败", e);
}
}
// 4. 更新状态、完成时间以及初复诊标识

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/CurrentDayEncounterTencentDto.java
View File

@@ -138,4 +138,12 @@ public class CurrentDayEncounterTencentDto {
*/
private String englishName;
/** 号源池ID（用于分诊队列 div_log 审计日志） */
@JsonSerialize(using = ToStringSerializer.class)
private Long poolId;
/** 号源槽位ID（用于分诊队列 div_log 审计日志） */
@JsonSerialize(using = ToStringSerializer.class)
private Long slotId;
}

10
openhis-server-new/openhis-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml
View File

@@ -27,7 +27,9 @@
T9.payment_id,
T9.picture_url,
T9.birth_date,
t9.english_name
t9.english_name,
t9.slot_id,
t9.pool_id
from (
SELECT T1.tenant_id AS tenant_id,
T1.id AS encounter_id,
@@ -51,7 +53,9 @@
T13.id AS payment_id,
ai.picture_url AS picture_url,
T8.birth_date AS birth_date,
tx.staff_english_name AS english_name
tx.staff_english_name AS english_name,
om_slot.slot_id AS slot_id,
om_slot.pool_id AS pool_id
FROM adm_encounter AS T1
LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0'
@@ -91,6 +95,8 @@
AND T13.status_enum = ${paymentStatus}
LEFT JOIN adm_invoice AS ai
ON ai.reconciliation_id = T13.id AND ai.delete_flag = '0'
LEFT JOIN order_main AS om ON T1.order_id = om.id AND om.delete_flag = '0'
LEFT JOIN adm_schedule_slot AS om_slot ON om.slot_id = om_slot.id
WHERE T1.delete_flag = '0'
AND T1.class_enum = #{classEnum}
AND T10.context_enum = #{register}