From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1，患者过滤状态修改（之前只支持发送之前的过滤，现在支持发送之后的过滤，如果任务发送后，外链不能再打开） 2.在出入院表新增入院申请单字段 3.采集入院数据时，同时要采集importanceFlagCode    emergencyLevelCode 4.外链的发送，也要查询子任务状态，如果是不执行，也不能再发送

---
 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 94aeecc..2617f5d 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -221,6 +221,7 @@
         <result property="futypedesc" column="futypedesc"/>
         <result property="fuadvice" column="fuadvice"/>
         <result property="fuspecialadvice" column="fuspecialadvice"/>
+        <result property="inhospMydFlag" column="inhosp_myd_flag"/>
     </resultMap>
 
     <resultMap type="com.smartor.domain.PatMedOuthosp" id="PatMedOuthospResult">
@@ -654,6 +655,7 @@
         b.leavehospitaldistrictname,
         b.leavehospitaldistrictid,
         b.deptid,
+        b.inhosp_myd_flag,
         b.leaveldeptid
         FROM
         healthy_inhosp b
@@ -880,7 +882,7 @@
         o.check_flag ,
         o.long_task_reason,
         o.opid ,
-        o.vopcode ,
+        o.opcode ,
         o.opdesc,
         o.oplevelcode ,
         o.opleveldesc,
@@ -922,7 +924,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 +935,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