From da026a34bcc97b2eb49607a3b02d94d8f683f997 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 07 一月 2026 16:18:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml |   31 ++++++++++++-------------------
 1 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml
index ac28143..3a197f4 100644
--- a/smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/HNGatherPatArchiveMapper.xml
@@ -367,25 +367,25 @@
     <select id="yhyjsxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserRoleResult">
         select user_id, role_id, orgid
         FROM yhyjsxx
-        <where>
-            <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
-        </where>
+        where 1=1
+        <if test="hisUserId != null ">
+            and user_id = #{hisUserId}
+        </if>
     </select>
 
     <select id="yhyksxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult">
         select user_id, user_code, dept_type,department_id as
         dept_id,dept_name,deptparent,del_flag,orgid,create_time,create_by,update_time,update_by
         FROM yhyksxx
-        <where>
-            user_id != 'admin'
+        where 1=1
+            and user_id != 'admin'
             <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
-        </where>
     </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>
@@ -415,7 +415,6 @@
             <if test="casePersonAge != null ">and case_person_age = #{casePersonAge}</if>
             <if test="filterDrname != null ">and filter_drname = #{filterDrname}</if>
             <if test="filterDrcode != null ">and filter_drcode = #{filterDrcode}</if>
-        </where>
     </select>
 
 
@@ -494,8 +493,7 @@
         b.fuadvice
         FROM
         cryxx b
-        <where>
-
+        where 1=1
             <if test="startOutHospTime != null ">and to_char(b.endtime,'YYMMDD') &gt;=
                 to_char(#{startOutHospTime}::date,'YYMMDD')
             </if>
@@ -518,7 +516,6 @@
             <if test="outWayId != null ">and b.out_way_id = #{outWayId}</if>
             <if test="outWayName != null ">and b.out_way_name = #{outWayName}</if>
             <if test="orgid != null ">and b.orgid = #{orgid}</if>
-        </where>
     </select>
 
 
@@ -552,8 +549,7 @@
         patname,
         mainsuit
         from mzxx
-        <where>
-
+        where 1=1
             <if test="beginTime != null ">and to_char( admitdate,'YYMMDD') &gt;=
                 to_char(#{beginTime}::date,'YYMMDD')
             </if>
@@ -561,7 +557,6 @@
                 to_char(#{endTime}::date,'YYMMDD')
             </if>
 
-        </where>
     </select>
 
 
@@ -574,7 +569,7 @@
         icdname,
         icdpym
         from jbxx
-        <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>
@@ -585,7 +580,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>
 
 
@@ -596,7 +590,7 @@
         u.birthday,u.orgid,u.job_phone,u.phonenumber, u.sex, u.status,
         u.login_ip, u.login_date, u.create_by, u.create_time, u.remark
         from ryxx u
-        <where>
+        where 1=1
             <if test="userId != null and userId != 0">
                 AND u.user_id = #{userId}
             </if>
@@ -627,7 +621,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">
@@ -645,7 +638,7 @@
                d.create_time,
                d.his_dept_id,
                d.his_parent_id
-        FROM bmxx d
+        FROM HEALTHY_DEPT d
 
     </select>
 </mapper>

--
Gitblit v1.9.3