From 7191c6d38f03f2e1baf39f959227ce9c038e4e96 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 十一月 2026 14:39:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into smartor_ls_261012

---
 ruoyi-patarchive/src/main/resources/mapper/patarchive/PatArchiveMapper.xml |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/ruoyi-patarchive/src/main/resources/mapper/patarchive/PatArchiveMapper.xml b/ruoyi-patarchive/src/main/resources/mapper/patarchive/PatArchiveMapper.xml
index 2f038f0..adbce7a 100644
--- a/ruoyi-patarchive/src/main/resources/mapper/patarchive/PatArchiveMapper.xml
+++ b/ruoyi-patarchive/src/main/resources/mapper/patarchive/PatArchiveMapper.xml
@@ -214,6 +214,12 @@
             <if test="casePersonAge != null ">and case_person_age = #{casePersonAge}</if>
             <if test="filterDrname != null ">and filter_drname = #{filterDrname}</if>
             <if test="filterDrcode != null ">and filter_drcode = #{filterDrcode}</if>
+            <if test="createTimeStart != null">
+                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{createTimeStart},'%y%m%d')
+            </if>
+            <if test="createTimeEnd != null">
+                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{createTimeEnd},'%y%m%d ')
+            </if>
         <if test="pageSize != null  and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if>
     </select>
 
@@ -262,6 +268,12 @@
             <if test="idcardno != null  and idcardno != ''">and idcardno = #{idcardno}</if>
             <if test="telcode != null  and telcode != ''">and telcode = #{telcode}</if>
             <if test="campusid != null  and campusid != ''">and campusid = #{campusid}</if>
+            <if test="createTimeStart != null">
+                AND date_format(a.create_time,'%y%m%d') &gt;= date_format(#{createTimeStart},'%y%m%d')
+            </if>
+            <if test="createTimeEnd != null">
+                AND date_format(a.create_time,'%y%m%d') &lt;= date_format(#{createTimeEnd},'%y%m%d ')
+            </if>
             <if test="tagIds != null  and tagIds != ''">and c.tagid in
                 <foreach collection="tagIds" item="tagId" open="(" separator="," close=")">
                     #{tagId}
@@ -272,6 +284,14 @@
     <select id="selectPatArchiveByPatid" parameterType="Long" resultMap="PatArchiveResult">
         <include refid="selectPatArchiveVo"/>
         where id = #{id} and del_flag=0
+    </select>
+
+    <!-- 涓茶鍖栧悓涓�鎮ｈ�呯殑浜哄伐闅忚鍒涘缓锛岄伩鍏嶅苟鍙戦噸澶嶆牎楠屽け鏁� -->
+    <select id="lockPatArchiveByPatid" resultType="java.lang.Long">
+        select id
+        from pat_archive
+        where id = #{patid} and del_flag = 0
+        for update
     </select>
 
     <select id="selectPatArchiveByPatnos" resultMap="PatArchiveResult">
@@ -543,6 +563,12 @@
                     #{tagId}
                 </foreach>
             </if>
+            <if test="createTimeStart != null">
+                AND date_format(a.create_time,'%y%m%d') &gt;= date_format(#{createTimeStart},'%y%m%d')
+            </if>
+            <if test="createTimeEnd != null">
+                AND date_format(a.create_time,'%y%m%d') &lt;= date_format(#{createTimeEnd},'%y%m%d ')
+            </if>
         order by a.update_time desc
         <if test="pn != null  and ps != null">limit ${pn},${ps}</if>
 
@@ -777,6 +803,12 @@
                     #{pid}
                 </foreach>
             </if>
+            <if test="createTimeStart != null">
+                AND date_format(a.create_time,'%y%m%d') &gt;= date_format(#{createTimeStart},'%y%m%d')
+            </if>
+            <if test="createTimeEnd != null">
+                AND date_format(a.create_time,'%y%m%d') &lt;= date_format(#{createTimeEnd},'%y%m%d ')
+            </if>
             <if test="isFilter == true">
                 AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
             </if>
@@ -868,6 +900,12 @@
                     #{pid}
                 </foreach>
             </if>
+            <if test="createTimeStart != null">
+                AND date_format(a.create_time,'%y%m%d') &gt;= date_format(#{createTimeStart},'%y%m%d')
+            </if>
+            <if test="createTimeEnd != null">
+                AND date_format(a.create_time,'%y%m%d') &lt;= date_format(#{createTimeEnd},'%y%m%d ')
+            </if>
             <if test="isFilter == true">
                 AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
             </if>
@@ -945,6 +983,12 @@
             <if test="pid != null  and pid != ''">and a.id = #{pid}</if>
             <if test="telcode != null  and telcode != ''">and a.telcode = #{telcode}</if>
             <if test="notrequiredFlag != null  and notrequiredFlag != ''">and a.notrequired_flag = #{notrequiredFlag}
+            </if>
+            <if test="createTimeStart != null">
+                AND date_format(a.create_time,'%y%m%d') &gt;= date_format(#{createTimeStart},'%y%m%d')
+            </if>
+            <if test="createTimeEnd != null">
+                AND date_format(a.create_time,'%y%m%d') &lt;= date_format(#{createTimeEnd},'%y%m%d ')
             </if>
             <if test="hospitalname != null and hospitalname != ''">
                 AND d.hospitalname = #{hospitalname}
@@ -1195,6 +1239,12 @@
                     #{pid}
                 </foreach>
             </if>
+            <if test="createTimeStart != null">
+                AND date_format(a.create_time,'%y%m%d') &gt;= date_format(#{createTimeStart},'%y%m%d')
+            </if>
+            <if test="createTimeEnd != null">
+                AND date_format(a.create_time,'%y%m%d') &lt;= date_format(#{createTimeEnd},'%y%m%d ')
+            </if>
             <if test="isFilter == true">
                 AND NOT exists ( SELECT 1 FROM pat_filterlist f where d.patid=f.patid)
             </if>

--
Gitblit v1.9.3