分配规则修改

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

@@ -91,16 +91,34 @@ namespace IRaCIS.Core.Application.ViewModel
         public bool IsJudgeDoctor { get; set; }
     }
 
+    public class TaskAllocationRuleDTO : TaskAllocationRuleAddOrEdit
+    {
+        public Guid CreateUserId { get; set; }
+        public DateTime CreateTime { get; set; }
+        public DateTime UpdateTime { get; set; }
+        public Guid UpdateUserId { get; set; }
+
+        public UserSimpleInfo DoctorUser { get; set; }
+
+        public List<ReadingCategory> ReadingCategoryList { get; set; }
+
+    }
+
+
     ///<summary> TaskAllocationRuleAddOrEdit  列表查询参数模型</summary>
     public class TaskAllocationRuleAddOrEdit
     {
         public Guid? Id { get; set; }
         public Guid TrialId { get; set; }
-        public int PlanReadingRatio { get; set; }
-        public Guid DoctorUserId { get; set; }
+
+        public Guid EnrollId { get; set; }
+        //public Guid DoctorUserId { get; set; }
+
+
+        public int PlanSubjectCount { get; set; }
+
         public bool IsEnable { get; set; }
 
-        public bool IsJudgeDoctor { get; set; }
         public string Note { get; set; } = string.Empty;
     }
 
@@ -110,6 +128,9 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public ReadingMethod ReadingType { get; set; }
 
+        [NotDefault]
+        public Guid EnrollId { get; set; }
+
         public Guid? DoctorUserId { get; set; }
 
         public string UserCode { get; set; }
@@ -151,7 +172,7 @@ namespace IRaCIS.Core.Application.ViewModel
         //重阅 产生任务
         public VisitTask ReReadingTask { get; set; }
 
-        public Action< VisitTask> Action;
+        public Action<VisitTask> Action;
 
         //public ReReadingApplyGenerateTaskCommand ReReadingApplyGenerateTaskCommand { get; set; } = new ReReadingApplyGenerateTaskCommand();
 
@@ -161,7 +182,7 @@ namespace IRaCIS.Core.Application.ViewModel
         //组间一致性
 
         public List<VisitTaskGroupSimpleDTO> GenerataGroupConsistentTaskList { get; set; }
-        
+
 
 
     }