From 6e397c664037b898b5e9d9955da1d953089e679e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 09 六月 2026 17:32:07 +0800
Subject: [PATCH] 【市一】手术随访对接

---
 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index 3e02cfd..94aeecc 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"/>
@@ -626,9 +626,7 @@
         b.patname,
         b.out_way_id,
         b.out_way_name,
-        (CASE WHEN b.inhospstate = '1' THEN '1'
-            WHEN b.inhospstate = '3' THEN '1'
-            ELSE b.inhospstate END) AS inhospstate,
+        b.inhospstate,
         b.patno,
         b.inhospno,
         b.serialnum,
@@ -819,7 +817,7 @@
     <select id="selectOperList" parameterType="com.smartor.domain.PatMedOperation"
             resultMap="PatMedOperationResult">
         select
-        o.patid,
+        o.patid_his,
         o.patcode,
         o.paname,
         o.opreqid,
@@ -885,17 +883,18 @@
         o.vopcode ,
         o.opdesc,
         o.oplevelcode ,
-        o.opleveldesc
+        o.opleveldesc,
+        o.last_Update_Time
         from HEALTHY_PAT_MED_OPERATION o
         where 1=1
         <if test="orgid != null and orgid != ''">
             AND o.orgid = #{orgid}
         </if>
         <if test="lastStartTime != null and lastStartTime != ''">
-            and to_char(o.opreqtime, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
+            and to_char(o.last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
         </if>
         <if test="lastEndTime != null and lastEndTime != ''">
-            and to_char(o.opreqtime, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{lastEndTime}
+            and to_char(o.last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{lastEndTime}
         </if>
     </select>
 
@@ -924,7 +923,8 @@
                oi.guid,
                oi.pid,
                oi.opercheck_flag,
-               oi.long_task_reason
+               oi.long_task_reason,
+               oi.last_Update_Time
         from HEALTHY_PAT_MED_OPERATION_ITEM oi
         where 1=1
         <if test="orgid != null and orgid != ''">
@@ -933,5 +933,11 @@
         <if test="opid != null and opid != ''">
             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')
+        </if>
+        <if test="lastEndTime != null and lastEndTime != ''">
+            and last_Update_Time &lt;= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS')
+        </if>
     </select>
 </mapper>

--
Gitblit v1.9.3