From edacaf3cf8d5115dc2fe691879246ed7dd2dbfb8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 06 五月 2026 11:38:50 +0800
Subject: [PATCH] 【丽水】手术随访合并

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

diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index ded67a3..ed32dc8 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,7 @@
         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>
@@ -393,9 +396,10 @@
 
     <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_bf
+        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>

--
Gitblit v1.9.3