From 734b5ea951a85edc5e6410debcd61c0adb6ae9b0 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 08 六月 2026 14:58:55 +0800
Subject: [PATCH] 【市一】目前没有预出院状态，统一改成出院状态

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

diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index 4767c80..3e02cfd 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -626,7 +626,9 @@
         b.patname,
         b.out_way_id,
         b.out_way_name,
-        b.inhospstate,
+        (CASE WHEN b.inhospstate = '1' THEN '1'
+            WHEN b.inhospstate = '3' THEN '1'
+            ELSE b.inhospstate END) AS inhospstate,
         b.patno,
         b.inhospno,
         b.serialnum,
@@ -655,7 +657,6 @@
         b.leavehospitaldistrictid,
         b.deptid,
         b.leaveldeptid
-
         FROM
         healthy_inhosp b
         where 1=1
@@ -885,16 +886,16 @@
         o.opdesc,
         o.oplevelcode ,
         o.opleveldesc
-        from PAT_MED_OPERATION o
+        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.last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
+            and to_char(o.opreqtime, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
         </if>
         <if test="lastEndTime != null and lastEndTime != ''">
-            and to_char(o.last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{lastEndTime}
+            and to_char(o.opreqtime, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{lastEndTime}
         </if>
     </select>
 
@@ -924,19 +925,13 @@
                oi.pid,
                oi.opercheck_flag,
                oi.long_task_reason
-        from PAT_MED_OPERATION_ITEM oi
+        from HEALTHY_PAT_MED_OPERATION_ITEM oi
         where 1=1
         <if test="orgid != null and orgid != ''">
             AND oi.orgid = #{orgid}
         </if>
         <if test="opid != null and opid != ''">
             AND oi.opid = #{opid}
-        </if>
-        <if test="lastStartTime != null and lastStartTime != ''">
-            and to_char(oi.last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
-        </if>
-        <if test="lastEndTime != null and lastEndTime != ''">
-            and to_char(oi.last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{lastEndTime}
         </if>
     </select>
 </mapper>

--
Gitblit v1.9.3