From f4352f07b481ceafacd70fd5c52e5f5c6d6682b5 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 25 Mar 2026 14:20:22 +0800
Subject: [PATCH] =?UTF-8?q?pad=E7=BC=96=E6=8E=92=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E4=B8=B4=E6=97=B6=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=97=B6=E5=A6=82=E6=9E=9C=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=9C=A8=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4=E5=90=8E6?=
 =?UTF-8?q?=E5=88=865=E7=A7=92=E4=B9=8B=E5=90=8E=20=E5=BD=93=E5=A4=A9?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=20=20=E5=90=A6=E5=88=99=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E5=A4=A9=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plan/care/service/impl/CareDirectivePlanServiceImpl.java | 5 +++--
 1 file changed, 3 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 83a63269..3bbdf3a1 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
@@ -10,6 +10,7 @@ import com.nu.modules.biz.plan.care.service.IDirectivePlanLogService;
 import com.nu.modules.config.directivepackage.service.IDirectivePackageService;
 import com.nu.modules.config.directivepackage.service.impl.DirectivePackageServiceImpl;
 import org.apache.commons.compress.utils.Lists;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.springframework.beans.BeanUtils;
@@ -136,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()) && "1".equals(careDirectivePlan.getOptCount())) {
+        if ("5".equals(careDirectivePlan.getCycleType()) && careDirectivePlan.getOptCount() == null) {
             //临时一次 需要处理 执行时间（定时更新快照任务处理的服务指令最近时间（目前是6分钟） + 5秒） 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
             String startTime = careDirectivePlan.getStartTime(); // 格式：01:55
 
@@ -237,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()) && "1".equals(careDirectivePlan.getOptCount())) {
+        if ("5".equals(careDirectivePlan.getCycleType()) && careDirectivePlan.getOptCount() == null) {
             //临时一次 需要处理 执行时间（定时更新快照任务处理的服务指令最近时间（目前是6分钟） + 5秒） 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
             String startTime = careDirectivePlan.getStartTime(); // 格式：01:55