任务修改

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -74,17 +74,13 @@ namespace IRaCIS.Core.Application.ViewModel
 
     public class ReadingTaskView : VisitTaskView
     {
-        public ReReadingApplyState ReReadingApplyState { get; set; }
+     
         public ReadingTaskState ReadingTaskState { get; set; }
 
 
         public DateTime? SignTime { get; set; }
 
-
-        public RequestReReadingResult RequestReReadingResultEnum { get; set; }
-
-        ////是否 重阅
-        //public bool IsReReading { get; set; }
+        public ReReadingApplyState ReReadingApplyState { get; set; }
         public DateTime? SuggesteFinishedTime { get; set; }
 
     }
@@ -127,6 +123,9 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public ReadingTaskState ReadingTaskState { get; set; }
 
+        public ReReadingApplyState ReReadingApplyState { get; set; }
+        public DateTime? SuggesteFinishedTime { get; set; }
+
         //签名时间
         public DateTime? SignTime { get; set; }
     }

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -899,7 +899,7 @@ namespace IRaCIS.Core.Application.Service
             {
                 if (task.ReReadingApplyState == ReReadingApplyState.HaveApplyed || task.ReReadingApplyState == ReReadingApplyState.Agree)
                 {
-                    throw new BusinessValidationFailedException("已申请，或者同意状态不允许再次申请重阅");
+                    throw new BusinessValidationFailedException("重阅已申请，或者重阅已同意状态下不允许申请重阅");
                 }
                 task.ReReadingApplyState = ReReadingApplyState.HaveApplyed;
 
@@ -920,7 +920,7 @@ namespace IRaCIS.Core.Application.Service
                 }
             }
 
-            //产生的新任务，状态保持很申请的一直
+            //产生的新任务，状态保持跟申请的一直
             var reReadingTaskList = taskList.Clone();
 
             await _visitTaskCommonService.AddTaskAsync(new GenerateTaskCommand()

IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs

@@ -597,6 +597,7 @@ namespace IRaCIS.Application.Services
             //x.ReReadingApplyState!=ReReadingApplyState.Agree  排除重阅的
             var visitTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstOrDefaultAsync();
             var visitTaskids = await _visitTaskRepository.Where(x => x.ReadingTaskState == ReadingTaskState.HaveSigned &&x.ReadingCategory!= ReadingCategory.Judge && x.ReReadingApplyState!=ReReadingApplyState.Agree && x.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && x.SouceReadModuleId == visitTask.SouceReadModuleId).Select(x => x.Id).ToListAsync();
+
             if (visitTaskids.Count == 2)
             {
                 var query = from questionAnswet in _readingTaskQuestionAnswerRepository.Where(x => visitTaskids.Contains(x.VisitTaskId))
@@ -610,6 +611,7 @@ namespace IRaCIS.Application.Services
                                 QuestionId = question.Id,
                                 VisitTaskId = questionAnswet.VisitTaskId,
                             };
+
                 var questionAnswerlist = await query.ToListAsync();
                 List<GroupTaskAnswerDto> groupTasks = questionAnswerlist.GroupBy(x => new { x.QuestionId, x.AnswerGroup,x.JudgeType,x.AnswerCombination }).Select(x => new GroupTaskAnswerDto
                 {
@@ -619,6 +621,7 @@ namespace IRaCIS.Application.Services
                     JudgeType=x.Key.JudgeType,
                     TaskAnswerList = x.ToList(),
                 }).ToList();
+
                 var noteEqual = false;
                 foreach (var item in groupTasks)
                 {