From ab82132d20559a5d40dcf7fa15743fba7b151d25 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 30 Jan 2026 09:59:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pad=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E4=B8=AD=E8=BF=87=E6=9C=9F=E8=BF=98=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/order/service/impl/DirectiveOrderPadServiceImpl.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java
index dfd775a7..f1f36f2b 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java
@@ -84,6 +84,7 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
         } else if (StringUtils.equals("2", directiveOrderEntity.getWorkType())) {
             queryWrapper.eq("iz_start", "Y");
             queryWrapper.eq("iz_finish", "N");
+            queryWrapper.apply("DATE_ADD(end_time, INTERVAL ifnull(timeout_duration,0) MINUTE) > NOW()");
         } else if (StringUtils.equals("3", directiveOrderEntity.getWorkType())) {
             queryWrapper.eq("iz_start", "Y");
             queryWrapper.eq("iz_finish", "Y");