XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

导航属性优化整理
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-08-22 20:10:59 +08:00
parent 4319982be9
commit 47ec4a5e7e
142 changed files with 1860 additions and 2493 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Domain/Allocation/SubjectTaskCategory.cs
View File

@ -15,7 +15,7 @@ namespace IRaCIS.Core.Domain.Models
///是否需要拆表
///</summary>
[Table("SubjectTaskCategory")]
public class SubjectTaskCategory : BaseAuditAddEntity
public class SubjectTaskCategory : BaseAddAuditEntity
{

2
IRaCIS.Core.Domain/Allocation/TaskInfluence.cs
View File

@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
///TaskInfluence
///</summary>
[Table("TaskInfluence")]
public class TaskInfluence : BaseAuditAddEntity
public class TaskInfluence : BaseAddAuditEntity
{
#region 导航属性

2
IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs
View File

@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
///TrialVirtualSiteCodeUpdate
///</summary>
[Table("TrialVirtualSiteCodeUpdate")]
public class TrialVirtualSiteCodeUpdate : BaseAuditAddEntity
public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
{
#region 导航属性

16
IRaCIS.Core.Domain/BaseModel/Entity.cs
View File

@ -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; }

2
IRaCIS.Core.Domain/Common/CommonDocument.cs
View File

@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
///CommonDocument
///</summary>
[Table("CommonDocument")]
public class CommonDocument : BaseFullAuditDeleteEntity
public class CommonDocument : BaseFullDeleteAuditEntity
{
public string Code { get; set; } = String.Empty;

2
IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs
View File

@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models
///EmailNoticeConfig
///</summary>
[Table("EmailNoticeConfig")]
public class EmailNoticeConfig : BaseFullAuditDeleteEntity
public class EmailNoticeConfig : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]

2
IRaCIS.Core.Domain/Common/ExploreRecommend.cs
View File

@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
///ExploreRecommend
///</summary>
[Table("ExploreRecommend")]
public class ExploreRecommend : BaseFullAuditDeleteEntity
public class ExploreRecommend : BaseFullDeleteAuditEntity
{
#region 导航属性

2
IRaCIS.Core.Domain/Common/VerificationCode.cs
View File

@ -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;

2
IRaCIS.Core.Domain/Dcotor/Attachment.cs
View File

@ -14,7 +14,7 @@ namespace IRaCIS.Core.Domain.Models
// HighestDegreeCertificate=7//最高学历证书
//}
[Table("Attachment")]
public partial class Attachment : BaseAuditAddEntity
public partial class Attachment : BaseAddAuditEntity
{
[JsonIgnore]

2
IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs
View File

@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
///DoctorCriterionFile
///</summary>
[Table("DoctorCriterionFile")]
public class DoctorCriterionFile :BaseAuditAddEntity
public class DoctorCriterionFile :BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]

2
IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs
View File

@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
///EnrollReadingCriterion
///</summary>
[Table("EnrollReadingCriterion")]
public class EnrollReadingCriterion :BaseAuditAddEntity
public class EnrollReadingCriterion :BaseAddAuditEntity
{
#region 导航属性

33
IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs
View File

@ -12,55 +12,32 @@ namespace IRaCIS.Core.Domain.Models
///SystemDocConfirmedUser
///</summary>
[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
/// <summary>
/// TrialDocumentId
/// </summary>
[Required]
public Guid SystemDocumentId { get; set; }
/// <summary>
/// ConfirmTime
/// </summary>
public DateTime? ConfirmTime { get; set; }
/// <summary>
/// ConfirmUserId
/// </summary>
[Required]
public Guid ConfirmUserId { get; set; }
/// <summary>
/// SignFirstViewTime
/// </summary>
public DateTime? SignFirstViewTime { get; set; }
public string SignText { get; set; } = string.Empty;
/// <summary>
/// 是否废除
/// </summary>
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
public Guid? DeleteUserId { get; set; }
}
}

2
IRaCIS.Core.Domain/Document/SystemDocument.cs
View File

@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
///SystemDocument
///</summary>
[Table("SystemDocument")]
public class SystemDocument : BaseFullAuditDeleteEntity
public class SystemDocument : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]

13
IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs
View File

@ -12,8 +12,8 @@ namespace IRaCIS.Core.Domain.Models
///TrialDocUserTypeConfirmUser
///</summary>
[Table("TrialDocConfirmedUser")]
public class TrialDocConfirmedUser : BaseAuditAddEntity,ISoftDelete
{
public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
@ -42,15 +42,6 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// 是否废除
/// </summary>
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
public Guid? DeleteUserId { get; set; }
}

2
IRaCIS.Core.Domain/Document/TrialDocument.cs
View File

@ -13,7 +13,7 @@ namespace IRaCIS.Core.Domain.Models
///TrialDocument
///</summary>
[Table("TrialDocument")]
public class TrialDocument : BaseFullAuditDeleteEntity
public class TrialDocument : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]

2
IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs
View File

@ -16,7 +16,7 @@ namespace IRaCIS.Core.Domain.Models
///TrialEmailNoticeConfig
///</summary>
[Table("TrialEmailNoticeConfig")]
public class TrialEmailNoticeConfig : BaseFullAuditDeleteEntity
public class TrialEmailNoticeConfig : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]

2
IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs
View File

@ -15,7 +15,9 @@ namespace IRaCIS.Core.Domain.Models
[Table("TrialEmailNoticeUser")]
public class TrialEmailNoticeUser : Entity
{
#region 导航属性
#endregion
[JsonIgnore]
public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; }

3
IRaCIS.Core.Domain/Image/DicomInstance.cs
View File

@ -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)]

5
IRaCIS.Core.Domain/Image/DicomSeries.cs
View File

@ -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<SubjectCriteriaEvaluationVisitStudyFilter> SubjectCriteriaEvaluationVisitStudyFilterList { get; set; }
#endregion
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

47
IRaCIS.Core.Domain/Image/DicomStudy.cs
View File

@ -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<TrialSiteUser> TrialSiteUserList { get; set; } = new List<TrialSiteUser>();
[JsonIgnore]
@ -15,10 +16,30 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore]
public List<DicomSeries> SeriesList { get; set; }
[JsonIgnore]
[ForeignKey("SubjectId")]
public Subject Subject { get; set; }
[JsonIgnore]
[ForeignKey("SubjectVisitId")]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
public List<SubjectCriteriaEvaluationVisitStudyFilter> SubjectCriteriaEvaluationVisitStudyFilterList { get; set; }
[ForeignKey("CreateUserId")]
public User Uploader { get; set; }
[JsonIgnore]
public List<ReadingClinicalData> ReadingClinicalDataList { get; set; }
[JsonIgnore]
public List<ReadingConsistentClinicalData> ReadingConsistentClinicalDataList { get; set; }
[JsonIgnore]
public List<SubjectCriteriaEvaluationVisitStudyFilter> 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<ReadingClinicalData> ReadingClinicalDataList { get; set; }
[JsonIgnore]
public List<ReadingConsistentClinicalData> ReadingConsistentClinicalDataList { get; set; }
public bool IsFromPACS { get; set; }

43
IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs
View File

@ -12,15 +12,12 @@ namespace IRaCIS.Core.Domain.Models
///DicomStudyMonitor
///</summary>
[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; }

3
IRaCIS.Core.Domain/Image/ImageShare.cs
View File

@ -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; }

31
IRaCIS.Core.Domain/Image/SCPImageUpload.cs
View File

@ -14,33 +14,39 @@ namespace IRaCIS.Core.Domain.Models
///SCPImageUpload
///</summary>
[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; }
}

3
IRaCIS.Core.Domain/Image/SCPInstance.cs
View File

@ -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)]

17
IRaCIS.Core.Domain/Image/SCPPatient.cs
View File

@ -8,7 +8,17 @@ namespace IRaCIS.Core.Domain.Models
[Table("SCPPatient")]
public class SCPPatient : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<SCPStudy> 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; }
}
}

5
IRaCIS.Core.Domain/Image/SCPSeries.cs
View File

@ -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<SCPInstance> SCPInstanceList { get; set; }
#endregion
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public Guid SeqId { get; set; }

37
IRaCIS.Core.Domain/Image/SCPStudy.cs
View File

@ -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<SCPInstance> InstanceList { get; set; }
[JsonIgnore]
public List<SCPSeries> 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<SCPInstance> InstanceList { get; set; }
[JsonIgnore]
public List<SCPSeries> 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; }
}

6
IRaCIS.Core.Domain/Image/SystemAnonymization.cs
View File

@ -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;

3
IRaCIS.Core.Domain/Image/TaskInstance.cs
View File

@ -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)]

5
IRaCIS.Core.Domain/Image/TaskSeries.cs
View File

@ -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<TaskInstance> InstanceList { get; set; }
#endregion
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]

26
IRaCIS.Core.Domain/Image/TaskStudy.cs
View File

@ -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<TaskSeries> 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; }

2
IRaCIS.Core.Domain/Image/TrialDicomAE.cs
View File

@ -15,7 +15,9 @@ namespace IRaCIS.Core.Domain.Models
[Table("TrialDicomAE")]
public class TrialDicomAE : BaseFullAuditEntity
{
#region 导航属性
#endregion
public Guid TrialId { get; set; }

3
IRaCIS.Core.Domain/Institution/CRO.cs
View File

@ -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; }

17
IRaCIS.Core.Domain/Institution/Hospital.cs
View File

@ -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<Doctor> 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<Doctor> DoctorList { get; set; }
}
}

9
IRaCIS.Core.Domain/Institution/Site.cs
View File

@ -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<TrialSite> 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<TrialSite> TrialSiteList { get; set; }
}
}

3
IRaCIS.Core.Domain/Institution/Sponsor.cs
View File

@ -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;

3
IRaCIS.Core.Domain/Management/Menu.cs
View File

@ -7,8 +7,11 @@ namespace IRaCIS.Core.Domain.Models
[Table("Menu")]
public class Menu : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<UserTypeMenu> UserTypeMenuList { get; set; }
#endregion
//上级菜单

12
IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs
View File

@ -18,18 +18,19 @@ namespace IRaCIS.Core.Domain.Models
[Table("SystemNotice")]
public class SystemNotice : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<SystemNoticeUserType> NoticeUserTypeList { get; set; }=new List<SystemNoticeUserType>();
public List<SystemNoticeUserType> NoticeUserTypeList { get; set; } = new List<SystemNoticeUserType>();
[JsonIgnore]
public List<SystemNoticeUserRead> NoticeUserReadList { get; set; }=new List<SystemNoticeUserRead>();
public List<SystemNoticeUserRead> NoticeUserReadList { get; set; } = new List<SystemNoticeUserRead>();
[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; }

4
IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs
View File

@ -13,10 +13,12 @@ namespace IRaCIS.Core.Domain.Models
///SystemNoticeUserRead
///</summary>
[Table("SystemNoticeUserRead")]
public class SystemNoticeUserRead : BaseAuditAddEntity
public class SystemNoticeUserRead : BaseAddAuditEntity
{
#region 导航属性
#endregion
public Guid SystemNoticeId { get; set; }

16
IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs
View File

@ -13,20 +13,22 @@ namespace IRaCIS.Core.Domain.Models
///SystemNoticeUserType
///</summary>
[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; }
}

2
IRaCIS.Core.Domain/Management/Role.cs
View File

@ -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;

18
IRaCIS.Core.Domain/Management/User.cs
View File

@ -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<VisitTask> 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; }
/// <summary>

9
IRaCIS.Core.Domain/Management/UserFeedBack.cs
View File

@ -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<string> ScreenshotList => JsonConvert.DeserializeObject<List<string>>(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<string> ScreenshotList => JsonConvert.DeserializeObject<List<string>>(ScreenshotListStr);

15
IRaCIS.Core.Domain/Management/UserLog.cs
View File

@ -13,8 +13,15 @@ namespace IRaCIS.Core.Domain.Models
///UserLog
///</summary>
[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; }

12
IRaCIS.Core.Domain/Management/UserPassWordLog.cs
View File

@ -13,14 +13,16 @@ namespace IRaCIS.Core.Domain.Models
///UserPassWordLog
///</summary>
[Table("UserPassWordLog")]
public class UserPassWordLog : BaseAuditAddEntity
public class UserPassWordLog : BaseAddAuditEntity
{
/// <summary>
#region 导航属性
#endregion
/// <summary>
/// 用户Id
/// </summary>
public Guid UserId { get; set; }
public Guid UserId { get; set; }
/// <summary>
/// 密码

22
IRaCIS.Core.Domain/Management/UserType.cs
View File

@ -8,7 +8,18 @@ namespace IRaCIS.Core.Domain.Models
{
#region 导航属性
[JsonIgnore]
public List<UserTypeMenu> UserTypeMenuList { get; set; }
[JsonIgnore]
public List<UserTypeGroup> UserTypeGroupList { get; set; }
[JsonIgnore]
public List<SystemDocNeedConfirmedUserType> SystemDocNeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
public List<User> 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<UserTypeMenu> UserTypeMenuList { get; set; }
[JsonIgnore]
public List <UserTypeGroup> UserTypeGroupList { get; set; }
[JsonIgnore]
public List<SystemDocNeedConfirmedUserType> SystemDocNeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
public List<User> UserList { get; set; }
}
}

33
IRaCIS.Core.Domain/Management/UserTypeGroup.cs
View File

@ -14,27 +14,24 @@ namespace IRaCIS.Core.Domain.Models
///</summary>
[Table("UserTypeGroup")]
public class UserTypeGroup : Entity
{
/// <summary>
/// UserTypeId
/// </summary>
[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; }
/// <summary>
/// DictionaryId
/// </summary>
[Required]
public Guid DictionaryId { get; set; }
[JsonIgnore]
[ForeignKey("DictionaryId")]
public Dictionary Group { get; set; }
[JsonIgnore]
[ForeignKey("UserTypeId")]
public UserType UserType { get; set; }
}

13
IRaCIS.Core.Domain/Management/UserTypeMenu.cs
View File

@ -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; }
}

10
IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs
View File

@ -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; }

75
IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs
View File

@ -12,84 +12,41 @@ namespace IRaCIS.Core.Domain.Models
///PreviousHistory
///</summary>
[Table("PreviousHistory")]
public class PreviousHistory : Entity, IAuditAddWithUserName
{
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUser
/// </summary>
[Required]
public string CreateUser { get; set; }
/// <summary>
/// StartTime
/// </summary>
public class PreviousHistory : BaseAddAuditEntityWithUserName
{
#region 导航属性
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
#endregion
public DateTime? StartTime { get; set; }
/// <summary>
/// EndTime
/// </summary>
public DateTime? EndTime { get; set; }
/// <summary>
/// IsPD
/// </summary>
public int? IsPD { get; set; }
/// <summary>
/// SubjectVisitId
/// </summary>
[Required]
public Guid SubjectVisitId { get; set; }
/// <summary>
/// IsSubjectLevel
/// </summary>
[Required]
public bool IsSubjectLevel { get; set; }
/// <summary>
/// Path
/// </summary>
[Required]
public string Path { get; set; } = String.Empty;
/// <summary>
/// FileName
/// </summary>
[Required]
public string FileName { get; set; } = String.Empty;
/// <summary>
/// Position
/// </summary>
[Required]
public string Position { get; set; } = String.Empty;
/// <summary>
/// 临床数据类型Id
/// </summary>
[Required]
public Guid ClinicalDataTrialSetId { get; set; }
//[Required]
//public Guid SubjectId { get; set; }
}
//移动到DBContext文件中
}

71
IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs
View File

@ -12,73 +12,34 @@ namespace IRaCIS.Core.Domain.Models
///PreviousOther
///</summary>
[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; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUser
/// </summary>
[Required]
public string CreateUser { get; set; }
/// <summary>
/// StartTime
/// </summary>
public DateTime? StartTime { get; set; }
/// <summary>
/// EndTime
/// </summary>
public DateTime? EndTime { get; set; }
/// <summary>
/// IsPD
/// </summary>
[Required]
public bool IsPD { get; set; }
/// <summary>
/// SubjectVisitId
/// </summary>
[Required]
public Guid SubjectVisitId { get; set; }
/// <summary>
/// IsSubjectLevel
/// </summary>
[Required]
public bool IsSubjectLevel { get; set; }
/// <summary>
/// Path
/// </summary>
[Required]
public string Path { get; set; } = String.Empty;
/// <summary>
/// FileName
/// </summary>
[Required]
public string FileName { get; set; } = String.Empty;
/// <summary>
/// TreatmentType
/// </summary>
[Required]
public string TreatmentType { get; set; } = String.Empty;
/// <summary>
@ -87,10 +48,6 @@ namespace IRaCIS.Core.Domain.Models
[Required]
public Guid ClinicalDataTrialSetId { get; set; }
//public Guid SubjectId { get; set; }
}
//移动到DBContext文件中
}

41
IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs
View File

@ -13,45 +13,22 @@ namespace IRaCIS.Core.Domain.Models
///PreviousPDF
///</summary>
[Table("PreviousPDF")]
public class PreviousPDF : Entity, IAuditAdd
public class PreviousPDF : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
public SubjectVisit SubjectVisit { get; set; }
#endregion
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// SubjectVisitId
/// </summary>
[Required]
public Guid SubjectVisitId { get; set; }
/// <summary>
/// Path
/// </summary>
[Required]
public string Path { get; set; }
/// <summary>
/// FileName
/// </summary>
[Required]
public string FileName { get; set; }
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// 是否是访视
/// </summary>
public bool? IsVisist { get; set; }
/// <summary>
@ -69,14 +46,8 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public ClinicalUploadType? UploadType { get; set; }
/// <summary>
/// 项目Id
/// </summary>
public Guid? TrialId { get; set; }
/// <summary>
/// 受试者ID
/// </summary>
public Guid? SubjectId { get; set; }
}

62
IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs
View File

@ -12,65 +12,27 @@ namespace IRaCIS.Core.Domain.Models
///PreviousSurgery
///</summary>
[Table("PreviousSurgery")]
public class PreviousSurgery : Entity, IAuditAddWithUserName
{
/// <summary>
/// CreateUserId
/// </summary>
[Required]
public Guid CreateUserId { get; set; }
/// <summary>
/// CreateTime
/// </summary>
[Required]
public DateTime CreateTime { get; set; }
/// <summary>
/// CreateUser
/// </summary>
[Required]
public string CreateUser { get; set; }
/// <summary>
/// OperationTime
/// </summary>
public class PreviousSurgery : BaseAddAuditEntityWithUserName
{
#region 导航属性
#endregion
public DateTime? OperationTime { get; set; }
/// <summary>
/// SubjectVisitId
/// </summary>
[Required]
public Guid SubjectVisitId { get; set; }
/// <summary>
/// IsSubjectLevel
/// </summary>
[Required]
public bool IsSubjectLevel { get; set; }
/// <summary>
/// Path
/// </summary>
[Required]
public string Path { get; set; } = String.Empty;
/// <summary>
/// FileName
/// </summary>
[Required]
public string FileName { get; set; } = String.Empty;
/// <summary>
/// OperationName
/// </summary>
[Required]
public string OperationName { get; set; } = String.Empty;
/// <summary>
/// 临床数据类型Id
/// </summary>
@ -78,8 +40,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid ClinicalDataTrialSetId { get; set; }
//[Required]
//public Guid SubjectId { get; set; }
}

29
IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs
View File

@ -8,33 +8,22 @@ namespace IRaCIS.Core.Domain.Models
/// 一致性核查文件
///</summary>
[Table("InspectionFile")]
public class InspectionFile : BaseAuditAddEntity
public class InspectionFile : BaseAddAuditEntity
{
/// <summary>
/// 文件名称
/// </summary>
public string FileName { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("CreateUserId")]
public User User { get; set; }
#endregion
public string FileName { get; set; }
/// <summary>
/// 相对路径
/// </summary>
public string RelativePath { get; set; }
/// <summary>
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
[JsonIgnore]
/// <summary>
/// 创建人
/// </summary>
[ForeignKey("CreateUserId")]
public User User { get; set; }
}

35
IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs
View File

@ -15,15 +15,22 @@ namespace IRaCIS.Core.Domain.Models
[Table("NoneDicomStudy")]
public class NoneDicomStudy : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<NoneDicomStudyFile> NoneDicomFileList { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
public List<NoneDicomStudyFile> 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;

5
IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudyFile.cs
View File

@ -12,11 +12,14 @@ namespace IRaCIS.Core.Domain.Models
///NoneDicomStudyFile
///</summary>
[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; }

32
IRaCIS.Core.Domain/QC/QCChallenge.cs
View File

@ -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<QCChallengeDialog> DialogList { get; set; } = new List<QCChallengeDialog>();
#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<QCChallengeDialog> DialogList { get; set; } = new List<QCChallengeDialog>();

12
IRaCIS.Core.Domain/QC/QCChallengeDialog.cs
View File

@ -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; }
}
}

50
IRaCIS.Core.Domain/QC/QCQuestion.cs
View File

@ -13,54 +13,34 @@ namespace IRaCIS.Core.Domain.Models
///</summary>
[Table("QCQuestion")]
public class QCQuestion : BaseFullAuditEntity
{
/// <summary>
/// QuestionName
/// </summary>
[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;
/// <summary>
/// 语言类型
/// </summary>
/// <summary> 语言类型 </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary>
/// IsRequired
/// </summary>
[Required]
public bool IsRequired { get; set; }
/// <summary>
/// IsEnable
/// </summary>
[Required]
public bool IsEnable { get; set; }
/// <summary>
/// 下拉框、文本、单选、多选
/// </summary>
[Required]
public string Type { get; set; } = string.Empty;
/// <summary>
/// TypeValue
/// </summary>
[Required]
public string TypeValue { get; set; } = string.Empty;
/// <summary> 下拉框、文本、单选、多选 </summary>
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; }
/// <summary>
/// ShowOrder
/// </summary>
[Required]
public int ShowOrder { get; set; }

76
IRaCIS.Core.Domain/QC/TrialQCQuestion.cs
View File

@ -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; }
/// <summary>
/// TrialId
/// </summary>
[Required]
public Guid TrialId { get; set; }
[JsonIgnore]
public List<TrialQCQuestionAnswer> TrialQCQuestionAnswerList { get; set; }
#endregion
public Guid TrialId { get; set; }
/// <summary>
/// QuestionName
/// </summary>
[Required]
public string QuestionName { get; set; } = string.Empty;
/// <summary> 语言类型 </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary>
/// 语言类型
/// </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary>
/// IsRequired
/// </summary>
[Required]
public bool IsRequired { get; set; }
/// <summary>
/// IsEnable
/// </summary>
[Required]
public bool IsEnable { get; set; }
/// <summary>
/// 下拉框、文本、单选、多选
/// </summary>
[Required]
public string Type { get; set; } = string.Empty;
/// <summary> 下拉框、文本、单选、多选 </summary>
public string Type { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
[JsonIgnore]
[ForeignKey("ParentId")]
public TrialQCQuestion ParentQCQuestion { get; set; }
/// <summary>
/// TypeValue
/// </summary>
[Required]
public string TypeValue { get; set; }
/// <summary>
/// ChildInvalidValue
/// </summary>
[Required]
public string ParentTriggerValue { get; set; }
/// <summary>
/// ShowOrder
/// </summary>
[Required]
public int ShowOrder { get; set; }
/// <summary>
/// 是否确认
/// </summary>
public bool? IsConfirm { get; set; }
[JsonIgnore]
public List<TrialQCQuestionAnswer> TrialQCQuestionAnswerList { get; set; }
}

24
IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs
View File

@ -15,21 +15,15 @@ namespace IRaCIS.Core.Domain.Models
[Table("TrialQCQuestionAnswer")]
public class TrialQCQuestionAnswer : BaseFullAuditEntity
{
/// <summary>
/// TrialId
/// </summary>
[Required]
public Guid TrialId { get; set; }
#region 导航属性
[JsonIgnore]
public TrialQCQuestion TrialQCQuestionConfigure { get; set; }
#endregion
public Guid TrialId { get; set; }
/// <summary>
/// Answer
/// </summary>
[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; }
}

24
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs
View File

@ -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; }
/// <summary>
/// 附加评估答案翻译字典
/// </summary>
[Required]
public string TranslateDictionaryCode { get; set; }=string.Empty;
/// <summary>
/// 是否是最终结果
/// </summary>
[Required]
public bool IsFinalResult { get; set; }
/// <summary>
/// 最终结果
/// </summary>
[Required]
public string FinalAnswer { get; set; }
/// <summary>
/// 最终结果翻字典
/// </summary>
[Required]
public string FinalTranslateDictionaryCode { get; set; }
}

18
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs
View File

@ -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<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilterList { get; set; }
#endregion
/// <summary>
/// SubjectId
/// </summary>
[Required]
public Guid SubjectId { get; set; }
/// <summary>
/// TrialReadingCriterionId
/// </summary>
[Required]
public Guid TrialReadingCriterionId { get; set; }
/// <summary>
/// 是否参与评估
/// </summary>
[Required]
public bool IsJoinEvaluation { get; set; }

11
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs
View File

@ -17,10 +17,7 @@ namespace IRaCIS.Core.Domain.Models
[Table("SubjectCriteriaEvaluationVisitFilter")]
public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity
{
//[JsonIgnore]
//public List<VisitTask> 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
/// <summary>
/// 影像筛选状态
/// </summary>
[Required]
public ImageFilterState ImageFilterState { get; set; }
/// <summary>
/// 影像判断结果
/// </summary>
[Required]
public ImageDeterminationResultState ImageDeterminationResultState { get; set; }
/// <summary>
/// 是否已生成任务
/// </summary>
[Required]
public bool IsGeneratedTask { get; set; }
}

3
IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs
View File

@ -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; }

15
IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs
View File

@ -13,13 +13,16 @@ namespace IRaCIS.Core.Domain.Models
/// 临床资料系统配置
///</summary>
[Table("ClinicalDataSystemSet")]
public class ClinicalDataSystemSet : BaseAuditAddEntity
{
public class ClinicalDataSystemSet : BaseAddAuditEntity
{
#region 导航属性
/// <summary>
/// 枚举(字典里面取的)
/// </summary>
public int ClinicalDataSetEnum { get; set; }
#endregion
/// <summary>
/// 枚举(字典里面取的)
/// </summary>
public int ClinicalDataSetEnum { get; set; }
/// <summary>
/// 名称

44
IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataTrialSet.cs
View File

@ -13,12 +13,27 @@ namespace IRaCIS.Core.Domain.Models
/// 临床资料项目配置
///</summary>
[Table("ClinicalDataTrialSet")]
public class ClinicalDataTrialSet : BaseAuditAddEntity
public class ClinicalDataTrialSet : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<ReadingClinicalData> ReadingClinicalDataList { get; set; }
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
[JsonIgnore]
public List<TrialClinicalDataSetCriterion> TrialClinicalDataSetCriteriaList { get; set; }
[JsonIgnore]
public List<TrialClinicalQuestion> TrialClinicalQuestionList { get; set; }
[JsonIgnore]
[ForeignKey("SystemClinicalDataSetId")]
public ClinicalDataSystemSet? ClinicalDataSystemSet { get; set; }
#endregion
/// <summary>
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
@ -51,8 +66,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary>
/// SystemClinicalDataSetId
/// </summary>
[ForeignKey("SystemClinicalDataSetId")]
public ClinicalDataSystemSet? ClinicalDataSystemSet { get; set; }
/// <summary>
/// 是否确认
@ -80,24 +94,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string Path { get; set; }
[JsonIgnore]
/// <summary>
///
/// </summary>
public List<ReadingClinicalData> ReadingClinicalDataList { get; set; }
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
[JsonIgnore]
public List<TrialClinicalDataSetCriterion> TrialClinicalDataSetCriteriaList { get; set; }
[JsonIgnore]
public List<TrialClinicalQuestion> TrialClinicalQuestionList { get; set; }
public string CriterionEnumListStr { get; set; } = String.Empty;

79
IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs
View File

@ -12,12 +12,43 @@ namespace IRaCIS.Core.Domain.Models
/// 项目的临床数据
///</summary>
[Table("ReadingClinicalData")]
public class ReadingClinicalData : BaseAuditAddEntity
public class ReadingClinicalData : BaseAddAuditEntity
{
/// <summary>
/// 项目ID
/// </summary>
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; }
/// <summary>
/// PDF文件
/// </summary>
[JsonIgnore]
public List<ReadingClinicalDataPDF> ReadingClinicalDataPDFList { get; set; }
#endregion
public Guid TrialId { get; set; }
/// <summary>
/// 访视Id 或者模块Id
@ -26,9 +57,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid? StudyId { get; set; }
/// <summary>
/// 受试者ID
/// </summary>
public Guid SubjectId { get; set; }
/// <summary>
@ -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; }
/// <summary>
/// PDF文件
/// </summary>
[JsonIgnore]
public List<ReadingClinicalDataPDF> ReadingClinicalDataPDFList { get; set; }

34
IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs
View File

@ -11,37 +11,27 @@ namespace IRaCIS.Core.Domain.Models
/// 项目的临床数据
///</summary>
[Table("ReadingClinicalDataPDF")]
public class ReadingClinicalDataPDF : BaseAuditAddEntity
public class ReadingClinicalDataPDF : BaseAddAuditEntity
{
[JsonIgnore]
[ForeignKey("ReadingClinicalDataId")]
public ReadingClinicalData ReadingClinicalData { get; set; }
/// <summary>
/// 阅片临床数据ID
/// </summary>
public Guid ReadingClinicalDataId { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("ReadingClinicalDataId")]
public ReadingClinicalData ReadingClinicalData { get; set; }
#endregion
/// <summary>
/// 阅片临床数据ID
/// </summary>
public Guid ReadingClinicalDataId { get; set; }
/// <summary>
/// Path
/// </summary>
[Required]
public string Path { get; set; }
/// <summary>
/// FileName
/// </summary>
[Required]
public string FileName { get; set; }
/// <summary>
/// 大小
/// </summary>
public int Size { get; set; } = 0;
/// <summary>
/// 文件类型
/// </summary>
public string Type { get; set; }
}

81
IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs
View File

@ -12,12 +12,48 @@ namespace IRaCIS.Core.Domain.Models
/// 一致性分析临床数据
///</summary>
[Table("ReadingConsistentClinicalData")]
public class ReadingConsistentClinicalData : BaseAuditAddEntity
public class ReadingConsistentClinicalData : BaseAddAuditEntity
{
/// <summary>
/// 项目ID
/// </summary>
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; }
/// <summary>
/// PDF文件
/// </summary>
[JsonIgnore]
public List<ReadingConsistentClinicalDataPDF> ReadingClinicalDataPDFList { get; set; }
#endregion
/// <summary>
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 访视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; }
/// <summary>
/// PDF文件
/// </summary>
[JsonIgnore]
public List<ReadingConsistentClinicalDataPDF> ReadingClinicalDataPDFList { get; set; }

36
IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs
View File

@ -11,32 +11,24 @@ namespace IRaCIS.Core.Domain.Models
/// 一致性分析临床数据
///</summary>
[Table("ReadingConsistentClinicalDataPDF")]
public class ReadingConsistentClinicalDataPDF : BaseAuditAddEntity
public class ReadingConsistentClinicalDataPDF : BaseAddAuditEntity
{
[JsonIgnore]
[ForeignKey("ReadingConsistentClinicalDataId")]
public ReadingConsistentClinicalData ReadingConsistentClinicalData { get; set; }
/// <summary>
/// 阅片临床数据ID
/// </summary>
public Guid ReadingConsistentClinicalDataId { get; set; }
/// <summary>
/// Path
/// </summary>
[Required]
public string Path { get; set; }
/// <summary>
/// FileName
/// </summary>
[Required]
public string FileName { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("ReadingConsistentClinicalDataId")]
public ReadingConsistentClinicalData ReadingConsistentClinicalData { get; set; }
#endregion
/// <summary>
/// 大小
/// 阅片临床数据ID
/// </summary>
public Guid ReadingConsistentClinicalDataId { get; set; }
public string Path { get; set; }
public string FileName { get; set; }
public int Size { get; set; } = 0;
/// <summary>

26
IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs
View File

@ -16,24 +16,22 @@ namespace IRaCIS.Core.Domain.Models
public class TrialClinicalDataSetCriterion : BaseFullAuditEntity
{
/// <summary>
/// TrialClinicalDataSetId
/// </summary>
[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; }
/// <summary>
/// TrialReadingCriterionId
/// </summary>
[Required]
public Guid TrialReadingCriterionId { get; set; }
[ForeignKey("TrialClinicalDataSetId")]
public ClinicalDataTrialSet TrialClinicalDataSet { get; set; }
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
}

55
IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs
View File

@ -16,8 +16,36 @@ namespace IRaCIS.Core.Domain.Models
///系统临床数据问题
///</summary>
[Table("SystemClinicalQuestion")]
public class SystemClinicalQuestion : BaseAuditAddEntity
public class SystemClinicalQuestion : BaseAddAuditEntity
{
#region 导航属性
/// <summary>
/// 分组
/// </summary>
[JsonIgnore]
[ForeignKey("GroupId")]
public SystemClinicalQuestion GroupQuestin { get; set; }
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
return result == null ? new List<CalculateInfo>() : result;
}
catch (Exception)
{
return new List<CalculateInfo>();
}
}
}
#endregion
/// <summary>
/// 项目临床数据Id
/// </summary>
@ -135,32 +163,7 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string CalculateQuestions { get; set; } = "[]";
/// <summary>
/// 分组
/// </summary>
[JsonIgnore]
[ForeignKey("GroupId")]
public SystemClinicalQuestion GroupQuestin { get; set; }
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
return result == null ? new List<CalculateInfo>() : result;
}
catch (Exception)
{
return new List<CalculateInfo>();
}
}
}
}

41
IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs
View File

@ -16,12 +16,31 @@ namespace IRaCIS.Core.Domain.Models
/// 系统临床表格问题
///</summary>
[Table("SystemClinicalTableQuestion")]
public class SystemClinicalTableQuestion : BaseAuditAddEntity
public class SystemClinicalTableQuestion : BaseAddAuditEntity
{
/// <summary>
#region 导航属性
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
#endregion
/// <summary>
/// 系统临床数据Id
/// </summary>
public Guid SystemClinicalId { get; set; }
public Guid SystemClinicalId { get; set; }
/// <summary>
/// 问题名称
@ -99,23 +118,7 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
}

63
IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs
View File

@ -16,8 +16,36 @@ namespace IRaCIS.Core.Domain.Models
///项目临床数据问题
///</summary>
[Table("TrialClinicalQuestion")]
public class TrialClinicalQuestion : BaseAuditAddEntity
public class TrialClinicalQuestion : BaseAddAuditEntity
{
#region 导航属性
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
return result == null ? new List<CalculateInfo>() : result;
}
catch (Exception)
{
return new List<CalculateInfo>();
}
}
}
[JsonIgnore]
[ForeignKey("TrialClinicalId")]
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
#endregion
/// <summary>
/// 项目临床数据Id
/// </summary>
@ -136,40 +164,17 @@ namespace IRaCIS.Core.Domain.Models
/// 自定义计算问题
/// </summary>
public string CalculateQuestions { get; set; } = "[]";
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
return result == null ? new List<CalculateInfo>() : result;
}
catch (Exception)
{
return new List<CalculateInfo>();
}
}
}
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; }
/// <summary>
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty;
[JsonIgnore]
[ForeignKey("TrialClinicalId")]
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
}

45
IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs
View File

@ -16,12 +16,32 @@ namespace IRaCIS.Core.Domain.Models
/// 项目临床表格问题
///</summary>
[Table("TrialClinicalTableQuestion")]
public class TrialClinicalTableQuestion : BaseAuditAddEntity
{
/// <summary>
public class TrialClinicalTableQuestion : BaseAddAuditEntity
{
#region 导航属性
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
#endregion
/// <summary>
/// 项目临床数据Id
/// </summary>
public Guid TrialClinicalId { get; set; }
public Guid TrialClinicalId { get; set; }
/// <summary>
/// 问题名称
@ -113,23 +133,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
}

12
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs
View File

@ -13,13 +13,13 @@ namespace IRaCIS.Core.Domain.Models
///ClinicalAnswerRowInfo
///</summary>
[Table("ClinicalAnswerRowInfo")]
public class ClinicalAnswerRowInfo : BaseAuditAddEntity
public class ClinicalAnswerRowInfo : BaseAddAuditEntity
{
/// <summary>
/// 受试者Id
/// </summary>
public Guid SubjectId { get; set; }
#region 导航属性
#endregion
public Guid SubjectId { get; set; }
/// <summary>
/// 表单Id

29
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs
View File

@ -13,13 +13,19 @@ namespace IRaCIS.Core.Domain.Models
///ClinicalForm
///</summary>
[Table("ClinicalForm")]
public class ClinicalForm : BaseAuditAddEntity
public class ClinicalForm : BaseAddAuditEntity
{
/// <summary>
/// 受试者Id
/// </summary>
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;
/// <summary>
/// ClinicalDataTrialSetId
/// </summary>
public Guid ClinicalDataTrialSetId { get; set; }
/// <summary>
@ -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; }
}

26
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs
View File

@ -13,12 +13,17 @@ namespace IRaCIS.Core.Domain.Models
///ClinicalQuestionAnswer
///</summary>
[Table("ClinicalQuestionAnswer")]
public class ClinicalQuestionAnswer : BaseAuditAddEntity
{
/// <summary>
/// 受试者Id
/// </summary>
public Guid SubjectId { get; set; }
public class ClinicalQuestionAnswer : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("ClinicalFormId")]
public ClinicalForm ClinicalForm { get; set; }
#endregion
public Guid SubjectId { get; set; }
/// <summary>
/// 表单Id
@ -31,19 +36,12 @@ namespace IRaCIS.Core.Domain.Models
/// 问题Id
/// </summary>
public Guid QuestionId { get; set; }
/// <summary>
/// Answer
/// </summary>
public string Answer { get; set; }
public Guid ClinicalDataTrialSetId { get; set; }
[JsonIgnore]
[ForeignKey("ClinicalFormId")]
public ClinicalForm ClinicalForm { get; set; }
}

43
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs
View File

@ -13,43 +13,28 @@ namespace IRaCIS.Core.Domain.Models
///ClinicalTableAnswer
///</summary>
[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; }
/// <summary>
/// 受试者Id
/// </summary>
public Guid SubjectId { get; set; }
/// <summary>
/// 表单Id
/// </summary>
public Guid ClinicalFormId { get; set; }
/// <summary>
/// 问题Id
/// </summary>
public Guid QuestionId { get; set; }
/// <summary>
/// 答案行的Id
/// </summary>
public Guid RowId { get; set; }
/// <summary>
/// 答案
/// </summary>
public string Answer { get; set; }
/// <summary>
/// 表格问题id
/// </summary>
public Guid TableQuestionId { get; set; }
[JsonIgnore]
[ForeignKey("RowId")]
public ClinicalAnswerRowInfo ClinicalAnswerRowInfo { get; set; }
}

29
IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs
View File

@ -13,23 +13,21 @@ namespace IRaCIS.Core.Domain.Models
///ReadModuleCriterionFrom
///</summary>
[Table("ReadModuleCriterionFrom")]
public class ReadModuleCriterionFrom : BaseAuditAddEntity
public class ReadModuleCriterionFrom : BaseAddAuditEntity
{
/// <summary>
/// 阅片期Id
/// </summary>
#region 导航属性
[ForeignKey("ReadModuleId")]
public Guid ReadModuleId { get; set; }
/// <summary>
/// 受试者Id
/// </summary>
public Guid SubjectId { get; set; }
/// <summary>
/// 项目Id
/// </summary>
[JsonIgnore]
[ForeignKey("ClinicalFormId")]
public ClinicalForm ClinicalForm { get; set; }
#endregion
public Guid SubjectId { get; set; }
public Guid TrialId { get; set; }
/// <summary>
@ -38,9 +36,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid ClinicalFormId { get; set; }
[JsonIgnore]
[ForeignKey("ClinicalFormId")]
public ClinicalForm ClinicalForm { get; set; }
}

72
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs
View File

@ -16,12 +16,46 @@ namespace IRaCIS.Core.Domain.Models
///阅片医学审核对话
///</summary>
[Table("ReadingMedicalReviewDialog")]
public class ReadingMedicalReviewDialog : BaseAuditAddEntity
{
/// <summary>
public class ReadingMedicalReviewDialog : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("TaskMedicalReviewId")]
public TaskMedicalReview TaskMedicalReview { get; set; }
/// <summary>
/// 文件
/// </summary>
[NotMapped]
public List<OSSImageInfo> FileList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
return result == null ? new List<OSSImageInfo>() : result;
}
catch (Exception)
{
return new List<OSSImageInfo>();
}
}
}
[JsonIgnore]
[ForeignKey("CreateUserId")]
public User CreateUser { get; set; }
#endregion
/// <summary>
/// 医学审核Id
/// </summary>
public Guid TaskMedicalReviewId { get; set; }
public Guid TaskMedicalReviewId { get; set; }
/// <summary>
/// 任务Id
@ -80,9 +114,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public bool? IsApplyHeavyReading { get; set; }
[JsonIgnore]
[ForeignKey("CreateUserId")]
public User CreateUser { get; set; }
/// <summary>
@ -95,35 +126,8 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public string FileName { get; set; } = string.Empty;
[JsonIgnore]
[ForeignKey("TaskMedicalReviewId")]
public TaskMedicalReview TaskMedicalReview { get; set; }
/// <summary>
/// 文件
/// </summary>
[NotMapped]
public List<OSSImageInfo> FileList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
return result == null ? new List<OSSImageInfo>() : result;
}
catch (Exception)
{
return new List<OSSImageInfo>();
}
}
}
}

29
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs
View File

@ -11,36 +11,31 @@ namespace IRaCIS.Core.Domain.Models
[Table("ReadingMedicineQuestionAnswer")]
public class ReadingMedicineQuestionAnswer : BaseFullAuditEntity
{
#region 导航属性
/// <summary>
/// 医学审核问题Id
/// </summary>
public Guid ReadingMedicineQuestionId { get; set; }
[JsonIgnore]
[ForeignKey("TaskMedicalReviewId")]
public TaskMedicalReview TaskMedicalReview { get; set; }
#endregion
/// <summary>
/// 医学审核问题Id
/// </summary>
public Guid ReadingMedicineQuestionId { get; set; }
/// <summary>
/// 医学审核Id
/// </summary>
public Guid TaskMedicalReviewId { get; set; }
/// <summary>
/// 任务Id
/// </summary>
public Guid VisitTaskId { get; set; }
/// <summary>
/// 答案
/// </summary>
public string Answer { get; set; }
[JsonIgnore]
[ForeignKey("TaskMedicalReviewId")]
public TaskMedicalReview TaskMedicalReview { get; set; }
}

29
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs
View File

@ -18,11 +18,21 @@ namespace IRaCIS.Core.Domain.Models
[Table("ReadingMedicineSystemQuestion")]
public class ReadingMedicineSystemQuestion : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
/// <summary>
/// 类型
/// </summary>
public string Type { get; set; }
[ForeignKey("ParentId")]
public ReadingMedicineSystemQuestion ParentQuestion { get; set; }
//// |1|2| 这种保存
// public string CriterionEnumStr { get; set; } = string.Empty;
// [NotMapped]
// public List<int> CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList(
#endregion
/// <summary>
/// 类型
/// </summary>
public string Type { get; set; }
/// <summary>
/// 父问题触发
@ -73,10 +83,7 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
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<int> CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList();
}
}
}

16
IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs
View File

@ -14,14 +14,18 @@ namespace IRaCIS.Core.Domain.Models
///</summary>
[Table("ReadingMedicineTrialQuestion")]
public class ReadingMedicineTrialQuestion : BaseFullAuditEntity
{
{
#region 导航属性
[JsonIgnore]
[ForeignKey("ParentId")]
public ReadingMedicineTrialQuestion ParentQuestion { get; set; }
#endregion
/// <summary>
/// <summary>
/// 类型
/// </summary>
public string Type { get; set; }
public string Type { get; set; }
/// <summary>
/// 父问题触发值
@ -88,9 +92,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid? SystemQuestionId { get; set; }
[JsonIgnore]
[ForeignKey("ParentId")]
public ReadingMedicineTrialQuestion ParentQuestion { get; set; }
}

20
IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusSystem.cs
View File

@ -13,13 +13,17 @@ namespace IRaCIS.Core.Domain.Models
/// 标准病灶中间表
/// </summary>
[Table("CriterionNidusSystem")]
public class CriterionNidusSystem : BaseAuditAddEntity
public class CriterionNidusSystem : BaseAddAuditEntity
{
/// <summary>
/// 标准ID
/// </summary>
public Guid CriterionId { get; set; }
#region 导航属性
[ForeignKey("CriterionId")]
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
/// <summary>
/// 标准ID
/// </summary>
public Guid CriterionId { get; set; }
/// <summary>
@ -39,9 +43,7 @@ namespace IRaCIS.Core.Domain.Models
public bool IsSystemCriterion { get; set; }
[ForeignKey("CriterionId")]
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
}

12
IRaCIS.Core.Domain/Reading/ReadingCriterion/CriterionNidusTrial.cs
View File

@ -13,18 +13,14 @@ namespace IRaCIS.Core.Domain.Models
///CriterionNidusTrial
///</summary>
[Table("CriterionNidusTrial")]
public class CriterionNidusTrial : BaseAuditAddEntity
public class CriterionNidusTrial : BaseAddAuditEntity
{
#region 导航属性
public Guid CriterionId { get; set; }
#endregion
public Guid CriterionId { get; set; }
/// <summary>
/// 病灶类型
/// </summary>
public LesionType LesionType { get; set; }
/// <summary>

12
IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs
View File

@ -13,14 +13,16 @@ namespace IRaCIS.Core.Domain.Models
///OrganInfo
///</summary>
[Table("OrganInfo")]
public class OrganInfo : BaseAuditAddEntity
public class OrganInfo : BaseAddAuditEntity
{
#region 导航属性
/// <summary>
/// 分类
/// </summary>
public string Classification { get; set; } = string.Empty;
#endregion
/// <summary>
/// 分类
/// </summary>
public string Classification { get; set; } = string.Empty;
/// <summary>
/// 分类 英文

22
IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs
View File

@ -13,13 +13,18 @@ namespace IRaCIS.Core.Domain.Models
///OrganTrialInfo
///</summary>
[Table("OrganTrialInfo")]
public class OrganTrialInfo : BaseAuditAddEntity
public class OrganTrialInfo : BaseAddAuditEntity
{
/// <summary>
#region 导航属性
[JsonIgnore]
[ForeignKey("OrganInfoId")]
public OrganInfo OrganInfo { get; set; }
#endregion
/// <summary>
/// 器官Id
/// </summary>
public Guid OrganInfoId { get; set; }
public Guid OrganInfoId { get; set; }
/// <summary>
/// 项目Id
@ -29,12 +34,6 @@ namespace IRaCIS.Core.Domain.Models
public bool IsEnable { get; set; }
///// <summary>
///// 病灶类型 项目自定义标准 可能会更改
///// </summary>
//public OrganType OrganType { get; set; }
/// <summary>
/// 标准Id
/// </summary>
@ -101,9 +100,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public OrganType? OrganType { get; set; }
[JsonIgnore]
[ForeignKey("OrganInfoId")]
public OrganInfo OrganInfo { get; set; }
}

19
IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs
View File

@ -15,12 +15,16 @@ namespace IRaCIS.Core.Domain.Models
///阅片标准分页
///</summary>
[Table("ReadingCriterionPage")]
public class ReadingCriterionPage : BaseAuditAddEntity
{
/// <summary>
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
public class ReadingCriterionPage : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<ReadingQuestionTrial> ReadingQuestionList { get; set; } = new List<ReadingQuestionTrial>();
#endregion
/// <summary>
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 分页名称
@ -48,8 +52,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid ReadingQuestionCriterionTrialId { get; set; }
[JsonIgnore]
public List<ReadingQuestionTrial> ReadingQuestionList { get; set; } = new List<ReadingQuestionTrial>();
}

22
IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs
View File

@ -12,12 +12,16 @@ namespace IRaCIS.Core.Domain.Models
/// 系统阅片标准
///</summary>
[Table("ReadingQuestionCriterionSystem")]
public class ReadingQuestionCriterionSystem : BaseAuditAddEntity
{
/// <summary>
/// 标准
/// </summary>
public string CriterionName { get; set; }
public class ReadingQuestionCriterionSystem : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<ReadingQuestionSystem> ReadingQuestionSystemList { get; set; } = new List<ReadingQuestionSystem>();
#endregion
/// <summary>
/// 标准
/// </summary>
public string CriterionName { get; set; }
/// <summary>
/// 是否启用
@ -68,12 +72,8 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public bool IsMustGlobalReading { get; set; } = false;
[JsonIgnore]
public List<ReadingQuestionSystem> ReadingQuestionSystemList { get; set; } = new List<ReadingQuestionSystem>();
//[JsonIgnore]
//[ForeignKey("CriterionId")]
//public Dictionary Dictionary { get; set; }

43
IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs
View File

@ -12,8 +12,27 @@ namespace IRaCIS.Core.Domain.Models
/// 项目阅片标准
///</summary>
[Table("ReadingQuestionCriterionTrial")]
public class ReadingQuestionCriterionTrial : BaseAuditAddEntity
public class ReadingQuestionCriterionTrial : BaseAddAuditEntity
{
#region 导航属性
[ForeignKey("TrialId")]
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public List<ReadingQuestionTrial> ReadingQuestionTrialList = new List<ReadingQuestionTrial>();
[JsonIgnore]
public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<TrialCriterionAdditionalAssessmentType>();
[JsonIgnore]
public List<VisitTask> VisitTaskList { get; set; }
#endregion
/// <summary>
/// 系统标准ID
/// </summary>
@ -247,26 +266,8 @@ namespace IRaCIS.Core.Domain.Models
public bool IsAutoCreate { get; set; } = true;
#endregion
/// <summary>
/// 项目
/// </summary>
[ForeignKey("TrialId")]
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public List<ReadingQuestionTrial> ReadingQuestionTrialList = new List<ReadingQuestionTrial>();
[JsonIgnore]
public List<TrialCriterionAdditionalAssessmentType> TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List<TrialCriterionAdditionalAssessmentType>();
[JsonIgnore]
public List<VisitTask> VisitTaskList { get; set; }
public ReadingImageDownload ImageDownloadEnum { get; set; }

18
IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs
View File

@ -13,18 +13,14 @@ namespace IRaCIS.Core.Domain.Models
///SystemCriterionDictionaryCode
///</summary>
[Table("SystemCriterionDictionaryCode")]
public class SystemCriterionDictionaryCode : BaseAuditAddEntity
{
/// <summary>
/// SystemCriterionId
/// </summary>
[Required]
public class SystemCriterionDictionaryCode : BaseAddAuditEntity
{
#region 导航属性
#endregion
public Guid SystemCriterionId { get; set; }
/// <summary>
/// Code
/// </summary>
[Required]
public string Code { get; set; }

8
IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs
View File

@ -16,8 +16,12 @@ namespace IRaCIS.Core.Domain.Models
///</summary>
[Table("TrialCriterionAdditionalAssessmentType")]
public class TrialCriterionAdditionalAssessmentType : BaseFullAuditEntity
{
public ReadingQuestionCriterionTrial TrialReadingCriterion{get;set;}
{
#region 导航属性
[JsonIgnore]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
public Guid TrialReadingCriterionId { get; set; }

23
IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs
View File

@ -13,22 +13,17 @@ namespace IRaCIS.Core.Domain.Models
///TrialCriterionDictionaryCode
///</summary>
[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
/// <summary>
/// TrialCriterionId
/// </summary>
[Required]
public Guid TrialCriterionId { get; set; }
/// <summary>
/// Code
/// </summary>
[Required]
public string Code { get; set; }

163
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs
View File

@ -13,12 +13,88 @@ namespace IRaCIS.Core.Domain.Models
/// 系统阅片问题
///</summary>
[Table("ReadingQuestionSystem")]
public class ReadingQuestionSystem : BaseAuditAddEntity
{
/// <summary>
/// 系统标准Id
/// </summary>
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<string> ParentTriggerValueList
{
get
{
try
{
return this.ParentTriggerValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<string> HighlightAnswerList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<string>>(this.HighlightAnswer);
return result == null ? new List<string>() : result;
}
catch (Exception)
{
return new List<string>();
}
}
}
#endregion
/// <summary>
/// 系统标准Id
/// </summary>
public Guid ReadingQuestionCriterionSystemId { get; set; }
/// <summary>
/// 类型
@ -214,80 +290,7 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
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<string> ParentTriggerValueList
{
get
{
try
{
return this.ParentTriggerValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<string> HighlightAnswerList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<string>>(this.HighlightAnswer);
return result == null ? new List<string>() : result;
}
catch (Exception)
{
return new List<string>();
}
}
}
}

204
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs
View File

@ -14,10 +14,110 @@ namespace IRaCIS.Core.Domain.Models
/// 项目阅片问题
///</summary>
[Table("ReadingQuestionTrial")]
public class ReadingQuestionTrial : BaseAuditAddEntity
public class ReadingQuestionTrial : BaseAddAuditEntity
{
#region 导航属性
/// <summary>
/// 分页标准
/// </summary>
[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<ReadingTableQuestionTrial> ReadingTableQuestionTrialList { get; set; }
[JsonIgnore]
[ForeignKey("GroupId")]
public ReadingQuestionTrial GroupInfo { get; set; }
[NotMapped]
public List<string> ParentTriggerValueList
{
get
{
try
{
return this.ParentTriggerValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
return result == null ? new List<CalculateInfo>() : result;
}
catch (Exception)
{
return new List<CalculateInfo>();
}
}
}
[NotMapped]
public List<string> HighlightAnswerList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<string>>(this.HighlightAnswer);
return result == null ? new List<string>() : result;
}
catch (Exception)
{
return new List<string>();
}
}
}
#endregion
public bool IsAdditional { get; set; }
/// <summary>
@ -292,112 +392,14 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public QuestionClassify? QuestionClassify { get; set; }
[JsonIgnore]
[ForeignKey("GroupId")]
public ReadingQuestionTrial GroupInfo { get; set; }
/// <summary>
/// 高亮问题的答案
/// </summary>
public string HighlightAnswer { get; set; } = "[]";
/// <summary>
/// 分页标准
/// </summary>
[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<ReadingTableQuestionTrial> ReadingTableQuestionTrialList { get; set; }
[NotMapped]
public List<string> ParentTriggerValueList
{
get
{
try
{
return this.ParentTriggerValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
return result == null ? new List<CalculateInfo>() : result;
}
catch (Exception)
{
return new List<CalculateInfo>();
}
}
}
[NotMapped]
public List<string> HighlightAnswerList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<string>>(this.HighlightAnswer);
return result == null ? new List<string>() : result;
}
catch (Exception)
{
return new List<string>();
}
}
}
}

12
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs
View File

@ -11,10 +11,15 @@ namespace IRaCIS.Core.Domain.Models
///ReadingCriterionDictionary
///</summary>
[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
/// </summary>
public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General;
[JsonIgnore]
[ForeignKey("DictionaryId")]
public Dictionary Dictionary { get; set; }

106
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs
View File

@ -16,22 +16,59 @@ namespace IRaCIS.Core.Domain.Models
///系统表格问题
///</summary>
[Table("ReadingTableQuestionSystem")]
public class ReadingTableQuestionSystem : BaseAuditAddEntity
{
public class ReadingTableQuestionSystem : BaseAddAuditEntity
{
#region 导航属性
[ForeignKey("DependParentId")]
[JsonIgnore]
public ReadingTableQuestionSystem DependParentQuestion { get; set; }
/// <summary>
/// 系统表的问题Id ReadingQuestionSystem的Id
/// </summary>
public Guid ReadingQuestionId { get; set; }
/// <summary>
/// Type
[NotMapped]
public List<string> ParentTriggerValueList
{
get
{
try
{
return this.ParentTriggerValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
#endregion
/// <summary>
/// 系统表的问题Id ReadingQuestionSystem的Id
/// </summary>
public Guid ReadingQuestionId { get; set; }
public string Type { get; set; }
/// <summary>
/// ParentId
/// </summary>
public Guid? ParentId { get; set; }
/// <summary>
@ -64,10 +101,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
@ -172,46 +205,7 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public QuestionClassify? QuestionClassify { get; set; }
[ForeignKey("DependParentId")]
[JsonIgnore]
public ReadingTableQuestionSystem DependParentQuestion { get; set; }
[NotMapped]
public List<string> ParentTriggerValueList
{
get
{
try
{
return this.ParentTriggerValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
}

216
IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs
View File

@ -16,113 +16,125 @@ namespace IRaCIS.Core.Domain.Models
/// 项目阅片问题
///</summary>
[Table("ReadingTableQuestionTrial")]
public class ReadingTableQuestionTrial : BaseAuditAddEntity
{
/// <summary>
/// TrialId
/// </summary>
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<string> ParentTriggerValueList
{
get
{
try
{
return this.ParentTriggerValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
return result == null ? new List<CalculateInfo>() : result;
}
catch (Exception)
{
return new List<CalculateInfo>();
}
}
}
#endregion
public Guid TrialId { get; set; }
/// <summary>
/// 项目问题的Id ReadingQuestionTrial的id
/// </summary>
public Guid ReadingQuestionId { get; set; }
/// <summary>
/// Type
/// </summary>
public string Type { get; set; } = string.Empty;
/// <summary>
/// ParentId
/// </summary>
public Guid? ParentId { get; set; }
/// <summary>
/// ParentTriggerValue
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary>
/// QuestionName
/// </summary>
public string QuestionName { get; set; } = string.Empty;
/// <summary>
/// IsRequired
/// </summary>
public IsRequired IsRequired { get; set; }
/// <summary>
/// ShowOrder
/// </summary>
public int ShowOrder { get; set; }
/// <summary>
/// TypeValue
/// </summary>
public string TypeValue { get; set; } = string.Empty;
/// <summary>
/// IsEnable
/// </summary>
public bool IsEnable { get; set; }
/// <summary>
/// Remark
/// </summary>
public string Remark { get; set; } = string.Empty;
/// <summary>
/// RelevanceId
/// </summary>
public Guid? RelevanceId { get; set; }
/// <summary>
/// RelevanceValue
/// </summary>
public string RelevanceValue { get; set; } = string.Empty;
/// <summary>
/// ShowQuestion
/// </summary>
public int ShowQuestion { get; set; }
/// <summary>
/// MaxRowCount
/// </summary>
public int? MaxRowCount { get; set; }
/// <summary>
/// DataTableName
/// </summary>
public string DataTableName { get; set; } = string.Empty;
/// <summary>
/// DataTableColumn
/// </summary>
public string DataTableColumn { get; set; }
/// <summary>
/// TableQuestionType
/// </summary>
public TableQuestionType? TableQuestionType { get; set; }
/// <summary>
/// DependParentId
/// </summary>
public Guid? DependParentId { get; set; }
/// <summary>
/// IsDepend
/// </summary>
public IsDepend IsDepend { get; set; }
/// <summary>
/// 项目标准Id
/// </summary>
public Guid TrialCriterionId { get; set; }
/// <summary>
@ -191,13 +203,7 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public QuestionClassify? QuestionClassify { get; set; }
[JsonIgnore]
[ForeignKey("DependParentId")]
public ReadingTableQuestionTrial DependParentQuestion { get; set; }
[JsonIgnore]
[ForeignKey("ReadingQuestionId")]
public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
/// <summary>
/// 复制病灶的时候 是否复制这个问题
@ -210,62 +216,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid? SystemTableQuestionId { get; set; }
[NotMapped]
public List<string> ParentTriggerValueList
{
get
{
try
{
return this.ParentTriggerValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<string> RelevanceValueList
{
get
{
try
{
return this.RelevanceValue.Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
}
}
[NotMapped]
public List<CalculateInfo> CalculateQuestionList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
return result == null ? new List<CalculateInfo>() : result;
}
catch (Exception)
{
return new List<CalculateInfo>();
}
}
}
}

Some files were not shown because too many files have changed in this diff Show More