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 9c377933..1ec41fe6 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 @@ -658,6 +658,12 @@ OR (sub.emp_start_time IS NOT NULL AND sub.emp_end_time IS NULL) )) tmp ON t.serv_start_time = tmp.serv_start_time LEFT JOIN nu_config_service_directive dire on t.directive_id = dire.id + where t.nu_id = #{entity.nuId} + AND ( + (t.employee_ids IS NOT NULL AND + SUBSTRING_INDEX(t.employee_ids, ',', 1) = #{entity.employeeId}) + OR (t.employee_ids IS NULL AND t.employee_id = #{entity.employeeId}) + ) ORDER BY t.serv_start_time ASC, CASE WHEN t.service_attribute = 'ds' THEN 0 ELSE 1 END, CASE