自身一致性分析提交

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

@@ -7,6 +7,7 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
 
 namespace IRaCIS.Core.Application.ViewModel
 {
@@ -23,14 +24,21 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public int? GeneratedSubjectCount { get; set; }
 
-        public int? GeneratedVisitCount { get; set; }
 
 
+    }
+
+
+    public class TaskConsistentRuleBasic : TaskConsistentRuleAddOrEdit
+    {
+
     }
 
     public class ConsistentQuery : PageInput
     {
-
+        [NotDefault]
+        public Guid DoctorUserId { get; set; }
+        [NotDefault]
         public Guid TaskConsistentRuleId { get; set; }
 
         //public int PlanSubjectCount { get; set; }
@@ -46,6 +54,8 @@ namespace IRaCIS.Core.Application.ViewModel
     public class ConsistentConfirmGenerateCommand
     {
         public Guid TaskConsistentRuleId { get; set; }
+        [NotDefault]
+        public Guid DoctorUserId { get; set; }
 
         public List<Guid> SubejctIdList { get; set; }
     }
@@ -180,7 +190,7 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid TrialId { get; set; }
 
-        //public bool IsSelfAnalysis { get; set; }
+        public bool IsSelfAnalysis { get; set; }
 
     }
 
@@ -197,8 +207,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public bool IsHaveReadingPeriod { get; set; }
         public bool IsGenerateGlobalTask { get; set; }
 
-        public Guid AnalysisDoctorUserId { get; set; }
-
+        public bool IsSelfAnalysis { get; set; }
         public int BlindSubjectNumberOfPlaces { get; set; }
         public string BlindTrialSiteCode { get; set; } = string.Empty;