From a7f132bc723df88c95b469260eb79ac247463442 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期四, 25 九月 2025 19:00:57 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml index ad372ef..bb424fa 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml @@ -394,7 +394,7 @@ <if test="uploadTime != null ">and upload_time = #{uploadTime}</if> <if test="viptype != null ">and viptype = #{viptype}</if> <if test="pattype != null ">and pattype = #{pattype}</if> - <if test="patientno != null ">and patientno = #{patientno}</if> + <if test="patientno != null ">and patientno = #{patientno} </if> <if test="patidHis != null ">and patid_his = #{patidHis}</if> <if test="sdFlag != null ">and sd_flag = #{sdFlag}</if> <if test="ageUnit != null ">and age_unit = #{ageUnit}</if> @@ -419,6 +419,9 @@ <if test="lastEndTime != null and lastEndTime != ''"> and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') <= #{lastEndTime} </if> + <if test="pageSize != null and pageSize!='' ">and rownum<#{pageSize}</if> + + </where> </select> -- Gitblit v1.9.3