自身一致性分析

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

@@ -27,6 +27,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public int? GeneratedVisitCount { get; set; }
 
+
     }
 
     public class ConsistentQuery : PageInput
@@ -70,7 +71,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public List<VisitTaskSimpleView> VisitTaskList { get; set; }
 
-        public List<UserSimpleInfo> HistoryDoctorUserList => VisitTaskList.SelectMany(t => t.RelationDoctorUserList).DistinctBy(t=>t.UserId).ToList();
+        //public List<UserSimpleInfo> HistoryDoctorUserList => VisitTaskList.SelectMany(t => t.RelationDoctorUserList).DistinctBy(t=>t.UserId).ToList();
     }
 
     public class VisitTaskSimpleView
@@ -99,8 +100,12 @@ namespace IRaCIS.Core.Application.ViewModel
         public String TrialSiteCode { get; set; } = String.Empty;
         public string SubjectCode { get; set; } = String.Empty;
 
-        [JsonIgnore]
-        public List<UserSimpleInfo> RelationDoctorUserList { get; set; } = new List<UserSimpleInfo>();
+
+
+        public List<VisitTaskSimpleView> GlobalVisitTaskList { get; set; }
+
+        //[JsonIgnore]
+        //public List<UserSimpleInfo> RelationDoctorUserList { get; set; } = new List<UserSimpleInfo>();
 
         [JsonIgnore]
         public Guid? DoctorUserId { get; set; }
@@ -118,7 +123,7 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid TrialId { get; set; }
 
-        public bool IsSelfAnalysis { get; set; }
+        //public bool IsSelfAnalysis { get; set; }
 
     }
 
@@ -132,7 +137,6 @@ namespace IRaCIS.Core.Application.ViewModel
         public int PlanSubjectCount { get; set; }
         public int PlanVisitCount { get; set; }
         public int IntervalWeeks { get; set; }
-        public Guid? CompareDoctorUserId { get; set; }
         public bool IsHaveReadingPeriod { get; set; }
         public bool IsGenerateGlobalTask { get; set; }
         public Guid AnalysisDoctorUserId { get; set; }
@@ -140,6 +144,12 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
 
+    public class TaskConsistentRuleBatchAddOrEdit : TaskConsistentRuleAddOrEdit
+    {
+
+        public bool IsBatchAdd { get; set; }
+    }
+
 }
 
 

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

@@ -13,6 +13,7 @@ namespace IRaCIS.Core.Application.ViewModel
     /// <summary> TaskMedicalReviewView  列表视图模型 </summary>
     public class TaskMedicalReviewView : VisitTaskViewBasic
     {
+        public string MedicalNo { get; set; } = string.Empty;
 
         public int AuditState { get; set; }
         public DateTime? AuditSignTime { get; set; }
@@ -39,6 +40,8 @@ namespace IRaCIS.Core.Application.ViewModel
         //开始读片时间
         public DateTime? FirstReadingTime { get; set; }
 
+        public string MedicalNo { get; set; } = string.Empty;
+
         //读片时间差
         public TimeSpan? ReadingDurationTimeSpan { get; set; }
 
@@ -47,15 +50,15 @@ namespace IRaCIS.Core.Application.ViewModel
         {
             get
             {
-                if (!ReadingDurationTimeSpan.HasValue )
+                if (!ReadingDurationTimeSpan.HasValue)
                     return "";
                 else return /*string.Format("{0}天{1}小时{2}分钟", (SignTime - FirstReadingTime)?.Days, (SignTime - FirstReadingTime)?.Hours, (SignTime - FirstReadingTime)?.Minutes)*/
-                         string.Format("{0}分钟",  (ReadingDurationTimeSpan)?.TotalMinutes);
+                         string.Format("{0}分钟", (ReadingDurationTimeSpan)?.TotalMinutes);
             }
         }
 
         //是否产生裁判
-        public   bool IsGeneratedJudge { get; set; }
+        public bool IsGeneratedJudge { get; set; }
 
         //审核次数
         public int? GeneratedMedicalReviewCount { get; set; }
@@ -87,6 +90,15 @@ namespace IRaCIS.Core.Application.ViewModel
 
     }
 
+    //public class GenerateMedicalReviewTaskQuery : TaskMedicalReviewQuery
+    //{
+    //    public bool? IsGeneratedJudge { get; set; }
+
+    //    public bool? IsGlobalHaveUpdate { get; set; }
+    //}
+
+
+
     public class GenerateMedicalReviewTaskCommand
     {
         public Guid TrialId { get; set; }