From abae517585ad7ff0038c31339d200712c9684556 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 21 八月 2026 16:07:07 +0800
Subject: [PATCH] 修改市一同步时间范围（实时前1天，补救前5天）

---
 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index 8c814e2..b5c6b71 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -395,6 +395,10 @@
         <result property="deptname" column="deptname"/>
         <result property="hospitaldistrictcode" column="hospitaldistrictcode"/>
         <result property="hospitaldistrictname" column="hospitaldistrictname"/>
+        <result property="leaveldeptcode" column="leaveldeptcode"/>
+        <result property="leaveldeptname" column="leaveldeptname"/>
+        <result property="leavehospitaldistrictcode" column="leavehospitaldistrictcode"/>
+        <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>
         <result property="roomno" column="roomno"/>
         <result property="bedNo" column="bed_no"/>
         <result property="drcode" column="drcode"/>
@@ -681,10 +685,10 @@
             <if test="outWayName != null ">and b.out_way_name = #{outWayName}</if>
             <if test="orgid != null ">and b.orgid = #{orgid}</if>
             <if test="lastStartTime != null and lastStartTime != ''">
-                and last_Update_Time &gt;= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
+                and last_Update_Time &gt;= (to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS') - 1)
             </if>
             <if test="lastEndTime != null and lastEndTime != ''">
-                and last_Update_Time &lt;= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS')
+                and last_Update_Time &lt;= (to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS')  - 1)
             </if>
     </select>
 
@@ -871,6 +875,10 @@
         o.deptname ,
         o.hospitaldistrictcode,
         o.hospitaldistrictname ,
+        o.deptcode as leaveldeptcode,
+        o.deptname as leaveldeptname,
+        o.hospitaldistrictcode as leavehospitaldistrictcode,
+        o.hospitaldistrictname as leavehospitaldistrictname,
         o.roomno  ,
         o.bed_no ,
         o.drcode  ,
@@ -880,7 +888,7 @@
         o.check_flag ,
         o.long_task_reason,
         o.opid ,
-        o.vopcode ,
+        o.opcode ,
         o.opdesc,
         o.oplevelcode ,
         o.opleveldesc,

--
Gitblit v1.9.3