From 5453b0171ad3a1bf874e44c85e7ced328bd1772f Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 31 Mar 2026 10:23:26 +0800
Subject: [PATCH] =?UTF-8?q?pad=E7=BC=96=E6=8E=92=E6=9F=A5=E8=AF=A2sql?=
=?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/xml/CareDirectivePlanMapper.xml | 20 ++-----------------
1 file changed, 2 insertions(+), 18 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 ca5c526a..164964be 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
@@ -282,11 +282,8 @@
p.positioning,
p.positioning_long,
p.tag_name,
- STR_TO_DATE(CONCAT(CURDATE(), ' ', p.start_time), '%Y-%m-%d %H:%i') AS start_time,
- DATE_ADD(
- STR_TO_DATE(CONCAT(CURDATE(), ' ', p.start_time), '%Y-%m-%d %H:%i'),
- INTERVAL CAST(directive.service_duration AS UNSIGNED) MINUTE
- ) AS end_time,
+ ADDTIME(CONCAT(CURDATE(), ' ', p.start_time), '00:00:00') AS start_time,
+ ADDTIME(CONCAT(CURDATE(), ' ', p.start_time), CONCAT('00:', directive.service_duration, ':00')) AS end_time,
p.create_by,
p.create_time,
p.update_by,
@@ -315,20 +312,7 @@
-
- AND CONCAT(DATE_FORMAT(#{dto.queryDate}, '%Y-%m-%d'), ' ', p.start_time, ':00') >= #{dto.queryDate}
-
ORDER BY p.nu_id ASC, p.instruction_tag_id ASC
-
-
-
- , start_time ASC
-
-
- , directive.directive_name ASC
-
-
-