组间一致性

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

@@ -65,7 +65,17 @@ namespace IRaCIS.Core.Application.ViewModel
         public List<Guid> SubejctIdList { get; set; }
     }
 
-    public class DoctorSelfConsistentSubjectView
+    public class DoctorSelfConsistentSubjectView: ConsistentCommonView
+    {
+
+        public string? BlindSubjectCode { get; set; } 
+
+        public List<VisitTaskSimpleDTO> VisitTaskList { get; set; }
+
+    }
+
+
+    public class ConsistentCommonView
     {
         public Guid TrialId { get; set; }
         public Guid SiteId { get; set; }
@@ -73,27 +83,28 @@ namespace IRaCIS.Core.Application.ViewModel
         public String TrialSiteCode { get; set; }
         public string SubjectCode { get; set; }
 
-        public string? BlindSubjectCode { get; set; } 
-
         public Guid SubjectId { get; set; }
 
         public bool IsHaveGeneratedTask { get; set; }
 
 
         public int? ValidVisitCount { get; set; }
-
-        public List<VisitTaskSimpleDTO> VisitTaskList { get; set; }
     }
 
-    public class VisitTaskSimpleDTO
+    public class DoctorGroupConsistentSubjectView: ConsistentCommonView
+    {
+
+        public List<VisitTaskGroupSimpleDTO> TaskList => VisitTaskList.GroupBy(t => new { t.SubjectId, t.VisitTaskNum }).Where(g => g.Count() == 2).SelectMany(g => g.ToList()).OrderBy(t=>t.VisitTaskNum).ToList();
+
+        public List<VisitTaskGroupSimpleDTO> VisitTaskList { get; set; } = new List<VisitTaskGroupSimpleDTO>();
+    }
+
+    public class VisitTaskGroupSimpleDTO
     {
-        public Guid Id { get; set; }
         public Guid TrialId { get; set; }
 
         public Guid SubjectId { get; set; }
 
-        public Arm ArmEnum { get; set; }
-        public string TaskCode { get; set; }
 
         public string TaskName { get; set; }
         public string TaskBlindName { get; set; }
@@ -107,7 +118,22 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public TaskState TaskState { get; set; }
 
+        public Guid? DoctorUserId { get; set; }
+        public Arm ArmEnum { get; set; }
 
+
+        [JsonIgnore]
+        public VisitTask GroupFirstVisitTask { get; set; }
+    }
+
+    public class VisitTaskSimpleDTO :VisitTaskGroupSimpleDTO
+    {
+        public Guid? Id { get; set; }
+      
+
+        public string TaskCode { get; set; }
+
+     
         //可以不查询
         public List<VisitTaskSimpleDTO> GlobalVisitTaskList { get; set; }
 
@@ -118,9 +144,9 @@ namespace IRaCIS.Core.Application.ViewModel
         public string BlindSubjectCode { get; set; } = string.Empty;
         public string BlindTrialSiteCode { get; set; } = string.Empty;
 
-        public Guid? DoctorUserId { get; set; }
 
-        public Guid? TaskConsistentRuleId { get; set; }
+
+        //public Guid? TaskConsistentRuleId { get; set; }
 
     }