From f1abb06ae85954eb9fc5d113d86a900588df0607 Mon Sep 17 00:00:00 2001
From: hejiayang <296714699@qq.com>
Date: Mon, 30 Mar 2026 09:52:55 +0800
Subject: [PATCH] =?UTF-8?q?fix(schedules):=20=E8=A7=A3=E5=86=B3=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E6=8E=92=E7=8F=AD=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 根据时间查询现有排班记录并删除重复数据
- 在保存新排班前清理已存在的相同时间段排班
- 同步删除关联的排班项目记录确保数据一致性
---
 .../impl/EmergencySchedulesNewServiceImpl.java       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencySchedulesNewServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencySchedulesNewServiceImpl.java
index 1783df9..a8b542f 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencySchedulesNewServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/EmergencySchedulesNewServiceImpl.java
@@ -1,6 +1,7 @@
 package com.renkang.emergency.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -177,6 +178,17 @@ public class EmergencySchedulesNewServiceImpl extends MPJBaseServiceImpl<Emergen
             emergencySchedules.setId(StrUtil.isNotEmpty(daySchedules.getSchedulesId()) ? daySchedules.getSchedulesId() : null);
             emergencySchedules.setCenterId(StrUtil.isNotEmpty(dto.getCenterId()) ? dto.getCenterId() : null);
             if (daySchedules.getSchedulesId() == null) {
+                //根据时间查询排班id
+                LambdaQueryWrapper<EmergencySchedules> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(EmergencySchedules::getSchedulesTime, daySchedules.getTime());
+                queryWrapper.eq(EmergencySchedules::getCenterId, dto.getCenterId());
+                queryWrapper.eq(EmergencySchedules::getDelFlag, 0);
+                List<EmergencySchedules> list = this.list(queryWrapper);
+                if(CollectionUtil.isNotEmpty(list)){
+                    Set<String> schedulesIds = list.stream().map(EmergencySchedules::getId).collect(Collectors.toSet());
+                    this.remove(new LambdaQueryWrapper<EmergencySchedules>().in(EmergencySchedules::getId, schedulesIds));
+                    itemService.remove(new LambdaQueryWrapper<EmergencySchedulesItem>().in(EmergencySchedulesItem::getSchedulesId, schedulesIds));
+                }
                 this.save(emergencySchedules);
             }