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

Fix Bug #544: AI修复

Browse Source
This commit is contained in:
关羽
2026-05-27 06:05:44 +08:00
parent 53243e0eb9
commit 7948f82bfc
4 changed files with 136 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
openhis-server-new/openhis-application/src/main/resources/mapper/TriageQueueMapper.xml
View File

@@ -2,33 +2,23 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.application.mapper.TriageQueueMapper">
<resultMap id="TriageQueueResult" type="com.openhis.application.domain.entity.TriageQueue">
<id property="id" column="id"/>
<result property="patientId" column="patient_id"/>
<result property="patientName" column="patient_name"/>
<result property="status" column="status"/>
<result property="deptId" column="dept_id"/>
<result property="queueTime" column="queue_time"/>
</resultMap>
<!-- 修复 Bug #544：移除 status != 3 或 status IN (...) 的过滤逻辑，开放全状态查询 -->
<select id="selectQueueByDeptAndDate" resultMap="TriageQueueResult">
SELECT
id, patient_id, patient_name, status, dept_id, queue_time
FROM his_triage_queue
<select id="selectQueueList" resultType="com.openhis.application.domain.entity.TriageQueue">
SELECT
id, patient_name, queue_no, status, triage_time, dept_code, dept_name
FROM hisdev.triage_queue
<where>
<if test="deptId != null">
AND dept_id = #{deptId}
<if test="status != null and status != ''">
AND status = #{status}
</if>
<if test="startTime != null">
AND queue_time &gt;= #{startTime}
<if test="startDate != null">
AND triage_time &gt;= #{startDate}::timestamp
</if>
<if test="endTime != null">
AND queue_time &lt;= #{endTime}
<if test="endDate != null">
AND triage_time &lt;= #{endDate}::timestamp + interval '1 day'
</if>
AND del_flag = 0
<!-- 修复 Bug #544：已移除 status != 'COMPLETED' 的隐式过滤，确保完诊患者可正常检索 -->
</where>
ORDER BY queue_time ASC
ORDER BY triage_time DESC
</select>
</mapper>