From b65c4cdd68b72771634fcfd52709edfd77d7abc6 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 07 八月 2026 17:47:43 +0800
Subject: [PATCH] 【景宁】发送方式改执行方式

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

diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index 1e46f20..9489fe5 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -226,7 +226,7 @@
     <resultMap type="com.smartor.domain.PatMedOuthosp" id="PatMedOuthospResult">
         <result property="id" column="id"/>
         <result property="serialnum" column="serialnum"/>
-        <result property="patid" column="patid"/>
+        <result property="patidHis" column="patid"/>
         <result property="hospitalname" column="hospitalname"/>
         <result property="hospitalcode" column="hospitalcode"/>
         <result property="icd10code" column="icd10code"/>
@@ -338,7 +338,7 @@
 
     <resultMap type="com.smartor.domain.PatMedOperation" id="PatMedOperationResult">
         <result property="id" column="id"/>
-        <result property="patid" column="patid"/>
+        <result property="patidHis" column="patid_his"/>
         <result property="patcode" column="patcode"/>
         <result property="paname" column="paname"/>
         <result property="opreqid" column="opreqid"/>
@@ -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"/>
@@ -817,7 +821,7 @@
     <select id="selectOperList" parameterType="com.smartor.domain.PatMedOperation"
             resultMap="PatMedOperationResult">
         select
-        o.patid,
+        o.patid_his,
         o.patcode,
         o.paname,
         o.opreqid,
@@ -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,
@@ -922,7 +930,6 @@
                oi.pguid,
                oi.guid,
                oi.pid,
-               oi.opercheck_flag,
                oi.long_task_reason,
                oi.last_Update_Time
         from HEALTHY_PAT_MED_OPERATION_ITEM oi
@@ -934,10 +941,10 @@
             AND oi.opid = #{opid}
         </if>
         <if test="lastStartTime != null and lastStartTime != ''">
-            and last_Update_Time &gt;= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
+            and oi.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')
+            and oi.last_Update_Time &lt;= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS')
         </if>
     </select>
 </mapper>

--
Gitblit v1.9.3