diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs index 672d61838..8dab47d6f 100644 --- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs @@ -459,6 +459,7 @@ namespace IRaCIS.Core.Application.ViewModel public Guid TrialId { get; set; } public bool IsCopyOrigenalForms { get; set; } + public bool IsCopyFollowForms { get; set; } public RequestReReadingType RequestReReadingType { get; set; } diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 8249c0ea3..2fd0638d1 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1084,6 +1084,7 @@ namespace IRaCIS.Core.Application.Service.Allocation RequestReReadingTime = DateTime.Now, RequestReReadingUserId = _userInfo.Id, IsCopyOrigenalForms = applyReReadingCommand.IsCopyOrigenalForms, + IsCopyFollowForms=applyReReadingCommand.IsCopyFollowForms, RequestReReadingReason = applyReReadingCommand.RequestReReadingReason, RequestReReadingType = applyReReadingCommand.RequestReReadingType, @@ -1363,7 +1364,7 @@ namespace IRaCIS.Core.Application.Service.Allocation newTask.AllocateTime = DateTime.Now; //拷贝表单 - if (visitTaskReReadingAppply.IsCopyOrigenalForms) + if (visitTaskReReadingAppply.IsCopyFollowForms) { var list = _readingTaskQuestionAnswerRepository.Where(t => t.VisitTaskId == influenceTask.Id).ToList(); @@ -1457,10 +1458,10 @@ namespace IRaCIS.Core.Application.Service.Allocation _ = _readingTaskQuestionAnswerRepository.AddRangeAsync(list).Result; } - //else if (origenalTask.ReadingCategory == ReadingCategory.Global) - //{ + else if (origenalTask.ReadingCategory == ReadingCategory.Global) + { - //} + } //else if (origenalTask.ReadingCategory == ReadingCategory.Judge) //{ // newTask.JudgeResultImagePath = origenalTask.JudgeResultImagePath; @@ -1476,10 +1477,7 @@ namespace IRaCIS.Core.Application.Service.Allocation //} - //else - //{ - //} } } diff --git a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs index 343ce6378..09d8ed446 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs @@ -60,6 +60,11 @@ namespace IRaCIS.Core.Domain.Models public bool IsCopyOrigenalForms { get; set; } + + //仅仅包括全局和访视 + public bool IsCopyFollowForms { get; set; } + + public Guid CreateUserId { get; set; }