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 1ec41fe6..bc0efb0e 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 @@ -645,7 +645,7 @@ dire.mp3_file, dire.mp4_file FROM nu_biz_directive_order t - INNER JOIN (SELECT DISTINCT sub.serv_start_time + INNER JOIN (SELECT DISTINCT sub.serv_start_time,sub.instruction_id FROM nu_biz_directive_order sub WHERE sub.nu_id = #{entity.nuId} AND ( @@ -656,7 +656,7 @@ AND ( (sub.serv_end_time >= NOW() AND sub.emp_end_time IS NULL) 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 + )) tmp ON t.serv_start_time = tmp.serv_start_time and t.instruction_id = tmp.instruction_id LEFT JOIN nu_config_service_directive dire on t.directive_id = dire.id where t.nu_id = #{entity.nuId} AND (