From e83565f512b7b14c4713ab5104e03bb1ced37e42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 21 Jan 2026 17:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=B7=A5=E5=8D=95=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=98=AF=E6=8A=A4=E7=90=86=E5=8D=95=E5=85=83=E5=88=99=E6=B4=BE?=
 =?UTF-8?q?=E5=8D=95nu=E7=8A=B6=E6=80=81=EF=BC=8C=E5=85=B6=E5=AE=83?=
 =?UTF-8?q?=E4=B8=8D=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/biz/order/mapper/xml/DirectiveOrderMapper.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml
index 851f55ca..0e5d507b 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml
@@ -129,8 +129,8 @@
             a.start_time as startTime,
             (case when c.orderly is null then 2 else 1 end) as orderEmp
         from nu_biz_nu_directive_data_pool a
-        inner join nu_base_info b on a.nu_id = b.nu_id and b.del_flag = '0'
-        left join nu_biz_elder_info c on a.nu_id = c.nu_id and c.del_flag = '0'
+        inner join nu_base_info b on a.nu_id = b.nu_id and b.del_flag = '0' and (case when b.area_flag = 1 then b.status = '2' else 1=1 end)
+        left join nu_biz_elder_info c on b.elder_id = c.id and c.del_flag = '0'
         left join view_sys_dict d on a.cycle_type_id = d.item_value and d.dict_code = 'period_type'
         where a.iz_orders = 'N'
         order by a.start_time,orderEmp,a.nu_id
@@ -458,8 +458,8 @@
             iz_package,
             (case when c.orderly is null then 2 else 1 end) as orderEmp
         from ${tableName} m
-        inner join nu_base_info b on m.nu_id = b.nu_id and b.del_flag = '0'
-        left join nu_biz_elder_info c on m.nu_id = c.nu_id and c.del_flag = '0'
+        inner join nu_base_info b on m.nu_id = b.nu_id and b.del_flag = '0' and (case when b.area_flag = 1 then b.status = '2' else 1=1 end)
+        left join nu_biz_elder_info c on b.elder_id = c.id and c.del_flag = '0'
         left join view_sys_dict d on m.cycle_type_id = d.item_value and d.dict_code = 'period_type'
         where m.id = #{id}
         and m.cycle_type_id = '2'