From adb8b265ae06098c346b362c7e89c613d795ee91 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Mon, 12 Jan 2026 13:50:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E7=90=86=E7=B1=BB=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=8E=A5=E5=8F=A3=EF=BC=9A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BE=85=E6=89=A7=E8=A1=8C=E6=8C=87=E4=BB=A4=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E6=8C=89=E7=85=A7=E5=BE=85=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E6=97=B6=E9=97=B4=E6=AD=A3=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../care/mapper/xml/CareDirectivePlanMapper.xml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml index 24176648..a560f9c8 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml @@ -226,11 +226,11 @@ CASE WHEN p.iz_package = 'N' THEN p.directive_name ELSE directive_name - END AS directive_name, + END AS directive_name, CASE WHEN p.iz_package = 'Y' THEN p.directive_name ELSE directive_name - END AS package_name, + END AS package_name, p.preview_file, p.net_preview_file, p.preview_file_small, @@ -251,16 +251,18 @@ p.positioning, p.positioning_long, p.tag_name, - STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.start_time), '%Y-%m-%d %H:%i:%s') as start_time, - STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.end_time), '%Y-%m-%d %H:%i:%s') as end_time, + STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.start_time), + '%Y-%m-%d %H:%i:%s') as start_time, + STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.end_time), + '%Y-%m-%d %H:%i:%s') as end_time, p.create_by, p.create_time, p.update_by, p.update_time, p.sys_org_code, p.iz_package, - pd.directive_id AS sub_id, - pd.directive_id AS sub_directive_id + pd.directive_id AS sub_id, + pd.directive_id AS sub_directive_id FROM nu_biz_nu_care_directive_plan p LEFT JOIN nu_config_package_directive pd ON p.directive_id = pd.package_id @@ -323,6 +325,7 @@ ) ) ) - ); + ) + ORDER BY STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.start_time), '%Y-%m-%d %H:%i:%s') ASC