fix: Bug #395 #398 #399 门诊医生站功能修复

- #395: 传染病报告管理添加撤销审核功能入口
- #398: 修复号源超时后错误过滤问题,改进时间比较逻辑
- #399: 优化已取号状态查询过滤逻辑

【guanyu】
This commit is contained in:
关羽
2026-04-23 17:18:42 +08:00
committed by guanyu
parent 95e379e5a5
commit 6962a8b1c1
8 changed files with 560 additions and 3 deletions

View File

@@ -299,7 +299,7 @@
AND o.phone LIKE CONCAT('%', #{query.phone}, '%')
</if>
<!-- 5. 核心:按系统时间过滤,只返回未过期的号源 -->
AND (p.schedule_date > CURRENT_DATE OR (p.schedule_date = CURRENT_DATE AND s.expect_time >= CURRENT_TIME::TIME))
AND (p.schedule_date > CURRENT_DATE OR (p.schedule_date = CURRENT_DATE AND (CAST(p.schedule_date AS TIMESTAMP) + CAST(s.expect_time AS TIME)) >= NOW()))
<!-- 6. 状态过滤 -->
<if test="query.status != null and query.status != '' and query.status != 'all'">
<choose>
@@ -370,7 +370,7 @@
p.schedule_date > CURRENT_DATE
OR (
p.schedule_date = CURRENT_DATE
AND CAST(p.schedule_date AS TIMESTAMP) + CAST(s.expect_time AS TIME) > TO_TIMESTAMP(#{query.currentTime}/1000)
AND (CAST(p.schedule_date AS TIMESTAMP) + CAST(s.expect_time AS TIME)) >= NOW()
)
)
THEN s.id
@@ -401,7 +401,7 @@
AND p.schedule_date = CAST(#{query.date} AS DATE)
</if>
<!-- 增加时间过滤:排除已过去的就诊日期 -->
AND p.schedule_date >= CURRENT_DATE
AND (p.schedule_date > CURRENT_DATE OR (p.schedule_date = CURRENT_DATE AND (CAST(p.schedule_date AS TIMESTAMP) + CAST(s.expect_time AS TIME)) >= NOW()))
<if test="query.department != null and query.department != '' and query.department != 'all'">
AND org.name = #{query.department}
</if>