From 6d7fcbb7269f8632a922db8c218ae24ab449f16a Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 24 Aug 2022 16:26:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20trila=20=20subjectVisit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.csproj | 2 +- IRaCIS.Core.Domain/Allocation/VisitTask.cs | 11 ++--- IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj | 7 ++++ IRaCIS.Core.Domain/Trial/Trial.cs | 40 +++++++++++-------- IRaCIS.Core.Domain/Visit/SubjectVisit.cs | 33 +++++++++------ 5 files changed, 59 insertions(+), 34 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj index 37ce64f7b..ddd196c96 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj @@ -22,7 +22,7 @@ - + diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index 0981e2808..56a63fc24 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -96,24 +96,24 @@ namespace IRaCIS.Core.Domain.Models //public List SameSubjectVisiTaskList { get; set; } - public TaskConsistentRule TaskConsistentRule { get; set; } //public TaskAllocationRule DoctorTaskAllocationRule { get; set; } public TaskMedicalReviewRule DoctorTaskMedicalReviewRule { get; set; } + [JsonIgnore] [ForeignKey("JudgeVisitTaskId")] public VisitTask JudgeVisitTask { get; set; } //public SubjectUser SujectArm { get; set; } - + [JsonIgnore] public Subject Subject { get; set; } - + [JsonIgnore] public List TaskMedicalReviewList { get; set; } @@ -166,7 +166,7 @@ namespace IRaCIS.Core.Domain.Models #region 裁判任务特有 - + [JsonIgnore] //对于裁判任务而言，触发裁判的列表 public List JudgeVisitList { get; set; } @@ -209,11 +209,12 @@ namespace IRaCIS.Core.Domain.Models #endregion - + [JsonIgnore] public List ReadingTaskQuestionAnswerList { get; set; } = new List(); //重阅或者退回影像的记录中间表 + [JsonIgnore] public List TaskInfluenceList { get; set; } = new List(); } diff --git a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj index db722ff11..a297c318a 100644 --- a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj +++ b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj @@ -24,4 +24,11 @@ + + + + + + + diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 6bb8a5fe5..dfa126e71 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -16,28 +16,35 @@ namespace IRaCIS.Core.Domain.Models TrialDicList = new List(); } - + [JsonIgnore] public List TaskConsistentRuleList { get; set; } - + [JsonIgnore] public List SubjectDoctorUserList { get; set; } = new List(); + [JsonIgnore] public List VisitTaskList { get; set; } = new List() { }; - + [JsonIgnore] public List TrialSiteSurveyList { get; set; } = new List(); + + [JsonIgnore] public List TrialDocumentList { get; set; } + [JsonIgnore] public List EnrollList { get; set; } = new List(); + [JsonIgnore] public List WorkloadList { get; set; } = new List(); + [JsonIgnore] public List TrialUserList { get; set; } = new List(); - + [JsonIgnore] public List ReadingQuestionCriterionTrialList { get; set; } = new List(); - + [JsonIgnore] public List SubjectList { get; set; } = new List(); - + [JsonIgnore] public List StudyList { get; set; } = new List(); - + [JsonIgnore] public List TrialSiteList { get; set; } = new List(); - + [JsonIgnore] public List TrialSiteUserList { get; set; } = new List(); + [JsonIgnore] [ForeignKey("DeclarationTypeId")] public Dictionary DeclarationType { get; set; } @@ -46,29 +53,30 @@ namespace IRaCIS.Core.Domain.Models public Guid IndicationTypeId { get; set; } = Guid.Empty; public Guid? PhaseId { get; set; } = Guid.Empty; - + [JsonIgnore] [ForeignKey("IndicationTypeId")] public Dictionary IndicationType { get; set; } - + [JsonIgnore] [ForeignKey("PhaseId")] public Dictionary Phase { get; set; } - + [JsonIgnore] [ForeignKey("SponsorId")] public Sponsor Sponsor { get; set; } - + [JsonIgnore] [ForeignKey("CROId")] public CRO CRO { get; set; } - + [JsonIgnore] [ForeignKey("ReviewModeId")] public Dictionary ReviewMode { get; set; } - + [JsonIgnore] public List clinicalDataTrialSets { get; set; } = new List { }; - + [JsonIgnore] public virtual ICollection ClinicalTrialProjectDetails { get; set; } + [JsonIgnore] public virtual ICollection TrialDicList { get; set; } @@ -90,7 +98,7 @@ namespace IRaCIS.Core.Domain.Models [StringLength(500)] public string TrialStatusStr { get; set; } = StaticData.TrialState.TrialInitializing; - + [JsonIgnore] public List TrialStateChangeList { get; set; } = new List(); diff --git a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs index 69d9eb2c0..15e9533c5 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs @@ -10,12 +10,13 @@ namespace IRaCIS.Core.Domain.Models public class SubjectVisit : Entity, IAuditUpdate, IAuditAdd, ISoftDelete { //一个访视 对应有对应Site的 TrialSiteCode 所以 fluentApi中配置 TrialSite 连表用TrialId SiteId 双字段 + [JsonIgnore] public TrialSite TrialSite { get; set; } public Guid TrialId { get; set; } public Guid SubjectId { get; set; } public Guid SiteId { get; set; } - + [JsonIgnore] public VisitStage VisitStage { get; set; } public Guid? VisitStageId { get; set; } public int VisitDay { get; set; } @@ -118,6 +119,7 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? OutPlanPreviousVisitId { get; set; } + [JsonIgnore] [ForeignKey("OutPlanPreviousVisitId")] public SubjectVisit OutPlanPreviousVisit { get; set; } @@ -125,6 +127,7 @@ namespace IRaCIS.Core.Domain.Models //public DateTime? ClinicalDataSignTime { get; set; } + [JsonIgnore] [ForeignKey("ClinicalDataSignUserId")] public User ClinicalDataSignUser { get; set; } @@ -132,12 +135,15 @@ namespace IRaCIS.Core.Domain.Models public User ForwardUser { get; set; } + [JsonIgnore] [ForeignKey("PreliminaryAuditUserId")] public User PreliminaryAuditUser { get; set; } + [JsonIgnore] [ForeignKey("ReviewAuditUserId")] public User ReviewAuditUser { get; set; } + [JsonIgnore] [ForeignKey("CurrentActionUserId")] public User CurrentActionUser { get; set; } @@ -172,12 +178,15 @@ namespace IRaCIS.Core.Domain.Models //导航属性 + [JsonIgnore] [ForeignKey("TrialId")] public Trial Trial { get; set; } + [JsonIgnore] [ForeignKey("SiteId")] public Site Site { get; set; } + [JsonIgnore] [ForeignKey("SubjectId")] public Subject Subject { get; set; } @@ -188,28 +197,28 @@ namespace IRaCIS.Core.Domain.Models ////一个访视 对应该Site下的多个CRC管理 必须加这个 不然生成的sql 会报 TrialSiteUserId 不存在该列名 //public List TrialSiteUserList { get; set; } - + [JsonIgnore] public List PreviousHistoryList { get; set; } - + [JsonIgnore] public List PreviousOtherList { get; set; } - + [JsonIgnore] public List PreviousSurgeryList { get; set; } - + [JsonIgnore] public List PreviousPDFList { get; set; } - + [JsonIgnore] public List ReadingClinicalDataList { get; set; } - + [JsonIgnore] public List CheckChallengeDialogList { get; set; } = new List(); - + [JsonIgnore] public List StudyList { get; set; } = new List(); - + [JsonIgnore] public List NoneDicomStudyList { get; set; } = new List(); - + [JsonIgnore] public List QCChallengeList { get; set; } = new List(); - + [JsonIgnore] public List QCChallengeDialogList { get; set; } = new List(); - + [JsonIgnore] public List VisitTaskList { get; set; } = new List(); public ReadingStatusEnum ReadingStatus { get; set; }