From 488ceb7d5ee4c04e5610196bc1018410b442cb4c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 15 五月 2026 09:35:03 +0800
Subject: [PATCH] 【市一】Service_Task\Service_SubTask新增院区ID

---
 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index db2f651..bfda1d8 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -198,6 +198,8 @@
         <result property="inhospstate" column="inhospstate"/>
         <result property="deptcheckFlag" column="deptcheck_flag"/>
         <result property="wardcheckFlag" column="wardcheck_flag"/>
+        <result property="inDeptcheckFlag" column="in_deptcheck_flag"/>
+        <result property="inWardcheckFlag" column="in_wardcheck_flag"/>
         <result property="diagcheckFlag" column="diagcheck_flag"/>
         <result property="age" column="age"/>
         <result property="sex" column="sex"/>
@@ -385,6 +387,19 @@
         FROM healthy_user_dept
         where 1=1
         and user_id != 'admin'
+        and dept_type = '1'
+        <if test="orgid != null and orgid != ''">
+            AND orgid = #{orgid}
+        </if>
+        <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
+    </select>
+
+    <select id="yhybfxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult">
+        select user_id , user_code , dept_type ,dept_code,dept_name,deptparent,del_flag,orgid
+        FROM healthy_user_dept
+        where 1=1
+        and user_id != 'admin'
+        and dept_type = '2'
         <if test="orgid != null and orgid != ''">
             AND orgid = #{orgid}
         </if>
@@ -394,7 +409,6 @@
     <select id="yhyyqxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserOrgResult">
         select
             d.orgid as campusid,
-            d.del_flag,
             ud.user_id as user_id,
             ud.orgid as orgid
         FROM healthy_dept d
@@ -406,6 +420,24 @@
         </if>
         <if test="hisUserId != null ">
             AND ud.user_id = #{hisUserId}
+        </if>
+        <if test="campusid != null">
+            AND d.orgid = #{campusid}
+        </if>
+        union all
+        select
+        d.orgid as campusid,
+        udb.user_id as user_id,
+        udb.orgid as orgid
+        FROM healthy_dept d
+        JOIN healthy_user_dept_bf udb ON d.his_dept_id = udb.dept_code
+        where 1=1
+        and udb.user_id != 'admin'
+        <if test="orgid != null and orgid != ''">
+            AND udb.orgid = #{orgid}
+        </if>
+        <if test="hisUserId != null ">
+            AND udb.user_id = #{hisUserId}
         </if>
         <if test="campusid != null">
             AND d.orgid = #{campusid}
@@ -445,10 +477,10 @@
             <if test="filterDrname != null ">and filter_drname = #{filterDrname}</if>
             <if test="filterDrcode != null ">and filter_drcode = #{filterDrcode}</if>
             <if test="lastStartTime != null and lastStartTime != ''">
-                and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
+                and last_Update_Time &gt;= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
             <if test="lastEndTime != null and lastEndTime != ''">
-                and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{lastEndTime}
+                and last_Update_Time &lt;= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
             <if test="pageSize != null and pageSize!='' ">and rownum&lt;#{pageSize}</if>
 
@@ -527,16 +559,16 @@
         healthy_inhosp b
         where 1=1
             <if test="startOutHospTime != null ">
-                and to_char(b.endtime, 'YYYY-MM-DD HH24:MI:SS') &gt;=to_char(#{startOutHospTime},'YYYY-MM-DD HH24:MI:SS')
+                and b.endtime &gt;= #{startOutHospTime}
             </if>
             <if test="endOutHospTime != null ">
-                and to_char(b.endtime, 'YYYY-MM-DD HH24:MI:SS') &lt;= to_char(#{endOutHospTime},'YYYY-MM-DD HH24:MI:SS')
+                and b.endtime &lt;= #{endOutHospTime}
             </if>
             <if test="startInHospTime != null ">
-                and to_char(starttime, 'YYYY-MM-DD HH24:MI:SS') &gt;= to_char(#{startInHospTime},'YYYY-MM-DD HH24:MI:SS')
+                and starttime &gt;= #{startInHospTime}
             </if>
             <if test="endInHospTime != null ">
-                and to_char(starttime, 'YYYY-MM-DD HH24:MI:SS') &lt;=to_char(#{endInHospTime},'YYYY-MM-DD HH24:MI:SS')
+                and starttime &lt;= #{endInHospTime}
             </if>
             <if test="inhospno != null ">and b.inhospno = #{inhospno}</if>
             <if test="fuflag != null ">and b.fuflag = #{fuflag}</if>
@@ -549,10 +581,10 @@
             <if test="outWayName != null ">and b.out_way_name = #{outWayName}</if>
             <if test="orgid != null ">and b.orgid = #{orgid}</if>
             <if test="lastStartTime != null and lastStartTime != ''">
-                and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') >= #{lastStartTime}
+                and last_Update_Time &gt;= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
             <if test="lastEndTime != null and lastEndTime != ''">
-                and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{lastEndTime}
+                and last_Update_Time &lt;= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
     </select>
 
@@ -630,7 +662,7 @@
         from healthy_user u
         where 1=1
             <if test="orgid != null and orgid != ''">
-                AND orgid = #{orgid}
+                AND u.orgid = #{orgid}
             </if>
             <if test="userId != null and userId != 0">
                 AND u.user_id = #{userId}
@@ -682,4 +714,4 @@
 
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3