From c8d1e2fb6b0684f447033248928fe84dc39a5c59 Mon Sep 17 00:00:00 2001 From: "{872297557@qq.com}" <872297557@qq.com> Date: Wed, 28 Dec 2022 14:19:59 +0800 Subject: [PATCH] [JsonIgnore] --- .../Allocation/SubjectTaskCategory.cs | 3 ++- .../Allocation/TaskAllocationRule.cs | 4 ++-- .../Allocation/TaskMedicalReviewRule.cs | 6 +++--- IRaCIS.Core.Domain/Common/Dictionary.cs | 8 ++++---- IRaCIS.Core.Domain/Dcotor/Doctor.cs | 19 ++++++++++--------- IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs | 4 +++- .../Document/SystemDocConfirmedUser.cs | 3 ++- .../SystemDocNeedConfirmedUserType.cs | 4 ++-- .../Document/TrialDocConfirmedUser.cs | 1 + .../Document/TrialDocNeedConfirmedUserType.cs | 3 ++- IRaCIS.Core.Domain/Image/DicomInstance.cs | 1 + IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs | 14 ++++++++------ IRaCIS.Core.Domain/Institution/Hospital.cs | 1 + IRaCIS.Core.Domain/Institution/Site.cs | 6 ++++-- IRaCIS.Core.Domain/Management/Menu.cs | 1 + .../Management/Notice/SystemNotice.cs | 5 +++-- .../Management/Notice/SystemNoticeUserType.cs | 1 + IRaCIS.Core.Domain/Management/User.cs | 6 ++++-- IRaCIS.Core.Domain/Management/UserType.cs | 6 ++++-- .../Management/UserTypeGroup.cs | 3 ++- IRaCIS.Core.Domain/Management/UserTypeMenu.cs | 1 + IRaCIS.Core.Domain/QC/QCChallenge.cs | 1 + IRaCIS.Core.Domain/QC/QCQuestion.cs | 3 ++- .../ClinicalData/ReadingClinicalDataPDF.cs | 1 + .../ReadingMedicalReviewDialog.cs | 3 ++- .../ReadingCriterion/OrganTrialInfo.cs | 1 + .../ReadingCriterion/ReadingCriterionPage.cs | 1 + .../ReadingTableQuestionSystem.cs | 1 + .../ReadingPeriod/ReadingPeriodPlan.cs | 4 +++- .../ReadingPeriod/ReadingPeriodSite.cs | 1 + .../SiteSurvey/TrialSiteEquipmentSurvey.cs | 4 ++-- .../SiteSurvey/TrialSiteUserSurvey.cs | 3 ++- IRaCIS.Core.Domain/Trial/Enroll.cs | 2 +- IRaCIS.Core.Domain/Trial/EnrollDetail.cs | 8 +++++--- IRaCIS.Core.Domain/Trial/TrialDictionary.cs | 3 ++- IRaCIS.Core.Domain/Trial/TrialStateChange.cs | 3 ++- IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs | 3 +-- .../TrialSiteUser/TrialExternalUser.cs | 4 ++-- .../TrialSiteUser/TrialUserPreparation .cs | 4 ++-- .../Visit/VisitPlanInfluenceStat.cs | 3 ++- .../Visit/VisitPlanInfluenceStudy.cs | 4 +++- 41 files changed, 98 insertions(+), 59 deletions(-) diff --git a/IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs b/IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs index 7aed6754..b0ff5410 100644 --- a/IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs +++ b/IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs @@ -26,12 +26,13 @@ namespace IRaCIS.Core.Domain.Models //任务来源访视Id 方便回更访视读片状态 public Guid? SourceSubjectVisitId { get; set; } + [JsonIgnore] [ForeignKey("SourceSubjectVisitId")] public SubjectVisit SubjectVisit { get; set; } public Guid? SouceReadModuleId { get; set; } - + [JsonIgnore] [ForeignKey("SouceReadModuleId")] public ReadModule ReadModule { get; set; } diff --git a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs index 03af13ce..f2132a3b 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs @@ -36,7 +36,7 @@ namespace IRaCIS.Core.Domain.Models public Guid DoctorUserId { get; set; } [ForeignKey("DoctorUserId")] - + [JsonIgnore] public User DoctorUser { get; set; } @@ -45,7 +45,7 @@ namespace IRaCIS.Core.Domain.Models public Guid EnrollId { get; set; } - + [JsonIgnore] public Enroll Enroll { get; set; } //是否是裁判医生 裁判医生单独加入 diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs index c161b7f8..ddefaf35 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs @@ -41,11 +41,11 @@ namespace IRaCIS.Core.Domain.Models public int PlanGlobalCount { get; set; } public int PlanTumorCount { get; set; } - + [JsonIgnore] public User DoctorUser { get; set; } - + [JsonIgnore] public List DoctorTrialVisitTaskList { get; set; } - + [JsonIgnore] public List TaskMedicalReviewList { get; set; } } diff --git a/IRaCIS.Core.Domain/Common/Dictionary.cs b/IRaCIS.Core.Domain/Common/Dictionary.cs index 1ca2012b..f169c9a7 100644 --- a/IRaCIS.Core.Domain/Common/Dictionary.cs +++ b/IRaCIS.Core.Domain/Common/Dictionary.cs @@ -9,7 +9,7 @@ namespace IRaCIS.Core.Domain.Models [Table("Dictionary")] public partial class Dictionary : Entity, IAuditUpdate, IAuditAdd { - + [JsonIgnore] public List DoctorDicRelationList { get; set; } = new List(); public string ChildGroup { get; set; } @@ -47,14 +47,14 @@ namespace IRaCIS.Core.Domain.Models public Guid? ConfigTypeId { get; set; } - + [JsonIgnore] [ForeignKey("ConfigTypeId")] public Dictionary ConfigDictionary { get; set; } - + [JsonIgnore] [ForeignKey("ParentId")] public Dictionary Parent { get; set; } - + [JsonIgnore] public List ChildList { get; set; } = new List(); diff --git a/IRaCIS.Core.Domain/Dcotor/Doctor.cs b/IRaCIS.Core.Domain/Dcotor/Doctor.cs index 49d05fc3..9ae5527e 100644 --- a/IRaCIS.Core.Domain/Dcotor/Doctor.cs +++ b/IRaCIS.Core.Domain/Dcotor/Doctor.cs @@ -12,16 +12,17 @@ namespace IRaCIS.Core.Domain.Models { // + [JsonIgnore] public List DoctorDicRelationList { get; set; }=new List(); - + [JsonIgnore] public List TrialExperienceCriteriaList { get; set; } // UserDoctor һҽ ɱû - + [JsonIgnore] public List UserList { get; set; } - + [JsonIgnore] public List EnrollList { get; set; } @@ -165,24 +166,24 @@ namespace IRaCIS.Core.Domain.Models public string SubspecialityOtherCN { get; set; } = string.Empty; public string SpecialityOtherCN { get; set; } = string.Empty; - + [JsonIgnore] [ForeignKey("HospitalId")] public Hospital Hospital { get; set; } - + [JsonIgnore] [ForeignKey("SpecialityId")] public virtual Dictionary Speciality { get; set; } - + [JsonIgnore] [ForeignKey("DepartmentId")] public virtual Dictionary Department { get; set; } - + [JsonIgnore] [ForeignKey("RankId")] public virtual Dictionary Rank { get; set; } - + [JsonIgnore] [ForeignKey("PositionId")] public virtual Dictionary Position { get; set; } - + [JsonIgnore] public List AttachmentList { get; set; } public bool IsVirtual { get; set; } diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs b/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs index 7738b7ab..24394b99 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs @@ -7,9 +7,11 @@ namespace IRaCIS.Core.Domain.Models [Table("DoctorDictionary")] public partial class DoctorDictionary : Entity { - + [JsonIgnore] [ForeignKey("DoctorId")] public Doctor Doctor { get; set; } + + [JsonIgnore] [ForeignKey("DictionaryId")] public Dictionary Dictionary { get; set; } diff --git a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs index 9aa8ad3e..ec048ce6 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs @@ -15,9 +15,10 @@ namespace IRaCIS.Core.Domain.Models public class SystemDocConfirmedUser : Entity, IAuditAdd,ISoftDelete { - + [JsonIgnore] public SystemDocument SystemDocument { get; set; } + [JsonIgnore] [ForeignKey("ConfirmUserId")] public User User { get; set; } diff --git a/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs b/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs index 51023cc6..cc7186df 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs @@ -14,11 +14,11 @@ namespace IRaCIS.Core.Domain.Models [Table("SystemDocNeedConfirmedUserType")] public class SystemDocNeedConfirmedUserType : Entity { - + [JsonIgnore] [ForeignKey("NeedConfirmUserTypeId")] public UserType UserTypeRole { get; set; } - + [JsonIgnore] public SystemDocument SystemDocument { get; set; } /// /// SystemDocumentId diff --git a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs index 02a1fadd..adfc388a 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs @@ -38,6 +38,7 @@ namespace IRaCIS.Core.Domain.Models [Required] public Guid ConfirmUserId { get; set; } + [JsonIgnore] [ForeignKey("ConfirmUserId")] public User User { get; set; } diff --git a/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs b/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs index bd87c683..fbc61e75 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs @@ -15,10 +15,11 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialDocNeedConfirmedUserType")] public class TrialDocNeedConfirmedUserType : Entity { + [JsonIgnore] [ForeignKey("NeedConfirmUserTypeId")] public UserType UserTypeRole { get; set; } - + [JsonIgnore] public TrialDocument TrialDocument { get; set; } diff --git a/IRaCIS.Core.Domain/Image/DicomInstance.cs b/IRaCIS.Core.Domain/Image/DicomInstance.cs index 8626970f..20c45db3 100644 --- a/IRaCIS.Core.Domain/Image/DicomInstance.cs +++ b/IRaCIS.Core.Domain/Image/DicomInstance.cs @@ -7,6 +7,7 @@ namespace IRaCIS.Core.Domain.Models [Table("DicomInstance")] public class DicomInstance : Entity, IAuditAdd, IAuditUpdate { + [JsonIgnore] [ForeignKey("SeriesId")] public DicomSeries DicomSerie { get; set; } diff --git a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs index eb86d318..2996b8e7 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs @@ -14,9 +14,10 @@ namespace IRaCIS.Core.Domain.Models [Table("StudyMonitor")] public class StudyMonitor : Entity, IAuditAdd { + [JsonIgnore] [ForeignKey("StudyId")] public DicomStudy DicomStudy { get; set; } - + [JsonIgnore] [ForeignKey("StudyId")] public NoneDicomStudy NoneDicomStudy { get; set; } @@ -61,22 +62,23 @@ namespace IRaCIS.Core.Domain.Models public Guid SubjectVisitId { get; set; } - + [JsonIgnore] [ForeignKey("SubjectId")] public Subject Subject { get; set; } + [JsonIgnore] [ForeignKey("SubjectVisitId")] public SubjectVisit SubjectVisit { get; set; } - + [JsonIgnore] public TrialSite TrialSite { get; set; } - + [JsonIgnore] [ForeignKey("SiteId")] public Site Site { get; set; } - + [JsonIgnore] [ForeignKey("TrialId")] public Trial Trial { get; set; } - + [JsonIgnore] [ForeignKey("CreateUserId")] public User Uploader { get; set; } diff --git a/IRaCIS.Core.Domain/Institution/Hospital.cs b/IRaCIS.Core.Domain/Institution/Hospital.cs index 6c30476a..45c86356 100644 --- a/IRaCIS.Core.Domain/Institution/Hospital.cs +++ b/IRaCIS.Core.Domain/Institution/Hospital.cs @@ -26,6 +26,7 @@ namespace IRaCIS.Core.Domain.Models public DateTime UpdateTime { get; set; } = DateTime.Now; public Guid UpdateUserId { get; set; } = Guid.Empty; + [JsonIgnore] public List DoctorList { get; set; } } diff --git a/IRaCIS.Core.Domain/Institution/Site.cs b/IRaCIS.Core.Domain/Institution/Site.cs index f47e1f1e..c89bcf9a 100644 --- a/IRaCIS.Core.Domain/Institution/Site.cs +++ b/IRaCIS.Core.Domain/Institution/Site.cs @@ -7,6 +7,7 @@ namespace IRaCIS.Core.Domain.Models [Table("Site")] public partial class Site : Entity, IAuditUpdate, IAuditAdd { + [JsonIgnore] public Hospital Hospital { get; set; } public string SiteName { get; set; } @@ -33,12 +34,13 @@ namespace IRaCIS.Core.Domain.Models public DateTime CreateTime { get; set; } = DateTime.Now; public Guid UpdateUserId { get; set; } = Guid.Empty; public DateTime UpdateTime { get; set; } = DateTime.Now; - + [JsonIgnore] public List SubjectList { get; set; } // + [JsonIgnore] public List TrialSiteList { get; set; } - + [JsonIgnore] public List< TrialSiteUser> TrialSiteUserList { get; set; } } } diff --git a/IRaCIS.Core.Domain/Management/Menu.cs b/IRaCIS.Core.Domain/Management/Menu.cs index 6bf734a6..2703fe1a 100644 --- a/IRaCIS.Core.Domain/Management/Menu.cs +++ b/IRaCIS.Core.Domain/Management/Menu.cs @@ -7,6 +7,7 @@ namespace IRaCIS.Core.Domain.Models [Table("Menu")] public class Menu : Entity, IAuditUpdate, IAuditAdd { + [JsonIgnore] public List UserTypeMenuList { get; set; } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs index 29d146fa..ec6117c4 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs @@ -18,11 +18,12 @@ namespace IRaCIS.Core.Domain.Models [Table("SystemNotice")] public class SystemNotice : Entity, IAuditUpdate, IAuditAdd { - + [JsonIgnore] public List NoticeUserTypeList { get; set; }=new List(); - + [JsonIgnore] public List NoticeUserReadList { get; set; }=new List(); + [JsonIgnore] public User CreateUser { get; set; } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs index db9561fa..6c5ff0f7 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs @@ -42,6 +42,7 @@ namespace IRaCIS.Core.Domain.Models [Required] public Guid UserTypeId { get; set; } + [JsonIgnore] [ForeignKey("UserTypeId")] public UserType NoticeUserType { get; set; } diff --git a/IRaCIS.Core.Domain/Management/User.cs b/IRaCIS.Core.Domain/Management/User.cs index 7d11c409..9d913fd9 100644 --- a/IRaCIS.Core.Domain/Management/User.cs +++ b/IRaCIS.Core.Domain/Management/User.cs @@ -13,11 +13,13 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("UserTypeId")] public UserType UserTypeRole { get; set; } + [JsonIgnore] public List SystemDocConfirmedList { get; set; } - + [JsonIgnore] public List UserDoctors { get; set; } = new List(); + [JsonIgnore] public List UserTrials { get; set; } = new List(); - + [JsonIgnore] public List VisitTaskList { get; set; } diff --git a/IRaCIS.Core.Domain/Management/UserType.cs b/IRaCIS.Core.Domain/Management/UserType.cs index e53ed493..87fd86cf 100644 --- a/IRaCIS.Core.Domain/Management/UserType.cs +++ b/IRaCIS.Core.Domain/Management/UserType.cs @@ -28,13 +28,15 @@ namespace IRaCIS.Core.Domain.Models - + [JsonIgnore] public List UserTypeMenuList { get; set; } - + [JsonIgnore] public List UserTypeGroupList { get; set; } + [JsonIgnore] public List SystemDocNeedConfirmedUserTypeList { get; set; } + [JsonIgnore] public List UserList { get; set; } diff --git a/IRaCIS.Core.Domain/Management/UserTypeGroup.cs b/IRaCIS.Core.Domain/Management/UserTypeGroup.cs index 9bf1138d..c9d960b9 100644 --- a/IRaCIS.Core.Domain/Management/UserTypeGroup.cs +++ b/IRaCIS.Core.Domain/Management/UserTypeGroup.cs @@ -28,10 +28,11 @@ namespace IRaCIS.Core.Domain.Models [Required] public Guid DictionaryId { get; set; } - + [JsonIgnore] [ForeignKey("DictionaryId")] public Dictionary Group { get; set; } + [JsonIgnore] [ForeignKey("UserTypeId")] public UserType UserType { get; set; } diff --git a/IRaCIS.Core.Domain/Management/UserTypeMenu.cs b/IRaCIS.Core.Domain/Management/UserTypeMenu.cs index 52753db7..b32311ee 100644 --- a/IRaCIS.Core.Domain/Management/UserTypeMenu.cs +++ b/IRaCIS.Core.Domain/Management/UserTypeMenu.cs @@ -12,6 +12,7 @@ namespace IRaCIS.Core.Domain.Models public Guid UserTypeId { get; set; } public Guid MenuId { get; set; } + [JsonIgnore] [ForeignKey("UserTypeId")] public UserType UserType { get; set; } diff --git a/IRaCIS.Core.Domain/QC/QCChallenge.cs b/IRaCIS.Core.Domain/QC/QCChallenge.cs index 3464196a..225efe9f 100644 --- a/IRaCIS.Core.Domain/QC/QCChallenge.cs +++ b/IRaCIS.Core.Domain/QC/QCChallenge.cs @@ -76,6 +76,7 @@ namespace IRaCIS.Core.Domain.Models //导航属性 [ForeignKey("SubjectVisitId")] public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] public List DialogList { get; set; } = new List(); diff --git a/IRaCIS.Core.Domain/QC/QCQuestion.cs b/IRaCIS.Core.Domain/QC/QCQuestion.cs index 564465b3..cd597677 100644 --- a/IRaCIS.Core.Domain/QC/QCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/QCQuestion.cs @@ -42,7 +42,8 @@ namespace IRaCIS.Core.Domain.Models /// [Required] public string TypeValue { get; set; } = string.Empty; - + + [JsonIgnore] [ForeignKey("ParentId")] public QCQuestion ParentQuestion { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs index 9177d16c..a42e9c86 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs @@ -13,6 +13,7 @@ namespace IRaCIS.Core.Domain.Models [Table("ReadingClinicalDataPDF")] public class ReadingClinicalDataPDF : Entity, IAuditAdd { + [JsonIgnore] [ForeignKey("ReadingClinicalDataId")] public ReadingClinicalData ReadingClinicalData { get; set; } /// diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs index 2508de07..54813200 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs @@ -84,6 +84,7 @@ namespace IRaCIS.Core.Domain.Models /// public bool? IsApplyHeavyReading { get; set; } + [JsonIgnore] [ForeignKey("CreateUserId")] public User CreateUser { get; set; } @@ -97,7 +98,7 @@ namespace IRaCIS.Core.Domain.Models /// 文件名称 /// public string FileName { get; set; } = string.Empty; - + [JsonIgnore] [ForeignKey("TaskMedicalReviewId")] public TaskMedicalReview TaskMedicalReview { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs index 707118d2..dfed36cf 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs @@ -49,6 +49,7 @@ namespace IRaCIS.Core.Domain.Models /// public Guid TrialCriterionId { get; set; } + [JsonIgnore] [ForeignKey("OrganInfoId")] public OrganInfo OrganInfo { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs index c0a5d693..5e959037 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs @@ -56,6 +56,7 @@ namespace IRaCIS.Core.Domain.Models public Guid ReadingQuestionCriterionTrialId { get; set; } + [JsonIgnore] public List ReadingQuestionList { get; set; } = new List(); diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index 3728ab5c..10c970c3 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -154,6 +154,7 @@ namespace IRaCIS.Core.Domain.Models public DataSources DataSource { get; set; } = DataSources.ManualEntry; [ForeignKey("DependParentId")] + [JsonIgnore] public ReadingTableQuestionSystem DependParentQuestion { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs index 543a5c2f..b82efd57 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs @@ -28,12 +28,14 @@ namespace IRaCIS.Core.Domain.Models /// 访视 /// [ForeignKey("SubjectVisitId")] + [JsonIgnore] public SubjectVisit SubjectVisit { get; set; } /// /// 阅片期配置 /// - [ForeignKey("ReadingPeriodSetId")] + [ForeignKey("ReadingPeriodSetId")] + [JsonIgnore] public ReadingPeriodSet ReadingPeriodSet { get; set; } /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs index 871b9954..120ac66e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs @@ -50,6 +50,7 @@ namespace IRaCIS.Core.Domain.Models public TrialSite TrialSite { get; set; } + [JsonIgnore] public ReadingPeriodSet ReadingPeriodSet { get; set; } diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs index a7aab4d2..883febf4 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs @@ -15,13 +15,13 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialSiteEquipmentSurvey")] public class TrialSiteEquipmentSurvey : Entity, IAuditUpdate, IAuditAdd { - + [JsonIgnore] [ForeignKey("TrialSiteSurveyId")] public TrialSiteSurvey TrialSiteSurvey { get; set; } public Guid TrialSiteSurveyId { get; set; } - + [JsonIgnore] [ForeignKey("EquipmentTypeId")] public Dictionary EquipmentType { get; set; } diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs index 22a29e1b..69563657 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs @@ -15,12 +15,13 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialSiteUserSurvey")] public class TrialSiteUserSurvey : Entity, IAuditUpdate, IAuditAdd { + [JsonIgnore] [ForeignKey("TrialSiteSurveyId")] public TrialSiteSurvey TrialSiteSurvey { get; set; } public Guid TrialSiteSurveyId { get; set; } - + [JsonIgnore] [ForeignKey("UserTypeId")] public UserType UserTypeRole { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/Enroll.cs b/IRaCIS.Core.Domain/Trial/Enroll.cs index 078b906e..6d0cfc82 100644 --- a/IRaCIS.Core.Domain/Trial/Enroll.cs +++ b/IRaCIS.Core.Domain/Trial/Enroll.cs @@ -62,7 +62,7 @@ namespace IRaCIS.Core.Domain.Models /// ˺ 뵽Ŀк ֵ /// public Guid? DoctorUserId { get; set; } - + [JsonIgnore] public User DoctorUser { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/EnrollDetail.cs b/IRaCIS.Core.Domain/Trial/EnrollDetail.cs index 6db35bb2..c4f46c29 100644 --- a/IRaCIS.Core.Domain/Trial/EnrollDetail.cs +++ b/IRaCIS.Core.Domain/Trial/EnrollDetail.cs @@ -7,6 +7,7 @@ namespace IRaCIS.Core.Domain.Models [Table("EnrollDetail")] public partial class EnrollDetail : Entity, IAuditAdd { + [JsonIgnore] public virtual TrialStatusDetail TrialDetail { get; set; } public Guid DoctorId { get; set; } @@ -18,12 +19,13 @@ namespace IRaCIS.Core.Domain.Models public int OptUserType { get; set; } public DateTime CreateTime { get; set; } - [ForeignKey("TrialDetail")] + public Guid TrialDetailId { get; set; } - + [JsonIgnore] [ForeignKey("CreateUserId")] - public User CreateUser { get; set; } + public User CreateUser { get; set; } + [JsonIgnore] public Doctor Doctor { get; set; } } } diff --git a/IRaCIS.Core.Domain/Trial/TrialDictionary.cs b/IRaCIS.Core.Domain/Trial/TrialDictionary.cs index 02df547c..2c87c9c8 100644 --- a/IRaCIS.Core.Domain/Trial/TrialDictionary.cs +++ b/IRaCIS.Core.Domain/Trial/TrialDictionary.cs @@ -8,8 +8,9 @@ namespace IRaCIS.Core.Domain.Models public partial class TrialDictionary : Entity { //public Guid Id { get; set; } - + [JsonIgnore] public virtual Trial Trial { get; set; } + [JsonIgnore] public virtual Dictionary Dictionary { get; set; } [StringLength(50)] diff --git a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs index 1bc58b74..a7a0cbba 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs @@ -13,6 +13,7 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialStateChange")] public class TrialStateChange : Entity, IAuditAdd { + [JsonIgnore] [ForeignKey("TrialId")] public Trial Trial { get; set; } @@ -33,7 +34,7 @@ namespace IRaCIS.Core.Domain.Models public Guid CreateUserId { get; set; } - + [JsonIgnore] [ForeignKey("CreateUserId")] public User User { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs index 49aca071..d90d797a 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs @@ -13,10 +13,9 @@ namespace IRaCIS.Core.Domain.Models { IntoGroupDetails = new HashSet(); } - + [JsonIgnore] public Trial Trial { get; set; } - [ForeignKey("Trial")] public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs index ec013503..297b3727 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs @@ -15,8 +15,8 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialExternalUser")] public class TrialExternalUser : Entity, IAuditUpdate, IAuditAdd { - - public Trial Trial { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } /// /// TrialId diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs index e9a2d66c..71dab10c 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs @@ -64,9 +64,9 @@ namespace IRaCIS.Core.Domain.Models public string RejectReason { get; set; } - + [JsonIgnore] public User User { get; set; } - + [JsonIgnore] public Trial Trial { get; set; } } diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs index 5b744d40..286717b2 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs @@ -15,7 +15,7 @@ namespace IRaCIS.Core.Domain.Models [Table("VisitPlanInfluenceStat")] public class VisitPlanInfluenceStat : Entity, IAuditAdd { - + [JsonIgnore] public List InfluenceStudyList { get; set; }=new List(); public Guid TrialId { get; set; } @@ -38,6 +38,7 @@ namespace IRaCIS.Core.Domain.Models [Required] public int InconsistentCount { get; set; } + [JsonIgnore] [ForeignKey("CreateUserId")] public User CreateUser { get; set; } diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs index 8fe4ad54..05e7bd0e 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs @@ -13,6 +13,7 @@ namespace IRaCIS.Core.Domain.Models [Table("VisitPlanInfluenceStudy")] public class VisitPlanInfluenceStudy : Entity, IAuditAdd { + [JsonIgnore] public SubjectVisit SubjectVisit { get; set; } public Guid SubjectVisitId { get; set; } @@ -35,9 +36,10 @@ namespace IRaCIS.Core.Domain.Models public Guid CreateUserId { get; set; } + [JsonIgnore] [ForeignKey("CreateUserId")] public User CreateUser { get; set; } - + [JsonIgnore] [ForeignKey("VisitPlanInfluenceStatId")] public VisitPlanInfluenceStat VisitPlanInfluenceStat { get; set; }