From cb5b7b173ef14d6b8ac23be92406d8a71bd48f49 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 九月 2026 12:27:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index b5c6b71..89b18cf 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -658,7 +658,8 @@
         b.leavehospitaldistrictname,
         b.leavehospitaldistrictid,
         b.deptid,
-        b.leaveldeptid
+        b.leaveldeptid,
+        b.del_flag
         FROM
         healthy_inhosp b
         where 1=1
@@ -685,10 +686,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') - 1)
+                and last_Update_Time &gt;= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
             <if test="lastEndTime != null and lastEndTime != ''">
-                and last_Update_Time &lt;= (to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS')  - 1)
+                and last_Update_Time &lt;= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
     </select>
 
@@ -826,6 +827,7 @@
         o.paname,
         o.opreqid,
         o.opreqcode,
+        o.canceltime,
         o.opsstatus,
         o.optypecode,
         o.optypename,
@@ -887,7 +889,7 @@
         o.nurse_name ,
         o.check_flag ,
         o.long_task_reason,
-        o.opid ,
+        null as opid ,
         o.opcode ,
         o.opdesc,
         o.oplevelcode ,
@@ -897,6 +899,9 @@
         where 1=1
         <if test="orgid != null and orgid != ''">
             AND o.orgid = #{orgid}
+        </if>
+        <if test="opreqid != null and opreqid != ''">
+            AND o.opreqid = #{opreqid}
         </if>
         <if test="lastStartTime != null and lastStartTime != ''">
             and to_char(o.last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
@@ -910,7 +915,7 @@
             resultMap="PatMedOperationItemResult">
         select
                oi.operationid,
-               oi.opid,
+               null as opid,
                oi.opcode,
                oi.opdesc,
                oi.main_flag,
@@ -940,6 +945,9 @@
         <if test="opid != null and opid != ''">
             AND oi.opid = #{opid}
         </if>
+        <if test="operationid != null and operationid != ''">
+            AND oi.operationid = #{operationid}
+        </if>
         <if test="lastStartTime != null and lastStartTime != ''">
             and oi.last_Update_Time &gt;= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
         </if>

--
Gitblit v1.9.3