From d940590c25d7381ba7bc08b068d223d7aa0b9c77 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 30 四月 2026 20:43:12 +0800
Subject: [PATCH] 南华附一 和 登陆优化
---
ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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..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,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}
@@ -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}
--
Gitblit v1.9.3