重阅任务产生和确认提交

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

@@ -143,6 +143,11 @@ namespace IRaCIS.Core.Application.ViewModel
         /// 阅片期
         /// </summary>
         public List<ReadingGenerataTaskDTO> ReadingGenerataTaskList= new List<ReadingGenerataTaskDTO>();
+
+
+       //重阅 产生任务
+
+        public List<VisitTask> ReReadingTaskList = new List<VisitTask>();
     }
 
 

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

@@ -197,7 +197,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid? OriginalReReadingId { get; set; }
     }
 
-    public class IRUnReadSubjectQuery:PageInput
+    public class IRUnReadSubjectQuery : PageInput
     {
         public Guid TrialId { get; set; }
 
@@ -271,12 +271,12 @@ namespace IRaCIS.Core.Application.ViewModel
         [JsonIgnore]
         public bool IsJudge { get; set; }
 
-        public bool IsConfirmed => DoctorUserList.Where(t=> IsJudge? t.ArmEnum==Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).All(t => t.IsConfirmed)
+        public bool IsConfirmed => DoctorUserList.Where(t => IsJudge ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).All(t => t.IsConfirmed)
             && DoctorUserList.Where(t => IsJudge ? t.ArmEnum == Arm.JudgeArm : t.ArmEnum != Arm.JudgeArm).Count() > 0;
 
         public List<Guid> DoctorUserIdList => DoctorUserList.Select(t => t.DoctorUserId).ToList();
 
-         //.ForEach(t => t.HistoryDoctorList = TotalDoctorUserList.Where(c => (Guid?)t.Id == c.OrignalSubjectUserId).ToList())
+        //.ForEach(t => t.HistoryDoctorList = TotalDoctorUserList.Where(c => (Guid?)t.Id == c.OrignalSubjectUserId).ToList())
         public List<AssignDoctorView> DoctorUserList => TotalDoctorUserList.Where(t => t.IsConfirmed && t.OrignalSubjectUserId == null).ToList()
            ;
 
@@ -412,6 +412,31 @@ namespace IRaCIS.Core.Application.ViewModel
 
     }
 
+
+    public class ApplyReReadingCommand
+    {
+
+
+        public List<Guid> TaskIdList { get; set; }
+
+        public Guid TrialId { get; set; }
+
+        public RequestReReadingType RequestReReadingTypeEnum { get; set; }
+
+        public string RequestReReadingReason { get; set; } = string.Empty;
+    }
+
+
+    public class ConfirmReReadingCommand
+    {
+        public List<Guid> TaskIdList { get; set; }
+
+        public Guid TrialId { get; set; }
+
+        public RequestReReadingResult RequestReReadingResultEnum { get; set; }
+    }
+
+
     public enum TaskOptType
     {
         Assign = 1,