From 39202e34aee9b13ee74e6c020ff466662a7e5df5 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 13 Jan 2026 14:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nu/modules/pad/employee/api/EmployeeApi.java    | 2 +-
 .../nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml | 5 ++---
 .../biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml     | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/employee/api/EmployeeApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/employee/api/EmployeeApi.java
index 863a1c7f..f9a8fcd4 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/pad/employee/api/EmployeeApi.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/employee/api/EmployeeApi.java
@@ -26,7 +26,7 @@ public class EmployeeApi {
      * @return
      */
     @GetMapping("/queryEmpList")
-    public Result<List<EmployeesInfoEntity>> queryEmpList() {
+    public Result<List<EmployeesInfoEntity>> queryEmpList(EmployeesInfoEntity dto) {
         return Result.OK(employeesInfoApi.queryEmpList());
     }
 
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 ac871413..65e26606 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
@@ -398,8 +398,7 @@
                 <![CDATA[
                         AND (
                             (DATE(o.start_time) = DATE(#{dto.queryDate}) AND o.end_time < NOW())
-                            OR
-                            (DATE(o.start_time) = DATE(#{dto.queryDate}) AND o.start_time < NOW() AND o.iz_finish = 'Y')
+
                         )
                     ]]>
             </when>
@@ -418,7 +417,7 @@
         <include refid="baseSelect"/>
 
         <![CDATA[
-                AND (DATE(o.start_time) = DATE(now()) AND o.start_time <= now() AND now() <= o.end_time AND o.iz_finish = 'N')
+                AND (DATE(o.start_time) = DATE(now()) AND o.start_time <= now() AND now() <= o.end_time )
             ]]>
 
         <include refid="commonConditions"/>
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 a560f9c8..7a5c9cb1 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
@@ -326,6 +326,7 @@
                                 )
                     )
             )
+          AND STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.start_time), '%Y-%m-%d %H:%i:%s') > NOW()
         ORDER BY STR_TO_DATE(CONCAT(DATE_FORMAT(CURDATE(), '%Y-%m-%d'), ' ', p.start_time), '%Y-%m-%d %H:%i:%s') ASC
     </select>
 </mapper>