diff --git a/Src/Dlhis.Basic/Device/EventBusHandler/CancelDuplicationTaskHandler.cs b/Src/Dlhis.Basic/Device/EventBusHandler/CancelDuplicationTaskHandler.cs
index 43c096dc..3a00b25e 100644
--- a/Src/Dlhis.Basic/Device/EventBusHandler/CancelDuplicationTaskHandler.cs
+++ b/Src/Dlhis.Basic/Device/EventBusHandler/CancelDuplicationTaskHandler.cs
@@ -64,34 +64,48 @@ public class CancelDuplicationTaskHandler : IAsyncChannelHandler<CancelDuplicati
                                                     .Where(x => x.Status == DeviceTaskStatusEnumType.Wait)
                                                     .Where(x => x.Id != item.Id)
                                                     .Select(x => new IdVersion { Id = x.Id, Version = x.Version }).ToList();
-
-                                ignoreData.ForEach(p =>
-                                {
-                                    where = where.Or(x => x.Id == p.Id && x.Version == p.Version && x.Status == DeviceTaskStatusEnumType.Wait);
-                                });
                             }
+                            //最新一条删除人员信息
                             else if (item.Type == DeviceTaskEnumType.Delete && item.Status == DeviceTaskStatusEnumType.Wait)
                             {
-                                ignoreData = data.Where(x => (x.Type == DeviceTaskEnumType.Add || x.Type == DeviceTaskEnumType.Delete))
-                                                    .Where(x => x.Status == DeviceTaskStatusEnumType.Wait)
-                                                    .Where(x => x.Id != item.Id)
-                                                    .Select(x => new IdVersion { Id = x.Id, Version = x.Version }).ToList();
-
-                                ignoreData.ForEach(p =>
+                                //判断是否成功
+                                if (await db.Queryable<DeviceTaskEntity>().Where(x => x.UserNo == item.UserNo)
+                                    .Where(x => x.DeviceUniqueNo == item.DeviceUniqueNo)
+                                    .Where(x => x.TenantId == item.TenantId).Where(x => x.Status == DeviceTaskStatusEnumType.Success).AnyAsync())
                                 {
-                                    where = where.Or(x => x.Id == p.Id && x.Version == p.Version && x.Status == DeviceTaskStatusEnumType.Wait);
-                                });
+                                    var beforeTask = data.Where(x => x.Type == DeviceTaskEnumType.Add || x.Type == DeviceTaskEnumType.Update)
+                                          .Select(x => new IdVersion { Id = x.Id, Version = x.Version })
+                                          .FirstOrDefault(x => x.Id != item.Id);
+
+                                    if (beforeTask != null) ignoreData.Add(beforeTask);
+
+                                }
+                                else
+                                {
+                                    ignoreData.AddRange(data.Where(x => x.Type == DeviceTaskEnumType.Add
+                                                        || x.Type == DeviceTaskEnumType.Delete
+                                                        || x.Type == DeviceTaskEnumType.Update)
+                                                        .Where(x => x.Status == DeviceTaskStatusEnumType.Wait)
+                                                        .Where(x => x.Id != item.Id)
+                                                        .Select(x => new IdVersion { Id = x.Id, Version = x.Version })
+                                    );
+                                }
                             }
 
                             if (ignoreData.Any())
                             {
+                                ignoreData.ForEach(p =>
+                                {
+                                    where = where.Or(x => x.Id == p.Id && x.Version == p.Version && x.Status == DeviceTaskStatusEnumType.Wait);
+                                });
+
                                 await db.Updateable<DeviceTaskEntity>()
-                                                                     .SetColumns(x => x.Version == x.Version + 1)
-                                                                     .SetColumns(x => x.Status == DeviceTaskStatusEnumType.Cancel)
-                                                                     .SetColumns(x => x.CancellationId == item.Id)
-                                                                     .SetColumns(x => x.ModifiedTime == DateTime.Now)
-                                                                     .Where(where)
-                                                                     .ExecuteCommandAsync();
+                                        .SetColumns(x => x.Version == x.Version + 1)
+                                        .SetColumns(x => x.Status == DeviceTaskStatusEnumType.Cancel)
+                                        .SetColumns(x => x.CancellationId == item.Id)
+                                        .SetColumns(x => x.ModifiedTime == DateTime.Now)
+                                        .Where(where)
+                                        .ExecuteCommandAsync();
 
                                 data.ForEach(x =>
                                 {