From 25a0ba7b2706db3c5ee546da3e0e7c909777b890 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 29 七月 2026 15:37:32 +0800
Subject: [PATCH] 1,患者过滤状态修改(之前只支持发送之前的过滤,现在支持发送之后的过滤,如果任务发送后,外链不能再打开) 2.在出入院表新增入院申请单字段 3.采集入院数据时,同时要采集importanceFlagCode    emergencyLevelCode 4.外链的发送,也要查询子任务状态,如果是不执行,也不能再发送

---
 ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
index 1efe6f1..ed3a343 100644
--- a/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/EquipmentinfoMapper.xml
@@ -27,7 +27,10 @@
 
     <select id="selectEquipmentinfoList" parameterType="Equipmentinfo" resultMap="EquipmentinfoResult">
         <include refid="selectEquipmentinfoVo"/>
-        <where>  
+        where 1=1
+            <if test="orgid != null and orgid != ''">
+                AND orgid = #{orgid}
+            </if>
             <if test="devtype != null "> and devtype = #{devtype}</if>
             <if test="equipmentname != null  and equipmentname != ''"> and equipmentname like concat('%', #{equipmentname}, '%')</if>
             <if test="modnum != null  and modnum != ''"> and modnum = #{modnum}</if>
@@ -40,7 +43,6 @@
             <if test="storePlace != null  and storePlace != ''"> and storePlace = #{storePlace}</if>
             <if test="technData != null  and technData != ''"> and technData = #{technData}</if>
             <if test="statusid != null "> and statusid = #{statusid}</if>
-        </where>
     </select>
     
     <select id="selectEquipmentinfoById" parameterType="Long" resultMap="EquipmentinfoResult">

--
Gitblit v1.9.3