From f88e81caa8c3fdab0d7b5898df6c7b34cfc73380 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 25 Mar 2026 14:43:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=A9=E9=98=B5=E7=BC=96=E6=8E=92=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E4=B8=80=E6=AC=A1=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/care/service/impl/CareDirectivePlanServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java
index 3bbdf3a1..1c745358 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/service/impl/CareDirectivePlanServiceImpl.java
@@ -137,7 +137,7 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
     public CareDirectiveEntity addDirective(CareDirectiveEntity careDirectiveEntity) {
         CareDirectivePlan careDirectivePlan = new CareDirectivePlan();
         BeanUtils.copyProperties(careDirectiveEntity, careDirectivePlan);
-        if ("5".equals(careDirectivePlan.getCycleType()) && careDirectivePlan.getOptCount() == null) {
+        if ("5".equals(careDirectivePlan.getCycleType()) && StringUtils.isBlank(careDirectivePlan.getCycleValue())) {
             //临时一次 需要处理 执行时间（定时更新快照任务处理的服务指令最近时间（目前是6分钟） + 5秒） 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
             String startTime = careDirectivePlan.getStartTime(); // 格式：01:55
 
@@ -238,7 +238,7 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
         BeanUtils.copyProperties(careDirectiveEntity, careDirectivePlan);
         CareDirectivePlan entity = baseMapper.selectById(careDirectiveEntity.getId());
         baseMapper.deleteByIdPhysic(careDirectiveEntity.getId());
-        if ("5".equals(careDirectivePlan.getCycleType()) && careDirectivePlan.getOptCount() == null) {
+        if ("5".equals(careDirectivePlan.getCycleType()) && StringUtils.isBlank(careDirectivePlan.getCycleValue())) {
             //临时一次 需要处理 执行时间（定时更新快照任务处理的服务指令最近时间（目前是6分钟） + 5秒） 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
             String startTime = careDirectivePlan.getStartTime(); // 格式：01:55