diff --git a/IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs b/IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs index 045510e9a..9cf314130 100644 --- a/IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs +++ b/IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs @@ -15,7 +15,7 @@ namespace IRaCIS.Core.Domain.Models ///是否需要拆表 /// [Table("SubjectTaskCategory")] - public class SubjectTaskCategory : BaseAuditAddEntity + public class SubjectTaskCategory : BaseAddAuditEntity { diff --git a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs index 67c388316..c372cbb50 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///TaskInfluence /// [Table("TaskInfluence")] - public class TaskInfluence : BaseAuditAddEntity + public class TaskInfluence : BaseAddAuditEntity { #region 导航属性 diff --git a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs index 35575cb2c..68c915486 100644 --- a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs +++ b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialVirtualSiteCodeUpdate /// [Table("TrialVirtualSiteCodeUpdate")] - public class TrialVirtualSiteCodeUpdate : BaseAuditAddEntity + public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity { #region 导航属性 diff --git a/IRaCIS.Core.Domain/BaseModel/Entity.cs b/IRaCIS.Core.Domain/BaseModel/Entity.cs index 4c2c23be8..5ca0a22aa 100644 --- a/IRaCIS.Core.Domain/BaseModel/Entity.cs +++ b/IRaCIS.Core.Domain/BaseModel/Entity.cs @@ -56,13 +56,23 @@ namespace IRaCIS.Core.Domain.Models #region 减少实体属性，增加基类 - public abstract class BaseAuditAddEntity : Entity, IAuditAdd + public abstract class BaseAddAuditEntity : Entity, IAuditAdd { public Guid CreateUserId { get; set; } public DateTime CreateTime { get; set; } } + public abstract class BaseAddDeleteAuditEntity : Entity, IAuditAdd, ISoftDelete + { + + public Guid CreateUserId { get; set; } + public DateTime CreateTime { get; set; } + public Guid? DeleteUserId { get; set; } + public bool IsDeleted { get; set; } + public DateTime? DeletedTime { get; set; } + } + public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd { public Guid CreateUserId { get; set; } @@ -72,7 +82,7 @@ namespace IRaCIS.Core.Domain.Models } - public abstract class BaseFullAuditDeleteEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete + public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete { public Guid? DeleteUserId { get; set; } public bool IsDeleted { get; set; } @@ -85,7 +95,7 @@ namespace IRaCIS.Core.Domain.Models - public abstract class BaseAuditAddEntityWithUserName : Entity, IAuditAddWithUserName + public abstract class BaseAddAuditEntityWithUserName : Entity, IAuditAddWithUserName { public string CreateUser { get; set; } diff --git a/IRaCIS.Core.Domain/Common/CommonDocument.cs b/IRaCIS.Core.Domain/Common/CommonDocument.cs index 579fb3da8..1b2af8ff8 100644 --- a/IRaCIS.Core.Domain/Common/CommonDocument.cs +++ b/IRaCIS.Core.Domain/Common/CommonDocument.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///CommonDocument /// [Table("CommonDocument")] - public class CommonDocument : BaseFullAuditDeleteEntity + public class CommonDocument : BaseFullDeleteAuditEntity { public string Code { get; set; } = String.Empty; diff --git a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs index 55d17c476..4f28ebf6b 100644 --- a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models ///EmailNoticeConfig /// [Table("EmailNoticeConfig")] - public class EmailNoticeConfig : BaseFullAuditDeleteEntity + public class EmailNoticeConfig : BaseFullDeleteAuditEntity { #region 导航属性 [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Common/ExploreRecommend.cs b/IRaCIS.Core.Domain/Common/ExploreRecommend.cs index c9401e9e7..fd5bef412 100644 --- a/IRaCIS.Core.Domain/Common/ExploreRecommend.cs +++ b/IRaCIS.Core.Domain/Common/ExploreRecommend.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///ExploreRecommend /// [Table("ExploreRecommend")] - public class ExploreRecommend : BaseFullAuditDeleteEntity + public class ExploreRecommend : BaseFullDeleteAuditEntity { #region 导航属性 diff --git a/IRaCIS.Core.Domain/Common/VerificationCode.cs b/IRaCIS.Core.Domain/Common/VerificationCode.cs index 40d21b59d..8a7638fad 100644 --- a/IRaCIS.Core.Domain/Common/VerificationCode.cs +++ b/IRaCIS.Core.Domain/Common/VerificationCode.cs @@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { [Table("VerificationCode")] - public class VerificationCode:BaseAuditAddEntity + public class VerificationCode:BaseAddAuditEntity { public Guid UserId { get; set; } = Guid.Empty; diff --git a/IRaCIS.Core.Domain/Dcotor/Attachment.cs b/IRaCIS.Core.Domain/Dcotor/Attachment.cs index bbc7d6d1b..a78eee9c8 100644 --- a/IRaCIS.Core.Domain/Dcotor/Attachment.cs +++ b/IRaCIS.Core.Domain/Dcotor/Attachment.cs @@ -14,7 +14,7 @@ namespace IRaCIS.Core.Domain.Models // HighestDegreeCertificate=7//最高学历证书 //} [Table("Attachment")] - public partial class Attachment : BaseAuditAddEntity + public partial class Attachment : BaseAddAuditEntity { [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs index 2394e4cbd..b7c019ea1 100644 --- a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs +++ b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///DoctorCriterionFile /// [Table("DoctorCriterionFile")] - public class DoctorCriterionFile :BaseAuditAddEntity + public class DoctorCriterionFile :BaseAddAuditEntity { #region 导航属性 [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs index a19f01686..ed90cbc57 100644 --- a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs +++ b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///EnrollReadingCriterion /// [Table("EnrollReadingCriterion")] - public class EnrollReadingCriterion :BaseAuditAddEntity + public class EnrollReadingCriterion :BaseAddAuditEntity { #region 导航属性 diff --git a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs index 80272ffa0..c684334ef 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs @@ -12,55 +12,32 @@ namespace IRaCIS.Core.Domain.Models ///SystemDocConfirmedUser /// [Table("SystemDocConfirmedUser")] - public class SystemDocConfirmedUser : BaseAuditAddEntity, ISoftDelete + public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity { #region 导航属性 - - #endregion [JsonIgnore] public SystemDocument SystemDocument { get; set; } [JsonIgnore] [ForeignKey("ConfirmUserId")] public User User { get; set; } + #endregion + + - /// - /// TrialDocumentId - /// - [Required] public Guid SystemDocumentId { get; set; } - /// - /// ConfirmTime - /// public DateTime? ConfirmTime { get; set; } - /// - /// ConfirmUserId - /// - [Required] + public Guid ConfirmUserId { get; set; } - /// - /// SignFirstViewTime - /// public DateTime? SignFirstViewTime { get; set; } public string SignText { get; set; } = string.Empty; - - /// - /// 是否废除 - /// - public bool IsDeleted { get; set; } - - public DateTime? DeletedTime { get; set; } - - public Guid? DeleteUserId { get; set; } - - } } diff --git a/IRaCIS.Core.Domain/Document/SystemDocument.cs b/IRaCIS.Core.Domain/Document/SystemDocument.cs index 4365f6706..e1ea73e42 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocument.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocument.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///SystemDocument /// [Table("SystemDocument")] - public class SystemDocument : BaseFullAuditDeleteEntity + public class SystemDocument : BaseFullDeleteAuditEntity { #region 导航属性 [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs index 7e10ac0c3..67db8d33d 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs @@ -12,8 +12,8 @@ namespace IRaCIS.Core.Domain.Models ///TrialDocUserTypeConfirmUser /// [Table("TrialDocConfirmedUser")] - public class TrialDocConfirmedUser : BaseAuditAddEntity,ISoftDelete - { + public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity + { #region 导航属性 [JsonIgnore] @@ -42,15 +42,6 @@ namespace IRaCIS.Core.Domain.Models - /// - /// 是否废除 - /// - public bool IsDeleted { get; set; } - - public DateTime? DeletedTime { get; set; } - - public Guid? DeleteUserId { get; set; } - } diff --git a/IRaCIS.Core.Domain/Document/TrialDocument.cs b/IRaCIS.Core.Domain/Document/TrialDocument.cs index 80b748894..1e8dad2fa 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocument.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocument.cs @@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialDocument /// [Table("TrialDocument")] - public class TrialDocument : BaseFullAuditDeleteEntity + public class TrialDocument : BaseFullDeleteAuditEntity { #region 导航属性 [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs index 919d0e8b9..1bd2ce787 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs @@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models ///TrialEmailNoticeConfig /// [Table("TrialEmailNoticeConfig")] - public class TrialEmailNoticeConfig : BaseFullAuditDeleteEntity + public class TrialEmailNoticeConfig : BaseFullDeleteAuditEntity { #region 导航属性 [JsonIgnore] diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs index cf8844ad4..2c4852eda 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs @@ -15,7 +15,9 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialEmailNoticeUser")] public class TrialEmailNoticeUser : Entity { + #region 导航属性 + #endregion [JsonIgnore] public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; } diff --git a/IRaCIS.Core.Domain/Image/DicomInstance.cs b/IRaCIS.Core.Domain/Image/DicomInstance.cs index 2f6614008..758ff13cf 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 : BaseFullAuditEntity { + #region 导航属性 [JsonIgnore] [ForeignKey("SeriesId")] public DicomSeries DicomSerie { get; set; } @@ -14,6 +15,8 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("StudyId")] public DicomStudy DicomStudy { get; set; } + #endregion + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/IRaCIS.Core.Domain/Image/DicomSeries.cs b/IRaCIS.Core.Domain/Image/DicomSeries.cs index bb74f7d64..c4225697c 100644 --- a/IRaCIS.Core.Domain/Image/DicomSeries.cs +++ b/IRaCIS.Core.Domain/Image/DicomSeries.cs @@ -6,8 +6,9 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { [Table("DicomSeries")] - public class DicomSeries : BaseFullAuditDeleteEntity + public class DicomSeries : BaseFullDeleteAuditEntity { + #region 导航属性 [JsonIgnore] [ForeignKey("StudyId")] public DicomStudy DicomStudy { get; set; } @@ -17,6 +18,8 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List SubjectCriteriaEvaluationVisitStudyFilterList { get; set; } + #endregion + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs index d1dc9f4d1..b17d275b1 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs @@ -6,8 +6,9 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { [Table("DicomStudy")] - public class DicomStudy : BaseFullAuditDeleteEntity + public class DicomStudy : BaseFullDeleteAuditEntity { + #region 导航属性 //一个检查 由多个人管理 //public List TrialSiteUserList { get; set; } = new List(); [JsonIgnore] @@ -15,10 +16,30 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List SeriesList { get; set; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } + + [JsonIgnore] + [ForeignKey("SubjectVisitId")] + public SubjectVisit SubjectVisit { get; set; } [JsonIgnore] - public List SubjectCriteriaEvaluationVisitStudyFilterList { get; set; } + [ForeignKey("CreateUserId")] + public User Uploader { get; set; } + + [JsonIgnore] + public List ReadingClinicalDataList { get; set; } + + [JsonIgnore] + public List ReadingConsistentClinicalDataList { get; set; } + + + [JsonIgnore] + public List SubjectCriteriaEvaluationVisitStudyFilterList { get; set; } + + #endregion [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public Guid SeqId { get; set; } @@ -68,27 +89,7 @@ namespace IRaCIS.Core.Domain.Models //0 未知 1 单重 2 双重 public bool IsDoubleReview { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } - - [JsonIgnore] - [ForeignKey("SubjectVisitId")] - public SubjectVisit SubjectVisit { get; set; } - - - [JsonIgnore] - [ForeignKey("CreateUserId")] - public User Uploader { get; set; } - - [JsonIgnore] - - public List ReadingClinicalDataList { get; set; } - - [JsonIgnore] - - public List ReadingConsistentClinicalDataList { get; set; } - + public bool IsFromPACS { get; set; } diff --git a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs index 7d3171773..dc83b79f4 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs @@ -12,15 +12,12 @@ namespace IRaCIS.Core.Domain.Models ///DicomStudyMonitor /// [Table("StudyMonitor")] - public class StudyMonitor : BaseAuditAddEntity + public class StudyMonitor : BaseAddAuditEntity { - - - - + #region 导航属性 [JsonIgnore] [ForeignKey("StudyId")] - public DicomStudy DicomStudy { get; set; } + public DicomStudy DicomStudy { get; set; } [JsonIgnore] [ForeignKey("StudyId")] public NoneDicomStudy NoneDicomStudy { get; set; } @@ -29,6 +26,24 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("StudyId")] public TaskStudy TaskStudy { get; set; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } + + [JsonIgnore] + [ForeignKey("SubjectVisitId")] + public SubjectVisit SubjectVisit { get; set; } + + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } + [JsonIgnore] + [ForeignKey("CreateUserId")] + public User Uploader { get; set; } + + #endregion + + //可能是Dicom 也可能是非Dicom 该字段废弃 @@ -66,21 +81,7 @@ 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] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("CreateUserId")] - public User Uploader { get; set; } - + public bool IsSuccess { get; set; } diff --git a/IRaCIS.Core.Domain/Image/ImageShare.cs b/IRaCIS.Core.Domain/Image/ImageShare.cs index 4df83bd66..cbd10e7af 100644 --- a/IRaCIS.Core.Domain/Image/ImageShare.cs +++ b/IRaCIS.Core.Domain/Image/ImageShare.cs @@ -4,6 +4,9 @@ namespace IRaCIS.Core.Domain.Models { public class ImageShare: Entity { + #region 导航属性 + + #endregion public Guid TrialId { get; set; } public Guid SubjectId { get; set; } public Guid StudyId { get; set; } diff --git a/IRaCIS.Core.Domain/Image/SCPImageUpload.cs b/IRaCIS.Core.Domain/Image/SCPImageUpload.cs index 2d365d765..73e01c195 100644 --- a/IRaCIS.Core.Domain/Image/SCPImageUpload.cs +++ b/IRaCIS.Core.Domain/Image/SCPImageUpload.cs @@ -14,33 +14,39 @@ namespace IRaCIS.Core.Domain.Models ///SCPImageUpload /// [Table("SCPImageUpload")] - public class SCPImageUpload : BaseAuditAddEntity + public class SCPImageUpload : BaseAddAuditEntity { - + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } - [Required] - public string CallingAE { get; set; }=string.Empty; + [JsonIgnore] + public TrialSite TrialSite { get; set; } + #endregion - [Required] + + public string CallingAE { get; set; }=string.Empty; + + public string CalledAE { get; set; } = string.Empty; - [Required] + public string CallingAEIP { get; set; } = string.Empty; - [Required] + public DateTime StartTime { get; set; } - [Required] + public DateTime EndTime { get; set; } - [Required] + public int FileCount { get; set; } - [Required] + public long FileSize { get; set; } @@ -52,12 +58,7 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialId { get; set; } public Guid TrialSiteId { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - - [JsonIgnore] - public TrialSite TrialSite { get; set; } } diff --git a/IRaCIS.Core.Domain/Image/SCPInstance.cs b/IRaCIS.Core.Domain/Image/SCPInstance.cs index 0203c57a4..115656f04 100644 --- a/IRaCIS.Core.Domain/Image/SCPInstance.cs +++ b/IRaCIS.Core.Domain/Image/SCPInstance.cs @@ -7,6 +7,7 @@ namespace IRaCIS.Core.Domain.Models [Table("SCPInstance")] public class SCPInstance : BaseFullAuditEntity { + #region 导航属性 [JsonIgnore] [ForeignKey("SeriesId")] public SCPSeries SCPSeries { get; set; } @@ -14,6 +15,8 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("StudyId")] public SCPStudy SCPStudy { get; set; } + #endregion + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/IRaCIS.Core.Domain/Image/SCPPatient.cs b/IRaCIS.Core.Domain/Image/SCPPatient.cs index 48cbeeb80..a9a04ea16 100644 --- a/IRaCIS.Core.Domain/Image/SCPPatient.cs +++ b/IRaCIS.Core.Domain/Image/SCPPatient.cs @@ -8,7 +8,17 @@ namespace IRaCIS.Core.Domain.Models [Table("SCPPatient")] public class SCPPatient : BaseFullAuditEntity { + #region 导航属性 + [JsonIgnore] public List SCPStudyList { get; set; } + [JsonIgnore] + public Subject Subject { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + public TrialSite TrialSite { get; set; } + #endregion + public string PatientIdStr { get; set; } = string.Empty; public string PatientName { get; set; } = string.Empty; @@ -28,12 +38,7 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialSiteId { get; set; } - [JsonIgnore] - public Subject Subject { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - [JsonIgnore] - public TrialSite TrialSite { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Image/SCPSeries.cs b/IRaCIS.Core.Domain/Image/SCPSeries.cs index fb51ec62f..4cc3e689d 100644 --- a/IRaCIS.Core.Domain/Image/SCPSeries.cs +++ b/IRaCIS.Core.Domain/Image/SCPSeries.cs @@ -6,14 +6,17 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { [Table("SCPSeries")] - public class SCPSeries : BaseFullAuditDeleteEntity + public class SCPSeries : BaseFullDeleteAuditEntity { + #region 导航属性 [JsonIgnore] [ForeignKey("StudyId")] public SCPStudy SCPStudy { get; set; } [JsonIgnore] public List SCPInstanceList { get; set; } + #endregion + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public Guid SeqId { get; set; } diff --git a/IRaCIS.Core.Domain/Image/SCPStudy.cs b/IRaCIS.Core.Domain/Image/SCPStudy.cs index c3940592e..5a11ca22f 100644 --- a/IRaCIS.Core.Domain/Image/SCPStudy.cs +++ b/IRaCIS.Core.Domain/Image/SCPStudy.cs @@ -6,22 +6,32 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { [Table("SCPStudy")] - public class SCPStudy : BaseFullAuditDeleteEntity + public class SCPStudy : BaseFullDeleteAuditEntity { + #region 导航属性 + [JsonIgnore] + public List InstanceList { get; set; } + [JsonIgnore] + public List SeriesList { get; set; } + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + + [JsonIgnore] + public Trial Trial { get; set; } + + [JsonIgnore] + public TrialSite TrialSite { get; set; } + + #endregion //0 未知 1 单重 2 双重 public bool IsDoubleReview { get; set; } - [JsonIgnore] - public List InstanceList { get; set; } - - [JsonIgnore] - public List SeriesList { get; set; } - + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public Guid SeqId { get; set; } @@ -31,9 +41,6 @@ namespace IRaCIS.Core.Domain.Models public SCPPatient Patient { get; set; } public Guid PatientId { get; set; } - - - public string StudyInstanceUid { get; set; } = string.Empty; public DateTime? StudyTime { get; set; } public string Modalities { get; set; } = string.Empty; @@ -76,15 +83,7 @@ namespace IRaCIS.Core.Domain.Models public Guid? SubjectVisitId { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - - [JsonIgnore] - - public Trial Trial { get; set; } - - [JsonIgnore] - public TrialSite TrialSite { get; set; } + } diff --git a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs index 5320b77fb..31275b027 100644 --- a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs +++ b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs @@ -14,8 +14,10 @@ namespace IRaCIS.Core.Domain.Models [Table("SystemAnonymization")] public class SystemAnonymization : BaseFullAuditEntity { - - public string Group { get; set; } = String.Empty; + #region 导航属性 + + #endregion + public string Group { get; set; } = String.Empty; public string Element { get; set; } = String.Empty; diff --git a/IRaCIS.Core.Domain/Image/TaskInstance.cs b/IRaCIS.Core.Domain/Image/TaskInstance.cs index 1f3243f81..ea1035483 100644 --- a/IRaCIS.Core.Domain/Image/TaskInstance.cs +++ b/IRaCIS.Core.Domain/Image/TaskInstance.cs @@ -6,6 +6,7 @@ namespace IRaCIS.Core.Domain.Models { public class TaskInstance : BaseFullAuditEntity { + #region 导航属性 [JsonIgnore] [ForeignKey("SeriesId")] public TaskSeries TaskSeries { get; set; } @@ -13,6 +14,8 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("StudyId")] public TaskStudy TaskStudy { get; set; } + #endregion + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/IRaCIS.Core.Domain/Image/TaskSeries.cs b/IRaCIS.Core.Domain/Image/TaskSeries.cs index b3b24dd06..1328a7c9f 100644 --- a/IRaCIS.Core.Domain/Image/TaskSeries.cs +++ b/IRaCIS.Core.Domain/Image/TaskSeries.cs @@ -5,14 +5,17 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { - public class TaskSeries : BaseFullAuditDeleteEntity + public class TaskSeries : BaseFullDeleteAuditEntity { + #region 导航属性 [JsonIgnore] [ForeignKey("StudyId")] public TaskStudy TaskStudy { get; set; } [JsonIgnore] public List InstanceList { get; set; } + #endregion + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] diff --git a/IRaCIS.Core.Domain/Image/TaskStudy.cs b/IRaCIS.Core.Domain/Image/TaskStudy.cs index 86c6db504..b290796f9 100644 --- a/IRaCIS.Core.Domain/Image/TaskStudy.cs +++ b/IRaCIS.Core.Domain/Image/TaskStudy.cs @@ -5,9 +5,9 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { - public class TaskStudy : BaseFullAuditDeleteEntity + public class TaskStudy : BaseFullDeleteAuditEntity { - + #region 导航属性 [JsonIgnore] [ForeignKey("VisitTaskId")] public VisitTask VisitTask { get; set; } @@ -21,6 +21,18 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List SeriesList { get; set; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } + + + + [JsonIgnore] + [ForeignKey("CreateUserId")] + public User Uploader { get; set; } + + #endregion + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public Guid SeqId { get; set; } @@ -70,15 +82,7 @@ namespace IRaCIS.Core.Domain.Models //0 未知 1 单重 2 双重 public bool IsDoubleReview { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } - - - - [JsonIgnore] - [ForeignKey("CreateUserId")] - public User Uploader { get; set; } + diff --git a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs index 8334c8ee3..58fdbf36e 100644 --- a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs +++ b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs @@ -15,7 +15,9 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialDicomAE")] public class TrialDicomAE : BaseFullAuditEntity { + #region 导航属性 + #endregion public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Domain/Institution/CRO.cs b/IRaCIS.Core.Domain/Institution/CRO.cs index 98a9b49b5..35b8bc753 100644 --- a/IRaCIS.Core.Domain/Institution/CRO.cs +++ b/IRaCIS.Core.Domain/Institution/CRO.cs @@ -6,6 +6,9 @@ namespace IRaCIS.Core.Domain.Models [Table("CROCompany")] public partial class CRO : BaseFullAuditEntity { + #region + + #endregion public string CROName { get; set; } = string.Empty; public string CRONameCN { get; set; } = string.Empty; public string CROCode { get; set; } diff --git a/IRaCIS.Core.Domain/Institution/Hospital.cs b/IRaCIS.Core.Domain/Institution/Hospital.cs index 680980264..b2d69d306 100644 --- a/IRaCIS.Core.Domain/Institution/Hospital.cs +++ b/IRaCIS.Core.Domain/Institution/Hospital.cs @@ -7,6 +7,16 @@ namespace IRaCIS.Core.Domain.Models [Table("Hospital")] public class Hospital : BaseFullAuditEntity { + #region 导航属性 + [JsonIgnore] + [ForeignKey("SiteId")] + public Site Site { get; set; } + + [JsonIgnore] + public List DoctorList { get; set; } + #endregion + + public string HospitalName { get; set; } = string.Empty; public string UniversityAffiliated { get; set; } = string.Empty; public string Country { get; set; } = string.Empty; @@ -26,12 +36,7 @@ namespace IRaCIS.Core.Domain.Models public Guid? SiteId { get; set; } = Guid.Empty; - [JsonIgnore] - [ForeignKey("SiteId")] - public Site Site { get; set; } - - [JsonIgnore] - public List DoctorList { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Institution/Site.cs b/IRaCIS.Core.Domain/Institution/Site.cs index 1b0fcbb2f..1287a1c86 100644 --- a/IRaCIS.Core.Domain/Institution/Site.cs +++ b/IRaCIS.Core.Domain/Institution/Site.cs @@ -7,9 +7,14 @@ namespace IRaCIS.Core.Domain.Models [Table("Site")] public partial class Site : BaseFullAuditEntity { + #region [JsonIgnore] [ForeignKey("HospitalId")] public Hospital Hospital { get; set; } + [JsonIgnore] + public List TrialSiteList { get; set; } + #endregion + public string SiteName { get; set; } = string.Empty; public string SiteNameCN{ get; set; } = string.Empty; public string AliasName { get; set; } = string.Empty; @@ -35,9 +40,7 @@ namespace IRaCIS.Core.Domain.Models - // - [JsonIgnore] - public List TrialSiteList { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Institution/Sponsor.cs b/IRaCIS.Core.Domain/Institution/Sponsor.cs index 66389dd89..23c0141a7 100644 --- a/IRaCIS.Core.Domain/Institution/Sponsor.cs +++ b/IRaCIS.Core.Domain/Institution/Sponsor.cs @@ -6,6 +6,9 @@ namespace IRaCIS.Core.Domain.Models [Table("Sponsor")] public partial class Sponsor : BaseFullAuditEntity { + #region + + #endregion public string SponsorName { get; set; } = String.Empty; public string SponsorNameCN { get; set; } = String.Empty; diff --git a/IRaCIS.Core.Domain/Management/Menu.cs b/IRaCIS.Core.Domain/Management/Menu.cs index 2a42407fe..04ef92b3a 100644 --- a/IRaCIS.Core.Domain/Management/Menu.cs +++ b/IRaCIS.Core.Domain/Management/Menu.cs @@ -7,8 +7,11 @@ namespace IRaCIS.Core.Domain.Models [Table("Menu")] public class Menu : BaseFullAuditEntity { + #region 导航属性 [JsonIgnore] public List UserTypeMenuList { get; set; } + #endregion + //上级菜单 diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs index cab3dca80..c73658228 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs @@ -18,18 +18,19 @@ namespace IRaCIS.Core.Domain.Models [Table("SystemNotice")] public class SystemNotice : BaseFullAuditEntity { + #region 导航属性 [JsonIgnore] - public List NoticeUserTypeList { get; set; }=new List(); + public List NoticeUserTypeList { get; set; } = new List(); [JsonIgnore] - public List NoticeUserReadList { get; set; }=new List(); + public List NoticeUserReadList { get; set; } = new List(); [JsonIgnore] public User CreateUser { get; set; } + #endregion - public string NoticeContent { get; set; } - + public string NoticeContent { get; set; } public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; } @@ -41,15 +42,12 @@ namespace IRaCIS.Core.Domain.Models public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; } - public DateTime? StartDate { get; set; } public DateTime? EndDate { get; set; } - [Required] public string FileName { get; set; } - [Required] public string Path { get; set; } public Guid? PublishedUserId { get; set; } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs index a09d4f282..6a4a785ef 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs @@ -13,10 +13,12 @@ namespace IRaCIS.Core.Domain.Models ///SystemNoticeUserRead /// [Table("SystemNoticeUserRead")] - public class SystemNoticeUserRead : BaseAuditAddEntity + public class SystemNoticeUserRead : BaseAddAuditEntity { + #region 导航属性 + #endregion public Guid SystemNoticeId { get; set; } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs index e2b4e0992..0b478f79b 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs @@ -13,20 +13,22 @@ namespace IRaCIS.Core.Domain.Models ///SystemNoticeUserType /// [Table("SystemNoticeUserType")] - public class SystemNoticeUserType : BaseAuditAddEntity + public class SystemNoticeUserType : BaseAddAuditEntity { - + #region 导航属性 + [JsonIgnore] - public Guid SystemNoticeId { get; set; } + [ForeignKey("UserTypeId")] + public UserType NoticeUserType { get; set; } + #endregion + + public Guid SystemNoticeId { get; set; } public Guid UserTypeId { get; set; } - [JsonIgnore] - - [ForeignKey("UserTypeId")] - public UserType NoticeUserType { get; set; } + } diff --git a/IRaCIS.Core.Domain/Management/Role.cs b/IRaCIS.Core.Domain/Management/Role.cs index 151a996ab..d0ca7f7f4 100644 --- a/IRaCIS.Core.Domain/Management/Role.cs +++ b/IRaCIS.Core.Domain/Management/Role.cs @@ -7,7 +7,9 @@ namespace IRaCIS.Core.Domain.Models [Table("Role")] public partial class Role : BaseFullAuditEntity { + #region 导航属性 + #endregion public string RoleName { get; set; } = string.Empty; public string RoleDescription { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Management/User.cs b/IRaCIS.Core.Domain/Management/User.cs index 14954c9b2..c024f2824 100644 --- a/IRaCIS.Core.Domain/Management/User.cs +++ b/IRaCIS.Core.Domain/Management/User.cs @@ -10,6 +10,7 @@ namespace IRaCIS.Core.Domain.Models [Table("User")] public partial class User : BaseFullAuditEntity { + #region [ForeignKey("UserTypeId")] public UserType UserTypeRole { get; set; } @@ -23,6 +24,12 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List VisitTaskList { get; set; } + [JsonIgnore] + [ForeignKey("DoctorId")] + public Doctor Doctor { get; set; } + #endregion + + [StringLength(255)] public string UserName { get; set; } = String.Empty; @@ -53,12 +60,6 @@ namespace IRaCIS.Core.Domain.Models public bool PasswordChanged { get; set; } - //public Guid OrganizationId { get; set; } = Guid.Empty; - //public Guid OrganizationTypeId { get; set; } = Guid.Empty; - //public string OrganizationType { get; set; } = String.Empty; - //public string UserType { get; set; } = string.Empty; - //public bool SuperAdmin { get; set; } = false; - //public string RealName { get; set; } public string UserCode { get; set; } = string.Empty; @@ -87,11 +88,6 @@ namespace IRaCIS.Core.Domain.Models //ҽ˺ź󣬻ֵ public Guid? DoctorId { get; set; } - [JsonIgnore] - [ForeignKey("DoctorId")] - public Doctor Doctor { get; set; } - - public bool IsTestUser { get; set; } /// diff --git a/IRaCIS.Core.Domain/Management/UserFeedBack.cs b/IRaCIS.Core.Domain/Management/UserFeedBack.cs index dcf74c8d4..9dd0d1d66 100644 --- a/IRaCIS.Core.Domain/Management/UserFeedBack.cs +++ b/IRaCIS.Core.Domain/Management/UserFeedBack.cs @@ -16,6 +16,7 @@ namespace IRaCIS.Core.Domain.Models [Table("UserFeedBack")] public class UserFeedBack : BaseFullAuditEntity { + #region 导航属性 [JsonIgnore] public Trial Trial { get; set; } [JsonIgnore] @@ -31,6 +32,11 @@ namespace IRaCIS.Core.Domain.Models public VisitTask VisitTask { get; set; } + [NotMapped] + public List ScreenshotList => JsonConvert.DeserializeObject>(ScreenshotListStr); + #endregion + + public Guid? VisitTaskId { get; set; } public Guid? SubjectId { get; set; } @@ -58,8 +64,7 @@ namespace IRaCIS.Core.Domain.Models public string ScreenshotListStr { get; set; } - [NotMapped] - public List ScreenshotList => JsonConvert.DeserializeObject>(ScreenshotListStr); + diff --git a/IRaCIS.Core.Domain/Management/UserLog.cs b/IRaCIS.Core.Domain/Management/UserLog.cs index d27867fa1..980656bca 100644 --- a/IRaCIS.Core.Domain/Management/UserLog.cs +++ b/IRaCIS.Core.Domain/Management/UserLog.cs @@ -13,8 +13,15 @@ namespace IRaCIS.Core.Domain.Models ///UserLog /// [Table("UserLog")] - public class UserLog : BaseAuditAddEntity + public class UserLog : BaseAddAuditEntity { + #region 导航属性 + [JsonIgnore] + public User LoginUser { get; set; } + + [JsonIgnore] + public User OptUser { get; set; } + #endregion public string IP { get; set; } = string.Empty; @@ -31,11 +38,7 @@ namespace IRaCIS.Core.Domain.Models public Guid? OptUserId { get;set; } - [JsonIgnore] - public User LoginUser { get; set; } - - [JsonIgnore] - public User OptUser { get; set; } + public string IPRegion { get; set; } diff --git a/IRaCIS.Core.Domain/Management/UserPassWordLog.cs b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs index 8b3c4fd31..e702b0be4 100644 --- a/IRaCIS.Core.Domain/Management/UserPassWordLog.cs +++ b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs @@ -13,14 +13,16 @@ namespace IRaCIS.Core.Domain.Models ///UserPassWordLog /// [Table("UserPassWordLog")] - public class UserPassWordLog : BaseAuditAddEntity + public class UserPassWordLog : BaseAddAuditEntity { - - - /// + #region 导航属性 + + #endregion + + /// /// 用户Id /// - public Guid UserId { get; set; } + public Guid UserId { get; set; } /// /// 密码 diff --git a/IRaCIS.Core.Domain/Management/UserType.cs b/IRaCIS.Core.Domain/Management/UserType.cs index 3a61dff11..a1490e0e8 100644 --- a/IRaCIS.Core.Domain/Management/UserType.cs +++ b/IRaCIS.Core.Domain/Management/UserType.cs @@ -8,7 +8,18 @@ namespace IRaCIS.Core.Domain.Models { + #region 导航属性 + [JsonIgnore] + public List UserTypeMenuList { get; set; } + [JsonIgnore] + public List UserTypeGroupList { get; set; } + [JsonIgnore] + public List SystemDocNeedConfirmedUserTypeList { get; set; } + + [JsonIgnore] + public List UserList { get; set; } + #endregion public UserTypeEnum UserTypeEnum { get; set; } public string UserTypeName { get; set; } @@ -26,16 +37,7 @@ 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; } + } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Management/UserTypeGroup.cs b/IRaCIS.Core.Domain/Management/UserTypeGroup.cs index c9d960b96..1c6d6645f 100644 --- a/IRaCIS.Core.Domain/Management/UserTypeGroup.cs +++ b/IRaCIS.Core.Domain/Management/UserTypeGroup.cs @@ -14,27 +14,24 @@ namespace IRaCIS.Core.Domain.Models /// [Table("UserTypeGroup")] public class UserTypeGroup : Entity - { - - /// - /// UserTypeId - /// - [Required] - public Guid UserTypeId { get; set; } + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("DictionaryId")] + public Dictionary Group { get; set; } + + [JsonIgnore] + [ForeignKey("UserTypeId")] + public UserType UserType { get; set; } + #endregion + + + public Guid UserTypeId { get; set; } - /// - /// DictionaryId - /// - [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 017cf37a1..654df3185 100644 --- a/IRaCIS.Core.Domain/Management/UserTypeMenu.cs +++ b/IRaCIS.Core.Domain/Management/UserTypeMenu.cs @@ -7,14 +7,19 @@ namespace IRaCIS.Core.Domain.Models [Table("UserTypeMenu")] public partial class UserTypeMenu : Entity { - - public Menu Menu { get; set; } - public Guid UserTypeId { get; set; } - public Guid MenuId { get; set; } + #region [JsonIgnore] [ForeignKey("UserTypeId")] public UserType UserType { get; set; } + [JsonIgnore] + public Menu Menu { get; set; } + #endregion + + public Guid UserTypeId { get; set; } + public Guid MenuId { get; set; } + + } diff --git a/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs b/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs index 4e6de99ee..df3e08de2 100644 --- a/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs +++ b/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs @@ -7,11 +7,15 @@ using System.Text; namespace IRaCIS.Core.Domain.Models { - public class CheckChallengeDialog : BaseAuditAddEntity + public class CheckChallengeDialog : BaseAddAuditEntity { - public string TalkContent { get; set; } = string.Empty; + #region 导航属性 [JsonIgnore] public SubjectVisit SubjectVisit { get; set; } + #endregion + + public string TalkContent { get; set; } = string.Empty; + public Guid SubjectVisitId { get; set; } public User CreateUser { get; set; } @@ -19,7 +23,7 @@ namespace IRaCIS.Core.Domain.Models public UserTypeEnum UserTypeEnum { get; set; } - // + public bool? IsCRCNeedReply { get; set; } public string ParamInfo { get; set; } diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs index 15a25680c..84e40c327 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs @@ -12,84 +12,41 @@ namespace IRaCIS.Core.Domain.Models ///PreviousHistory /// [Table("PreviousHistory")] - public class PreviousHistory : Entity, IAuditAddWithUserName - { - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUser - /// - [Required] - public string CreateUser { get; set; } - - /// - /// StartTime - /// + public class PreviousHistory : BaseAddAuditEntityWithUserName + { + #region 导航属性 + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + #endregion + + public DateTime? StartTime { get; set; } - - /// - /// EndTime - /// + public DateTime? EndTime { get; set; } - /// - /// IsPD - /// + public int? IsPD { get; set; } - /// - /// SubjectVisitId - /// - [Required] + public Guid SubjectVisitId { get; set; } - /// - /// IsSubjectLevel - /// - [Required] + public bool IsSubjectLevel { get; set; } - /// - /// Path - /// - [Required] + public string Path { get; set; } = String.Empty; - /// - /// FileName - /// - [Required] + public string FileName { get; set; } = String.Empty; - /// - /// Position - /// - [Required] + public string Position { get; set; } = String.Empty; - /// - /// 临床数据类型Id - /// - [Required] + public Guid ClinicalDataTrialSetId { get; set; } - //[Required] - //public Guid SubjectId { get; set; } } - //移动到DBContext文件中 } diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs index 0fb545383..4628c79f1 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs @@ -12,73 +12,34 @@ namespace IRaCIS.Core.Domain.Models ///PreviousOther /// [Table("PreviousOther")] - public class PreviousOther : Entity, IAuditAddWithUserName - { + public class PreviousOther : BaseAddAuditEntityWithUserName + { + #region 导航属性 + + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + #endregion - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUser - /// - [Required] - public string CreateUser { get; set; } - - /// - /// StartTime - /// public DateTime? StartTime { get; set; } - /// - /// EndTime - /// + public DateTime? EndTime { get; set; } - /// - /// IsPD - /// - [Required] + public bool IsPD { get; set; } - - /// - /// SubjectVisitId - /// - [Required] + public Guid SubjectVisitId { get; set; } - /// - /// IsSubjectLevel - /// - [Required] + public bool IsSubjectLevel { get; set; } - /// - /// Path - /// - [Required] + public string Path { get; set; } = String.Empty; - /// - /// FileName - /// - [Required] + public string FileName { get; set; } = String.Empty; - /// - /// TreatmentType - /// - [Required] + public string TreatmentType { get; set; } = String.Empty; /// @@ -87,10 +48,6 @@ namespace IRaCIS.Core.Domain.Models [Required] public Guid ClinicalDataTrialSetId { get; set; } - - //public Guid SubjectId { get; set; } - } - //移动到DBContext文件中 } diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs index 006458269..7e42a1cc4 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs @@ -13,45 +13,22 @@ namespace IRaCIS.Core.Domain.Models ///PreviousPDF /// [Table("PreviousPDF")] - public class PreviousPDF : Entity, IAuditAdd + public class PreviousPDF : BaseAddAuditEntity { + #region 导航属性 + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } - public SubjectVisit SubjectVisit { get; set; } + #endregion - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// SubjectVisitId - /// - [Required] + public Guid SubjectVisitId { get; set; } - /// - /// Path - /// - [Required] public string Path { get; set; } - /// - /// FileName - /// - [Required] public string FileName { get; set; } - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// 是否是访视 - /// public bool? IsVisist { get; set; } /// @@ -69,14 +46,8 @@ namespace IRaCIS.Core.Domain.Models /// public ClinicalUploadType? UploadType { get; set; } - /// - /// 项目Id - /// public Guid? TrialId { get; set; } - /// - /// 受试者ID - /// public Guid? SubjectId { get; set; } } diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs index a8c30982e..330e4fbe4 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs @@ -12,65 +12,27 @@ namespace IRaCIS.Core.Domain.Models ///PreviousSurgery /// [Table("PreviousSurgery")] - public class PreviousSurgery : Entity, IAuditAddWithUserName - { - - - - /// - /// CreateUserId - /// - [Required] - public Guid CreateUserId { get; set; } - - /// - /// CreateTime - /// - [Required] - public DateTime CreateTime { get; set; } - - /// - /// CreateUser - /// - [Required] - public string CreateUser { get; set; } - - /// - /// OperationTime - /// + public class PreviousSurgery : BaseAddAuditEntityWithUserName + { + + #region 导航属性 + + #endregion + + + public DateTime? OperationTime { get; set; } - - /// - /// SubjectVisitId - /// - [Required] + public Guid SubjectVisitId { get; set; } - - /// - /// IsSubjectLevel - /// - [Required] + public bool IsSubjectLevel { get; set; } - /// - /// Path - /// - [Required] public string Path { get; set; } = String.Empty; - /// - /// FileName - /// - [Required] public string FileName { get; set; } = String.Empty; - /// - /// OperationName - /// - [Required] public string OperationName { get; set; } = String.Empty; - /// /// 临床数据类型Id /// @@ -78,8 +40,6 @@ namespace IRaCIS.Core.Domain.Models public Guid ClinicalDataTrialSetId { get; set; } - //[Required] - //public Guid SubjectId { get; set; } } diff --git a/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs b/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs index ea3c51e01..104f759c3 100644 --- a/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs +++ b/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs @@ -8,33 +8,22 @@ namespace IRaCIS.Core.Domain.Models /// 一致性核查文件 /// [Table("InspectionFile")] - public class InspectionFile : BaseAuditAddEntity + public class InspectionFile : BaseAddAuditEntity { - /// - /// 文件名称 - /// - public string FileName { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("CreateUserId")] + public User User { get; set; } + #endregion + + public string FileName { get; set; } - - /// - /// 相对路径 - /// public string RelativePath { get; set; } - - - /// - /// 项目ID - /// public Guid TrialId { get; set; } - [JsonIgnore] - /// - /// 创建人 - /// - [ForeignKey("CreateUserId")] - public User User { get; set; } + } diff --git a/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs b/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs index 1bf4876c8..61b17b548 100644 --- a/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs +++ b/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs @@ -15,15 +15,22 @@ namespace IRaCIS.Core.Domain.Models [Table("NoneDicomStudy")] public class NoneDicomStudy : BaseFullAuditEntity { + #region 导航属性 [JsonIgnore] - public List NoneDicomFileList { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } + public List NoneDicomFileList { get; set; } + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + public Subject Subject { get; set; } + [JsonIgnore] + [ForeignKey("CreateUserId")] + public User CreateUser { get; set; } + + #endregion + - [JsonIgnore] - public Subject Subject { get; set; } public string StudyCode { get; set; } = string.Empty; @@ -31,36 +38,24 @@ namespace IRaCIS.Core.Domain.Models public int Code { get; set; } - - [Required] public Guid TrialId { get; set; } - - [Required] public Guid SubjectId { get; set; } - [Required] + public Guid SubjectVisitId { get; set; } - [Required] + public string BodyPart { get; set; } - [Required] + public string Modality { get; set; } - - [Required] public DateTime ImageDate { get; set; } - - - [ForeignKey("CreateUserId")] - public User CreateUser { get; set; } - - public string Description { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs b/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs index 372f1e50f..138bf1427 100644 --- a/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs +++ b/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs @@ -12,11 +12,14 @@ namespace IRaCIS.Core.Domain.Models ///NoneDicomStudyFile /// [Table("NoneDicomStudyFile")] - public class NoneDicomStudyFile : BaseAuditAddEntity + public class NoneDicomStudyFile : BaseAddAuditEntity { + #region 导航属性 [ForeignKey("NoneDicomStudyId")] [JsonIgnore] public NoneDicomStudy NoneDicomStudy { get; set; } + #endregion + public Guid NoneDicomStudyId { get; set; } diff --git a/IRaCIS.Core.Domain/QC/QCChallenge.cs b/IRaCIS.Core.Domain/QC/QCChallenge.cs index d17e2f202..6732c2bc2 100644 --- a/IRaCIS.Core.Domain/QC/QCChallenge.cs +++ b/IRaCIS.Core.Domain/QC/QCChallenge.cs @@ -5,12 +5,25 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { - public class QCChallenge : BaseAuditAddEntity + public class QCChallenge : BaseAddAuditEntity { + #region 导航属性 [JsonIgnore] [ForeignKey("CreateUserId")] - public User CreateUser { get; set; } + [JsonIgnore] + [ForeignKey("LatestReplyUserId")] + public User LatestReplyUser { get; set; } + [JsonIgnore] + //导航属性 + [ForeignKey("SubjectVisitId")] + public SubjectVisit SubjectVisit { get; set; } + + [JsonIgnore] + public List DialogList { get; set; } = new List(); + + #endregion + @@ -36,13 +49,10 @@ namespace IRaCIS.Core.Domain.Models public DateTime? LatestMsgTime { get; set; } - //public int ChallengeState { get; set; } public Guid? LatestReplyUserId { get; set; } - [JsonIgnore] - [ForeignKey("LatestReplyUserId")] - public User LatestReplyUser { get; set; } + public string ChallengeCode { get; set; } public int Code { get; set; } @@ -68,15 +78,7 @@ namespace IRaCIS.Core.Domain.Models public string ChallengeType { get; set; } = string.Empty; - - [JsonIgnore] - //导航属性 - [ForeignKey("SubjectVisitId")] - public SubjectVisit SubjectVisit { get; set; } - - [JsonIgnore] - public List DialogList { get; set; } = new List(); - + diff --git a/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs b/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs index bf363afb4..b01a25b0f 100644 --- a/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs +++ b/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs @@ -4,20 +4,22 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { - public class QCChallengeDialog : BaseAuditAddEntity + public class QCChallengeDialog : BaseAddAuditEntity { + #region 导航属性 [JsonIgnore] public QCChallenge QCChallenge { get; set; } + [JsonIgnore] + [ForeignKey("CreateUserId")] + public User CreateUser { get; set; } + #endregion + public string TalkContent { get; set; } = string.Empty; public Guid QCChallengeId { get; set; } public Guid SubjectVisitId { get; set; } - [JsonIgnore] - [ForeignKey("CreateUserId")] - public User CreateUser { get; set; } - public UserTypeEnum UserTypeEnum { get; set; } } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/QC/QCQuestion.cs b/IRaCIS.Core.Domain/QC/QCQuestion.cs index 8e7d6a5f7..febd0c98b 100644 --- a/IRaCIS.Core.Domain/QC/QCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/QCQuestion.cs @@ -13,54 +13,34 @@ namespace IRaCIS.Core.Domain.Models /// [Table("QCQuestion")] public class QCQuestion : BaseFullAuditEntity - { - /// - /// QuestionName - /// - [Required] - public string QuestionName { get; set; } = string.Empty; + { + #region 导航属性 + + [JsonIgnore] + [ForeignKey("ParentId")] + public QCQuestion ParentQuestion { get; set; } + #endregion + + public string QuestionName { get; set; } = string.Empty; - /// - /// 语言类型 - /// + /// 语言类型 public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - /// - /// IsRequired - /// - [Required] + public bool IsRequired { get; set; } - /// - /// IsEnable - /// - [Required] public bool IsEnable { get; set; } - /// - /// 下拉框、文本、单选、多选 - /// - [Required] - public string Type { get; set; } = string.Empty; - - /// - /// TypeValue - /// - [Required] - public string TypeValue { get; set; } = string.Empty; + /// 下拉框、文本、单选、多选 + public string Type { get; set; } = string.Empty; - [JsonIgnore] - [ForeignKey("ParentId")] - public QCQuestion ParentQuestion { get; set; } + public string TypeValue { get; set; } = string.Empty; public string ParentTriggerValue { get; set; } public Guid? ParentId { get; set; } - /// - /// ShowOrder - /// - [Required] + public int ShowOrder { get; set; } diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs index 3437800da..fcca55688 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs @@ -15,78 +15,52 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialQCQuestion")] public class TrialQCQuestion : BaseFullAuditEntity { - [JsonIgnore] - public Trial Trial { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + [ForeignKey("ParentId")] + public TrialQCQuestion ParentQCQuestion { get; set; } - /// - /// TrialId - /// - [Required] - public Guid TrialId { get; set; } + [JsonIgnore] + public List TrialQCQuestionAnswerList { get; set; } + + #endregion + + + public Guid TrialId { get; set; } - /// - /// QuestionName - /// - [Required] + public string QuestionName { get; set; } = string.Empty; + /// 语言类型 + + public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - /// - /// 语言类型 - /// - public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - /// - /// IsRequired - /// - [Required] public bool IsRequired { get; set; } - /// - /// IsEnable - /// - [Required] + public bool IsEnable { get; set; } - - /// - /// 下拉框、文本、单选、多选 - /// - [Required] - public string Type { get; set; } = string.Empty; + + /// 下拉框、文本、单选、多选 + public string Type { get; set; } = string.Empty; public Guid? ParentId { get; set; } - [JsonIgnore] - [ForeignKey("ParentId")] - public TrialQCQuestion ParentQCQuestion { get; set; } + - /// - /// TypeValue - /// - [Required] public string TypeValue { get; set; } - /// - /// ChildInvalidValue - /// - [Required] + public string ParentTriggerValue { get; set; } - /// - /// ShowOrder - /// - [Required] + public int ShowOrder { get; set; } - - - /// - /// 是否确认 - /// + public bool? IsConfirm { get; set; } - [JsonIgnore] - public List TrialQCQuestionAnswerList { get; set; } } diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs index 35ab4c4a1..2b18610b2 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs @@ -15,21 +15,15 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialQCQuestionAnswer")] public class TrialQCQuestionAnswer : BaseFullAuditEntity { - - - /// - /// TrialId - /// - [Required] - public Guid TrialId { get; set; } + #region 导航属性 + [JsonIgnore] + public TrialQCQuestion TrialQCQuestionConfigure { get; set; } + #endregion + + + public Guid TrialId { get; set; } - /// - /// Answer - /// - [Required] public string Answer { get; set; } - - public TrialQCProcess QCProcessEnum { get; set; } @@ -38,12 +32,10 @@ namespace IRaCIS.Core.Domain.Models public Guid SubjectVisitId { get; set; } - //public string Note { get; set; } public Guid TrialQCQuestionConfigureId { get; set; } - [JsonIgnore] - public TrialQCQuestion TrialQCQuestionConfigure { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs index f12dbfd64..ec93af7de 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs @@ -15,53 +15,47 @@ namespace IRaCIS.Core.Domain.Models [Table("SubjectAdditionalEvaluationResult")] public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity { - - + #region 导航属性 [JsonIgnore] [ForeignKey("TrialReadingQuestionId")] public ReadingQuestionTrial TrialReadingQuestion { get; set; } + #endregion + + public Guid TrialReadingQuestionId { get; set; } - - - public Guid SubjectId { get; set; } - - public Guid TrialReadingCriterionId { get; set; } - - - + public Guid TrialReadingCriterionId { get; set; } public Guid? VisitTaskId { get; set; } - public string Answer { get; set; } /// /// 附加评估答案翻译字典 /// - [Required] + public string TranslateDictionaryCode { get; set; }=string.Empty; /// /// 是否是最终结果 /// - [Required] + public bool IsFinalResult { get; set; } /// /// 最终结果 /// - [Required] + public string FinalAnswer { get; set; } /// /// 最终结果翻字典 /// - [Required] + public string FinalTranslateDictionaryCode { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs index dc7cd2ecd..00cbd1ad6 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs @@ -17,32 +17,26 @@ namespace IRaCIS.Core.Domain.Models [Table("SubjectCriteriaEvaluation")] public class SubjectCriteriaEvaluation : BaseFullAuditEntity { - [JsonIgnore] - public Subject subject { get; set; } + #region 导航属性 + [JsonIgnore] + public Subject subject { get; set; } [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] + [ForeignKey("TrialReadingCriterionId")] public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } [JsonIgnore] public List SubjectCriteriaEvaluationVisitFilterList { get; set; } + #endregion + - /// - /// SubjectId - /// - [Required] public Guid SubjectId { get; set; } - /// - /// TrialReadingCriterionId - /// - [Required] public Guid TrialReadingCriterionId { get; set; } /// /// 是否参与评估 /// - [Required] public bool IsJoinEvaluation { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs index a00ed163e..f414c6c64 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs @@ -17,10 +17,7 @@ namespace IRaCIS.Core.Domain.Models [Table("SubjectCriteriaEvaluationVisitFilter")] public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity { - - //[JsonIgnore] - - //public List SubjectCriterionTaskList { get; set; } + #region 导航属性 [JsonIgnore] [ForeignKey("TrialReadingCriterionId")] public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } @@ -32,6 +29,9 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public SubjectVisit SubjectVisit { get; set; } + #endregion + + public Guid SubjectId { get; set; } @@ -44,19 +44,16 @@ namespace IRaCIS.Core.Domain.Models /// /// 影像筛选状态 /// - [Required] public ImageFilterState ImageFilterState { get; set; } /// /// 影像判断结果 /// - [Required] public ImageDeterminationResultState ImageDeterminationResultState { get; set; } /// /// 是否已生成任务 /// - [Required] public bool IsGeneratedTask { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs index bfb11784e..caff2e28f 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs @@ -15,6 +15,7 @@ namespace IRaCIS.Core.Domain.Models [Table("SubjectCriteriaEvaluationVisitStudyFilter")] public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity { + #region 导航属性 [JsonIgnore] [ForeignKey("TrialReadingCriterionId")] public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } @@ -30,6 +31,8 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("StudyId")] [JsonIgnore] public DicomStudy Study { get; set; } + #endregion + public Guid TrialReadingCriterionId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs index 148bdaef7..9b1c1d414 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs @@ -13,13 +13,16 @@ namespace IRaCIS.Core.Domain.Models /// 临床资料系统配置 /// [Table("ClinicalDataSystemSet")] - public class ClinicalDataSystemSet : BaseAuditAddEntity - { + public class ClinicalDataSystemSet : BaseAddAuditEntity + { + #region 导航属性 - /// - /// 枚举(字典里面取的) - /// - public int ClinicalDataSetEnum { get; set; } + #endregion + + /// + /// 枚举(字典里面取的) + /// + public int ClinicalDataSetEnum { get; set; } /// /// 名称 diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs index 1f7081e7b..64f743b74 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs @@ -13,12 +13,27 @@ namespace IRaCIS.Core.Domain.Models /// 临床资料项目配置 /// [Table("ClinicalDataTrialSet")] - public class ClinicalDataTrialSet : BaseAuditAddEntity + public class ClinicalDataTrialSet : BaseAddAuditEntity { + #region 导航属性 + + [JsonIgnore] + public List ReadingClinicalDataList { get; set; } + + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } + + [JsonIgnore] + public List TrialClinicalDataSetCriteriaList { get; set; } + + [JsonIgnore] + public List TrialClinicalQuestionList { get; set; } + [JsonIgnore] + [ForeignKey("SystemClinicalDataSetId")] + public ClinicalDataSystemSet? ClinicalDataSystemSet { get; set; } + #endregion - /// - /// 项目ID - /// public Guid TrialId { get; set; } /// @@ -51,8 +66,7 @@ namespace IRaCIS.Core.Domain.Models /// /// SystemClinicalDataSetId /// - [ForeignKey("SystemClinicalDataSetId")] - public ClinicalDataSystemSet? ClinicalDataSystemSet { get; set; } + /// /// 是否确认 @@ -80,24 +94,6 @@ namespace IRaCIS.Core.Domain.Models /// public string Path { get; set; } - [JsonIgnore] - /// - /// - /// - public List ReadingClinicalDataList { get; set; } - - [JsonIgnore] - - [ForeignKey("TrialId")] - public Trial Trial { get; set; } - - - - [JsonIgnore] - public List TrialClinicalDataSetCriteriaList { get; set; } - - [JsonIgnore] - public List TrialClinicalQuestionList { get; set; } public string CriterionEnumListStr { get; set; } = String.Empty; diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs index e40c42a92..a4188779c 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs @@ -12,12 +12,43 @@ namespace IRaCIS.Core.Domain.Models /// 项目的临床数据 /// [Table("ReadingClinicalData")] - public class ReadingClinicalData : BaseAuditAddEntity + public class ReadingClinicalData : BaseAddAuditEntity { - /// - /// 项目ID - /// - public Guid TrialId { get; set; } + #region 导航属性 + + [JsonIgnore] + [ForeignKey("ClinicalDataTrialSetId")] + + public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } + + [JsonIgnore] + public DicomStudy? DicomStudy { get; set; } + + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } + + [JsonIgnore] + [ForeignKey("ReadingId")] + public SubjectVisit SubjectVisit { get; set; } + + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } + + [JsonIgnore] + [ForeignKey("ReadingId")] + + public ReadModule ReadModule { get; set; } + + /// + /// PDF文件 + /// + [JsonIgnore] + public List ReadingClinicalDataPDFList { get; set; } + #endregion + + public Guid TrialId { get; set; } /// /// 访视Id 或者模块Id @@ -26,9 +57,7 @@ namespace IRaCIS.Core.Domain.Models public Guid? StudyId { get; set; } - /// - /// 受试者ID - /// + public Guid SubjectId { get; set; } /// @@ -64,40 +93,6 @@ namespace IRaCIS.Core.Domain.Models //临床数据状态 public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } - [JsonIgnore] - [ForeignKey("ClinicalDataTrialSetId")] - - public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } - - [JsonIgnore] - - public DicomStudy? DicomStudy { get; set; } - - [JsonIgnore] - [ForeignKey("TrialId")] - - public Trial Trial { get; set; } - - [JsonIgnore] - [ForeignKey("ReadingId")] - - public SubjectVisit SubjectVisit { get; set; } - - [JsonIgnore] - [ForeignKey("SubjectId")] - - public Subject Subject { get; set; } - - [JsonIgnore] - [ForeignKey("ReadingId")] - - public ReadModule ReadModule { get; set; } - - /// - /// PDF文件 - /// - [JsonIgnore] - public List ReadingClinicalDataPDFList { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs index 89b73fa92..fe2149803 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs @@ -11,37 +11,27 @@ namespace IRaCIS.Core.Domain.Models /// 项目的临床数据 /// [Table("ReadingClinicalDataPDF")] - public class ReadingClinicalDataPDF : BaseAuditAddEntity + public class ReadingClinicalDataPDF : BaseAddAuditEntity { - [JsonIgnore] - [ForeignKey("ReadingClinicalDataId")] - public ReadingClinicalData ReadingClinicalData { get; set; } - /// - /// 阅片临床数据ID - /// - public Guid ReadingClinicalDataId { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("ReadingClinicalDataId")] + public ReadingClinicalData ReadingClinicalData { get; set; } + #endregion + + /// + /// 阅片临床数据ID + /// + public Guid ReadingClinicalDataId { get; set; } - /// - /// Path - /// - [Required] public string Path { get; set; } - /// - /// FileName - /// - [Required] + public string FileName { get; set; } - /// - /// 大小 - /// public int Size { get; set; } = 0; - /// - /// 文件类型 - /// public string Type { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs index 5a1a6f000..37510150f 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs @@ -12,12 +12,48 @@ namespace IRaCIS.Core.Domain.Models /// 一致性分析临床数据 /// [Table("ReadingConsistentClinicalData")] - public class ReadingConsistentClinicalData : BaseAuditAddEntity + public class ReadingConsistentClinicalData : BaseAddAuditEntity { - /// - /// 项目ID - /// - public Guid TrialId { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("ClinicalDataTrialSetId")] + + public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } + + [JsonIgnore] + + public DicomStudy? DicomStudy { get; set; } + + [JsonIgnore] + [ForeignKey("TrialId")] + + public Trial Trial { get; set; } + + [JsonIgnore] + [ForeignKey("ReadingId")] + + public SubjectVisit SubjectVisit { get; set; } + + [JsonIgnore] + [ForeignKey("SubjectId")] + + public Subject Subject { get; set; } + + [JsonIgnore] + [ForeignKey("ReadingId")] + + public ReadModule ReadModule { get; set; } + + /// + /// PDF文件 + /// + [JsonIgnore] + public List ReadingClinicalDataPDFList { get; set; } + #endregion + /// + /// 项目ID + /// + public Guid TrialId { get; set; } /// /// 访视Id 或者模块Id @@ -64,40 +100,7 @@ namespace IRaCIS.Core.Domain.Models //临床数据状态 public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } - [JsonIgnore] - [ForeignKey("ClinicalDataTrialSetId")] - - public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } - - [JsonIgnore] - - public DicomStudy? DicomStudy { get; set; } - - [JsonIgnore] - [ForeignKey("TrialId")] - - public Trial Trial { get; set; } - - [JsonIgnore] - [ForeignKey("ReadingId")] - - public SubjectVisit SubjectVisit { get; set; } - - [JsonIgnore] - [ForeignKey("SubjectId")] - - public Subject Subject { get; set; } - - [JsonIgnore] - [ForeignKey("ReadingId")] - - public ReadModule ReadModule { get; set; } - - /// - /// PDF文件 - /// - [JsonIgnore] - public List ReadingClinicalDataPDFList { get; set; } + diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs index 9eb8c89d9..c37778d50 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs @@ -11,32 +11,24 @@ namespace IRaCIS.Core.Domain.Models /// 一致性分析临床数据 /// [Table("ReadingConsistentClinicalDataPDF")] - public class ReadingConsistentClinicalDataPDF : BaseAuditAddEntity + public class ReadingConsistentClinicalDataPDF : BaseAddAuditEntity { - [JsonIgnore] - [ForeignKey("ReadingConsistentClinicalDataId")] - public ReadingConsistentClinicalData ReadingConsistentClinicalData { get; set; } - /// - /// 阅片临床数据ID - /// - public Guid ReadingConsistentClinicalDataId { get; set; } - - /// - /// Path - /// - [Required] - public string Path { get; set; } - - /// - /// FileName - /// - [Required] - public string FileName { get; set; } - + #region 导航属性 + [JsonIgnore] + [ForeignKey("ReadingConsistentClinicalDataId")] + public ReadingConsistentClinicalData ReadingConsistentClinicalData { get; set; } + #endregion /// - /// 大小 + /// 阅片临床数据ID /// + public Guid ReadingConsistentClinicalDataId { get; set; } + + public string Path { get; set; } + + + public string FileName { get; set; } + public int Size { get; set; } = 0; /// diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs index c141ee7c3..c687e7e6b 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs @@ -16,24 +16,22 @@ namespace IRaCIS.Core.Domain.Models public class TrialClinicalDataSetCriterion : BaseFullAuditEntity { - /// - /// TrialClinicalDataSetId - /// - [Required] - public Guid TrialClinicalDataSetId { get; set; } + #region 导航属性 + [JsonIgnore] + + [ForeignKey("TrialClinicalDataSetId")] + public ClinicalDataTrialSet TrialClinicalDataSet { get; set; } + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion + + public Guid TrialClinicalDataSetId { get; set; } - /// - /// TrialReadingCriterionId - /// - [Required] + public Guid TrialReadingCriterionId { get; set; } - [ForeignKey("TrialClinicalDataSetId")] - public ClinicalDataTrialSet TrialClinicalDataSet { get; set; } - - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs index 2cd4b9f4d..7a8ddccb0 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs @@ -16,8 +16,36 @@ namespace IRaCIS.Core.Domain.Models ///系统临床数据问题 /// [Table("SystemClinicalQuestion")] - public class SystemClinicalQuestion : BaseAuditAddEntity + public class SystemClinicalQuestion : BaseAddAuditEntity { + #region 导航属性 + /// + /// 分组 + /// + [JsonIgnore] + [ForeignKey("GroupId")] + public SystemClinicalQuestion GroupQuestin { get; set; } + + [NotMapped] + public List CalculateQuestionList + { + get + { + + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + #endregion /// /// 项目临床数据Id /// @@ -135,32 +163,7 @@ namespace IRaCIS.Core.Domain.Models /// public string CalculateQuestions { get; set; } = "[]"; - /// - /// 分组 - /// - [JsonIgnore] - [ForeignKey("GroupId")] - public SystemClinicalQuestion GroupQuestin { get; set; } - [NotMapped] - public List CalculateQuestionList - { - get - { - - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - - } - } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs index 97991cf4a..96a1a0a24 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs @@ -16,12 +16,31 @@ namespace IRaCIS.Core.Domain.Models /// 系统临床表格问题 /// [Table("SystemClinicalTableQuestion")] - public class SystemClinicalTableQuestion : BaseAuditAddEntity + public class SystemClinicalTableQuestion : BaseAddAuditEntity { - /// + #region 导航属性 + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + #endregion + /// /// 系统临床数据Id /// - public Guid SystemClinicalId { get; set; } + public Guid SystemClinicalId { get; set; } /// /// 问题名称 @@ -99,23 +118,7 @@ namespace IRaCIS.Core.Domain.Models /// public string RelevanceValue { get; set; } = string.Empty; - [NotMapped] - public List RelevanceValueList - { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - return new List(); - } - } - - } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs index 67f6a6e82..d01d044da 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs @@ -16,8 +16,36 @@ namespace IRaCIS.Core.Domain.Models ///项目临床数据问题 /// [Table("TrialClinicalQuestion")] - public class TrialClinicalQuestion : BaseAuditAddEntity + public class TrialClinicalQuestion : BaseAddAuditEntity { + #region 导航属性 + [NotMapped] + public List CalculateQuestionList + { + get + { + + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + + + + [JsonIgnore] + [ForeignKey("TrialClinicalId")] + public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } + #endregion + /// /// 项目临床数据Id /// @@ -136,40 +164,17 @@ namespace IRaCIS.Core.Domain.Models /// 自定义计算问题 /// public string CalculateQuestions { get; set; } = "[]"; - - [NotMapped] - public List CalculateQuestionList - { - get - { - - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - - } - } - - /// - /// 小数点位数 - /// - public int? DigitPlaces { get; set; } + /// + /// 小数点位数 + /// + public int? DigitPlaces { get; set; } /// /// 单位 /// public string Unit { get; set; } = string.Empty; - [JsonIgnore] - [ForeignKey("TrialClinicalId")] - public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs index 1cc565235..20cf7ec6c 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs @@ -16,12 +16,32 @@ namespace IRaCIS.Core.Domain.Models /// 项目临床表格问题 /// [Table("TrialClinicalTableQuestion")] - public class TrialClinicalTableQuestion : BaseAuditAddEntity - { - /// + public class TrialClinicalTableQuestion : BaseAddAuditEntity + { + #region 导航属性 + + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + #endregion + /// /// 项目临床数据Id /// - public Guid TrialClinicalId { get; set; } + public Guid TrialClinicalId { get; set; } /// /// 问题名称 @@ -113,23 +133,6 @@ namespace IRaCIS.Core.Domain.Models /// public string RelevanceValue { get; set; } = string.Empty; - [NotMapped] - public List RelevanceValueList - { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs index f0c9fc506..c08e94424 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs @@ -13,13 +13,13 @@ namespace IRaCIS.Core.Domain.Models ///ClinicalAnswerRowInfo /// [Table("ClinicalAnswerRowInfo")] - public class ClinicalAnswerRowInfo : BaseAuditAddEntity + public class ClinicalAnswerRowInfo : BaseAddAuditEntity { - - /// - /// 受试者Id - /// - public Guid SubjectId { get; set; } + #region 导航属性 + + #endregion + + public Guid SubjectId { get; set; } /// /// 表单Id diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs index 9242426bb..dfa39ad93 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs @@ -13,13 +13,19 @@ namespace IRaCIS.Core.Domain.Models ///ClinicalForm /// [Table("ClinicalForm")] - public class ClinicalForm : BaseAuditAddEntity + public class ClinicalForm : BaseAddAuditEntity { - - /// - /// 受试者Id - /// - public Guid SubjectId { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("ClinicalDataTrialSetId")] + public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } + + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } + #endregion + + public Guid SubjectId { get; set; } public Guid TrialId { get; set; } @@ -35,9 +41,6 @@ namespace IRaCIS.Core.Domain.Models public string PicturePath { get; set; } = string.Empty; - /// - /// ClinicalDataTrialSetId - /// public Guid ClinicalDataTrialSetId { get; set; } /// @@ -46,13 +49,7 @@ namespace IRaCIS.Core.Domain.Models public Guid? ReadingId { get; set; } - [JsonIgnore] - [ForeignKey("ClinicalDataTrialSetId")] - public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } - - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs index 930dd7cbe..f08083760 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs @@ -13,12 +13,17 @@ namespace IRaCIS.Core.Domain.Models ///ClinicalQuestionAnswer /// [Table("ClinicalQuestionAnswer")] - public class ClinicalQuestionAnswer : BaseAuditAddEntity - { - /// - /// 受试者Id - /// - public Guid SubjectId { get; set; } + public class ClinicalQuestionAnswer : BaseAddAuditEntity + { + #region 导航属性 + + + [JsonIgnore] + [ForeignKey("ClinicalFormId")] + public ClinicalForm ClinicalForm { get; set; } + #endregion + + public Guid SubjectId { get; set; } /// /// 表单Id @@ -31,19 +36,12 @@ namespace IRaCIS.Core.Domain.Models /// 问题Id /// public Guid QuestionId { get; set; } - - /// - /// Answer - /// + public string Answer { get; set; } public Guid ClinicalDataTrialSetId { get; set; } - [JsonIgnore] - [ForeignKey("ClinicalFormId")] - public ClinicalForm ClinicalForm { get; set; } - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs index 53bfa3b57..668a68260 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs @@ -13,43 +13,28 @@ namespace IRaCIS.Core.Domain.Models ///ClinicalTableAnswer /// [Table("ClinicalTableAnswer")] - public class ClinicalTableAnswer : BaseAuditAddEntity - { + public class ClinicalTableAnswer : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("RowId")] + public ClinicalAnswerRowInfo ClinicalAnswerRowInfo{get; set;} + #endregion + + public Guid SubjectId { get; set; } - /// - /// 受试者Id - /// - public Guid SubjectId { get; set; } - - /// - /// 表单Id - /// + public Guid ClinicalFormId { get; set; } - - - /// - /// 问题Id - /// + public Guid QuestionId { get; set; } - - /// - /// 答案行的Id - /// + public Guid RowId { get; set; } - - /// - /// 答案 - /// + public string Answer { get; set; } - /// - /// 表格问题id - /// public Guid TableQuestionId { get; set; } - [JsonIgnore] - [ForeignKey("RowId")] - public ClinicalAnswerRowInfo ClinicalAnswerRowInfo { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs index fa4fc09cb..72824c96e 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs @@ -13,23 +13,21 @@ namespace IRaCIS.Core.Domain.Models ///ReadModuleCriterionFrom /// [Table("ReadModuleCriterionFrom")] - public class ReadModuleCriterionFrom : BaseAuditAddEntity + public class ReadModuleCriterionFrom : BaseAddAuditEntity { - - /// - /// 阅片期Id - /// + #region 导航属性 [ForeignKey("ReadModuleId")] public Guid ReadModuleId { get; set; } - - /// - /// 受试者Id - /// - public Guid SubjectId { get; set; } - - /// - /// 项目Id - /// + + [JsonIgnore] + [ForeignKey("ClinicalFormId")] + public ClinicalForm ClinicalForm { get; set; } + #endregion + + + + public Guid SubjectId { get; set; } + public Guid TrialId { get; set; } /// @@ -38,9 +36,6 @@ namespace IRaCIS.Core.Domain.Models public Guid ClinicalFormId { get; set; } - [JsonIgnore] - [ForeignKey("ClinicalFormId")] - public ClinicalForm ClinicalForm { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs index c85aa24e7..0a3fc3c2f 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs @@ -16,12 +16,46 @@ namespace IRaCIS.Core.Domain.Models ///阅片医学审核对话 /// [Table("ReadingMedicalReviewDialog")] - public class ReadingMedicalReviewDialog : BaseAuditAddEntity - { - /// + public class ReadingMedicalReviewDialog : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("TaskMedicalReviewId")] + public TaskMedicalReview TaskMedicalReview { get; set; } + + + /// + /// 文件 + /// + [NotMapped] + public List FileList + { + get + { + + + try + { + var result = JsonConvert.DeserializeObject>(this.ImagePath); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + [JsonIgnore] + [ForeignKey("CreateUserId")] + public User CreateUser { get; set; } + + #endregion + /// /// 医学审核Id /// - public Guid TaskMedicalReviewId { get; set; } + public Guid TaskMedicalReviewId { get; set; } /// /// 任务Id @@ -80,9 +114,6 @@ namespace IRaCIS.Core.Domain.Models /// public bool? IsApplyHeavyReading { get; set; } - [JsonIgnore] - [ForeignKey("CreateUserId")] - public User CreateUser { get; set; } /// @@ -95,35 +126,8 @@ namespace IRaCIS.Core.Domain.Models /// public string FileName { get; set; } = string.Empty; - [JsonIgnore] - [ForeignKey("TaskMedicalReviewId")] - public TaskMedicalReview TaskMedicalReview { get; set; } - /// - /// 文件 - /// - [NotMapped] - public List FileList - { - get - { - - - try - { - var result = JsonConvert.DeserializeObject>(this.ImagePath); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - - } - } - } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs index 1b9d7d84f..1be26e10e 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs @@ -11,36 +11,31 @@ namespace IRaCIS.Core.Domain.Models [Table("ReadingMedicineQuestionAnswer")] public class ReadingMedicineQuestionAnswer : BaseFullAuditEntity { + #region 导航属性 - /// - /// 医学审核问题Id - /// - public Guid ReadingMedicineQuestionId { get; set; } + [JsonIgnore] + [ForeignKey("TaskMedicalReviewId")] + public TaskMedicalReview TaskMedicalReview { get; set; } + #endregion + + /// + /// 医学审核问题Id + /// + public Guid ReadingMedicineQuestionId { get; set; } /// /// 医学审核Id /// public Guid TaskMedicalReviewId { get; set; } - - /// - /// 任务Id - /// - + public Guid VisitTaskId { get; set; } - - /// - /// 答案 - /// + public string Answer { get; set; } - - [JsonIgnore] - [ForeignKey("TaskMedicalReviewId")] - public TaskMedicalReview TaskMedicalReview { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs index 339bd236a..47862f8a5 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs @@ -18,11 +18,21 @@ namespace IRaCIS.Core.Domain.Models [Table("ReadingMedicineSystemQuestion")] public class ReadingMedicineSystemQuestion : BaseFullAuditEntity { + #region 导航属性 + [JsonIgnore] - /// - /// 类型 - /// - public string Type { get; set; } + [ForeignKey("ParentId")] + public ReadingMedicineSystemQuestion ParentQuestion { get; set; } + //// |1|2| 这种保存 + // public string CriterionEnumStr { get; set; } = string.Empty; + + // [NotMapped] + // public List CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList( + #endregion + /// + /// 类型 + /// + public string Type { get; set; } /// /// 父问题触发 @@ -73,10 +83,7 @@ namespace IRaCIS.Core.Domain.Models /// public ReadingCategory ReadingCategory { get; set; } - [JsonIgnore] - [ForeignKey("ParentId")] - public ReadingMedicineSystemQuestion ParentQuestion { get; set; } @@ -85,11 +92,5 @@ namespace IRaCIS.Core.Domain.Models public bool IsGeneral { get; set; } - //// |1|2| 这种保存 - // public string CriterionEnumStr { get; set; } = string.Empty; - - // [NotMapped] - // public List CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList(); - - } + } } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs index cb5f30528..9a4f7557a 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs @@ -14,14 +14,18 @@ namespace IRaCIS.Core.Domain.Models /// [Table("ReadingMedicineTrialQuestion")] public class ReadingMedicineTrialQuestion : BaseFullAuditEntity - { + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("ParentId")] + public ReadingMedicineTrialQuestion ParentQuestion { get; set; } + #endregion - - /// + /// /// 类型 /// - public string Type { get; set; } + public string Type { get; set; } /// /// 父问题触发值 @@ -88,9 +92,7 @@ namespace IRaCIS.Core.Domain.Models public Guid? SystemQuestionId { get; set; } - [JsonIgnore] - [ForeignKey("ParentId")] - public ReadingMedicineTrialQuestion ParentQuestion { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs index 62d46f833..6ad40a4a8 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs @@ -13,13 +13,17 @@ namespace IRaCIS.Core.Domain.Models /// 标准病灶中间表 /// [Table("CriterionNidusSystem")] - public class CriterionNidusSystem : BaseAuditAddEntity + public class CriterionNidusSystem : BaseAddAuditEntity { - - /// - /// 标准ID - /// - public Guid CriterionId { get; set; } + #region 导航属性 + [ForeignKey("CriterionId")] + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion + /// + /// 标准ID + /// + public Guid CriterionId { get; set; } /// @@ -39,9 +43,7 @@ namespace IRaCIS.Core.Domain.Models public bool IsSystemCriterion { get; set; } - [ForeignKey("CriterionId")] - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs index ae6a1a3d5..821203b13 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs @@ -13,18 +13,14 @@ namespace IRaCIS.Core.Domain.Models ///CriterionNidusTrial /// [Table("CriterionNidusTrial")] - public class CriterionNidusTrial : BaseAuditAddEntity + public class CriterionNidusTrial : BaseAddAuditEntity { - + #region 导航属性 - public Guid CriterionId { get; set; } - + #endregion + public Guid CriterionId { get; set; } - - /// - /// 病灶类型 - /// public LesionType LesionType { get; set; } /// diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs index 65fbc6c49..e2fd617b9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs @@ -13,14 +13,16 @@ namespace IRaCIS.Core.Domain.Models ///OrganInfo /// [Table("OrganInfo")] - public class OrganInfo : BaseAuditAddEntity + public class OrganInfo : BaseAddAuditEntity { + #region 导航属性 - /// - /// 分类 - /// - public string Classification { get; set; } = string.Empty; + #endregion + /// + /// 分类 + /// + public string Classification { get; set; } = string.Empty; /// /// 分类 英文 diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs index 36a991b2c..1b3f12531 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs @@ -13,13 +13,18 @@ namespace IRaCIS.Core.Domain.Models ///OrganTrialInfo /// [Table("OrganTrialInfo")] - public class OrganTrialInfo : BaseAuditAddEntity + public class OrganTrialInfo : BaseAddAuditEntity { - - /// + #region 导航属性 + + [JsonIgnore] + [ForeignKey("OrganInfoId")] + public OrganInfo OrganInfo { get; set; } + #endregion + /// /// 器官Id /// - public Guid OrganInfoId { get; set; } + public Guid OrganInfoId { get; set; } /// /// 项目Id @@ -29,12 +34,6 @@ namespace IRaCIS.Core.Domain.Models public bool IsEnable { get; set; } - - ///// - ///// 病灶类型 项目自定义标准 可能会更改 - ///// - //public OrganType OrganType { get; set; } - /// /// 标准Id /// @@ -101,9 +100,6 @@ namespace IRaCIS.Core.Domain.Models /// public OrganType? OrganType { 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 6c78c524e..5638cec3e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs @@ -15,12 +15,16 @@ namespace IRaCIS.Core.Domain.Models ///阅片标准分页 /// [Table("ReadingCriterionPage")] - public class ReadingCriterionPage : BaseAuditAddEntity - { - /// - /// 项目ID - /// - public Guid TrialId { get; set; } + public class ReadingCriterionPage : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + public List ReadingQuestionList { get; set; } = new List(); + #endregion + /// + /// 项目ID + /// + public Guid TrialId { get; set; } /// /// 分页名称 @@ -48,8 +52,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/ReadingCriterion/ReadingQuestionCriterionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs index e3f56cf6f..ec37a79d3 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs @@ -12,12 +12,16 @@ namespace IRaCIS.Core.Domain.Models /// 系统阅片标准 /// [Table("ReadingQuestionCriterionSystem")] - public class ReadingQuestionCriterionSystem : BaseAuditAddEntity - { - /// - /// 标准 - /// - public string CriterionName { get; set; } + public class ReadingQuestionCriterionSystem : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + public List ReadingQuestionSystemList { get; set; } = new List(); + #endregion + /// + /// 标准 + /// + public string CriterionName { get; set; } /// /// 是否启用 @@ -68,12 +72,8 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsMustGlobalReading { get; set; } = false; - [JsonIgnore] - public List ReadingQuestionSystemList { get; set; } = new List(); - //[JsonIgnore] - //[ForeignKey("CriterionId")] - //public Dictionary Dictionary { get; set; } + diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index 6996cac9c..550d828f1 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -12,8 +12,27 @@ namespace IRaCIS.Core.Domain.Models /// 项目阅片标准 /// [Table("ReadingQuestionCriterionTrial")] - public class ReadingQuestionCriterionTrial : BaseAuditAddEntity + public class ReadingQuestionCriterionTrial : BaseAddAuditEntity { + #region 导航属性 + [ForeignKey("TrialId")] + [JsonIgnore] + public Trial Trial { get; set; } + + [JsonIgnore] + + public List ReadingQuestionTrialList = new List(); + + [JsonIgnore] + + public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); + + + [JsonIgnore] + + public List VisitTaskList { get; set; } + + #endregion /// /// 系统标准ID /// @@ -247,26 +266,8 @@ namespace IRaCIS.Core.Domain.Models public bool IsAutoCreate { get; set; } = true; #endregion - /// - /// 项目 - /// - [ForeignKey("TrialId")] - [JsonIgnore] - public Trial Trial { get; set; } - - [JsonIgnore] - - public List ReadingQuestionTrialList = new List(); - - [JsonIgnore] - - public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); - - - [JsonIgnore] - - public List VisitTaskList { get; set; } - + + public ReadingImageDownload ImageDownloadEnum { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs index 9a3d887d9..8698348b9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs @@ -13,18 +13,14 @@ namespace IRaCIS.Core.Domain.Models ///SystemCriterionDictionaryCode /// [Table("SystemCriterionDictionaryCode")] - public class SystemCriterionDictionaryCode : BaseAuditAddEntity - { - /// - /// SystemCriterionId - /// - [Required] + public class SystemCriterionDictionaryCode : BaseAddAuditEntity + { + #region 导航属性 + + #endregion + public Guid SystemCriterionId { get; set; } - - /// - /// Code - /// - [Required] + public string Code { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs index 734e87cd3..78d196c08 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs @@ -16,8 +16,12 @@ namespace IRaCIS.Core.Domain.Models /// [Table("TrialCriterionAdditionalAssessmentType")] public class TrialCriterionAdditionalAssessmentType : BaseFullAuditEntity - { - public ReadingQuestionCriterionTrial TrialReadingCriterion{get;set;} + { + #region 导航属性 + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion + public Guid TrialReadingCriterionId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs index 68b4ce336..a1dac37b9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs @@ -13,22 +13,17 @@ namespace IRaCIS.Core.Domain.Models ///TrialCriterionDictionaryCode /// [Table("TrialCriterionDictionaryCode")] - public class TrialCriterionDictionaryCode : BaseAuditAddEntity - { - [ForeignKey("TrialCriterionId")] - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + public class TrialCriterionDictionaryCode : BaseAddAuditEntity + { + #region 导航属性 + [ForeignKey("TrialCriterionId")] + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion + - /// - /// TrialCriterionId - /// - [Required] public Guid TrialCriterionId { get; set; } - - /// - /// Code - /// - [Required] + public string Code { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs index d481f0421..bcfd1d304 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -13,12 +13,88 @@ namespace IRaCIS.Core.Domain.Models /// 系统阅片问题 /// [Table("ReadingQuestionSystem")] - public class ReadingQuestionSystem : BaseAuditAddEntity - { - /// - /// 系统标准Id - /// - public Guid ReadingQuestionCriterionSystemId { get; set; } + public class ReadingQuestionSystem : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("GroupId")] + public ReadingQuestionSystem GroupInfo { get; set; } + + + [JsonIgnore] + [ForeignKey("ReadingQuestionCriterionSystemId")] + public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; } + + [JsonIgnore] + [ForeignKey("ParentId")] + public ReadingQuestionSystem ParentReadingQuestionSystem { get; set; } + + + [JsonIgnore] + [ForeignKey("RelevanceId")] + public ReadingQuestionSystem RelevanceReadingQuestionSystem { get; set; } + + [NotMapped] + public List ParentTriggerValueList + { + get + { + try + { + return this.ParentTriggerValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + + + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + + [NotMapped] + public List HighlightAnswerList + { + get + { + + try + { + var result = JsonConvert.DeserializeObject>(this.HighlightAnswer); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + #endregion + /// + /// 系统标准Id + /// + public Guid ReadingQuestionCriterionSystemId { get; set; } /// /// 类型 @@ -214,80 +290,7 @@ namespace IRaCIS.Core.Domain.Models /// public string HighlightAnswer { get; set; } = "[]"; - [JsonIgnore] - [ForeignKey("GroupId")] - public ReadingQuestionSystem GroupInfo { get; set; } - - - [JsonIgnore] - [ForeignKey("ReadingQuestionCriterionSystemId")] - public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; } - - [JsonIgnore] - [ForeignKey("ParentId")] - public ReadingQuestionSystem ParentReadingQuestionSystem { get; set; } - - - [JsonIgnore] - [ForeignKey("RelevanceId")] - public ReadingQuestionSystem RelevanceReadingQuestionSystem { get; set; } - - [NotMapped] - public List ParentTriggerValueList - { - get - { - try - { - return this.ParentTriggerValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } - - - [NotMapped] - public List RelevanceValueList - { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } - - [NotMapped] - public List HighlightAnswerList - { - get - { - - try - { - var result = JsonConvert.DeserializeObject>(this.HighlightAnswer); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - - } - } + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index 25b574f90..ba9ac4405 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -14,10 +14,110 @@ namespace IRaCIS.Core.Domain.Models /// 项目阅片问题 /// [Table("ReadingQuestionTrial")] - public class ReadingQuestionTrial : BaseAuditAddEntity + public class ReadingQuestionTrial : BaseAddAuditEntity { + #region 导航属性 + /// + /// 分页标准 + /// + [ForeignKey("ReadingCriterionPageId")] + [JsonIgnore] + public ReadingCriterionPage ReadingCriterionPage { get; set; } + [JsonIgnore] + [ForeignKey("ParentId")] + public ReadingQuestionTrial ParentReadingQuestionTrial { get; set; } + [JsonIgnore] + [ForeignKey("RelevanceId")] + public ReadingQuestionTrial RelevanceReadingQuestionTrial { get; set; } + [JsonIgnore] + [ForeignKey("ReadingQuestionCriterionTrialId")] + public ReadingQuestionCriterionTrial ReadingQuestionCriterionTrial { get; set; } - public bool IsAdditional { get; set; } + [JsonIgnore] + public List ReadingTableQuestionTrialList { get; set; } + [JsonIgnore] + [ForeignKey("GroupId")] + public ReadingQuestionTrial GroupInfo { get; set; } + + [NotMapped] + public List ParentTriggerValueList + { + get + { + try + { + return this.ParentTriggerValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + + + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + + + [NotMapped] + public List CalculateQuestionList + { + get + { + + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + + [NotMapped] + public List HighlightAnswerList + { + get + { + + try + { + var result = JsonConvert.DeserializeObject>(this.HighlightAnswer); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + #endregion + public bool IsAdditional { get; set; } /// @@ -292,112 +392,14 @@ namespace IRaCIS.Core.Domain.Models /// public QuestionClassify? QuestionClassify { get; set; } - [JsonIgnore] - [ForeignKey("GroupId")] - public ReadingQuestionTrial GroupInfo { get; set; } + /// /// 高亮问题的答案 /// public string HighlightAnswer { get; set; } = "[]"; - /// - /// 分页标准 - /// - [ForeignKey("ReadingCriterionPageId")] - [JsonIgnore] - public ReadingCriterionPage ReadingCriterionPage { get; set; } - [JsonIgnore] - [ForeignKey("ParentId")] - public ReadingQuestionTrial ParentReadingQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("RelevanceId")] - public ReadingQuestionTrial RelevanceReadingQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("ReadingQuestionCriterionTrialId")] - public ReadingQuestionCriterionTrial ReadingQuestionCriterionTrial { get; set; } - [JsonIgnore] - public List ReadingTableQuestionTrialList { get; set; } - - - [NotMapped] - public List ParentTriggerValueList - { - get - { - try - { - return this.ParentTriggerValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } - - - [NotMapped] - public List RelevanceValueList - { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } - - - [NotMapped] - public List CalculateQuestionList - { - get - { - - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - - } - } - - [NotMapped] - public List HighlightAnswerList - { - get - { - - try - { - var result = JsonConvert.DeserializeObject>(this.HighlightAnswer); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - - } - } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs index 4b52c7894..17733a479 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs @@ -11,10 +11,15 @@ namespace IRaCIS.Core.Domain.Models ///ReadingCriterionDictionary /// [Table("ReadingSystemCriterionDictionary")] - public class ReadingSystemCriterionDictionary : BaseAuditAddEntity + public class ReadingSystemCriterionDictionary : BaseAddAuditEntity { + #region - public Guid CriterionId { get; set; } + [JsonIgnore] + [ForeignKey("DictionaryId")] + public Dictionary Dictionary { get; set; } + #endregion + public Guid CriterionId { get; set; } public Guid DictionaryId { get; set; } @@ -37,9 +42,6 @@ namespace IRaCIS.Core.Domain.Models /// public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General; - [JsonIgnore] - [ForeignKey("DictionaryId")] - public Dictionary Dictionary { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index 8504ab606..6de27d20b 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -16,22 +16,59 @@ namespace IRaCIS.Core.Domain.Models ///系统表格问题 /// [Table("ReadingTableQuestionSystem")] - public class ReadingTableQuestionSystem : BaseAuditAddEntity - { + public class ReadingTableQuestionSystem : BaseAddAuditEntity + { + #region 导航属性 + [ForeignKey("DependParentId")] + [JsonIgnore] + public ReadingTableQuestionSystem DependParentQuestion { get; set; } - /// - /// 系统表的问题Id ReadingQuestionSystem的Id - /// - public Guid ReadingQuestionId { get; set; } - - /// - /// Type + [NotMapped] + public List ParentTriggerValueList + { + get + { + try + { + return this.ParentTriggerValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + + + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + #endregion + + /// + /// 系统表的问题Id ReadingQuestionSystem的Id /// + public Guid ReadingQuestionId { get; set; } + public string Type { get; set; } - /// - /// ParentId - /// + public Guid? ParentId { get; set; } /// @@ -64,10 +101,6 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsEnable { get; set; } - - /// - /// 备注 - /// public string Remark { get; set; } /// @@ -172,46 +205,7 @@ namespace IRaCIS.Core.Domain.Models /// public QuestionClassify? QuestionClassify { get; set; } - [ForeignKey("DependParentId")] - [JsonIgnore] - public ReadingTableQuestionSystem DependParentQuestion { get; set; } - - [NotMapped] - public List ParentTriggerValueList - { - get - { - try - { - return this.ParentTriggerValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } - - - [NotMapped] - public List RelevanceValueList - { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index fe2b9404b..c10894d8b 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -16,113 +16,125 @@ namespace IRaCIS.Core.Domain.Models /// 项目阅片问题 /// [Table("ReadingTableQuestionTrial")] - public class ReadingTableQuestionTrial : BaseAuditAddEntity - { - /// - /// TrialId - /// - public Guid TrialId { get; set; } + public class ReadingTableQuestionTrial : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("DependParentId")] + public ReadingTableQuestionTrial DependParentQuestion { get; set; } + + [JsonIgnore] + [ForeignKey("ReadingQuestionId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + [NotMapped] + public List ParentTriggerValueList + { + get + { + try + { + return this.ParentTriggerValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + + + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + + + [NotMapped] + public List CalculateQuestionList + { + get + { + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + #endregion + + public Guid TrialId { get; set; } /// /// 项目问题的Id ReadingQuestionTrial的id /// public Guid ReadingQuestionId { get; set; } - /// - /// Type - /// + public string Type { get; set; } = string.Empty; - /// - /// ParentId - /// + public Guid? ParentId { get; set; } - - /// - /// ParentTriggerValue - /// + public string ParentTriggerValue { get; set; } = string.Empty; - /// - /// QuestionName - /// + public string QuestionName { get; set; } = string.Empty; - /// - /// IsRequired - /// + public IsRequired IsRequired { get; set; } - - /// - /// ShowOrder - /// + public int ShowOrder { get; set; } - - /// - /// TypeValue - /// + public string TypeValue { get; set; } = string.Empty; - /// - /// IsEnable - /// + public bool IsEnable { get; set; } - - /// - /// Remark - /// public string Remark { get; set; } = string.Empty; - /// - /// RelevanceId - /// + public Guid? RelevanceId { get; set; } - - /// - /// RelevanceValue - /// + public string RelevanceValue { get; set; } = string.Empty; - /// - /// ShowQuestion - /// public int ShowQuestion { get; set; } - /// - /// MaxRowCount - /// + public int? MaxRowCount { get; set; } - - /// - /// DataTableName - /// + public string DataTableName { get; set; } = string.Empty; - /// - /// DataTableColumn - /// public string DataTableColumn { get; set; } - /// - /// TableQuestionType - /// public TableQuestionType? TableQuestionType { get; set; } - - /// - /// DependParentId - /// + public Guid? DependParentId { get; set; } - /// - /// IsDepend - /// public IsDepend IsDepend { get; set; } - /// - /// 项目标准Id - /// public Guid TrialCriterionId { get; set; } /// @@ -191,13 +203,7 @@ namespace IRaCIS.Core.Domain.Models /// public QuestionClassify? QuestionClassify { get; set; } - [JsonIgnore] - [ForeignKey("DependParentId")] - public ReadingTableQuestionTrial DependParentQuestion { get; set; } - - [JsonIgnore] - [ForeignKey("ReadingQuestionId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + /// /// 复制病灶的时候 是否复制这个问题 @@ -210,62 +216,6 @@ namespace IRaCIS.Core.Domain.Models public Guid? SystemTableQuestionId { get; set; } - [NotMapped] - public List ParentTriggerValueList - { - get - { - try - { - return this.ParentTriggerValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } - - - [NotMapped] - public List RelevanceValueList - { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } - - - [NotMapped] - public List CalculateQuestionList - { - get - { - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - - } - } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs index 2eeeeb5e9..187b9fe34 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs @@ -13,11 +13,19 @@ namespace IRaCIS.Core.Domain.Models ///ReadingTrialCriterionDictionary /// [Table("ReadingTrialCriterionDictionary")] - public class ReadingTrialCriterionDictionary : BaseAuditAddEntity + public class ReadingTrialCriterionDictionary : BaseAddAuditEntity { - - public Guid CriterionId { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("DictionaryId")] + public Dictionary Dictionary { get; set; } + + [ForeignKey("CriterionId")] + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion + public Guid CriterionId { get; set; } public Guid DictionaryId { get; set; } @@ -31,13 +39,7 @@ namespace IRaCIS.Core.Domain.Models public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } - [JsonIgnore] - [ForeignKey("DictionaryId")] - public Dictionary Dictionary { get; set; } - - [ForeignKey("CriterionId")] - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs index 5aff9b283..1b056bb37 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs @@ -13,34 +13,23 @@ namespace IRaCIS.Core.Domain.Models ///ReadingCustomTag /// [Table("ReadingCustomTag")] - public class ReadingCustomTag : BaseAuditAddEntity - { - /// - /// 任务Id - /// - public Guid VisitTaskId { get; set; } - - /// - /// StudyId - /// + public class ReadingCustomTag : BaseAddAuditEntity + { + #region 导航属性 + + #endregion + + public Guid VisitTaskId { get; set; } + public Guid? StudyId { get; set; } - /// - /// SeriesId - /// + public Guid? SeriesId { get; set; } - - /// - /// InstanceId - /// + public Guid? InstanceId { get; set; } - - /// - /// MeasureData - /// + public string MeasureData { get; set; } - public int? NumberOfFrames { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs index db512b224..c5b164d7c 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs @@ -9,49 +9,45 @@ namespace IRaCIS.Core.Domain.Models /// 阅片全局任务信息 /// [Table("ReadingGlobalTaskInfo")] - public class ReadingGlobalTaskInfo : BaseAuditAddEntity - { - - /// + public class ReadingGlobalTaskInfo : BaseAddAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("TaskId")] + public VisitTask VisitTask { get; set; } + + [JsonIgnore] + [ForeignKey("GlobalTaskId")] + public VisitTask GlobalVisitTask { get; set; } + + + [JsonIgnore] + [ForeignKey("QuestionId")] + public ReadingQuestionTrial TrialReadingQuestion { get; set; } + #endregion + + /// /// 全局任务Id /// - public Guid GlobalTaskId { get; set; } + public Guid GlobalTaskId { get; set; } /// /// 原任务ID /// public Guid TaskId { get; set; } - - [JsonIgnore] - [ForeignKey("TaskId")] - public VisitTask VisitTask { get; set; } - - [JsonIgnore] - [ForeignKey("GlobalTaskId")] - public VisitTask GlobalVisitTask { get; set; } - - + /// /// 问题ID /// public Guid? QuestionId { get; set; } - [JsonIgnore] - [ForeignKey("QuestionId")] - public ReadingQuestionTrial TrialReadingQuestion { get; set; } - - /// /// 问题答案 /// public string Answer { get; set; } - - /// - /// TrialId - /// public Guid TrialId { get; set; } @@ -60,9 +56,6 @@ namespace IRaCIS.Core.Domain.Models /// public GlobalAnswerType GlobalAnswerType { get; set; } - /// - /// SubjectId - /// public Guid SubjectId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs index 98704f936..166730010 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs @@ -10,12 +10,15 @@ namespace IRaCIS.Core.Domain.Models ///阅片裁判信息 /// [Table("ReadingJudgeInfo")] - public class ReadingJudgeInfo : BaseAuditAddEntity - { - /// + public class ReadingJudgeInfo : BaseAddAuditEntity + { + #region 导航属性 + + #endregion + /// /// 第一个任务ID /// - [Required] + [Required] public Guid TaskIdOne { get; set; } /// @@ -31,17 +34,10 @@ namespace IRaCIS.Core.Domain.Models public Guid JudgeTaskId { get; set; } - - /// - /// 项目ID - /// - [Required] + public Guid TrialId { get; set; } - /// - /// 受试者ID - /// - [Required] + public Guid SubjectId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs index ad7bbe582..ccb6efcde 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs @@ -13,13 +13,22 @@ namespace IRaCIS.Core.Domain.Models /// 阅片肿瘤学 针对访视任务 添加了一个结果 /// [Table("ReadingOncologyTaskInfo")] - public class ReadingOncologyTaskInfo : BaseAuditAddEntity + public class ReadingOncologyTaskInfo : BaseAddAuditEntity { - - /// + #region 导航属性 + + [JsonIgnore] + [ForeignKey("OncologyTaskId")] + public VisitTask OncologyVisitTask { get; set; } + + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + #endregion + /// /// 肿瘤学 阅片任务ID /// - public Guid OncologyTaskId { get; set; } + public Guid OncologyTaskId { get; set; } /// /// 产生肿瘤学阅片任务的 访视类型的阅片任务Id @@ -47,13 +56,6 @@ namespace IRaCIS.Core.Domain.Models /// public Guid SubjectId { get; set; } - [JsonIgnore] - [ForeignKey("OncologyTaskId")] - public VisitTask OncologyVisitTask { get; set; } - - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index 2794831cd..8338e1031 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -16,60 +16,56 @@ namespace IRaCIS.Core.Domain.Models /// 表格问题答案行数据 /// [Table("ReadingTableAnswerRowInfo")] - public class ReadingTableAnswerRowInfo : BaseFullAuditDeleteEntity - { - [JsonIgnore] - [ForeignKey("InstanceId")] - public DicomInstance Instance { get; set; } + public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity + { + #region 导航属性 + [JsonIgnore] + [ForeignKey("InstanceId")] + public DicomInstance Instance { get; set; } + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + [JsonIgnore] + [ForeignKey("OrganInfoId")] + public OrganInfo OrganInfo { get; set; } + [JsonIgnore] + [ForeignKey("SplitRowId")] + public ReadingTableAnswerRowInfo SplitRow { get; set; } + [JsonIgnore] + [ForeignKey("MergeRowId")] + public ReadingTableAnswerRowInfo MergeRow { get; set; } + [JsonIgnore] + [ForeignKey("QuestionId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + + + //病灶答案表 + [JsonIgnore] + public List LesionAnswerList { get; set; } = new List(); + #endregion - /// - /// 第一层的Question - /// - public Guid QuestionId { get; set; } - /// - /// VisitTaskId - /// + public Guid QuestionId { get; set; } + + public Guid VisitTaskId { get; set; } - - /// - /// TrialId - /// + public Guid TrialId { get; set; } - /// - /// InstanceId - /// public Guid? InstanceId { get; set; } - /// - /// SeriesId - /// public Guid? SeriesId { get; set; } - /// - /// StudyId - /// public Guid? StudyId { get; set; } - /// - /// InstanceId - /// public Guid? OtherInstanceId { get; set; } - /// - /// SeriesId - /// public Guid? OtherSeriesId { get; set; } - - /// - /// StudyId - /// public Guid? OtherStudyId { get; set; } public string? OtherMarkTool { get; set; } @@ -86,32 +82,17 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsDicomReading { get; set; } = true; - /// - /// RowIndex - /// public decimal RowIndex { get; set; } - /// - /// MeasureData - /// public string MeasureData { get; set; } = string.Empty; - /// /// 是否是当前任务添加 /// public bool IsCurrentTaskAdd { get; set; } = false; - - /// - /// SplitRowId - /// public Guid? SplitRowId { get; set; } - - /// - /// MergeRowId - /// public Guid? MergeRowId { get; set; } public string BlindName { get; set; } = string.Empty; @@ -143,7 +124,6 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? CTSeriesId { get; set; } - public SplitOrMergeType? SplitOrMergeType { get; set; } @@ -156,8 +136,6 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? OrganInfoId { get; set; } - [ForeignKey("OrganInfoId")] - public OrganInfo OrganInfo { get; set; } /// /// 窗宽WW @@ -182,17 +160,7 @@ namespace IRaCIS.Core.Domain.Models public string? OtherMeasureData { get; set; } = string.Empty; - - [JsonIgnore] - [ForeignKey("SplitRowId")] - public ReadingTableAnswerRowInfo SplitRow { get; set; } - [JsonIgnore] - [ForeignKey("MergeRowId")] - public ReadingTableAnswerRowInfo MergeRow { get; set; } - [JsonIgnore] - [ForeignKey("QuestionId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - + //病灶编号 public string RowMark { get; set; } = string.Empty; @@ -202,13 +170,7 @@ namespace IRaCIS.Core.Domain.Models /// public string MarkTool { get; set; } = string.Empty; - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } - - //病灶答案表 - [JsonIgnore] - public List LesionAnswerList { get; set; } = new List(); + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs index ad1f01c59..b524e02de 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs @@ -13,49 +13,9 @@ namespace IRaCIS.Core.Domain.Models ///ReadingTableQuestionAnswer /// [Table("ReadingTableQuestionAnswer")] - public class ReadingTableQuestionAnswer : BaseFullAuditDeleteEntity - { - /// - /// 问题Id - /// - - public Guid QuestionId { get; set; } - - /// - /// 表格问题Id - /// - public Guid TableQuestionId { get; set; } - - /// - /// 任务Id - /// - public Guid VisitTaskId { get; set; } - - /// - /// 项目Id - /// - public Guid TrialId { get; set; } - - /// - /// 行号 - /// - public decimal RowIndex { get; set; } - - /// - /// 答案 - /// - public string Answer { get; set; } - - - - /// - /// RowId - /// - public Guid RowId { get; set; } - - - - + public class ReadingTableQuestionAnswer : BaseFullDeleteAuditEntity + { + #region 导航属性 [JsonIgnore] [ForeignKey("RowId")] @@ -63,21 +23,44 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] - [ForeignKey("QuestionId")] + [ForeignKey("QuestionId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("TableQuestionId")] + [JsonIgnore] + [ForeignKey("TableQuestionId")] - public ReadingTableQuestionTrial ReadingTableQuestionTrial { get; set; } + public ReadingTableQuestionTrial ReadingTableQuestionTrial { get; set; } [JsonIgnore] [ForeignKey("VisitTaskId")] public VisitTask VisitTask { get; set; } + #endregion + + + public Guid QuestionId { get; set; } + + /// + /// 表格问题Id + /// + public Guid TableQuestionId { get; set; } + + public Guid VisitTaskId { get; set; } + + public Guid TrialId { get; set; } + + + public decimal RowIndex { get; set; } + + public string Answer { get; set; } + + + public Guid RowId { get; set; } + + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs index 6016257f1..d96db2391 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs @@ -12,31 +12,32 @@ namespace IRaCIS.Core.Domain.Models /// 阅片任务答案 /// [Table("ReadingTaskQuestionAnswer")] - public class ReadingTaskQuestionAnswer : BaseAuditAddEntity - { - /// - /// 项目问题Id - /// - public Guid ReadingQuestionTrialId { get; set; } + public class ReadingTaskQuestionAnswer : BaseAddAuditEntity + { + #region 导航属性 + + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + + [JsonIgnore] + [ForeignKey("ReadingQuestionTrialId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + #endregion + /// + /// 项目问题Id + /// + public Guid ReadingQuestionTrialId { get; set; } /// /// 项目问题标准Id /// public Guid ReadingQuestionCriterionTrialId { get; set; } - /// - /// 项目ID - /// public Guid TrialId { get; set; } - /// - /// 受试者Id - /// public Guid SubjectId { get; set; } - /// - /// 任务Id - /// public Guid VisitTaskId { get; set; } /// @@ -44,7 +45,6 @@ namespace IRaCIS.Core.Domain.Models /// public string Answer { get; set; } - /// /// 全局阅片修改的答案 /// @@ -58,13 +58,6 @@ namespace IRaCIS.Core.Domain.Models - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } - - [JsonIgnore] - [ForeignKey("ReadingQuestionTrialId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs index d63500edf..9971310d7 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs @@ -13,58 +13,37 @@ namespace IRaCIS.Core.Domain.Models /// /// [Table("ReadingTaskQuestionMark")] - public class ReadingTaskQuestionMark : BaseAuditAddEntity + public class ReadingTaskQuestionMark : BaseAddAuditEntity { - + #region 导航属性 + [JsonIgnore] + [ForeignKey("QuestionId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + #endregion + + + public Guid VisitTaskId { get; set; } - - /// - /// 任务Id - /// - [Required] - public Guid VisitTaskId { get; set; } - - /// - /// 问题Id - /// - [Required] public Guid QuestionId { get; set; } - - /// - /// InstanceId - /// + public Guid? InstanceId { get; set; } - - /// - /// SeriesId - /// + public Guid? SeriesId { get; set; } - /// - /// StudyId - /// public Guid? StudyId { get; set; } - /// - /// MarkTool - /// + public string MarkTool { get; set; } = string.Empty; - /// - /// PicturePath - /// public string PicturePath { get; set; } = string.Empty; - /// - /// NumberOfFrames - /// public int? NumberOfFrames { get; set; } - /// - /// MeasureData - /// - [Required] public string MeasureData { get; set; } = string.Empty; @@ -75,19 +54,10 @@ namespace IRaCIS.Core.Domain.Models public string? OrderMarkName { get; set; } = string.Empty; - /// - /// InstanceId - /// public Guid? OtherInstanceId { get; set; } - /// - /// SeriesId - /// public Guid? OtherSeriesId { get; set; } - /// - /// StudyId - /// public Guid? OtherStudyId { get; set; } public string? OtherMarkTool { get; set; } @@ -97,13 +67,7 @@ namespace IRaCIS.Core.Domain.Models public int? OtherNumberOfFrames { get; set; } public string? OtherMeasureData { get; set; } = string.Empty; - [JsonIgnore] - [ForeignKey("QuestionId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs index 62ff67329..0cd1a852e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs @@ -13,16 +13,19 @@ namespace IRaCIS.Core.Domain.Models ///任务关系表 /// [Table("ReadingTaskRelation")] - public class ReadingTaskRelation : BaseAuditAddEntity - { + public class ReadingTaskRelation : BaseAddAuditEntity + { + #region 导航属性 - [ForeignKey("TaskId")] - [JsonIgnore] - public VisitTask VisitTask { get; set; } - /// + [ForeignKey("TaskId")] + [JsonIgnore] + public VisitTask VisitTask { get; set; } + #endregion + + /// /// 任务ID /// - public Guid TaskId { get; set; } + public Guid TaskId { get; set; } /// /// 关联的任务ID diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs index 31f52688a..c05a12219 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs @@ -12,19 +12,48 @@ namespace IRaCIS.Core.Domain.Models ///读片模块 /// [Table("ReadModule")] - public class ReadModule : BaseFullAuditDeleteEntity - { + public class ReadModule : BaseFullDeleteAuditEntity + { + #region 导航属性 [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + /// + /// 受试者 + /// + [ForeignKey("SubjectId")] + + public Subject Subject { get; set; } + + [JsonIgnore] + /// + /// 阅片期配置 + /// + [ForeignKey("ReadingPeriodSetId")] + public ReadingPeriodSet ReadingPeriodSet { get; set; } + + [JsonIgnore] + /// + /// 访视 + /// + [ForeignKey("SubjectVisitId")] + public SubjectVisit SubjectVisit { get; set; } + + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - [JsonIgnore] - public List ModuleTaskList { get; set; } + [JsonIgnore] + public List ReadModuleCriterionFromList { get; set; } = new List(); + + + [JsonIgnore] + public List ModuleTaskList { get; set; } + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion + - /// - /// 受试者ID - /// public Guid SubjectId { get; set; } public Guid TrialReadingCriterionId { get; set; } @@ -44,27 +73,16 @@ namespace IRaCIS.Core.Domain.Models /// public bool? IsUrgent { get; set; } - /// - /// 访视ID - /// public Guid SubjectVisitId { get; set; } - /// /// 阅片计划ID /// public Guid? ReadingPeriodSetId { get; set; } - - - /// - /// 项目ID - /// public Guid TrialId { get; set; } - - public bool IsCRCConfirm { get; set; } = false; @@ -88,55 +106,11 @@ namespace IRaCIS.Core.Domain.Models /// public bool? IsClinicalDataBlind { get; set; } - ///// - ///// - ///// - //public decimal VisitNum { get; set; } - - // [JsonIgnore] - ///// - ///// 对应 - ///// - //[ForeignKey("ReadModuleId")] - //public ReadModule ReadModuleModel { get; set; } - - [JsonIgnore] - /// - /// 受试者 - /// - [ForeignKey("SubjectId")] - - public Subject Subject { get; set; } - - [JsonIgnore] - /// - /// 阅片期配置 - /// - [ForeignKey("ReadingPeriodSetId")] - public ReadingPeriodSet ReadingPeriodSet { get; set; } - - [JsonIgnore] - /// - /// 访视 - /// - [ForeignKey("SubjectVisitId")] - public SubjectVisit SubjectVisit { get; set; } - - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } - - - [JsonIgnore] - public List ReadModuleCriterionFromList { get; set; } = new List(); - /// /// 阅片配置的类型 /// public ReadingSetType ReadingSetType { get; set; } - - public ReadingStatusEnum ReadingStatus { get; set; } = ReadingStatusEnum.TaskAllocate; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs index 23ef46e1b..1f4b6f172 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs @@ -11,32 +11,34 @@ namespace IRaCIS.Core.Domain.Models /// 阅片计划 /// [Table("ReadingPeriodPlan")] - public class ReadingPeriodPlan : BaseFullAuditDeleteEntity + public class ReadingPeriodPlan : BaseFullDeleteAuditEntity { + #region 导航属性 + // + /// 访视 + /// + [ForeignKey("SubjectVisitId")] + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } - /// - /// 阅片期配置ID - /// - public Guid ReadingPeriodSetId { get; set; } + /// + /// 阅片期配置 + /// + [ForeignKey("ReadingPeriodSetId")] + [JsonIgnore] + public ReadingPeriodSet ReadingPeriodSet { get; set; } + #endregion + /// + /// 阅片期配置ID + /// + public Guid ReadingPeriodSetId { get; set; } /// /// 访视 /// public Guid SubjectVisitId { get; set; } - /// - /// 访视 - /// - [ForeignKey("SubjectVisitId")] - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - - /// - /// 阅片期配置 - /// - [ForeignKey("ReadingPeriodSetId")] - [JsonIgnore] - public ReadingPeriodSet ReadingPeriodSet { get; set; } + diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs index 5f42cfb13..7317239db 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs @@ -12,13 +12,26 @@ namespace IRaCIS.Core.Domain.Models ///阅片期设置 只会设计到所有人 或者某个Site 针对全局 /// [Table("ReadingPeriodSet")] - public class ReadingPeriodSet : BaseFullAuditDeleteEntity + public class ReadingPeriodSet : BaseFullDeleteAuditEntity { + #region 导航属性 + [JsonIgnore] + public List ReadingPeriodSites { get; set; } = new List(); + [JsonIgnore] + /// + /// 访视模板 + /// + [ForeignKey("VisitStageId")] + public VisitStage VisitStage { get; set; } - /// - /// 项目ID - /// - public Guid TrialId { get; set; } + /// + /// 阅片期计划 + /// + [JsonIgnore] + public List ReadingPeriodPlanList { get; set; } = new List(); + #endregion + + public Guid TrialId { get; set; } public Guid TrialReadingCriterionId { get; set; } @@ -47,12 +60,7 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? VisitStageId { get; set; } - [JsonIgnore] - /// - /// 访视模板 - /// - [ForeignKey("VisitStageId")] - public VisitStage VisitStage { get; set; } + /// /// 是否生效 @@ -77,15 +85,7 @@ namespace IRaCIS.Core.Domain.Models - [JsonIgnore] - public List ReadingPeriodSites { get; set; } = new List(); - - /// - /// 阅片期计划 - /// - [JsonIgnore] - public List ReadingPeriodPlanList { get; set; } = new List(); } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs index ca90985f8..cec49bf5a 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs @@ -11,31 +11,25 @@ namespace IRaCIS.Core.Domain.Models /// 阅片期和中心关联 /// [Table("ReadingPeriodSite")] - public class ReadingPeriodSite : BaseAuditAddEntity + public class ReadingPeriodSite : BaseAddAuditEntity { + #region 导航属性 + [JsonIgnore] + public TrialSite TrialSite { get; set; } - /// - ///阅片期配置ID - /// - - public Guid ReadingPeriodSetId { get; set; } + [JsonIgnore] + public ReadingPeriodSet ReadingPeriodSet { get; set; } + #endregion + /// + ///阅片期配置ID + /// + + public Guid ReadingPeriodSetId { get; set; } - /// - /// 项目ID - /// public Guid TrialId { get; set; } - - - - - public Guid TrialSiteId { get; set; } - public TrialSite TrialSite { get; set; } - - [JsonIgnore] - public ReadingPeriodSet ReadingPeriodSet { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs index f793aa37d..40c68b430 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs @@ -13,12 +13,15 @@ namespace IRaCIS.Core.Domain.Models ///ShortcutKey /// [Table("ShortcutKey")] - public class ShortcutKey : BaseAuditAddEntity - { - /// - /// 对应的键盘按键 - /// - public string Keyboardkey { get; set; } = string.Empty; + public class ShortcutKey : BaseAddAuditEntity + { + #region 导航属性 + + #endregion + /// + /// 对应的键盘按键 + /// + public string Keyboardkey { get; set; } = string.Empty; /// /// 按键枚举 diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs index 1922f4004..88fc6f7f1 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs @@ -13,11 +13,13 @@ namespace IRaCIS.Core.Domain.Models ///UserWLTemplate /// [Table("UserWLTemplate")] - public class UserWLTemplate : BaseAuditAddEntity + public class UserWLTemplate : BaseAddAuditEntity { - + #region 导航属性 - public string TemplateName { get; set; } + #endregion + + public string TemplateName { get; set; } public Guid UserId { get; set; } diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs index b2d4e9095..0a5dda331 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs @@ -15,22 +15,21 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialSiteEquipmentSurvey")] public class TrialSiteEquipmentSurvey : BaseFullAuditEntity { + #region 导航属性 [JsonIgnore] [ForeignKey("TrialSiteSurveyId")] public TrialSiteSurvey TrialSiteSurvey { get; set; } - public Guid TrialSiteSurveyId { get; set; } [JsonIgnore] [ForeignKey("EquipmentTypeId")] - public Dictionary EquipmentType { get; set; } + public Dictionary EquipmentType { get; set; } + #endregion + + + public Guid TrialSiteSurveyId { get; set; } public Guid EquipmentTypeId { get; set; } - - - - - public string Parameters { get; set; } = string.Empty; public string ManufacturerName { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs index 8b378578e..d612b9eaa 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs @@ -14,99 +14,56 @@ namespace IRaCIS.Core.Domain.Models ///TrialSiteSurvey /// [Table("TrialSiteSurvey")] - public class TrialSiteSurvey : BaseFullAuditDeleteEntity + public class TrialSiteSurvey : BaseFullDeleteAuditEntity { + #region 导航属性 + // 必须 { get; set; } 否则 翻译出错 + [JsonIgnore] + public List TrialSiteUserSurveyList { get; set; } = new List(); + [JsonIgnore] + public List TrialSiteEquipmentSurveyList { get; set; } = new List(); + + [JsonIgnore] + public TrialSite TrialSite { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + public User ReviewerUser { get; set; } + [JsonIgnore] + public User PreliminaryUser { get; set; } + #endregion - - [Required] public Guid TrialSiteId { get; set; } public TrialSiteSurveyEnum State { get; set; } = TrialSiteSurveyEnum.ToSubmit; - // 必须 { get; set; } 否则 翻译出错 - [JsonIgnore] - public List TrialSiteUserSurveyList { get; set; } =new List(); - [JsonIgnore] - public List TrialSiteEquipmentSurveyList { get; set; } = new List(); - - [JsonIgnore] - public TrialSite TrialSite { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - - - - - /// - /// TrialId - /// - [Required] public Guid TrialId { get; set; } - - - - /// - /// UserName - /// - [Required] + public string UserName { get; set; } = string.Empty; - /// - /// Phone - /// - [Required] public string Phone { get; set; } = string.Empty; - /// - /// Email - /// - [Required] + public string Email { get; set; } = string.Empty; - /// - /// AverageEngravingCycle - /// - [Required] + public int AverageEngravingCycle { get; set; } - - /// - /// IsConfirmImagingTechnologist - /// - [Required] + public bool IsConfirmImagingTechnologist { get; set; } - - /// - /// NotConfirmReson - /// - [Required] + public string NotConfirmReson { get; set; } = string.Empty; - /// - /// EfficacyEvaluatorType - /// - [Required] public int EfficacyEvaluatorType { get; set; } - - /// - /// IsFollowStudyParameters - /// - [Required] + public bool IsFollowStudyParameters { get; set; } - /// - /// NotFollowReson - /// - [Required] public string NotFollowReson { get; set; } = string.Empty; - public string LatestBackReason { get; set; } = string.Empty; - - public Guid? PreliminaryUserId { get; set; } public Guid? ReviewerUserId { get; set; } @@ -115,10 +72,7 @@ namespace IRaCIS.Core.Domain.Models public DateTime? ReviewerTime { get; set; } - [JsonIgnore] - public User ReviewerUser { get; set; } - [JsonIgnore] - public User PreliminaryUser { get; set; } + } diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs index 26ca94a46..07b950b62 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs @@ -15,53 +15,34 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialSiteUserSurvey")] public class TrialSiteUserSurvey : BaseFullAuditEntity { + #region 导航属性 [JsonIgnore] [ForeignKey("TrialSiteSurveyId")] public TrialSiteSurvey TrialSiteSurvey { get; set; } - - public Guid TrialSiteSurveyId { get; set; } - [JsonIgnore] [ForeignKey("UserTypeId")] public UserType UserTypeRole { get; set; } + #endregion + + + public Guid TrialSiteSurveyId { get; set; } public Guid? UserTypeId { get; set; } public int? TrialRoleCode { get; set; } - - - - /// - /// Phone - /// - [Required] public string Phone { get; set; } = string.Empty; - /// - /// Email - /// - [Required] public string Email { get; set; } = string.Empty; - - public string FirstName { get; set; } = string.Empty; public string LastName { get; set; } = string.Empty; - - public string OrganizationName { get; set; } = string.Empty; public Guid? SystemUserId { get; set; } - - - /// - /// IsGenerateAccount - /// - [Required] public bool IsGenerateAccount { get; set; } public bool IsGenerateSuccess { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/DataInspection.cs b/IRaCIS.Core.Domain/Trial/DataInspection.cs index 1cf752924..749b10c77 100644 --- a/IRaCIS.Core.Domain/Trial/DataInspection.cs +++ b/IRaCIS.Core.Domain/Trial/DataInspection.cs @@ -12,52 +12,34 @@ namespace IRaCIS.Core.Domain.Models ///DataInspection /// [Table("DataInspection")] - public class DataInspection : BaseAuditAddEntity + public class DataInspection : BaseAddAuditEntity { + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion - - /// - /// 项目iD - /// - - public Guid? TrialId { get; set; } + public Guid? TrialId { get; set; } public Guid? TrialSiteId { get; set; } - - - /// - /// 受试者 - /// public Guid? SubjectId { get; set; } - /// - /// 访视 - /// - public Guid? SubjectVisitId { get; set; } + public Guid? SubjectVisitId { get; set; } public Guid? VisitTaskId { get; set; } public VisitTask VisitTask { get; set; } - /// - /// IP地址 - /// public string IP { get; set; } = string.Empty; - /// - /// 修改原因 - /// - [Required] public string Reason { get; set; } = string.Empty; - /// - /// 是否有签名 - /// public bool IsSign { get; set; } /// @@ -90,26 +72,14 @@ namespace IRaCIS.Core.Domain.Models /// public Guid? ModuleTypeId { get; set; } - - /// - /// Json 对象 - /// - public string JsonDetail { get; set; } = string.Empty; - /// - /// 创建人名称 - /// public string CreateUserName { get; set; } = string.Empty; public string CreateUserRealName { get; set; } = string.Empty; - /// - /// 角色名称 - /// + public string RoleName { get; set; } = string.Empty; - - /// /// 标识 /// @@ -146,8 +116,6 @@ namespace IRaCIS.Core.Domain.Models public Guid? DoctorUserId { get; set; } - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } } diff --git a/IRaCIS.Core.Domain/Trial/Enroll.cs b/IRaCIS.Core.Domain/Trial/Enroll.cs index 7d4764112..e7dd58bb9 100644 --- a/IRaCIS.Core.Domain/Trial/Enroll.cs +++ b/IRaCIS.Core.Domain/Trial/Enroll.cs @@ -8,12 +8,22 @@ namespace IRaCIS.Core.Domain.Models [Table("Enroll")] public partial class Enroll : BaseFullAuditEntity { - + #region [JsonIgnore] [ForeignKey("TrialId")] public virtual Trial Trial { get; set; } [JsonIgnore] public virtual Doctor Doctor { get; set; } + [JsonIgnore] + public User DoctorUser { get; set; } + + + [JsonIgnore] + public List EnrollReadingCategoryList { get; set; } + + [JsonIgnore] + public List EnrollReadingCriteriaList { get; set; } + #endregion public Guid DoctorId { get; set; } @@ -28,9 +38,7 @@ namespace IRaCIS.Core.Domain.Models public string Memo { get; set; } = string.Empty; public int ReviewerReadingType { get; set; } = 0; - - - + public int? Training { get; set; } public int? RefresherTraining { get; set; } @@ -49,24 +57,14 @@ namespace IRaCIS.Core.Domain.Models public int? Global { get; set; } - public int? Downtime { get; set; } - /// /// ˺ 뵽Ŀк ֵ /// public Guid? DoctorUserId { get; set; } - [JsonIgnore] - public User DoctorUser { get; set; } - - - [JsonIgnore] - public List EnrollReadingCategoryList { get; set; } - - [JsonIgnore] - public List EnrollReadingCriteriaList { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Trial/EnrollDetail.cs b/IRaCIS.Core.Domain/Trial/EnrollDetail.cs index 191f8148d..6e27b8200 100644 --- a/IRaCIS.Core.Domain/Trial/EnrollDetail.cs +++ b/IRaCIS.Core.Domain/Trial/EnrollDetail.cs @@ -5,10 +5,18 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { [Table("EnrollDetail")] - public partial class EnrollDetail : BaseAuditAddEntity + public partial class EnrollDetail : BaseAddAuditEntity { + #region [JsonIgnore] - public virtual TrialStatusDetail TrialDetail { get; set; } + public virtual TrialStatusDetail TrialDetail { get; set; } + [JsonIgnore] + [ForeignKey("CreateUserId")] + public User CreateUser { get; set; } + [JsonIgnore] + public Doctor Doctor { get; set; } + #endregion + public Guid DoctorId { get; set; } public Guid TrialId { get; set; } @@ -20,10 +28,6 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialDetailId { get; set; } - [JsonIgnore] - [ForeignKey("CreateUserId")] - public User CreateUser { get; set; } - [JsonIgnore] - public Doctor Doctor { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs index 0bd9d8148..036ed8d39 100644 --- a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs +++ b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs @@ -13,9 +13,15 @@ namespace IRaCIS.Core.Domain.Models ///EnrollReadingCategory /// [Table("EnrollReadingCategory")] - public class EnrollReadingCategory : BaseAuditAddEntity + public class EnrollReadingCategory : BaseAddAuditEntity { + #region 导航属性 + + [JsonIgnore] + [ForeignKey("EnrollId")] + public Enroll Enroll { get; set; } + #endregion public Guid EnrollId { get; set; } @@ -24,11 +30,7 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialReadingCriterionId { get; set; } - - [JsonIgnore] - [ForeignKey("EnrollId")] - public Enroll Enroll { get; set; } } } diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index b2ee8cff8..b47d8d4fb 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -9,21 +9,16 @@ using Newtonsoft.Json; namespace IRaCIS.Core.Domain.Models { [Table("Trial")] - public partial class Trial : BaseFullAuditDeleteEntity + public partial class Trial : BaseFullDeleteAuditEntity { - public Trial() - { - ClinicalTrialProjectDetails = new HashSet(); - TrialDicList = new List(); - } - + #region 导航属性 [JsonIgnore] public List TrialBodyPartList { get; set; } [JsonIgnore] public List TaskMedicalReviewList { get; set; } - + [JsonIgnore] public List TaskConsistentRuleList { get; set; } @@ -33,7 +28,7 @@ namespace IRaCIS.Core.Domain.Models public List VisitTaskList { get; set; } = new List() { }; [JsonIgnore] - public List VisitTaskReReadingList { get; set; } + public List VisitTaskReReadingList { get; set; } [JsonIgnore] public List TrialSiteSurveyList { get; set; } = new List(); @@ -61,8 +56,6 @@ namespace IRaCIS.Core.Domain.Models public List ReadModuleList { get; set; } = new List(); [JsonIgnore] public List UserFeedBackList { get; set; } = new List(); - public Guid IndicationTypeId { get; set; } = Guid.Empty; - public Guid? PhaseId { get; set; } = Guid.Empty; [JsonIgnore] [ForeignKey("IndicationTypeId")] @@ -86,12 +79,20 @@ namespace IRaCIS.Core.Domain.Models public List clinicalDataTrialSets { get; set; } = new List { }; [JsonIgnore] - public virtual ICollection ClinicalTrialProjectDetails { get; set; } + public List ClinicalTrialProjectDetails { get; set; } [JsonIgnore] - public virtual ICollection TrialDicList { get; set; } + public List TrialDicList { get; set; } = new List(); + [JsonIgnore] public List ReadingClinicalDataList { get; set; } + [JsonIgnore] + public List TrialStateChangeList { get; set; } = new List(); + #endregion + + public Guid IndicationTypeId { get; set; } = Guid.Empty; + public Guid? PhaseId { get; set; } = Guid.Empty; + [StringLength(100)] public string TrialCode { get; set; } = string.Empty; @@ -104,16 +105,10 @@ namespace IRaCIS.Core.Domain.Models //[ConcurrencyCheck] public int TrialEnrollStatus { get; set; } - //启动状态 [StringLength(500)] public string TrialStatusStr { get; set; } = StaticData.TrialState.TrialInitializing; - [JsonIgnore] - public List TrialStateChangeList { get; set; } = new List(); - - - public Guid? CROId { get; set; } = Guid.Empty; public Guid? SponsorId { get; set; } = Guid.Empty; @@ -147,20 +142,6 @@ namespace IRaCIS.Core.Domain.Models - - //废弃 - //public AttendedReviewerType AttendedReviewerType { get; set; } = AttendedReviewerType.CN;//0全部中国医生 1美国医生 2既有中国医生，也有美国医生 - - ////废弃 - //[JsonIgnore] - //[ForeignKey("DeclarationTypeId")] - //public Dictionary DeclarationType { get; set; } - - //废弃 - //public Guid DeclarationTypeId { get; set; } = Guid.Empty; - - - public string DeclarationTypes { get; set; } = string.Empty; [NotMapped] @@ -168,13 +149,10 @@ namespace IRaCIS.Core.Domain.Models .Select(s => Enum.Parse(typeof(DeclarationType), s)).Cast().ToList(); [NotMapped] - public List AttendedReviewerTypeEnumList=> AttendedReviewerTypes.Split('|',StringSplitOptions.RemoveEmptyEntries) + public List AttendedReviewerTypeEnumList => AttendedReviewerTypes.Split('|', StringSplitOptions.RemoveEmptyEntries) .Select(s => Enum.Parse(typeof(AttendedReviewerType), s)).Cast().ToList(); - public string AttendedReviewerTypes { get; set; }=string.Empty; - - - + public string AttendedReviewerTypes { get; set; } = string.Empty; public string TrialExtraConfigJsonStr { get; set; } = string.Empty; @@ -244,16 +222,12 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsImageExport { get; set; } = false; - public bool IsSubjectSecondCodeView { get; set; } - //阅片方式 public int ReadingMode { get; set; } = 1; - - public int ChangeDefalutDays { get; set; } = 5; /// @@ -307,8 +281,6 @@ namespace IRaCIS.Core.Domain.Models public int PlanVisitCount { get; set; } - - public DateTime? TrialFinishedTime { get; set; } public bool IsSubjectSexView { get; set; } = false; @@ -316,7 +288,6 @@ namespace IRaCIS.Core.Domain.Models //配置Suject Edit页面 是否显示 加急 public bool IsSubjectExpeditedView { get; set; } = false; - public bool IsTrialStart { get; set; } = false; @@ -331,10 +302,8 @@ namespace IRaCIS.Core.Domain.Models /// public DateTime? TrialFinishTime { get; set; } - public int? DigitPlaces { get; set; } = 1; - public bool IsTrialProcessConfirmed { get; set; } public bool IsTrialBasicLogicConfirmed { get; set; } public bool IsTrialUrgentConfirmed { get; set; } @@ -347,14 +316,14 @@ namespace IRaCIS.Core.Domain.Models /// public DateTime? SyncClinicalDataTime { get; set; } - + public string BlindBaseLineName { get; set; } = "Baseline"; public string BlindFollowUpPrefix { get; set; } = "Follow-up"; public int IndicationEnum { get; set; } = -1; - public string VitrualSiteCode { get; set; }=string.Empty; + public string VitrualSiteCode { get; set; } = string.Empty; #region 邮件配置 /// @@ -393,104 +362,6 @@ namespace IRaCIS.Core.Domain.Models public bool IsTrialPACSConfirmed { get; set; } - ///// - ///// 图像是否有标注 - ///// - //public bool IsImageIabeled { get; set; } - - - - ////阅片类型 - //public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; - - - //public bool IsGlobalReading { get; set; } = true; - - ///// - ///// 仲裁阅片 - ///// - //public bool? IsArbitrationReading { get; set; } = true; - - //public bool IsClinicalReading { get; set; } - - - ///// - ///// 1 Mint、2 PACS - ///// - - //public int ImagePlatform { get; set; } = 1; - - - ///// - ///// 仲裁规则 - ///// - //public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.None; - - ////任务分配对象 - //public TaskAllocateObj TaskAllocateObjEnum { get; set; } - - ////后续访视任务自动分配 - //public bool IsFollowVisitAutoAssign { get; set; } = true; - - ////后续全局自动分配 - //public bool IsFollowGlobalVisitAutoAssign { get; set; } = true; - - //public bool IsFollowJudgeTaskAutoAssign { get; set; } = true; - - //public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - - ////后续访视自动分配默认状态 - //public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - - ////后续全局自动分配默认状态 - //public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - - ////读片任务显示规则 - - //public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } - - - ///// - ///// 阅片是否显示受试者信息 - ///// - //public bool IsReadingShowSubjectInfo { get; set; } = false; - - ///// - ///// 阅片是否显示既往结果 - ///// - //public bool IsReadingShowPreviousResults { get; set; } = false; - - - - - ///// - ///// 是确认医学审核问题 - ///// - - //public bool IsConfirmMedicineQuestion { get; set; } = false; - - - - - ///// - ///// 阅片信息签名时间 - ///// - //public DateTime? ReadingInfoSignTime { get; set; } - - ///// - ///// 阅片工具 - ///// - //public ReadingTool? ReadingTool { get; set; } - - //public Guid? ReviewTypeId { get; set; } = Guid.Empty; - - //[ForeignKey("ReviewTypeId")] - //public Dictionary ReviewType { get; set; } - - - //public Guid? QCSecondConfirmedUserId { get; set; } - //public DateTime? QCSecondConfirmedTime { get; set; } - - //public int QCQuestionConfirmState { get; set; } + } } diff --git a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs index fc8f71aad..67d9fadb6 100644 --- a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs +++ b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs @@ -14,10 +14,16 @@ namespace IRaCIS.Core.Domain.Models ///TrialBodyPart /// [Table("TrialBodyPart")] - public class TrialBodyPart : BaseAuditAddEntity + public class TrialBodyPart : BaseAddAuditEntity { - - public string Code { get; set; } + #region 导航属性 + + [JsonIgnore] + public Trial Trial { get; set; } + + #endregion + + public string Code { get; set; } public string Name { get; set; } @@ -29,9 +35,6 @@ namespace IRaCIS.Core.Domain.Models public Guid TrialId { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - public bool IsHandAdd { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/TrialDictionary.cs b/IRaCIS.Core.Domain/Trial/TrialDictionary.cs index 2c87c9c88..586bbd512 100644 --- a/IRaCIS.Core.Domain/Trial/TrialDictionary.cs +++ b/IRaCIS.Core.Domain/Trial/TrialDictionary.cs @@ -7,13 +7,14 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialDictionary")] public partial class TrialDictionary : Entity { - //public Guid Id { get; set; } + #region [JsonIgnore] public virtual Trial Trial { get; set; } [JsonIgnore] public virtual Dictionary Dictionary { get; set; } + #endregion + - [StringLength(50)] public string KeyName { get; set; } = string.Empty; public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/TrialSign.cs b/IRaCIS.Core.Domain/Trial/TrialSign.cs index 6b14d89f2..eead7343c 100644 --- a/IRaCIS.Core.Domain/Trial/TrialSign.cs +++ b/IRaCIS.Core.Domain/Trial/TrialSign.cs @@ -13,10 +13,12 @@ namespace IRaCIS.Core.Domain.Models ///TrialSign /// [Table("TrialSign")] - public class TrialSign : BaseAuditAddEntity + public class TrialSign : BaseAddAuditEntity { - - public Guid? TrialId { get; set; } + #region 导航属性 + + #endregion + public Guid? TrialId { get; set; } public Guid? SubjectVisitId { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs index b65f5c9ef..6bfdfdd91 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs @@ -11,13 +11,20 @@ namespace IRaCIS.Core.Domain.Models ///TrialStateChange /// [Table("TrialStateChange")] - public class TrialStateChange : BaseAuditAddEntity + public class TrialStateChange : BaseAddAuditEntity { - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } - - public Guid TrialId { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } + + [JsonIgnore] + [ForeignKey("CreateUserId")] + public User User { get; set; } + + #endregion + + public Guid TrialId { get; set; } public string OriginState { get; set; } = String.Empty; @@ -29,9 +36,6 @@ namespace IRaCIS.Core.Domain.Models public string Reason { get; set; }=String.Empty; - [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 389b497d8..93677466d 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs @@ -6,23 +6,20 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { [Table("TrialStatus")] - public partial class TrialStatusDetail : BaseAuditAddEntity + public partial class TrialStatusDetail : BaseAddAuditEntity { - public virtual ICollection IntoGroupDetails { get; set; } - public TrialStatusDetail() - { - IntoGroupDetails = new HashSet(); - } + #region + [JsonIgnore] + public List IntoGroupDetails { get; set; } + [JsonIgnore] public Trial Trial { get; set; } + #endregion + public Guid TrialId { get; set; } - - - public int TrialStatus { get; set; } - [StringLength(100)] public string Memo { get; set; } = string.Empty; public int OptUserType { get; set; } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs index cba781e60..cfa84c0a4 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs @@ -5,6 +5,13 @@ namespace IRaCIS.Core.Domain.Models { public class TrialAudit:Entity { + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } + #endregion public int AuditType { get; set; } public Guid TrialId { get; set; } @@ -22,8 +29,6 @@ namespace IRaCIS.Core.Domain.Models public string Detail { get; set; } - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } - public Trial Trial { get; set; } + } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs index 0b4496652..0ad444f3c 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs @@ -15,17 +15,17 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialExternalUser")] public class TrialExternalUser : BaseFullAuditEntity { - [JsonIgnore] - public Trial Trial { get; set; } - + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + #endregion - public Guid TrialId { get; set; } - + + + public Guid TrialId { get; set; } public Guid UserTypeId { get; set; } - - public string Phone { get; set; } = String.Empty; /// diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs index 9bae0745a..405a61aec 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs @@ -4,22 +4,11 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { - public class TrialSite : BaseFullAuditDeleteEntity + public class TrialSite : BaseFullDeleteAuditEntity { - - public Guid TrialId { get; set; } - - public Guid? SiteId { get; set; } - - public string TrialSiteCode { get; set; } = String.Empty; - - public string TrialSiteName { get; set; } = String.Empty; - - public string TrialSiteAliasName { get; set; }=String.Empty; - public DateTime? EnabledTime { get; set; } - + #region 导航属性 [JsonIgnore] - //导航属性 + [ForeignKey("SiteId")] public Site Site { get; set; } @@ -27,8 +16,6 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("TrialId")] public Trial Trial { get; set; } - - /// /// Site 下面有多个访视记录 /// @@ -48,6 +35,19 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List TrialSiteDicomAEList { get; set; } + #endregion + public Guid TrialId { get; set; } + + public Guid? SiteId { get; set; } + + public string TrialSiteCode { get; set; } = String.Empty; + + public string TrialSiteName { get; set; } = String.Empty; + + public string TrialSiteAliasName { get; set; }=String.Empty; + public DateTime? EnabledTime { get; set; } + + } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs index 8047c237c..36b86415f 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs @@ -13,19 +13,18 @@ namespace IRaCIS.Core.Domain.Models ///TrialSiteDicomAE /// [Table("TrialSiteDicomAE")] - public class TrialSiteDicomAE : BaseFullAuditDeleteEntity + public class TrialSiteDicomAE : BaseFullDeleteAuditEntity { - + #region 导航属性 + [JsonIgnore] + public TrialSite TrialSite { get; set; } + #endregion - - public Guid TrialId { get; set; } - - + public Guid TrialId { get; set; } - public Guid TrialSiteId { get; set; } @@ -41,8 +40,6 @@ namespace IRaCIS.Core.Domain.Models public string Description { get; set; } - - public TrialSite TrialSite { get; set; } } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs index 1f399902a..4cdda8998 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs @@ -14,31 +14,29 @@ namespace IRaCIS.Core.Domain.Models ///UserTrialSite /// [Table("TrialSiteUser")] - public class TrialSiteUser : BaseFullAuditDeleteEntity + public class TrialSiteUser : BaseFullDeleteAuditEntity { + #region 导航属性 + [JsonIgnore] + [ForeignKey("UserId")] + public User User { get; set; } + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - public Guid TrialSiteId { get; set; } + [JsonIgnore] + public TrialSite TrialSite { get; set; } + [JsonIgnore] + public TrialUser TrialUser { get; set; } + #endregion + public Guid TrialSiteId { get; set; } - - [Required] public Guid UserId { get; set; } - - [Required] public Guid TrialId { get; set; } - [JsonIgnore] - [ForeignKey("UserId")] - public User User { get; set; } - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } - - [JsonIgnore] - public TrialSite TrialSite { get; set; } - [JsonIgnore] - public TrialUser TrialUser { get; set; } + } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs index 84955b57e..5ac7e53d8 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs @@ -9,10 +9,9 @@ namespace IRaCIS.Core.Domain.Models /// 运维人员与项目关联关系表 - 实体 /// [Table("TrialUser")] - public partial class TrialUser : BaseFullAuditDeleteEntity + public partial class TrialUser : BaseFullDeleteAuditEntity { - public Guid UserId { get; set; } - public Guid TrialId { get; set; } + #region 导航属性 [JsonIgnore] public Trial Trial { get; set; } [JsonIgnore] @@ -21,11 +20,10 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public List SiteList { get; set; } - - - - - + #endregion + public Guid UserId { get; set; } + public Guid TrialId { get; set; } + public DateTime? RemoveTime { get; set; } public DateTime? JoinTime { get; set; } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs index 7b14dccdd..e1fb8ec88 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs @@ -15,20 +15,19 @@ namespace IRaCIS.Core.Domain.Models [Table("TrialUserPreparation ")] public class TrialUserPreparation : BaseFullAuditEntity { - + #region 导航属性 + [JsonIgnore] + public User User { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } + #endregion + + public Guid UserId { get; set; } - - public Guid UserId { get; set; } - - public Guid TrialId { get; set; } - - - public DateTime? ExpireTime { get; set; } - public bool? IsJoin { get; set; } @@ -36,10 +35,7 @@ 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/Subject.cs b/IRaCIS.Core.Domain/Visit/Subject.cs index d574782b1..4d69a7de6 100644 --- a/IRaCIS.Core.Domain/Visit/Subject.cs +++ b/IRaCIS.Core.Domain/Visit/Subject.cs @@ -10,8 +10,9 @@ namespace IRaCIS.Core.Domain.Models /// 受试者 /// [Table("Subject")] - public class Subject : BaseFullAuditDeleteEntity + public class Subject : BaseFullDeleteAuditEntity { + #region 导航属性 [JsonIgnore] public List TaskStudyList { get; set; } = new List(); @@ -47,9 +48,6 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] [ForeignKey("FinalSubjectVisitId")] public SubjectVisit FinalSubjectVisit { get; set; } - public Guid? FinalSubjectVisitId { get; set; } - - [JsonIgnore] [ForeignKey("TrialId")] public Trial Trial { get; set; } @@ -57,14 +55,19 @@ namespace IRaCIS.Core.Domain.Models [JsonIgnore] public TrialSite TrialSite { get; set; } - - public Guid TrialSiteId { get; set; } - - - - [JsonIgnore] public List StudyList { get; set; } = new List(); + [JsonIgnore] + [ForeignKey("LatestSubjectVisitId")] + public SubjectVisit LatestSubjectVisit { get; set; } + [JsonIgnore] + public List ClinicalFormList { get; set; } + #endregion + + public Guid? FinalSubjectVisitId { get; set; } + + + public Guid TrialSiteId { get; set; } public string Code { get; set; } public string FirstName { get; set; } = string.Empty; @@ -73,12 +76,9 @@ namespace IRaCIS.Core.Domain.Models public string Sex { get; set; } = string.Empty; - [JsonIgnore] - [ForeignKey("LatestSubjectVisitId")] - public SubjectVisit LatestSubjectVisit { get; set; } + public Guid? LatestSubjectVisitId { get; set; } - //public bool IsMissingImages { get; set; } = false; public Guid TrialId { get; set; } = Guid.Empty; @@ -94,8 +94,6 @@ namespace IRaCIS.Core.Domain.Models public DateTime? VisitOverTime { get; set; } - - public string ShortName { get; set; } = String.Empty; public string Height { get; set; } = String.Empty; @@ -116,8 +114,7 @@ namespace IRaCIS.Core.Domain.Models public bool IsReReadingOrBackInfluenceAnalysis { get; set; } - [JsonIgnore] - public List ClinicalFormList { get; set; } + } diff --git a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs index 819204cdd..47744b41e 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs @@ -13,13 +13,16 @@ namespace IRaCIS.Core.Domain.Models ///SubjectCanceDoctor /// [Table("SubjectCanceDoctor")] - public class SubjectCanceDoctor : BaseAuditAddEntity + public class SubjectCanceDoctor : BaseAddAuditEntity { - - public Subject Subject { get; set; } + #region 导航属性 + [JsonIgnore] + public Subject Subject { get; set; } + #endregion - public Guid SubjectId { get; set; } + + public Guid SubjectId { get; set; } public string Note { get; set; } diff --git a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs index e6cdc1f24..e0e61e5f0 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs @@ -7,31 +7,95 @@ using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models { [Table("SubjectVisit")] - public class SubjectVisit : BaseFullAuditDeleteEntity + public class SubjectVisit : BaseFullDeleteAuditEntity { - - - - - public Guid TrialSiteId { get; set; } + #region 导航属性 [JsonIgnore] public TrialSite TrialSite { get; set; } + [JsonIgnore] + public VisitStage VisitStage { get; set; } + [JsonIgnore] + [ForeignKey("OutPlanPreviousVisitId")] + public SubjectVisit OutPlanPreviousVisit { get; set; } + [JsonIgnore] + [ForeignKey("ClinicalDataSignUserId")] + public User ClinicalDataSignUser { get; set; } + + [ForeignKey("ForwardUserId")] + 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; } + [JsonIgnore] + [ForeignKey("SubmitUserId")] + public User SubmitUser { get; set; } + + //导航属性 + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } + + + + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { 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(); + + [JsonIgnore] + public List SubjectCriteriaEvaluationVisitFilterList { get; set; } + #endregion + + + + public Guid TrialSiteId { get; set; } //一个访视 对应有对应Site的 TrialSiteCode public Guid TrialId { get; set; } public Guid SubjectId { get; set; } - - [JsonIgnore] - public VisitStage VisitStage { get; set; } public Guid? VisitStageId { get; set; } public int VisitDay { get; set; } public string VisitName { get; set; } = string.Empty; @@ -40,11 +104,8 @@ namespace IRaCIS.Core.Domain.Models [Column(TypeName = "decimal(18,1)")] public decimal VisitNum { get; set; } - //public string AnonymousVisitName { get; set; } = string.Empty; public string BlindName { get; set; } = string.Empty; - - public string SVUPDES { get; set; } = string.Empty; public DateTime? SVSTDTC { get; set; } public DateTime? SVENDTC { get; set; } @@ -65,7 +126,6 @@ namespace IRaCIS.Core.Domain.Models public Guid? Auditor { get; set; } - //核查状态 public CheckStateEnum CheckState { get; set; } @@ -127,7 +187,6 @@ namespace IRaCIS.Core.Domain.Models public CheckChanllengeTypeEnum CheckChallengeState { get; set; } public PDStateEnum PDState { get; set; } = PDStateEnum.None; - //public bool IsOutEnromentVisit { get; set; } = false; public DateTime? CheckPassedTime { get; set; } @@ -135,34 +194,7 @@ namespace IRaCIS.Core.Domain.Models /// 上一访视 /// public Guid? OutPlanPreviousVisitId { get; set; } - - [JsonIgnore] - [ForeignKey("OutPlanPreviousVisitId")] - public SubjectVisit OutPlanPreviousVisit { get; set; } - - //public Guid? ClinicalDataSignUserId { get; set; } - - //public DateTime? ClinicalDataSignTime { get; set; } - - [JsonIgnore] - [ForeignKey("ClinicalDataSignUserId")] - public User ClinicalDataSignUser { get; set; } - - [ForeignKey("ForwardUserId")] - 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; } + public RequestBackStateEnum RequestBackState { get; set; } @@ -187,54 +219,9 @@ namespace IRaCIS.Core.Domain.Models /// public string CloseTheReason { get; set; } - - - - public Guid? SubmitUserId { get; set; } - [JsonIgnore] - [ForeignKey("SubmitUserId")] - public User SubmitUser { get; set; } - - //导航属性 - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } - - - - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { 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(); - - [JsonIgnore] - public List SubjectCriteriaEvaluationVisitFilterList { get; set; } + public ReadingStatusEnum ReadingStatus { get; set; } public string VisitImageZipPath { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs index 2a1666153..184505791 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs @@ -13,21 +13,23 @@ namespace IRaCIS.Core.Domain.Models ///VisitPlanInfluenceStudystat /// [Table("VisitPlanInfluenceStat")] - public class VisitPlanInfluenceStat : BaseAuditAddEntity + public class VisitPlanInfluenceStat : BaseAddAuditEntity { - [JsonIgnore] - public List InfluenceStudyList { get; set; }=new List(); + #region 导航属性 - public Guid TrialId { get; set; } + [JsonIgnore] + [ForeignKey("CreateUserId")] + public User CreateUser { get; set; } + [JsonIgnore] + public List InfluenceStudyList { get; set; } = new List(); - + #endregion + + public Guid TrialId { get; set; } 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 a753df5d0..b35e2c1f6 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs @@ -11,10 +11,20 @@ namespace IRaCIS.Core.Domain.Models ///VisitPlanInfluenceSubjectVisit /// [Table("VisitPlanInfluenceStudy")] - public class VisitPlanInfluenceStudy : BaseAuditAddEntity + public class VisitPlanInfluenceStudy : BaseAddAuditEntity { + #region 导航属性 + [JsonIgnore] + [ForeignKey("CreateUserId")] + public User CreateUser { get; set; } + [JsonIgnore] + [ForeignKey("VisitPlanInfluenceStatId")] + public VisitPlanInfluenceStat VisitPlanInfluenceStat { get; set; } [JsonIgnore] public SubjectVisit SubjectVisit { get; set; } + #endregion + + public Guid SubjectVisitId { get; set; } public Guid StudyId { get; set; } @@ -33,14 +43,6 @@ namespace IRaCIS.Core.Domain.Models public string NowWindow { get; set; } - - [JsonIgnore] - [ForeignKey("CreateUserId")] - public User CreateUser { get; set; } - [JsonIgnore] - [ForeignKey("VisitPlanInfluenceStatId")] - public VisitPlanInfluenceStat VisitPlanInfluenceStat { get; set; } - public Guid VisitPlanInfluenceStatId { get; set; } } diff --git a/IRaCIS.Core.Domain/Visit/VisitStage.cs b/IRaCIS.Core.Domain/Visit/VisitStage.cs index e646a3184..a5dca24a4 100644 --- a/IRaCIS.Core.Domain/Visit/VisitStage.cs +++ b/IRaCIS.Core.Domain/Visit/VisitStage.cs @@ -4,16 +4,17 @@ using System.ComponentModel.DataAnnotations.Schema; namespace IRaCIS.Core.Domain.Models { [Table("VisitStage")] - public class VisitStage : BaseFullAuditDeleteEntity + public class VisitStage : BaseFullDeleteAuditEntity { + #region 导航属性 [JsonIgnore] public Trial Trial { get; set; } + #endregion + public Guid TrialId { get; set; } public string BlindName { get; set; } = string.Empty; - - [Column(TypeName = "decimal(18,1)")] public decimal VisitNum { get; set; } public string VisitName { get; set; } = string.Empty;