From 9db295a6e2a7be9ab74e23d3fcf002086cc5713e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 04 九月 2026 16:43:51 +0800
Subject: [PATCH] 【市一】处理市一同步

---
 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml |    9 +++++----
 1 files changed, 5 insertions(+), 4 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..c88cd19 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -685,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') - 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 +826,7 @@
         o.paname,
         o.opreqid,
         o.opreqcode,
+        o.canceltime,
         o.opsstatus,
         o.optypecode,
         o.optypename,
@@ -887,7 +888,7 @@
         o.nurse_name ,
         o.check_flag ,
         o.long_task_reason,
-        o.opid ,
+        null as opid ,
         o.opcode ,
         o.opdesc,
         o.oplevelcode ,
@@ -910,7 +911,7 @@
             resultMap="PatMedOperationItemResult">
         select
                oi.operationid,
-               oi.opid,
+               null as opid,
                oi.opcode,
                oi.opdesc,
                oi.main_flag,

--
Gitblit v1.9.3