diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 0cf37f150..2646ad49f 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -7,7 +7,7 @@ using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { [Table("Trial")] - public partial class Trial : Entity, IAuditUpdate, IAuditAdd,ISoftDelete + public partial class Trial : Entity, IAuditUpdate, IAuditAdd, ISoftDelete { public Trial() { @@ -15,13 +15,13 @@ namespace IRaCIS.Core.Domain.Models TrialDicList = new List(); } - public List SubjectDoctorUserList { get; set; }=new List(); - public List VisitTaskList { get; set; }=new List(){ }; + public List SubjectDoctorUserList { get; set; } = new List(); + public List VisitTaskList { get; set; } = new List() { }; public List TrialSiteSurveyList { get; set; } = new List(); public List TrialDocumentList { get; set; } - public List EnrollList { get; set; } - public List WorkloadList { get; set; } + public List EnrollList { get; set; } = new List(); + public List WorkloadList { get; set; } = new List(); public List TrialUserList { get; set; } = new List(); public List ReadingQuestionCriterionTrialList { get; set; } = new List(); @@ -61,13 +61,13 @@ namespace IRaCIS.Core.Domain.Models public Dictionary ReviewMode { get; set; } - - public List clinicalDataTrialSets { get; set; }=new List { }; + + public List clinicalDataTrialSets { get; set; } = new List { }; public virtual ICollection ClinicalTrialProjectDetails { get; set; } public virtual ICollection TrialDicList { get; set; } - + [StringLength(100)] public string TrialCode { get; set; } = string.Empty; @@ -96,7 +96,7 @@ namespace IRaCIS.Core.Domain.Models public Guid? SponsorId { get; set; } = Guid.Empty; public Guid? ReviewModeId { get; set; } = Guid.Empty; - + [StringLength(500)] public string ProjectCycle { get; set; } = string.Empty; @@ -240,7 +240,7 @@ namespace IRaCIS.Core.Domain.Models public string BodyPartTypes { get; set; } = "鼻咽部|脑部|颈部|胸部|上/下腹部|盆腔|全身|其他"; - + public string Modalitys { get; set; } = "CT|MR|BoneScan|Photograph|PET|X-ray|US"; @@ -280,7 +280,7 @@ namespace IRaCIS.Core.Domain.Models public int PlanVisitCount { get; set; } - + public DateTime? TrialFinishedTime { get; set; } @@ -319,20 +319,26 @@ namespace IRaCIS.Core.Domain.Models public DateTime? DeletedTime { get; set; } public Guid? DeleteUserId { get; set; } + //任务分配对象 + public TaskAllocateObj TaskAllocateObjEnum { get; set; } - public TaskAllocateObj TaskAllocateObjEnum { get; set; } - + //后续访视任务自动分配 public bool IsFollowVisitAutoAssign { get; set; } - public bool IsFollowGlobalVisitAutoAssign { get; set; } + //后续全局自动分配 + public bool IsFollowGlobalVisitAutoAssign { get; set; } + //后续访视自动分配默认状态 public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } + //后续全局自动分配默认状态 public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } + //读片任务显示规则 - public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } + public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } + //读片任务显示是否顺序 public bool IsReadingTaskViewInOrder { get; set; } = true;