From 33cb63076c8db2fd26a09bc498e59b25c20a31ac Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 8 Apr 2026 13:29:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3pad=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E5=8D=95=E4=BE=9D=E7=84=B6=E5=B1=95=E7=8E=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 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 (