From e5c6f7089e843f9ea59e11abe631f2adfc4e727f Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Tue, 13 Jan 2026 13:23:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E4=BB=A4=E9=A2=84=E8=A7=88-=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=9A=84=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E7=BB=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../directiveplan/api/CareDirectiveApi.java | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) 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 ebe9fa94..eadb212a 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 @@ -285,10 +285,29 @@ public class CareDirectiveApi { //给数据加标识 if (!CollectionUtils.isEmpty(history)) { history.stream().forEach(item -> { - if ("Y".equals(item.getIzFinish())) { - item.setExecuteStatus("hisOk"); - } else { - item.setExecuteStatus("hisFaild"); + if("N".equals(item.getIzStart())) { + //未开始 + item.setExecuteStatus("hisUnExe"); + }else{ + //判断是否超时 + //如果izStrart = 'Y' && beginTime > （endTime + 容错时长） 也是超时 +// { +// //如果没点结束 +// if("N".equals(item.getIzFinish())){ +// //todo 超时 （beginTime + serviceDura + 容错时长） > now() +// } +// } + + + + //已开始 + if ("Y".equals(item.getIzTimeout())) { + //超时 + item.setExecuteStatus("hisTimeOut"); + }else{ + //未超时 + item.setExecuteStatus("hisOk"); + } } }); }