diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 8d13ba8d7..451192b75 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -2205,15 +2205,7 @@ public class VisitTaskService(IRepository _visitTaskRepository, _ = _readingCustomTagRepository.AddRangeAsync(readingCustomTagList).Result; - var readingTaskQuestionMarkList = _readingTaskQuestionMarkRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList(); - - foreach (var item in readingTaskQuestionMarkList) - { - item.Id = Guid.Empty; - item.VisitTaskId = newTask.Id; - } - - _ = _readingTaskQuestionMarkRepository.AddRangeAsync(readingTaskQuestionMarkList).Result; + var readingTaskQuestionAnswerList = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList(); @@ -2225,6 +2217,15 @@ public class VisitTaskService(IRepository _visitTaskRepository, _ = _readingTaskQuestionAnswerRepository.AddRangeAsync(readingTaskQuestionAnswerList).Result; + var readingTaskQuestionMarkList = _readingTaskQuestionMarkRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList(); + + foreach (var item in readingTaskQuestionMarkList) + { + item.Id = Guid.Empty; + item.VisitTaskId = newTask.Id; + } + + //ReadingTableAnswerRowInfo ReadingTableQuestionAnswer 一起加 var readingTableAnswerRowInfoList = _readingTableAnswerRowInfoRepository.Where(t => t.VisitTaskId == origenalTask.Id).Include(t => t.LesionAnswerList).ToList(); @@ -2235,7 +2236,14 @@ public class VisitTaskService(IRepository _visitTaskRepository, var originalVisitTaskId = item.VisitTaskId; var originalFristAddTaskId = item.FristAddTaskId; - item.Id = NewId.NextSequentialGuid(); + var newRowId= NewId.NextSequentialGuid(); + + foreach (var item1 in readingTaskQuestionMarkList) + { + item1.RowId = item1.RowId == item.Id ? newRowId : item1.RowId; + } + + item.Id = newRowId; item.VisitTaskId = newTask.Id; //默认值是当前任务添加的 @@ -2250,6 +2258,7 @@ public class VisitTaskService(IRepository _visitTaskRepository, } } + _ = _readingTaskQuestionMarkRepository.AddRangeAsync(readingTaskQuestionMarkList).Result; _ = _readingTableAnswerRowInfoRepository.AddRangeAsync(readingTableAnswerRowInfoList).Result;