修改site关联

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

@@ -1,37 +0,0 @@
-using IRaCIS.Core.Domain.Share;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IRaCIS.Core.Application.Service.ViewModel
-{
-    public class AllocationVisitViewModel
-    {
-      
-        public Guid SubjectVisitId { get; set; }
-        public Guid SubjectId { get; set; }
-      
-        public string BlindName { get; set; } = string.Empty;
-
-        public decimal VisitNum { get; set; }
-
-
-        public Guid SiteId { get; set; }
-        public String TrialSiteCode { get; set; } = String.Empty;
-        public string SubjectCode { get; set; } = String.Empty;
-
-        public string VisitName { get; set; } = string.Empty;
-
-        public DateTime? CheckPassedTime { get; set; }
-
-        public bool IsUrgent { get; set; }
-
-
-        public ReadingCategory ReadingCategoryEnum { get; set; }
-
-
-
-    }
-}

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

@@ -118,7 +118,7 @@ namespace IRaCIS.Core.Application.ViewModel
     public class ConsistentCommonView
     {
         public Guid TrialId { get; set; }
-        public Guid SiteId { get; set; }
+        public Guid TrialSiteId { get; set; }
 
         public String TrialSiteCode { get; set; }
         public string SubjectCode { get; set; }
@@ -200,31 +200,12 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
 
-    //public class DoctorConsistentRuleSubjectView
-    //{
-    //    public Guid TrialId => VisitTaskList.Select(t => t.TrialId).First();
-    //    public Guid SiteId => VisitTaskList.Select(t => t.SiteId).First();
-
-    //    public String TrialSiteCode => VisitTaskList.Select(t => t.TrialSiteCode).First();
-    //    public string SubjectCode => VisitTaskList.Select(t => t.SubjectCode).First();
-
-    //    public Guid SubjectId { get; set; }
-
-    //    public bool IsHaveGeneratedTask { get; set; }
-    //    public int? ValidTaskCount { get; set; }
-
-    //    public int? ValidVisitCount => VisitTaskList.Select(t => t.TaskName).Distinct().Count();
-
-    //    public List<VisitTaskSimpleView> VisitTaskList { get; set; }
-
-    //    //public List<UserSimpleInfo> HistoryDoctorUserList => VisitTaskList.SelectMany(t => t.RelationDoctorUserList).DistinctBy(t=>t.UserId).ToList();
-    //}
 
     public class InfluenceTaskInfo
     {
         public Guid Id { get; set; }
         public Guid TrialId { get; set; }
-        public Guid SiteId { get; set; }
+        public Guid TrialSiteId { get; set; }
 
         public Guid SubjectId { get; set; }
 
@@ -267,7 +248,7 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid Id { get; set; }
         public Guid TrialId { get; set; }
-        public Guid SiteId { get; set; }
+        public Guid TrialSiteId { get; set; }
 
         public Guid SubjectId { get; set; }
 

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

@@ -93,7 +93,7 @@ namespace IRaCIS.Core.Application.ViewModel
     public class TaskMedicalReviewQuery : PageInput
     {
         public Guid TrialId { get; set; }
-        public Guid? SiteId { get; set; }
+        public Guid? TrialSiteId { get; set; }
 
         /// <summary>
         /// 传了Id 

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

@@ -54,7 +54,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid UpdateUserId { get; set; }
 
 
-        public Guid SiteId { get; set; }
+        public Guid TrialSiteId { get; set; }
 
         public string BlindTrialSiteCode { get; set; }
         public String TrialSiteCode { get; set; } = String.Empty;
@@ -388,7 +388,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid TrialId { get; set; }
 
 
-		public Guid? SiteId { get; set; }
+		public Guid? TrialSiteId { get; set; }
 
         public Guid? SubjectId { get; set; }
 
@@ -499,7 +499,7 @@ namespace IRaCIS.Core.Application.ViewModel
         [NotDefault]
         public Guid TrialId { get; set; }
 
-        public Guid? SiteId { get; set; }
+        public Guid? TrialSiteId { get; set; }
 
         public Guid? SubjectId { get; set; }
 
@@ -521,7 +521,7 @@ namespace IRaCIS.Core.Application.ViewModel
         [NotDefault]
         public Guid TrialId { get; set; }
 
-        public Guid? SiteId { get; set; }
+        public Guid? TrialSiteId { get; set; }
 
         public Guid? SubjectId { get; set; }
 
@@ -564,7 +564,7 @@ namespace IRaCIS.Core.Application.ViewModel
     public class SubjectAssignStat
     {
         public Guid TrialId { get; set; }
-        public Guid SiteId { get; set; }
+        public Guid TrialSiteId { get; set; }
 
         public Guid SubjectId { get; set; }
 
@@ -644,7 +644,7 @@ namespace IRaCIS.Core.Application.ViewModel
     public class SubjectAssignView
     {
         public Guid TrialId { get; set; }
-        public Guid SiteId { get; set; }
+        public Guid TrialSiteId { get; set; }
 
         public Guid SubjectId { get; set; }