From b96f6e012592dc79aa470f9cd85c134cb3db83bf Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Fri, 9 Jan 2026 10:17:45 +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=8E=A5=E5=8F=A3=20=E7=BB=99=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=95=B0=E6=8D=AE=E5=8A=A0=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=20=E4=BE=BF=E4=BA=8E=E5=89=8D=E7=AB=AF=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../directiveplan/api/CareDirectiveApi.java   | 23 +++++++++++++++++++
 .../com/nu/entity/DirectiveOrderEntity.java   |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java
index 0aff6562..b9df12e2 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java
@@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
 import org.jeecg.common.api.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.text.SimpleDateFormat;
@@ -272,6 +273,28 @@ public class CareDirectiveApi {
             //将来
             future = careDirectivePlanApi.queryFuture(dto);
         }
+
+        //给数据加标识
+        if (!CollectionUtils.isEmpty(history)) {
+            history.stream().forEach(item -> {
+                if ("Y".equals(item.getIzFinish())) {
+                    item.setExecuteStatus("hisOk");
+                } else {
+                    item.setExecuteStatus("hisFaild");
+                }
+            });
+        }
+        if (!CollectionUtils.isEmpty(current)) {
+            current.stream().forEach(item -> {
+                item.setExecuteStatus("current");
+            });
+        }
+        if (!CollectionUtils.isEmpty(future)) {
+            future.stream().forEach(item -> {
+                item.setExecuteStatus("future");
+            });
+        }
+
         //所有
         all.addAll(history);
         all.addAll(current);
diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java
index 3d16226c..51361231 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java
@@ -131,4 +131,7 @@ public class DirectiveOrderEntity implements Serializable {
      * 子表信息
      */
     private List<DirectiveOrderSubEntity> subList;
+
+    // 历史成功hisOk  历史失败hisFaild  正在执行current 待执行future
+    private String executeStatus;
 }