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'