From b1e21a107469d2759845f800c037d741c0554f07 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 11 九月 2026 11:45:46 +0800
Subject: [PATCH] 【市一】同步数据

---
 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml |   24 ++++++++++++++++++++----
 1 files changed, 20 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 8c814e2..89b18cf 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"/>
@@ -654,7 +658,8 @@
         b.leavehospitaldistrictname,
         b.leavehospitaldistrictid,
         b.deptid,
-        b.leaveldeptid
+        b.leaveldeptid,
+        b.del_flag
         FROM
         healthy_inhosp b
         where 1=1
@@ -822,6 +827,7 @@
         o.paname,
         o.opreqid,
         o.opreqcode,
+        o.canceltime,
         o.opsstatus,
         o.optypecode,
         o.optypename,
@@ -871,6 +877,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  ,
@@ -879,8 +889,8 @@
         o.nurse_name ,
         o.check_flag ,
         o.long_task_reason,
-        o.opid ,
-        o.vopcode ,
+        null as opid ,
+        o.opcode ,
         o.opdesc,
         o.oplevelcode ,
         o.opleveldesc,
@@ -889,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}
@@ -902,7 +915,7 @@
             resultMap="PatMedOperationItemResult">
         select
                oi.operationid,
-               oi.opid,
+               null as opid,
                oi.opcode,
                oi.opdesc,
                oi.main_flag,
@@ -932,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