diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 7eb28540c..84500ecfa 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -25,6 +25,7 @@ using Quartz;
 using IRaCIS.Application.Services.BackGroundJob;
 using Magicodes.ExporterAndImporter.Core.Extension;
 using Hangfire;
+using MassTransit;
 
 namespace IRaCIS.Core.Application.Service.Allocation
 {
@@ -1229,18 +1230,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                             {
                                                 if (origenalTask.ReadingCategory == ReadingCategory.Visit)
                                                 {
-                                                    var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
-
-                                                    foreach (var item in list)
-                                                    {
-                                                        item.Id = Guid.Empty;
-                                                        item.VisitTaskId = newTask.Id;
-                                                    }
-
-                                                    _ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result;
+                                                    CopyForms(newTask, origenalTask);
                                                 }
 
-
                                             }
 
                                             //拷贝后续表单
@@ -1248,15 +1240,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                             {
                                                 if (origenalTask.ReadingCategory == ReadingCategory.Visit)
                                                 {
-                                                    var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
-
-                                                    foreach (var item in list)
-                                                    {
-                                                        item.Id = Guid.Empty;
-                                                        item.VisitTaskId = newTask.Id;
-                                                    }
-
-                                                    _ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result;
+                                                    CopyForms(newTask, origenalTask);
                                                 }
 
                                             }
@@ -1352,15 +1336,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                             {
                                                 if (origenalTask.ReadingCategory == ReadingCategory.Visit)
                                                 {
-                                                    var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
-
-                                                    foreach (var item in list)
-                                                    {
-                                                        item.Id = Guid.Empty;
-                                                        item.VisitTaskId = newTask.Id;
-                                                    }
-
-                                                    _ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result;
+                                                    CopyForms(newTask, origenalTask);
                                                 }
 
                                             }
@@ -1370,15 +1346,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                                             {
                                                 if (origenalTask.ReadingCategory == ReadingCategory.Visit)
                                                 {
-                                                    var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == origenalTask.Id).ToList();
-
-                                                    foreach (var item in list)
-                                                    {
-                                                        item.Id = Guid.Empty;
-                                                        item.VisitTaskId = newTask.Id;
-                                                    }
-
-                                                    _ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result;
+                                                    CopyForms(newTask, origenalTask);
                                                 }
                                             }
 
@@ -1437,7 +1405,73 @@ namespace IRaCIS.Core.Application.Service.Allocation
             return ResponseOutput.Ok();
         }
 
+        private void CopyForms(VisitTask newTask, VisitTask origenalTask)
+        {
 
+            //自定义
+            var readingCustomTagList = _repository.Where<ReadingCustomTag>(t => t.VisitTaskId == origenalTask.Id).ToList();
+
+            foreach (var item in readingCustomTagList)
+            {
+                item.Id = Guid.Empty;
+                item.VisitTaskId = newTask.Id;
+            }
+
+            _ = _repository.AddRangeAsync(readingCustomTagList).Result;
+
+
+            var readingTaskQuestionMarkList = _repository.Where<ReadingTaskQuestionMark>(t => t.VisitTaskId == origenalTask.Id).ToList();
+
+            foreach (var item in readingTaskQuestionMarkList)
+            {
+                item.Id = Guid.Empty;
+                item.VisitTaskId = newTask.Id;
+            }
+
+            _ = _repository.AddRangeAsync(readingTaskQuestionMarkList).Result;
+
+            var readingTaskQuestionAnswerList = _repository.Where<ReadingTaskQuestionAnswer>(t => t.VisitTaskId == origenalTask.Id).ToList();
+
+            foreach (var item in readingTaskQuestionAnswerList)
+            {
+                item.Id = Guid.Empty;
+                item.VisitTaskId = newTask.Id;
+            }
+            _ = _repository.AddRangeAsync(readingTaskQuestionAnswerList).Result;
+
+
+
+            //ReadingTableAnswerRowInfo  ReadingTableQuestionAnswer 一起加
+            var readingTableAnswerRowInfoList = _repository.Where<ReadingTableAnswerRowInfo>(t => t.VisitTaskId == origenalTask.Id).Include(t => t.LesionAnswerList).ToList();
+
+            foreach (var item in readingTableAnswerRowInfoList)
+            {
+                item.Id = NewId.NextSequentialGuid();
+                item.VisitTaskId = newTask.Id;
+
+                foreach (var item2 in item.LesionAnswerList)
+                {
+                    item2.Id = Guid.Empty;
+                    item2.RowId = item.Id;
+                    item2.VisitTaskId = newTask.Id;
+                }
+            }
+
+            _ = _repository.AddRangeAsync(readingTableAnswerRowInfoList).Result;
+
+
+            //var readingTableQuestionAnswerList = _repository.Where<ReadingTableQuestionAnswer>(t => t.VisitTaskId == origenalTask.Id).ToList();
+
+            //foreach (var item in readingTableQuestionAnswerList)
+            //{
+            //    item.Id = Guid.Empty;
+            //    item.VisitTaskId = newTask.Id;
+            //}
+
+            //_ = _repository.AddRangeAsync(readingTableQuestionAnswerList).Result;
+
+
+        }
         /// <summary>
         /// PM  设置任务 退回
         /// </summary>