From be738537e87f8e71f22a0b284904ba063c7f8fe3 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 07 一月 2026 15:38:04 +0800
Subject: [PATCH] 【市一】where标签替换

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

diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
index bb424fa..7975eb9 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -366,24 +366,28 @@
     <select id="yhyjsxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserRoleResult">
         select user_id, role_id, orgid
         FROM healthy_user_role
-        <where>
+        where 1=1
+            <if test="orgid != null and orgid != ''">
+                AND orgid = #{orgid}
+            </if>
             <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
-        </where>
     </select>
 
     <select id="yhyksxx" 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>
-            user_id != 'admin'
-            <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
-        </where>
+        where 1=1
+        and user_id != 'admin'
+        <if test="orgid != null and orgid != ''">
+            AND orgid = #{orgid}
+        </if>
+        <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
     </select>
 
 
     <select id="selectPatArchiveList" parameterType="com.smartor.domain.PatArchive" resultMap="PatArchiveResult">
         <include refid="selectPatArchiveVo"/>
-        <where>
+        where 1=1
             <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
             <if test="idcardno != null  and idcardno != ''">and idcardno = #{idcardno}</if>
             <if test="sourcefrom != null ">and sourcefrom = #{sourcefrom}</if>
@@ -422,7 +426,6 @@
             <if test="pageSize != null and pageSize!='' ">and rownum&lt;#{pageSize}</if>
 
 
-        </where>
     </select>
 
 
@@ -495,8 +498,7 @@
 
         FROM
         healthy_inhosp b
-        <where>
-
+        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')
             </if>
@@ -525,7 +527,6 @@
             <if test="lastEndTime != null and lastEndTime != ''">
                 and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{lastEndTime}
             </if>
-        </where>
     </select>
 
 
@@ -552,8 +553,10 @@
         patname,
         mainsuit
         from healthy_outhosp
-        <where>
-
+        where 1=1
+            <if test="orgid != null and orgid != ''">
+                AND orgid = #{orgid}
+            </if>
             <if test="beginTime != null ">
                 and to_char(admitdate, 'YYYY-MM-DD HH24:MI:SS') &gt;= to_char(#{beginTime}, 'YYYY-MM-DD HH24:MI:SS')
             </if>
@@ -566,7 +569,6 @@
             <if test="lastEndTime != null and lastEndTime != ''">
                 and to_char(last_Update_Time, 'YYYY-MM-DD HH24:MI:SS') &lt;= #{lastEndTime}
             </if>
-        </where>
     </select>
 
 
@@ -579,7 +581,7 @@
         icdname,
         icdpym
         from healthy_disease
-        <where>
+        where 1=1
             <if test="icdcode != null  and icdcode != ''">and icdcode = #{icdcode}</if>
             <if test="lastflag != null  and lastflag != ''">and lastflag = #{lastflag}</if>
             <if test="chimedflag != null  and chimedflag != ''">and chimedflag = #{chimedflag}</if>
@@ -590,7 +592,6 @@
             <if test="pid != null ">and pid = #{pid}</if>
             <if test="guid != null  and guid != ''">and guid = #{guid}</if>
             <if test="hisIcdid != null  and hisIcdid != ''">and his_icdid = #{hisIcdid}</if>
-        </where>
     </select>
 
 
@@ -600,7 +601,10 @@
         u.nick_name, u.user_name, u.email,u.id_card, u.avatar,
         u.birthday,u.orgid,u.job_phone,u.phonenumber, u.sex, u.status
         from healthy_user u
-        <where>
+        where 1=1
+            <if test="orgid != null and orgid != ''">
+                AND orgid = #{orgid}
+            </if>
             <if test="userId != null and userId != 0">
                 AND u.user_id = #{userId}
             </if>
@@ -631,7 +635,6 @@
             <if test="phonenumber != null and phonenumber != ''">
                 AND u.phonenumber like concat('%', #{phonenumber}, '%')
             </if>
-        </where>
     </select>
 
     <select id="selectDeptList" parameterType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="SysDeptResult">

--
Gitblit v1.9.3