From 9dd748e0352f31b6255be2860c177db0d20ac40e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 21 十月 2025 14:41:35 +0800
Subject: [PATCH] Merge branch 'master' into 0929-master
---
smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index ce7292e..11c69e2 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -519,7 +519,7 @@
</if>
</where>
order by a.update_time desc
- <if test="pn != null and ps != null"> limit ${pn},${ps} </if>
+ <if test="pn != null and ps != null">limit ${pn},${ps}</if>
</select>
@@ -660,8 +660,9 @@
AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
</if>
</where>
- order by a.update_time desc
- <if test="pn != null and ps != null"> limit ${pn},${ps} </if>
+ -- order by a.update_time desc
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
+
</select>
<select id="selectPatArchiveInfoByOuthosp" parameterType="com.smartor.domain.PatArchiveReq"
@@ -751,8 +752,8 @@
AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
</if>
</where>
- order by a.update_time desc
- <if test="pn != null and ps != null"> limit ${pn},${ps} </if>
+ -- order by a.update_time desc
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
<select id="selectPatArchiveInfoByPhysical" parameterType="com.smartor.domain.PatArchiveReq"
@@ -844,8 +845,8 @@
AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
</if>
</where>
- order by a.update_time desc
- <if test="pn != null and ps != null"> limit ${pn},${ps} </if>
+ -- order by a.update_time desc
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
<select id="selectPatArchiveInfoByInhospQC" parameterType="com.smartor.domain.PatArchiveReq"
@@ -939,8 +940,8 @@
<if test="drcode != null">
AND d.drcode = #{drcode}
</if>
- <if test="cry != null and cry == 0 ">and d.endtime is null</if>
- <if test="cry != null and cry == 1 ">and d.endtime is not null</if>
+ <if test="allhosp != null and allhosp == 1 ">and d.endtime is null</if>
+ <if test="allhosp != null and allhosp == 4 ">and d.endtime is not null</if>
<if test="visitno != null and visitno != ''">
AND d.inhospno = #{visitno}
</if>
@@ -989,8 +990,8 @@
AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
</if>
</where>
- order by a.id,a.update_time desc ) as tmp order by endtime desc
- <if test="pn != null and ps != null"> limit ${pn},${ps} </if>
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
+ ) as tmp
</select>
<select id="selectPatArchiveInfoByOuthospQC" parameterType="com.smartor.domain.PatArchiveReq"
@@ -1084,7 +1085,7 @@
AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
</if>
</where>
- order by a.update_time desc
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
<select id="selectPatArchiveInfoByPhysicalQC" parameterType="com.smartor.domain.PatArchiveReq"
@@ -1176,6 +1177,7 @@
AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
</if>
</where>
- order by a.update_time desc
+ -- order by a.update_time desc
+ <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
</select>
</mapper>
--
Gitblit v1.9.3