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

---
 .../care/service/impl/CareDirectivePlanServiceImpl.java    | 7 +++++--
 1 file changed, 5 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 1c745358..9bb6d6e0 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
@@ -9,6 +9,7 @@ import com.nu.modules.biz.plan.care.service.IDirectivePlanChangeStatusService;
 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 lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
@@ -26,6 +27,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.util.CollectionUtils;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -36,6 +38,7 @@ import java.util.stream.Collectors;
  * @Version: V1.0
  */
 @Service
+@Slf4j
 public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanMapper, CareDirectivePlan> implements ICareDirectivePlanService, ICareDirectivePlanApi {
 
     @Autowired
@@ -137,7 +140,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()) && StringUtils.isBlank(careDirectivePlan.getCycleValue())) {
+        if ("5".equals(careDirectivePlan.getCycleTypeId()) && StringUtils.isBlank(careDirectivePlan.getCycleValue())) {
             //临时一次 需要处理 执行时间（定时更新快照任务处理的服务指令最近时间（目前是6分钟） + 5秒） 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
             String startTime = careDirectivePlan.getStartTime(); // 格式：01:55
 
@@ -238,7 +241,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()) && StringUtils.isBlank(careDirectivePlan.getCycleValue())) {
+        if ("5".equals(careDirectivePlan.getCycleTypeId()) && StringUtils.isBlank(careDirectivePlan.getCycleValue())) {
             //临时一次 需要处理 执行时间（定时更新快照任务处理的服务指令最近时间（目前是6分钟） + 5秒） 如果当前时间比startTime+执行时间早 则今天执行 否则明天执行
             String startTime = careDirectivePlan.getStartTime(); // 格式：01:55