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 07:24:44 +08:00
parent 81e5fd768a
commit 261663926d
4 changed files with 90 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,35 +1,16 @@
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8"?>
<!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="BaseResultMap" type="com.openhis.application.domain.entity.TriageQueue">
<id column="id" property="id"/>
<result column="patient_name" property="patientName"/>
<result column="patient_id" property="patientId"/>
<result column="dept_id" property="deptId"/>
<result column="status" property="status"/>
<result column="queue_no" property="queueNo"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<!-- 修复 Bug #544：移除 status != 3 过滤，增加时间范围查询条件 -->
<select id="selectQueueList" resultMap="BaseResultMap">
SELECT id, patient_name, patient_id, dept_id, status, queue_no, create_time, update_time
FROM triage_queue
<where>
<if test="deptId != null">
AND dept_id = #{deptId}
</if>
<!-- 原逻辑：AND status != 3 已移除，确保“完诊”状态患者可被检索 -->
<if test="startDate != null">
AND create_time &gt;= #{startDate}
</if>
<if test="endDate != null">
AND create_time &lt;= #{endDate}
</if>
</where>
ORDER BY create_time DESC
<select id="selectQueueList" resultType="com.openhis.application.domain.dto.QueuePatientDto">
SELECT
q.id, q.patient_name, q.queue_no, q.status, q.triage_time, q.visit_time
FROM triage_queue q
WHERE q.dept_code = #{deptCode}
AND q.queue_date BETWEEN #{startDate} AND #{endDate}
<!-- 修复 Bug #544：移除原 AND q.status != 'COMPLETED' 硬编码 -->
<if test="status != null and status != ''">
AND q.status = #{status}
</if>
ORDER BY q.triage_time ASC
</select>
</mapper>