diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs index 82efb13f1..48333b11e 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs @@ -207,11 +207,7 @@ namespace IRaCIS.Core.Application.Service CreateMap().ReverseMap(); - CreateMap() - .ForMember(t => t.UserRealName, u => u.MapFrom(c => c.User.FullName)) - .ForMember(t => t.UserName, u => u.MapFrom(c => c.User.UserName)) - .ForMember(t => t.UserTypeShortName, u => u.MapFrom(c => c.User.UserTypeRole.UserTypeShortName)); CreateMap().IncludeMembers(t => t.Trial) diff --git a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs index 2065752ca..d651deda5 100644 --- a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs +++ b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs @@ -1,47 +1,45 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Description("受试者某标准阅片用户中间关系表")] +[Table("SubjectUser")] +public class SubjectUser : BaseFullAuditEntity { - [Description("受试者某标准阅片用户中间关系表")] - [Table("SubjectUser")] - public class SubjectUser : BaseFullAuditEntity - { + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + [JsonIgnore] + //Parent + [ForeignKey("ReplacedSubjectUserId")] + public SubjectUser ReplacedSubjectUser { get; set; } - [JsonIgnore] - //Parent - [ForeignKey("ReplacedSubjectUserId")] - public SubjectUser ReplacedSubjectUser { get; set; } + //ChildList + [JsonIgnore] + public List EarlierSubjectUserList { get; set; } + [JsonIgnore] + public User DoctorUser { get; set; } - //ChildList - [JsonIgnore] - public List EarlierSubjectUserList { get; set; } - [JsonIgnore] - public User DoctorUser { get; set; } + [JsonIgnore] + public Subject Subject { get; set; } + #endregion - [JsonIgnore] - public Subject Subject { get; set; } - #endregion + public Guid TrialId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - public Guid TrialReadingCriterionId { get; set; } + public DateTime? AssignTime { get; set; } - public DateTime? AssignTime { get; set; } + public Guid SubjectId { get; set; } + public Guid DoctorUserId { get; set; } + public Arm ArmEnum { get; set; } - public Guid SubjectId { get; set; } - public Guid DoctorUserId { get; set; } - public Arm ArmEnum { get; set; } - - public bool IsConfirmed { get; set; } = true; - - //该属性有值 说明该医生被替换了 分配的时候 要过滤掉 - public Guid? ReplacedSubjectUserId { get; set; } - } + public bool IsConfirmed { get; set; } = true; + //该属性有值 说明该医生被替换了 分配的时候 要过滤掉 + public Guid? ReplacedSubjectUserId { get; set; } } + diff --git a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs index 05c1290e0..938041bc8 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs @@ -1,39 +1,35 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TaskAllocationRule")] +public class TaskAllocationRule : BaseFullAuditEntity { - /// - ///TaskAllocationRule - /// - [Table("TaskAllocationRule")] - public class TaskAllocationRule : BaseFullAuditEntity - { - #region 导航属性 + #region 导航属性 - [ForeignKey("DoctorUserId")] - [JsonIgnore] - public User DoctorUser { get; set; } + [ForeignKey("DoctorUserId")] + [JsonIgnore] + public User DoctorUser { get; set; } - [JsonIgnore] - public Enroll Enroll { get; set; } + [JsonIgnore] + public Enroll Enroll { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - #endregion + [JsonIgnore] + public Trial Trial { get; set; } + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public int PlanSubjectCount { get; set; } - public bool IsEnable { get; set; } + public int PlanSubjectCount { get; set; } + public bool IsEnable { get; set; } - public string Note { get; set; } = string.Empty; + public string Note { get; set; } = string.Empty; - public Guid DoctorUserId { get; set; } + public Guid DoctorUserId { get; set; } - public Guid EnrollId { get; set; } + public Guid EnrollId { get; set; } - //是否是裁判医生 裁判医生单独加入 - public bool IsJudgeDoctor { get; set; } - - public int PlanReadingRatio { get; set; } - } + //是否是裁判医生 裁判医生单独加入 + public bool IsJudgeDoctor { get; set; } + public int PlanReadingRatio { get; set; } } + diff --git a/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs b/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs index 12ff17bf5..523b845c8 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs @@ -1,43 +1,39 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TaskConsistentRule")] +public class TaskConsistentRule : BaseFullAuditEntity { - /// - ///TaskConsistentRule - /// - [Table("TaskConsistentRule")] - public class TaskConsistentRule : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public int PlanSubjectCount { get; set; } + public int PlanSubjectCount { get; set; } - public int PlanVisitCount { get; set; } + public int PlanVisitCount { get; set; } - public int IntervalWeeks { get; set; } + public int IntervalWeeks { get; set; } - public bool IsHaveReadingPeriod { get; set; } + public bool IsHaveReadingPeriod { get; set; } - public bool IsGenerateGlobalTask { get; set; } + public bool IsGenerateGlobalTask { get; set; } - public int BlindSubjectNumberOfPlaces { get; set; } + public int BlindSubjectNumberOfPlaces { get; set; } - public string BlindTrialSiteCode { get; set; } = string.Empty; + public string BlindTrialSiteCode { get; set; } = string.Empty; - public bool IsSelfAnalysis { get; set; } + public bool IsSelfAnalysis { get; set; } - public bool IsEnable { get; set; } - - public string Note { get; set; } = string.Empty; - public Guid TrialReadingCriterionId { get; set; } - } + public bool IsEnable { get; set; } + public string Note { get; set; } = string.Empty; + public Guid TrialReadingCriterionId { get; set; } } + diff --git a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs index 2c95e32c9..49074ea28 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskInfluence.cs @@ -1,39 +1,35 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TaskInfluence")] +public class TaskInfluence : BaseAddAuditEntity { - /// - ///TaskInfluence - /// - [Table("TaskInfluence")] - public class TaskInfluence : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public VisitTask OriginalTask { get; set; } + #region 导航属性 + [JsonIgnore] + public VisitTask OriginalTask { get; set; } - [JsonIgnore] - public VisitTask InfluenceTask { get; set; } - #endregion + [JsonIgnore] + public VisitTask InfluenceTask { get; set; } + #endregion - public Guid OriginalTaskId { get; set; } + public Guid OriginalTaskId { get; set; } - public Guid InfluenceTaskId { get; set; } + public Guid InfluenceTaskId { get; set; } - //对影响任务进行的操作 - public ReReadingOrBackOptType OptType { get; set; } - } - public enum ReReadingOrBackOptType - { - //取消分配 - CancelAssign = 0, + //对影响任务进行的操作 + public ReReadingOrBackOptType OptType { get; set; } +} +public enum ReReadingOrBackOptType +{ + //取消分配 + CancelAssign = 0, - //失效 - Abandon = 1, + //失效 + Abandon = 1, - //重阅重置 + //重阅重置 - Return = 2, - - } + Return = 2, } + diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs index d5a8c57ab..a401ea3e4 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs @@ -1,157 +1,115 @@ using IRaCIS.Core.Domain.Share; using System.Linq; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public class OSSImageInfo { - public class OSSImageInfo - { - public string FileName { get; set; } = string.Empty; + public string FileName { get; set; } = string.Empty; - public string ImagePath { get; set; } = string.Empty; - } - /// - ///TaskMedicalReview - /// - [Table("TaskMedicalReview")] - public class TaskMedicalReview : BaseFullAuditEntity - { - #region 导航属性 - - [JsonIgnore] - public User LatestReplyUser { get; set; } - - [JsonIgnore] - public User MedicalManagerUser { get; set; } - - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } - - [JsonIgnore] - public List ReadingMedicalReviewDialogList { get; set; } - - [JsonIgnore] - public Trial Trial { get; set; } - /// - /// 文件 - /// - [NotMapped] - public List FileList - { - get - { - try - { - var result = JsonConvert.DeserializeObject>(this.ImagePath); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - - } - } - - [NotMapped] - public List PDRelationTaskIdList => PDRelationTaskIdListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Select(t => Guid.Parse(t)).ToList(); - - #endregion - - public Guid? LatestReplyUserId { get; set; } - /// - /// 分配时间 - /// - public DateTime? AllocateTime { get; set; } - - /// - /// 审核状态 - /// - [Required] - public MedicalReviewAuditState AuditState { get; set; } - - /// - /// 审核通过时间 - /// - public DateTime? AuditSignTime { get; set; } - - /// - /// 阅片人是否认同 - /// - public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } - - public Guid? MedicalManagerUserId { get; set; } - public Guid VisitTaskId { get; set; } - public Guid TrialId { get; set; } - - /// - /// 是否有问题 - /// - public bool IsHaveQuestion { get; set; } = false; - - /// - /// 质询问题 - /// - public string Questioning { get; set; } = string.Empty; - /// - /// 图片路径 - /// - public string ImagePath { get; set; } = string.Empty; - - /// - /// 审核建议 - /// - public AuditAdvice AuditAdviceEnum { get; set; } - - /// - /// 是否关闭对话 - /// - public bool IsClosedDialog { get; set; } - - /// - /// 保存问题的时间 - /// - public DateTime? SaveQuestionTime { get; set; } - /// - /// 不同意重阅原因 - /// - public string DisagreeReason { get; set; } = string.Empty; - /// - /// 是否申请重阅 - /// - public bool IsApplyHeavyReading { get; set; } = false; - /// - /// 保存结论时间 - /// - public DateTime? SaveConclusionTime { get; set; } - /// - /// 文件名称 - /// - public string FileName { get; set; } = string.Empty; - - /// - /// 是否发送消息 - /// - public bool IsSendMessage { get; set; } = false; - /// - /// 医学审核对话关闭原因 - /// - public MedicalDialogClose MedicalDialogCloseEnum { get; set; } - - /// - /// 对话关闭原因 - /// - public string DialogCloseReason { get; set; } = string.Empty; - - /// - /// 无效的 为True无效 - /// - public bool IsInvalid { get; set; } - - public bool IsAutoGenerate { get; set; } - - // | 分割 - public string PDRelationTaskIdListStr { get; set; } = string.Empty; - } + public string ImagePath { get; set; } = string.Empty; +} + +[Table("TaskMedicalReview")] +public class TaskMedicalReview : BaseFullAuditEntity +{ + #region 导航属性 + + [JsonIgnore] + public User LatestReplyUser { get; set; } + + [JsonIgnore] + public User MedicalManagerUser { get; set; } + + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + + [JsonIgnore] + public List ReadingMedicalReviewDialogList { get; set; } + + [JsonIgnore] + public Trial Trial { get; set; } + [Comment("文件")] + [NotMapped] + public List FileList + { + get + { + try + { + var result = JsonConvert.DeserializeObject>(this.ImagePath); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + + [NotMapped] + public List PDRelationTaskIdList => PDRelationTaskIdListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Select(t => Guid.Parse(t)).ToList(); + + #endregion + + public Guid? LatestReplyUserId { get; set; } + [Comment("分配时间")] + public DateTime? AllocateTime { get; set; } + + [Comment("审核状态")] + [Required] + public MedicalReviewAuditState AuditState { get; set; } + + [Comment("审核通过时间")] + public DateTime? AuditSignTime { get; set; } + + [Comment("阅片人是否认同")] + public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } + + public Guid? MedicalManagerUserId { get; set; } + public Guid VisitTaskId { get; set; } + public Guid TrialId { get; set; } + + [Comment("是否有问题")] + public bool IsHaveQuestion { get; set; } = false; + + [Comment("质询问题")] + public string Questioning { get; set; } = string.Empty; + [Comment("图片路径")] + public string ImagePath { get; set; } = string.Empty; + + [Comment("审核建议")] + public AuditAdvice AuditAdviceEnum { get; set; } + + [Comment("是否关闭对话")] + public bool IsClosedDialog { get; set; } + + [Comment("保存问题的时间")] + public DateTime? SaveQuestionTime { get; set; } + [Comment("不同意重阅原因")] + public string DisagreeReason { get; set; } = string.Empty; + [Comment("是否申请重阅")] + public bool IsApplyHeavyReading { get; set; } = false; + [Comment("保存结论时间")] + public DateTime? SaveConclusionTime { get; set; } + [Comment("文件名称")] + public string FileName { get; set; } = string.Empty; + + [Comment("是否发送消息")] + public bool IsSendMessage { get; set; } = false; + [Comment("医学审核对话关闭原因")] + public MedicalDialogClose MedicalDialogCloseEnum { get; set; } + + [Comment("对话关闭原因")] + public string DialogCloseReason { get; set; } = string.Empty; + + [Comment("无效的 为True无效")] + public bool IsInvalid { get; set; } + + public bool IsAutoGenerate { get; set; } + + // | 分割 + public string PDRelationTaskIdListStr { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs index d62a8fef2..f8bd16c36 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs @@ -1,34 +1,30 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TaskMedicalReviewRule")] +public class TaskMedicalReviewRule : BaseFullAuditEntity { - /// - ///TaskTaskMedicalReviewRule - /// - [Table("TaskMedicalReviewRule")] - public class TaskMedicalReviewRule : BaseFullAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - public Guid DoctorUserId { get; set; } + public Guid DoctorUserId { get; set; } - public bool IsEnable { get; set; } + public bool IsEnable { get; set; } - public string Note { get; set; } = string.Empty; + public string Note { get; set; } = string.Empty; - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public int PlanVisitCount { get; set; } + public int PlanVisitCount { get; set; } - public int PlanJudgeCount { get; set; } + public int PlanJudgeCount { get; set; } - public int PlanGlobalCount { get; set; } + public int PlanGlobalCount { get; set; } - public int PlanTumorCount { get; set; } - - [JsonIgnore] - public User DoctorUser { get; set; } - } + public int PlanTumorCount { get; set; } + [JsonIgnore] + public User DoctorUser { get; set; } } + diff --git a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs index 82504ddc7..4a731713c 100644 --- a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs +++ b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs @@ -1,17 +1,13 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialVirtualSiteCodeUpdate")] +public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity { - /// - ///TrialVirtualSiteCodeUpdate - /// - [Table("TrialVirtualSiteCodeUpdate")] - public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - public Guid TrialId { get; set; } - public string VirturalSiteCode { get; set; } = string.Empty; - } + public Guid TrialId { get; set; } + public string VirturalSiteCode { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index 6685a0069..7a45a67d3 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -2,348 +2,280 @@ using EntityFrameworkCore.Projectables; using IRaCIS.Core.Domain.Share; using System.Linq; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("VisitTask")] +public class VisitTask : BaseFullAuditEntity { - /// - ///VisitTask - /// - [Table("VisitTask")] - public class VisitTask : BaseFullAuditEntity + #region 导航属性 + [JsonIgnore] + public List TaskStudyList { get; set; } + + public List TaskNoneDicomStudyFileList { get; set; } + + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + [ForeignKey("DoctorUserId")] + public User DoctorUser { get; set; } + + [ForeignKey("SouceReadModuleId")] + public ReadModule ReadModule { get; set; } + + [ForeignKey("SourceSubjectVisitId")] + public SubjectVisit SourceSubjectVisit { get; set; } + [JsonIgnore] + [ForeignKey("JudgeVisitTaskId")] + public VisitTask JudgeVisitTask { get; set; } + [JsonIgnore] + public Subject Subject { get; set; } + [JsonIgnore] + public List TaskMedicalReviewList { get; set; } + + [ForeignKey("JudgeResultTaskId")] + public VisitTask JudgeResultTask { get; set; } + //影像质量 等等第一层级问题答案 + [JsonIgnore] + public List ReadingTaskQuestionAnswerList { get; set; } = new List(); + //病灶表 + [JsonIgnore] + public List LesionList { get; set; } = new List(); + + //病灶答案表 + [JsonIgnore] + public List LesionAnswerList { get; set; } = new List(); + //重阅或者退回影像的记录中间表 + [JsonIgnore] + public List TaskInfluenceList { get; set; } = new List(); + [JsonIgnore] + //对于全局任务而言 才可以用的 关联的访视阅片结果 + public List GlobalVisitResultList { get; set; } = new List(); + [Comment("裁判结果图片地址")] + [NotMapped] + public List JudgeResultImagePathList { - #region 导航属性 - [JsonIgnore] - public List TaskStudyList { get; set; } - - public List TaskNoneDicomStudyFileList { get; set; } - - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - [ForeignKey("DoctorUserId")] - public User DoctorUser { get; set; } - - [ForeignKey("SouceReadModuleId")] - public ReadModule ReadModule { get; set; } - - [ForeignKey("SourceSubjectVisitId")] - public SubjectVisit SourceSubjectVisit { get; set; } - [JsonIgnore] - [ForeignKey("JudgeVisitTaskId")] - public VisitTask JudgeVisitTask { get; set; } - [JsonIgnore] - public Subject Subject { get; set; } - [JsonIgnore] - public List TaskMedicalReviewList { get; set; } - - [ForeignKey("JudgeResultTaskId")] - public VisitTask JudgeResultTask { get; set; } - //影像质量 等等第一层级问题答案 - [JsonIgnore] - public List ReadingTaskQuestionAnswerList { get; set; } = new List(); - //病灶表 - [JsonIgnore] - public List LesionList { get; set; } = new List(); - - //病灶答案表 - [JsonIgnore] - public List LesionAnswerList { get; set; } = new List(); - //重阅或者退回影像的记录中间表 - [JsonIgnore] - public List TaskInfluenceList { get; set; } = new List(); - [JsonIgnore] - //对于全局任务而言 才可以用的 关联的访视阅片结果 - public List GlobalVisitResultList { get; set; } = new List(); - /// - /// 裁判结果图片地址 - /// - [NotMapped] - public List JudgeResultImagePathList + get { - get + + try + { + return this.JudgeResultImagePath.Trim().Split(',').ToList(); + } + catch (Exception) { - try - { - return this.JudgeResultImagePath.Trim().Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - + return new List(); } + } - [JsonIgnore] - - public Trial Trial { get; set; } - [JsonIgnore] - public List UserFeedBackList { get; set; } - - /// - /// 关联的访视任务ID (当前任务是访视任务的话会有自己)集合 - /// - [NotMapped] - public List RelatedVisitTaskIdList - { - get - { - - try - { - - return JsonConvert.DeserializeObject>(this.RelatedVisitTaskIds); - } - catch (Exception) - { - - return new List(); - } - - } - } - /// - /// 报告任务关系 包含冻结 - /// - [NotMapped] - public List ReportRelatedTaskIdList - { - get - { - - try - { - - return JsonConvert.DeserializeObject>(this.ReportRelatedTaskIds); - } - catch (Exception) - { - - return new List(); - } - - } - } - /// - /// 既往任务Id 不包括自己集合 - /// - [NotMapped] - public List PastResultTaskIdList - { - get - { - - try - { - return JsonConvert.DeserializeObject>(this.PastResultTaskIds); - } - catch (Exception) - { - - return new List(); - } - - } - } - #endregion - public string TaskName { get; set; } = string.Empty; - public string TaskBlindName { get; set; } = string.Empty; - - //任务来源访视Id 方便回更访视读片状态 - public Guid? SourceSubjectVisitId { get; set; } - public Guid? SouceReadModuleId { get; set; } - - /// 任务类型 - public ReadingCategory ReadingCategory { get; set; } - - public Guid TrialId { get; set; } - /// - /// 分配时间 - /// - public DateTime? AllocateTime { get; set; } - - public Guid SubjectId { get; set; } - public int Code { get; set; } - - public string TaskCode { get; set; } = string.Empty; - - public bool IsUrgent { get; set; } - - /// - /// 加急类型 - /// - public TaskUrgentType? TaskUrgentType { get; set; } - - /// - /// 任务加急类型 - /// - public string TaskUrgentRemake { get; set; } = string.Empty; - - /// - /// 是否和编辑加急状态 - /// - public bool IsCanEditUrgentState { get; set; } = true; - - /// - /// 0 代表 单重阅片 产生的任务 否则就是双重 任务 1 任务 2 - /// - [Required] - public Arm ArmEnum { get; set; } - - /// - /// 分配状态 - /// - public TaskAllocationState TaskAllocationState { get; set; } - public TaskState TaskState { get; set; } - /// - /// 重阅状态 - /// - public ReReadingApplyState ReReadingApplyState { get; set; } - - public Guid? DoctorUserId { get; set; } - public Guid TrialReadingCriterionId { get; set; } - //裁判任务的Id - public Guid? JudgeVisitTaskId { get; set; } - - //任务阅片状态 - public ReadingTaskState ReadingTaskState { get; set; } - - //签名时间 - public DateTime? SignTime { get; set; } - - public DateTime? SuggesteFinishedTime { get; set; } - /// - /// 是否是重阅产生的，方便过滤数据 - /// - public bool IsReReadingCreate { get; set; } - - /// - /// PM 对该任务进行了回退 影响的任务不设置 - /// - public bool IsPMSetBack { get; set; } - /// 裁判结果的任务ID - public Guid? JudgeResultTaskId { get; set; } - //随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定 - public decimal VisitTaskNum { get; set; } - /// - /// 首次阅片时间 - /// - public DateTime? FirstReadingTime { get; set; } - - /// - /// 全局是否有更新 - /// - public bool? IsGlobalHaveUpdate { get; set; } - - /// - /// IR是否阅读临床数据 - /// - public bool IsReadClinicalData { get; set; } = false; - - /// - /// 关联的访视任务ID (当前任务是访视任务的话会有自己) - /// - public string RelatedVisitTaskIds { get; set; } = "[]"; - - /// - /// 报告任务关系 包含冻结 - /// - public string ReportRelatedTaskIds { get; set; } = "[]"; - - /// - /// 既往任务Id 不包括自己 - /// - - public string PastResultTaskIds { get; set; } = "[]"; - #region 裁判任务特有 - - [JsonIgnore] - //对于裁判任务而言，触发裁判的列表 - public List JudgeVisitList { get; set; } - - /// - /// 裁判结果的备注 - /// - public string JudgeResultRemark { get; set; } = string.Empty; - /// - /// 裁判结果的图片路径 - /// - public string JudgeResultImagePath { get; set; } = string.Empty; - - #endregion - #region 一致性分析的任务特有数据 - - /// - /// 阅片结果是否和原数据有差异 - /// - public bool? IsAnalysisDiffToOriginalData { get; set; } - - /// - /// 组件一致性和原Arm1是否有差异 - /// - public bool? IsGroupDiffArm1 { get; set; } - - /// - /// 组件一致性和原Arm2是否有差异 - /// - public bool? IsGroupDiffArm2 { get; set; } - - /// - /// 是否是一致性分析产生 - /// - public bool IsAnalysisCreate { get; set; } - /// - /// 转换之前的任务Id(转化的任务才有该值) - /// - public Guid? BeforeConvertedTaskId { get; set; } - [Projectable] - [JsonIgnore] - public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask || Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId - && t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null - && t.TaskState == TaskState.Effect - && t.VisitTaskNum < VisitTaskNum - && t.IsSelfAnalysis == IsSelfAnalysis - && t.ArmEnum == ArmEnum - ).Any(); - /// - /// 是否修改了整体肿瘤评估 - /// - public bool IsChangeTumorEvaluate { get; set; } = false; - /// - /// 重阅重置任务的 标注是转化之前的 还是转化之后的 - /// - public bool IsHistoryConvertedTask { get; set; } = false; - - /// - /// 是否是自身一致性 - /// - public bool? IsSelfAnalysis { get; set; } - - public string BlindSubjectCode { get; set; } = string.Empty; - public string BlindTrialSiteCode { get; set; } = string.Empty; - - //一致性分析规则Id 用于最后统计 - //public Guid? TaskConsistentRuleId { get; set; } - - /// - /// 针对产生的一致性任务而言，这个字段存储的是原始任务 - /// - public Guid? ConsistentAnalysisOriginalTaskId { get; set; } - - #endregion - //临床数据 - - public bool IsNeedClinicalDataSign { get; set; } - - /// - /// 临床数据是否签名 - /// - public bool IsClinicalDataSign { get; set; } - - /// - /// 前序任务需要签名 但是未签名 - /// - public bool IsFrontTaskNeedSignButNotSign { get; set; } - public int ImageStudyState { get; set; } } + [JsonIgnore] + + public Trial Trial { get; set; } + [JsonIgnore] + public List UserFeedBackList { get; set; } + + [Comment("关联的访视任务ID (当前任务是访视任务的话会有自己)集合")] + [NotMapped] + public List RelatedVisitTaskIdList + { + get + { + + try + { + + return JsonConvert.DeserializeObject>(this.RelatedVisitTaskIds); + } + catch (Exception) + { + + return new List(); + } + + } + } + [Comment("报告任务关系 包含冻结")] + [NotMapped] + public List ReportRelatedTaskIdList + { + get + { + + try + { + + return JsonConvert.DeserializeObject>(this.ReportRelatedTaskIds); + } + catch (Exception) + { + + return new List(); + } + + } + } + [Comment("既往任务Id 不包括自己集合")] + [NotMapped] + public List PastResultTaskIdList + { + get + { + + try + { + return JsonConvert.DeserializeObject>(this.PastResultTaskIds); + } + catch (Exception) + { + + return new List(); + } + + } + } + #endregion + public string TaskName { get; set; } = string.Empty; + public string TaskBlindName { get; set; } = string.Empty; + + //任务来源访视Id 方便回更访视读片状态 + public Guid? SourceSubjectVisitId { get; set; } + public Guid? SouceReadModuleId { get; set; } + + /// 任务类型 + public ReadingCategory ReadingCategory { get; set; } + + public Guid TrialId { get; set; } + [Comment("分配时间")] + public DateTime? AllocateTime { get; set; } + + public Guid SubjectId { get; set; } + public int Code { get; set; } + + public string TaskCode { get; set; } = string.Empty; + + public bool IsUrgent { get; set; } + + [Comment("加急类型")] + public TaskUrgentType? TaskUrgentType { get; set; } + + [Comment("任务加急类型")] + public string TaskUrgentRemake { get; set; } = string.Empty; + + [Comment("是否和编辑加急状态")] + public bool IsCanEditUrgentState { get; set; } = true; + + [Comment("0 代表 单重阅片 产生的任务 否则就是双重 任务 1 任务 2")] + [Required] + public Arm ArmEnum { get; set; } + + [Comment("分配状态")] + public TaskAllocationState TaskAllocationState { get; set; } + public TaskState TaskState { get; set; } + [Comment("重阅状态")] + public ReReadingApplyState ReReadingApplyState { get; set; } + + public Guid? DoctorUserId { get; set; } + public Guid TrialReadingCriterionId { get; set; } + //裁判任务的Id + public Guid? JudgeVisitTaskId { get; set; } + + //任务阅片状态 + public ReadingTaskState ReadingTaskState { get; set; } + + //签名时间 + public DateTime? SignTime { get; set; } + + public DateTime? SuggesteFinishedTime { get; set; } + [Comment("是否是重阅产生的，方便过滤数据")] + public bool IsReReadingCreate { get; set; } + + [Comment("PM 对该任务进行了回退 影响的任务不设置")] + public bool IsPMSetBack { get; set; } + /// 裁判结果的任务ID + public Guid? JudgeResultTaskId { get; set; } + //随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定 + public decimal VisitTaskNum { get; set; } + [Comment("首次阅片时间")] + public DateTime? FirstReadingTime { get; set; } + + [Comment("全局是否有更新")] + public bool? IsGlobalHaveUpdate { get; set; } + + [Comment("IR是否阅读临床数据")] + public bool IsReadClinicalData { get; set; } = false; + + [Comment("关联的访视任务ID (当前任务是访视任务的话会有自己)")] + public string RelatedVisitTaskIds { get; set; } = "[]"; + + [Comment("报告任务关系 包含冻结")] + public string ReportRelatedTaskIds { get; set; } = "[]"; + + [Comment("既往任务Id 不包括自己")] + + public string PastResultTaskIds { get; set; } = "[]"; + #region 裁判任务特有 + + [JsonIgnore] + //对于裁判任务而言，触发裁判的列表 + public List JudgeVisitList { get; set; } + + [Comment("裁判结果的备注")] + public string JudgeResultRemark { get; set; } = string.Empty; + [Comment("裁判结果的图片路径")] + public string JudgeResultImagePath { get; set; } = string.Empty; + + #endregion + #region 一致性分析的任务特有数据 + + [Comment("阅片结果是否和原数据有差异")] + public bool? IsAnalysisDiffToOriginalData { get; set; } + + [Comment("组件一致性和原Arm1是否有差异")] + public bool? IsGroupDiffArm1 { get; set; } + + [Comment("组件一致性和原Arm2是否有差异")] + public bool? IsGroupDiffArm2 { get; set; } + + [Comment("是否是一致性分析产生")] + public bool IsAnalysisCreate { get; set; } + [Comment("转换之前的任务Id(转化的任务才有该值)")] + public Guid? BeforeConvertedTaskId { get; set; } + [Projectable] + [JsonIgnore] + public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask || Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId + && t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null + && t.TaskState == TaskState.Effect + && t.VisitTaskNum < VisitTaskNum + && t.IsSelfAnalysis == IsSelfAnalysis + && t.ArmEnum == ArmEnum + ).Any(); + [Comment("是否修改了整体肿瘤评估")] + public bool IsChangeTumorEvaluate { get; set; } = false; + [Comment("重阅重置任务的 标注是转化之前的 还是转化之后的")] + public bool IsHistoryConvertedTask { get; set; } = false; + + [Comment("是否是自身一致性")] + public bool? IsSelfAnalysis { get; set; } + + public string BlindSubjectCode { get; set; } = string.Empty; + public string BlindTrialSiteCode { get; set; } = string.Empty; + + //一致性分析规则Id 用于最后统计 + //public Guid? TaskConsistentRuleId { get; set; } + + [Comment("针对产生的一致性任务而言，这个字段存储的是原始任务")] + public Guid? ConsistentAnalysisOriginalTaskId { get; set; } + + #endregion + //临床数据 + + public bool IsNeedClinicalDataSign { get; set; } + + [Comment("临床数据是否签名")] + public bool IsClinicalDataSign { get; set; } + + [Comment("前序任务需要签名 但是未签名")] + public bool IsFrontTaskNeedSignButNotSign { get; set; } + public int ImageStudyState { get; set; } } diff --git a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs index 44ef98240..30d8b8a3b 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs @@ -1,57 +1,53 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("重阅申请流程记录表")] +[Table("VisitTaskReReading")] +public class VisitTaskReReading : BaseFullAuditEntity { - /// - ///重阅申请流程记录表 - /// - [Table("VisitTaskReReading")] - public class VisitTaskReReading : BaseFullAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - public User RequestReReadingUser { get; set; } + [JsonIgnore] + public User RequestReReadingUser { get; set; } - [JsonIgnore] - public VisitTask NewReReadingTask { get; set; } - [JsonIgnore] - public VisitTask RootReReadingTask { get; set; } - [JsonIgnore] - public VisitTask OriginalReReadingTask { get; set; } - [JsonIgnore] - public User RequestReReadingConfirmUser { get; set; } + [JsonIgnore] + public VisitTask NewReReadingTask { get; set; } + [JsonIgnore] + public VisitTask RootReReadingTask { get; set; } + [JsonIgnore] + public VisitTask OriginalReReadingTask { get; set; } + [JsonIgnore] + public User RequestReReadingConfirmUser { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } - #endregion + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - //重阅原始任务Id 重阅会产生新的任务 - public Guid OriginalReReadingTaskId { get; set; } - //产生重阅的根任务Id - public Guid RootReReadingTaskId { get; set; } + //重阅原始任务Id 重阅会产生新的任务 + public Guid OriginalReReadingTaskId { get; set; } + //产生重阅的根任务Id + public Guid RootReReadingTaskId { get; set; } - //重阅申请 产生的新任务Id - public Guid? NewReReadingTaskId { get; set; } + //重阅申请 产生的新任务Id + public Guid? NewReReadingTaskId { get; set; } - public Guid RequestReReadingUserId { get; set; } - public DateTime RequestReReadingTime { get; set; } - //申请回退类型 - public RequestReReadingType RequestReReadingType { get; set; } - public string RequestReReadingReason { get; set; } = string.Empty; + public Guid RequestReReadingUserId { get; set; } + public DateTime RequestReReadingTime { get; set; } + //申请回退类型 + public RequestReReadingType RequestReReadingType { get; set; } + public string RequestReReadingReason { get; set; } = string.Empty; - public string RequestReReadingRejectReason { get; set; } = string.Empty; + public string RequestReReadingRejectReason { get; set; } = string.Empty; - public RequestReReadingResult RequestReReadingResultEnum { get; set; } + public RequestReReadingResult RequestReReadingResultEnum { get; set; } - public Guid? RequestReReadingConfirmUserId { get; set; } - public bool IsCopyOrigenalForms { get; set; } - - //仅仅包括全局和访视 - public bool IsCopyFollowForms { get; set; } - } + public Guid? RequestReReadingConfirmUserId { get; set; } + public bool IsCopyOrigenalForms { get; set; } + //仅仅包括全局和访视 + public bool IsCopyFollowForms { get; set; } } + diff --git a/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs b/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs index 739c873e9..35964354e 100644 --- a/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs +++ b/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs @@ -1,18 +1,16 @@ -namespace IRaCIS.Core.Domain.BaseModel +using System.ComponentModel; + +namespace IRaCIS.Core.Domain.BaseModel; +[Description("领域实体事件基类")] +public abstract class DomainEvent { - /// - /// 领域实体事件基类 - /// - public abstract class DomainEvent - { - } - - public class FailedDomainEvent - { - public Guid Id { get; set; } - public string EventType { get; set; } = string.Empty; - public string EventData { get; set; } = string.Empty; - public DateTime FailedAt { get; set; } - } +} + +public class FailedDomainEvent +{ + public Guid Id { get; set; } + public string EventType { get; set; } = string.Empty; + public string EventData { get; set; } = string.Empty; + public DateTime FailedAt { get; set; } } diff --git a/IRaCIS.Core.Domain/BaseModel/Entity.cs b/IRaCIS.Core.Domain/BaseModel/Entity.cs index 25b99d09b..ae63d156b 100644 --- a/IRaCIS.Core.Domain/BaseModel/Entity.cs +++ b/IRaCIS.Core.Domain/BaseModel/Entity.cs @@ -1,107 +1,105 @@ using IRaCIS.Core.Domain.BaseModel; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public interface IAggregateRoot; +public interface IEntity { - public interface IAggregateRoot; - public interface IEntity - { - abstract TKey Id { get; set; } - - } - - //针对dicom - public interface IEntitySeqId - { - public Guid SeqId { get; set; } - } - - public abstract class Entity : IEntity - { - [Key] - [Required] - [DatabaseGenerated(DatabaseGeneratedOption.None)] - public Guid Id { get; set; } - #region 领域事件 仅仅允许通过提供的方法进行操作 - [JsonIgnore] - private readonly List _domainEvents = []; - - [JsonIgnore] - [NotMapped] - public IReadOnlyCollection DomainEvents => _domainEvents.AsReadOnly(); - public void AddDomainEvent(DomainEvent domainEvent) - { - _domainEvents.Add(domainEvent); - } - - public void RemoveDomainEvent(DomainEvent domainEvent) - { - _domainEvents.Remove(domainEvent); - } - - public void ClearDomainEvents() - { - _domainEvents.Clear(); - } - #endregion - } - #region 减少实体属性，增加基类 - - public abstract class BaseAddAuditEntity : Entity, IAuditAdd - { - - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } - - [ForeignKey("CreateUserId")] - [JsonIgnore] - public virtual User CreateUser { 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; } - - [ForeignKey("CreateUserId")] - [JsonIgnore] - public User CreateUser { get; set; } - } - - public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd - { - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } - - [ForeignKey("CreateUserId")] - [JsonIgnore] - public User CreateUser { get; set; } - } - public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete - { - public Guid? DeleteUserId { get; set; } - public bool IsDeleted { get; set; } - public DateTime? DeletedTime { get; set; } - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } - - [ForeignKey("CreateUserId")] - [JsonIgnore] - public User CreateUser { get; set; } - } - - public abstract class BaseAuditUpdateEntity : Entity, IAuditUpdate - { - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } - } - #endregion + abstract TKey Id { get; set; } } + +//针对dicom +public interface IEntitySeqId +{ + public Guid SeqId { get; set; } +} + +public abstract class Entity : IEntity +{ + [Key] + [Required] + [DatabaseGenerated(DatabaseGeneratedOption.None)] + public Guid Id { get; set; } + #region 领域事件 仅仅允许通过提供的方法进行操作 + [JsonIgnore] + private readonly List _domainEvents = []; + + [JsonIgnore] + [NotMapped] + public IReadOnlyCollection DomainEvents => _domainEvents.AsReadOnly(); + public void AddDomainEvent(DomainEvent domainEvent) + { + _domainEvents.Add(domainEvent); + } + + public void RemoveDomainEvent(DomainEvent domainEvent) + { + _domainEvents.Remove(domainEvent); + } + + public void ClearDomainEvents() + { + _domainEvents.Clear(); + } + #endregion +} +#region 减少实体属性，增加基类 + +public abstract class BaseAddAuditEntity : Entity, IAuditAdd +{ + + public Guid CreateUserId { get; set; } + public DateTime CreateTime { get; set; } + + [ForeignKey("CreateUserId")] + [JsonIgnore] + public virtual User CreateUser { 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; } + + [ForeignKey("CreateUserId")] + [JsonIgnore] + public User CreateUser { get; set; } +} + +public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd +{ + public Guid CreateUserId { get; set; } + public DateTime CreateTime { get; set; } + public Guid UpdateUserId { get; set; } + public DateTime UpdateTime { get; set; } + + [ForeignKey("CreateUserId")] + [JsonIgnore] + public User CreateUser { get; set; } +} +public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete +{ + public Guid? DeleteUserId { get; set; } + public bool IsDeleted { get; set; } + public DateTime? DeletedTime { get; set; } + public Guid CreateUserId { get; set; } + public DateTime CreateTime { get; set; } + public Guid UpdateUserId { get; set; } + public DateTime UpdateTime { get; set; } + + [ForeignKey("CreateUserId")] + [JsonIgnore] + public User CreateUser { get; set; } +} + +public abstract class BaseAuditUpdateEntity : Entity, IAuditUpdate +{ + public Guid UpdateUserId { get; set; } + public DateTime UpdateTime { get; set; } +} +#endregion + diff --git a/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs b/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs index 1251d01cc..ff8da5068 100644 --- a/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs +++ b/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs @@ -1,19 +1,17 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public interface IAuditAdd where TKey : struct { - public interface IAuditAdd where TKey : struct - { - public TKey CreateUserId { get; set; } + public TKey CreateUserId { get; set; } - public DateTime CreateTime { get; set; } + public DateTime CreateTime { get; set; } - } - public interface IAuditAdd : IAuditAdd - { - - } - - public interface IAuditAddWithUserName : IAuditAdd - { - public string CreateUser { get; set; } - } +} +public interface IAuditAdd : IAuditAdd +{ + +} + +public interface IAuditAddWithUserName : IAuditAdd +{ + public string CreateUser { get; set; } } diff --git a/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs b/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs index 34da3be32..ee83734ce 100644 --- a/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs +++ b/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs @@ -1,13 +1,11 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public interface IAuditUpdate where TKey : struct { - public interface IAuditUpdate where TKey : struct - { - public TKey UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } - } - - public interface IAuditUpdate : IAuditUpdate - { - - } + public TKey UpdateUserId { get; set; } + public DateTime UpdateTime { get; set; } +} + +public interface IAuditUpdate : IAuditUpdate +{ + } diff --git a/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs b/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs index 0e2a17d82..59fa640f7 100644 --- a/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs +++ b/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs @@ -1,15 +1,13 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public interface ISoftDelete where TKey : struct +{ + public TKey? DeleteUserId { get; set; } + public bool IsDeleted { get; set; } + + public DateTime? DeletedTime { get; set; } +} + +public interface ISoftDelete : ISoftDelete { - public interface ISoftDelete where TKey : struct - { - public TKey? DeleteUserId { get; set; } - public bool IsDeleted { get; set; } - public DateTime? DeletedTime { get; set; } - } - - public interface ISoftDelete : ISoftDelete - { - - } } diff --git a/IRaCIS.Core.Domain/Common/CommonDocument.cs b/IRaCIS.Core.Domain/Common/CommonDocument.cs index 3d887fc7b..4bade9545 100644 --- a/IRaCIS.Core.Domain/Common/CommonDocument.cs +++ b/IRaCIS.Core.Domain/Common/CommonDocument.cs @@ -4,17 +4,17 @@ namespace IRaCIS.Core.Domain.Models; [Table("CommonDocument")] public class CommonDocument : BaseFullDeleteAuditEntity { - [Comment(" 业务场景")] + [Comment("业务场景")] public EmailBusinessScenario BusinessScenarioEnum { get; set; } public string Code { get; set; } = null!; - [Comment(" 系统标准枚举")] + [Comment("系统标准枚举")] public CriterionType? CriterionTypeEnum { get; set; } public string Description { get; set; } = null!; - [Comment(" 类型-上传|导出|邮件附件")] + [Comment("类型-上传|导出|邮件附件")] public CommonDocumentFileType FileTypeEnum { get; set; } public string Name { get; set; } = null!; diff --git a/IRaCIS.Core.Domain/Common/Dictionary.cs b/IRaCIS.Core.Domain/Common/Dictionary.cs index e37787007..7bc89d6e9 100644 --- a/IRaCIS.Core.Domain/Common/Dictionary.cs +++ b/IRaCIS.Core.Domain/Common/Dictionary.cs @@ -26,13 +26,13 @@ public partial class Dictionary : BaseFullAuditEntity public Guid? ConfigTypeId { get; set; } - [Comment(" ֵ- ö|bool|")] + [Comment("ֵ- ö|bool|")] public DicDataTypeEnum DataTypeEnum { get; set; } [StringLength(512)] public string Description { get; set; } = null!; - [Comment(" Ƿֵ")] + [Comment("Ƿֵ")] public bool IsConfig { get; set; } public bool IsEnable { get; set; } diff --git a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs index 8b07d0843..ab450f753 100644 --- a/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs +++ b/IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs @@ -22,23 +22,23 @@ public class EmailNoticeConfig : BaseFullDeleteAuditEntity public string AttachPath { get; set; } = null!; - [Comment(" 业务级别")] + [Comment("业务级别")] public int BusinessLevelEnum { get; set; } - [Comment(" 业务模块")] + [Comment("业务模块")] public int BusinessModuleEnum { get; set; } - [Comment(" 业务场景")] + [Comment("业务场景")] public EmailBusinessScenario BusinessScenarioEnum { get; set; } public string Code { get; set; } = null!; - [Comment(" 标准枚举")] + [Comment("标准枚举")] public CriterionType? CriterionTypeEnum { get; set; } public string Description { get; set; } = null!; - [Comment(" 发送周期")] + [Comment("发送周期")] public string EmailCron { get; set; } = null!; [MaxLength] public string EmailHtmlContent { get; set; } = null!; @@ -49,18 +49,18 @@ public class EmailNoticeConfig : BaseFullDeleteAuditEntity public string EmailTopicCN { get; set; } = null!; - [Comment(" 加急枚举")] + [Comment("加急枚举")] public int EmailUrgentEnum { get; set; } - [Comment(" 是否自动发送")] + [Comment("是否自动发送")] public bool IsAutoSend { get; set; } - [Comment(" 是否区分标准")] + [Comment("是否区分标准")] public bool IsDistinguishCriteria { get; set; } public bool IsEnable { get; set; } - [Comment(" 是否需要回执")] + [Comment("是否需要回执")] public bool IsReturnRequired { get; set; } public SysEmailLevel SystemLevel { get; set; } diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index f844a3378..540c20490 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -10,29 +10,29 @@ public class FrontAuditConfig : BaseFullAuditEntity [StringLength(1000)] public string ChildDataEnLabel { get; set; } = null!; - [Comment(" 前端渲染数组 数组名 和数组值")] + [Comment("前端渲染数组 数组名 和数组值")] [StringLength(400)] public string ChildDataLabel { get; set; } = null!; - [Comment(" 子数据Value")] + [Comment("子数据Value")] [StringLength(400)] public string ChildDataValue { get; set; } = null!; public Guid? ChildrenTypeId { get; set; } - [Comment(" 翻译的字段名 这里有可能是一个数组名 那么具体的翻译字段名就不是这个了")] + [Comment("翻译的字段名 这里有可能是一个数组名 那么具体的翻译字段名就不是这个了")] public string Code { get; set; } = null!; [StringLength(1000)] public string CodeEn { get; set; } = null!; - [Comment(" 前端使用 C M")] + [Comment("前端使用 C M")] public string ConfigType { get; set; } = null!; - [Comment(" 前端展示类型 Router， Array，Table")] + [Comment("前端展示类型 Router， Array，Table")] public string DataType { get; set; } = null!; - [Comment(" 日期格式")] + [Comment("日期格式")] public string DateType { get; set; } = null!; [StringLength(512)] @@ -41,61 +41,61 @@ public class FrontAuditConfig : BaseFullAuditEntity [StringLength(500)] public string DescriptionCN { get; set; } = null!; - [Comment(" 翻译的字典名（单个字段翻译的时候）")] + [Comment("翻译的字典名（单个字段翻译的时候）")] public string DictionaryCode { get; set; } = null!; - [Comment(" 字典名称-待废弃核查")] + [Comment("字典名称-待废弃核查")] public string DictionaryKey { get; set; } = null!; - [Comment(" 枚举字典Type")] + [Comment("枚举字典Type")] public string DictionaryType { get; set; } = null!; - [Comment(" 后端翻译的类型 对应前端界面 "" Dictionary Date")] + [Comment("后端翻译的类型 对应前端界面 Dictionary Date")] public string EnumType { get; set; } = null!; [StringLength(1000)] public string ForeignKeyEnText { get; set; } = null!; - [Comment(" 外键表")] + [Comment("外键表")] public string ForeignKeyTableName { get; set; } = null!; - [Comment(" 外键Text")] + [Comment("外键Text")] [StringLength(1000)] public string ForeignKeyText { get; set; } = null!; - [Comment(" 外键Value")] + [Comment("外键Value")] public string ForeignKeyValue { get; set; } = null!; - [Comment(" 标识")] + [Comment("标识")] [StringLength(400)] public string Identification { get; set; } = null!; - [Comment(" 接口名")] + [Comment("接口名")] public string InterfaceName { get; set; } = null!; - [Comment(" 未知是否有用-废弃核查")] + [Comment("未知是否有用-废弃核查")] public bool IsConfig { get; set; } public bool IsEnable { get; set; } - [Comment(" 是否完成")] + [Comment("是否完成")] public bool IsFinish { get; set; } - [Comment(" 是否有原因")] + [Comment("是否有原因")] public bool IsHaveReason { get; set; } - [Comment(" 是否有签名")] + [Comment("是否有签名")] public bool IsHaveSign { get; set; } - [Comment(" 是否加入计划")] + [Comment("是否加入计划")] public bool? IsJoinPlan { get; set; } - [Comment(" 待废弃核查")] + [Comment("待废弃核查")] public bool IsShowByTrialConfig { get; set; } public int IsShowParent { get; set; } - [Comment(" 是否为特殊类型")] + [Comment("是否为特殊类型")] public bool? IsSpecialType { get; set; } public Guid? ModuleTypeId { get; set; } @@ -111,7 +111,7 @@ public class FrontAuditConfig : BaseFullAuditEntity [MaxLength] public string? TableConfigJsonStr { get; set; } - [Comment(" 待废弃核查")] + [Comment("待废弃核查")] public string TrialConfigRelyFieldName { get; set; } = null!; [MaxLength] diff --git a/IRaCIS.Core.Domain/Common/Internationalization.cs b/IRaCIS.Core.Domain/Common/Internationalization.cs index b74000cb4..75f11d8d6 100644 --- a/IRaCIS.Core.Domain/Common/Internationalization.cs +++ b/IRaCIS.Core.Domain/Common/Internationalization.cs @@ -1,36 +1,30 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("Internationalization")] +public class Internationalization : BaseFullAuditEntity { - /// - ///Internationalization - /// - [Table("Internationalization")] - public class Internationalization : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public PublishLog PublishLog { get; set; } + #region 导航属性 + [JsonIgnore] + public PublishLog PublishLog { get; set; } - #endregion - public int ShowOrder { get; set; } + #endregion + public int ShowOrder { get; set; } - /// - /// 0 1 2 预翻译 已确认 废除 - /// - public int State { get; set; } - public string Description { get; set; } = string.Empty; + [Comment("0 1 2 预翻译 已确认 废除")] + public int State { get; set; } + public string Description { get; set; } = string.Empty; - public string Code { get; set; } = string.Empty; + public string Code { get; set; } = string.Empty; - public string Value { get; set; } = string.Empty; + public string Value { get; set; } = string.Empty; - public string ValueCN { get; set; } = string.Empty; + public string ValueCN { get; set; } = string.Empty; - public int InternationalizationType { get; set; } - - public string FrontType { get; set; } = string.Empty; - public string Module { get; set; } = string.Empty; - //关联版本历史记录表Id - public Guid? PublishLogId { get; set; } - } + public int InternationalizationType { get; set; } + public string FrontType { get; set; } = string.Empty; + public string Module { get; set; } = string.Empty; + //关联版本历史记录表Id + public Guid? PublishLogId { get; set; } } + diff --git a/IRaCIS.Core.Domain/Common/PublishLog.cs b/IRaCIS.Core.Domain/Common/PublishLog.cs index bc4178f99..262c2f8d9 100644 --- a/IRaCIS.Core.Domain/Common/PublishLog.cs +++ b/IRaCIS.Core.Domain/Common/PublishLog.cs @@ -1,22 +1,18 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("PublishLog")] +public class PublishLog : BaseFullAuditEntity { - /// - ///PublishLog - /// - [Table("PublishLog")] - public class PublishLog : BaseFullAuditEntity - { - public string Version { get; set; } = string.Empty; + public string Version { get; set; } = string.Empty; - public DateTime? PublishTime { get; set; } + public DateTime? PublishTime { get; set; } - public string UpdateContent { get; set; } = string.Empty; + public string UpdateContent { get; set; } = string.Empty; - //0 开发中 ，已发布 - public int State { get; set; } + //0 开发中 ，已发布 + public int State { get; set; } - public bool IsCurrentVersion { get; set; } - - } + public bool IsCurrentVersion { get; set; } } + diff --git a/IRaCIS.Core.Domain/Common/SystemBasicData.cs b/IRaCIS.Core.Domain/Common/SystemBasicData.cs index 419616dae..847b65fda 100644 --- a/IRaCIS.Core.Domain/Common/SystemBasicData.cs +++ b/IRaCIS.Core.Domain/Common/SystemBasicData.cs @@ -1,35 +1,31 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SystemBasicData")] +public class SystemBasicData : BaseFullAuditEntity { - /// - ///SystemBasicData - /// - [Table("SystemBasicData")] - public class SystemBasicData : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("ParentId")] - public SystemBasicData Parent { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("ParentId")] + public SystemBasicData Parent { get; set; } - #endregion - public string Name { get; set; } = string.Empty; + #endregion + public string Name { get; set; } = string.Empty; - public string Value { get; set; } = string.Empty; + public string Value { get; set; } = string.Empty; - public string Description { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; - public int ShowOrder { get; set; } + public int ShowOrder { get; set; } - public string Code { get; set; } = string.Empty; + public string Code { get; set; } = string.Empty; - public Guid? ParentId { get; set; } - public string ValueCN { get; set; } = string.Empty; + public Guid? ParentId { get; set; } + public string ValueCN { get; set; } = string.Empty; - public bool IsEnable { get; set; } - - public BasicDataTypeEnum BasicDataTypeEnum { get; set; } - } + public bool IsEnable { get; set; } + public BasicDataTypeEnum BasicDataTypeEnum { get; set; } } + diff --git a/IRaCIS.Core.Domain/Common/VerificationCode.cs b/IRaCIS.Core.Domain/Common/VerificationCode.cs index 12f585ec2..8d814a4b8 100644 --- a/IRaCIS.Core.Domain/Common/VerificationCode.cs +++ b/IRaCIS.Core.Domain/Common/VerificationCode.cs @@ -1,27 +1,25 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("VerificationCode")] +public class VerificationCode : BaseAddAuditEntity { - [Table("VerificationCode")] - public class VerificationCode : BaseAddAuditEntity - { - public Guid UserId { get; set; } = Guid.Empty; + public Guid UserId { get; set; } = Guid.Empty; - //验证码 - public string Code { get; set; } = string.Empty; + //验证码 + public string Code { get; set; } = string.Empty; - //什么类型的验证码 邮箱|手机 + //什么类型的验证码 邮箱|手机 - public VerifyType CodeType { get; set; } + public VerifyType CodeType { get; set; } - public bool HasSend { get; set; } + public bool HasSend { get; set; } - //发送的邮箱或者手机 - public string EmailOrPhone { get; set; } = string.Empty; + //发送的邮箱或者手机 + public string EmailOrPhone { get; set; } = string.Empty; - //过期时间 - public DateTime ExpirationTime { get; set; } + //过期时间 + public DateTime ExpirationTime { get; set; } - } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Dcotor/Attachment.cs b/IRaCIS.Core.Domain/Dcotor/Attachment.cs index 793719d2a..9a20df2eb 100644 --- a/IRaCIS.Core.Domain/Dcotor/Attachment.cs +++ b/IRaCIS.Core.Domain/Dcotor/Attachment.cs @@ -18,27 +18,27 @@ public class Attachment : BaseAddAuditEntity [JsonIgnore] public Doctor Doctor { get; set; } - [Comment(" 编码")] + [Comment("编码")] [StringLength(400)] public string Code { get; set; } = null!; public Guid DoctorId { get; set; } - [Comment(" 过期时间")] + [Comment("过期时间")] public DateTime? ExpiryDate { get; set; } public string FileName { get; set; } = null!; - [Comment(" 是否正式简历")] + [Comment("是否正式简历")] public bool IsOfficial { get; set; } - [Comment(" 1 中文 2为英文")] + [Comment("1 中文 2为英文")] public int Language { get; set; } [StringLength(512)] public string Path { get; set; } = null!; - [Comment(" 文件类型名")] + [Comment("文件类型名")] [StringLength(400)] public string Type { get; set; } = null!; } diff --git a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs index 4d7bf5edb..fae63ebec 100644 --- a/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs +++ b/IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs @@ -1,21 +1,17 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("EnrollReadingCriterion")] +public class EnrollReadingCriterion : BaseAddAuditEntity { - /// - ///EnrollReadingCriterion - /// - [Table("EnrollReadingCriterion")] - public class EnrollReadingCriterion : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - [ForeignKey("EnrollId")] - public Enroll Enroll { get; set; } - #endregion - public Guid EnrollId { get; set; } + [JsonIgnore] + [ForeignKey("EnrollId")] + public Enroll Enroll { get; set; } + #endregion + public Guid EnrollId { get; set; } - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - public bool IsJoinAnalysis { get; set; } - } + public bool IsJoinAnalysis { get; set; } } diff --git a/IRaCIS.Core.Domain/Dcotor/Postgraduate.cs b/IRaCIS.Core.Domain/Dcotor/Postgraduate.cs index a6c5629d9..6012dadfb 100644 --- a/IRaCIS.Core.Domain/Dcotor/Postgraduate.cs +++ b/IRaCIS.Core.Domain/Dcotor/Postgraduate.cs @@ -1,58 +1,56 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("Postgraduate")] +public partial class Postgraduate : BaseFullAuditEntity { - [Table("Postgraduate")] - public partial class Postgraduate : BaseFullAuditEntity - { - #region + #region - #endregion + #endregion - public Guid DoctorId { get; set; } + public Guid DoctorId { get; set; } - [Column(TypeName = "date")] - public DateTime? BeginDate { get; set; } + [Column(TypeName = "date")] + public DateTime? BeginDate { get; set; } - [Column(TypeName = "date")] - public DateTime? EndDate { get; set; } + [Column(TypeName = "date")] + public DateTime? EndDate { get; set; } - [StringLength(50)] - public string Training { get; set; } = string.Empty; + [StringLength(50)] + public string Training { get; set; } = string.Empty; - [StringLength(100)] - public string Major { get; set; } = string.Empty; + [StringLength(100)] + public string Major { get; set; } = string.Empty; - [StringLength(100)] - public string Hospital { get; set; } = string.Empty; + [StringLength(100)] + public string Hospital { get; set; } = string.Empty; - [StringLength(100)] - public string School { get; set; } = string.Empty; - [StringLength(100)] - public string Country { get; set; } = string.Empty; + [StringLength(100)] + public string School { get; set; } = string.Empty; + [StringLength(100)] + public string Country { get; set; } = string.Empty; - [StringLength(100)] - public string Province { get; set; } = string.Empty; + [StringLength(100)] + public string Province { get; set; } = string.Empty; - [StringLength(100)] - public string City { get; set; } = string.Empty; + [StringLength(100)] + public string City { get; set; } = string.Empty; - [StringLength(50)] - public string TrainingCN { get; set; } = string.Empty; + [StringLength(50)] + public string TrainingCN { get; set; } = string.Empty; - [StringLength(100)] - public string MajorCN { get; set; } = string.Empty; + [StringLength(100)] + public string MajorCN { get; set; } = string.Empty; - [StringLength(100)] - public string HospitalCN { get; set; } = string.Empty; + [StringLength(100)] + public string HospitalCN { get; set; } = string.Empty; - [StringLength(100)] - public string SchoolCN { get; set; } = string.Empty; - [StringLength(100)] - public string CountryCN { get; set; } = string.Empty; + [StringLength(100)] + public string SchoolCN { get; set; } = string.Empty; + [StringLength(100)] + public string CountryCN { get; set; } = string.Empty; - [StringLength(100)] - public string ProvinceCN { get; set; } = string.Empty; + [StringLength(100)] + public string ProvinceCN { get; set; } = string.Empty; - [StringLength(100)] - public string CityCN { get; set; } = string.Empty; - } + [StringLength(100)] + public string CityCN { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs b/IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs index 74992475f..c86209342 100644 --- a/IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs +++ b/IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs @@ -1,20 +1,18 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("ResearchPublication")] +public partial class ResearchPublication : BaseFullAuditEntity { - [Table("ResearchPublication")] - public partial class ResearchPublication : BaseFullAuditEntity - { - #region + #region - #endregion - public Guid DoctorId { get; set; } - public string Research { get; set; } = string.Empty; - public string Grants { get; set; } = string.Empty; - public string Publications { get; set; } = string.Empty; - public string AwardsHonors { get; set; } = string.Empty; + #endregion + public Guid DoctorId { get; set; } + public string Research { get; set; } = string.Empty; + public string Grants { get; set; } = string.Empty; + public string Publications { get; set; } = string.Empty; + public string AwardsHonors { get; set; } = string.Empty; - public string ResearchCN { get; set; } = string.Empty; - public string GrantsCN { get; set; } = string.Empty; - public string PublicationsCN { get; set; } = string.Empty; - public string AwardsHonorsCN { get; set; } = string.Empty; - } + public string ResearchCN { get; set; } = string.Empty; + public string GrantsCN { get; set; } = string.Empty; + public string PublicationsCN { get; set; } = string.Empty; + public string AwardsHonorsCN { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs index 5db3bdc64..811227904 100644 --- a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs +++ b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs @@ -1,25 +1,23 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("TrialExperience")] +public partial class TrialExperience : BaseFullAuditEntity { - [Table("TrialExperience")] - public partial class TrialExperience : BaseFullAuditEntity - { - #region + #region - [JsonIgnore] - public List ExperienceCriteriaList { get; set; } - #endregion - public Guid DoctorId { get; set; } + [JsonIgnore] + public List ExperienceCriteriaList { get; set; } + #endregion + public Guid DoctorId { get; set; } - public Guid? PhaseId { get; set; } + public Guid? PhaseId { get; set; } - public Dictionary Phase { get; set; } + public Dictionary Phase { get; set; } - [StringLength(512)] - public string EvaluationContent { get; set; } = string.Empty; - public int VisitReadingCount { get; set; } + [StringLength(512)] + public string EvaluationContent { get; set; } = string.Empty; + public int VisitReadingCount { get; set; } - public DateTime? StartTime { get; set; } + public DateTime? StartTime { get; set; } - public DateTime? EndTime { get; set; } - } + public DateTime? EndTime { get; set; } } diff --git a/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs b/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs index 603ccfec5..5a2127f92 100644 --- a/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs +++ b/IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs @@ -1,14 +1,12 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public class TrialExperienceCriteria : Entity { - public class TrialExperienceCriteria : Entity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("EvaluationCriteriaId")] - public Dictionary EvaluationCriteria { get; set; } - #endregion - public Guid DoctorId { get; set; } - public Guid TrialExperienceId { get; set; } - public Guid EvaluationCriteriaId { get; set; } - } + #region 导航属性 + [JsonIgnore] + [ForeignKey("EvaluationCriteriaId")] + public Dictionary EvaluationCriteria { get; set; } + #endregion + public Guid DoctorId { get; set; } + public Guid TrialExperienceId { get; set; } + public Guid EvaluationCriteriaId { get; set; } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Dcotor/Vacation.cs b/IRaCIS.Core.Domain/Dcotor/Vacation.cs index 42f3782cf..159ec33f2 100644 --- a/IRaCIS.Core.Domain/Dcotor/Vacation.cs +++ b/IRaCIS.Core.Domain/Dcotor/Vacation.cs @@ -1,15 +1,13 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("Vacation")] +public class Vacation : BaseFullAuditEntity { - [Table("Vacation")] - public class Vacation : BaseFullAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - public Guid DoctorId { get; set; } - public DateTime StartDate { get; set; } - public DateTime EndDate { get; set; } - public int Status { get; set; } = 1; + #endregion + public Guid DoctorId { get; set; } + public DateTime StartDate { get; set; } + public DateTime EndDate { get; set; } + public int Status { get; set; } = 1; - } } diff --git a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs index 658656526..b67e2ecb7 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs @@ -1,28 +1,24 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SystemDocConfirmedUser")] +public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity + { - /// - ///SystemDocConfirmedUser - /// - [Table("SystemDocConfirmedUser")] - public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity + #region 导航属性 + [JsonIgnore] + public SystemDocument SystemDocument { get; set; } - { - #region 导航属性 - [JsonIgnore] - public SystemDocument SystemDocument { get; set; } + [JsonIgnore] + [ForeignKey("ConfirmUserId")] + public User ConfirmUser { get; set; } + #endregion + public Guid SystemDocumentId { get; set; } - [JsonIgnore] - [ForeignKey("ConfirmUserId")] - public User ConfirmUser { get; set; } - #endregion - public Guid SystemDocumentId { get; set; } + public DateTime? ConfirmTime { get; set; } + public Guid ConfirmUserId { get; set; } - public DateTime? ConfirmTime { get; set; } - public Guid ConfirmUserId { get; set; } - - public DateTime? SignFirstViewTime { get; set; } - - public string SignText { get; set; } = string.Empty; - } + public DateTime? SignFirstViewTime { get; set; } + public string SignText { get; set; } = string.Empty; } + diff --git a/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs b/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs index feca99154..ad67ff703 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs @@ -1,23 +1,19 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SystemDocNeedConfirmedUserType")] +public class SystemDocNeedConfirmedUserType : Entity { - /// - ///SystemDocNeedConfirmedUserType - /// - [Table("SystemDocNeedConfirmedUserType")] - public class SystemDocNeedConfirmedUserType : Entity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("NeedConfirmUserTypeId")] - public UserType UserTypeRole { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("NeedConfirmUserTypeId")] + public UserType UserTypeRole { get; set; } - [JsonIgnore] - public SystemDocument SystemDocument { get; set; } - #endregion - public Guid SystemDocumentId { get; set; } + [JsonIgnore] + public SystemDocument SystemDocument { get; set; } + #endregion + public Guid SystemDocumentId { get; set; } - public Guid NeedConfirmUserTypeId { get; set; } - - } + public Guid NeedConfirmUserTypeId { get; set; } } + diff --git a/IRaCIS.Core.Domain/Document/SystemDocument.cs b/IRaCIS.Core.Domain/Document/SystemDocument.cs index 78a5eac12..4200a2475 100644 --- a/IRaCIS.Core.Domain/Document/SystemDocument.cs +++ b/IRaCIS.Core.Domain/Document/SystemDocument.cs @@ -1,25 +1,21 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SystemDocument")] +public class SystemDocument : BaseFullDeleteAuditEntity { - /// - ///SystemDocument - /// - [Table("SystemDocument")] - public class SystemDocument : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List SystemDocConfirmedUserList { get; set; } - [JsonIgnore] - public List NeedConfirmedUserTypeList { get; set; } - [JsonIgnore] - [ForeignKey("FileTypeId")] - public Dictionary FileType { get; set; } - #endregion - public Guid FileTypeId { get; set; } - public string Name { get; set; } = string.Empty; - - public int SignViewMinimumMinutes { get; set; } - public string Path { get; set; } = string.Empty; - } + #region 导航属性 + [JsonIgnore] + public List SystemDocConfirmedUserList { get; set; } + [JsonIgnore] + public List NeedConfirmedUserTypeList { get; set; } + [JsonIgnore] + [ForeignKey("FileTypeId")] + public Dictionary FileType { get; set; } + #endregion + public Guid FileTypeId { get; set; } + public string Name { get; set; } = string.Empty; + public int SignViewMinimumMinutes { get; set; } + public string Path { get; set; } = string.Empty; } + diff --git a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs index 2e644f42b..066e32588 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs @@ -1,23 +1,19 @@ -namespace IRaCIS.Core.Domain.Models -{ - /// - ///TrialDocUserTypeConfirmUser - /// - [Table("TrialDocConfirmedUser")] - public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity - { - #region 导航属性 +namespace IRaCIS.Core.Domain.Models; - [JsonIgnore] - [ForeignKey("ConfirmUserId")] - public User User { get; set; } - [JsonIgnore] - public TrialDocument TrialDocument { get; set; } - #endregion - public Guid TrialDocumentId { get; set; } - public DateTime? ConfirmTime { get; set; } - public Guid ConfirmUserId { get; set; } - public DateTime? SignFirstViewTime { get; set; } - public string SignText { get; set; } = string.Empty; - } +[Table("TrialDocConfirmedUser")] +public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity +{ + #region 导航属性 + + [JsonIgnore] + [ForeignKey("ConfirmUserId")] + public User User { get; set; } + [JsonIgnore] + public TrialDocument TrialDocument { get; set; } + #endregion + public Guid TrialDocumentId { get; set; } + public DateTime? ConfirmTime { get; set; } + public Guid ConfirmUserId { get; set; } + public DateTime? SignFirstViewTime { get; set; } + public string SignText { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs b/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs index ddcabe15d..d45e959ea 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs @@ -1,23 +1,19 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialDocNeedConfirmedUserType")] +public class TrialDocNeedConfirmedUserType : Entity { - /// - ///TrialDocumentUserConfirm - /// - [Table("TrialDocNeedConfirmedUserType")] - public class TrialDocNeedConfirmedUserType : Entity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("NeedConfirmUserTypeId")] - public UserType UserTypeRole { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("NeedConfirmUserTypeId")] + public UserType UserTypeRole { get; set; } - [JsonIgnore] - public TrialDocument TrialDocument { get; set; } - #endregion + [JsonIgnore] + public TrialDocument TrialDocument { get; set; } + #endregion - public Guid TrialDocumentId { get; set; } - - public Guid NeedConfirmUserTypeId { get; set; } - } + public Guid TrialDocumentId { get; set; } + public Guid NeedConfirmUserTypeId { get; set; } } + diff --git a/IRaCIS.Core.Domain/Document/TrialDocument.cs b/IRaCIS.Core.Domain/Document/TrialDocument.cs index 325b8049f..604f63596 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocument.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocument.cs @@ -1,35 +1,31 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialDocument")] +public class TrialDocument : BaseFullDeleteAuditEntity { - /// - ///TrialDocument - /// - [Table("TrialDocument")] - public class TrialDocument : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List TrialDocConfirmedUserList { get; set; } - [JsonIgnore] - public List NeedConfirmedUserTypeList { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } + #region 导航属性 + [JsonIgnore] + public List TrialDocConfirmedUserList { get; set; } + [JsonIgnore] + public List NeedConfirmedUserTypeList { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("FileTypeId")] - public Dictionary FileType { get; set; } - #endregion - //需要确认的项目用户 通过TrialId 关联 用中间表过滤 - public Guid FileTypeId { get; set; } + [JsonIgnore] + [ForeignKey("FileTypeId")] + public Dictionary FileType { get; set; } + #endregion + //需要确认的项目用户 通过TrialId 关联 用中间表过滤 + public Guid FileTypeId { get; set; } - public string Name { get; set; } = string.Empty; + public string Name { get; set; } = string.Empty; - public string Path { get; set; } = string.Empty; + public string Path { get; set; } = string.Empty; - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public string Description { get; set; } = string.Empty; - - public int SignViewMinimumMinutes { get; set; } - } + public string Description { get; set; } = string.Empty; + public int SignViewMinimumMinutes { get; set; } } + diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs index dfc49b91a..d4d66fffc 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs @@ -1,21 +1,17 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialEmailNoticeUser")] +public class TrialEmailNoticeUser : Entity { - /// - ///TrialEmailNoticeUser - /// - [Table("TrialEmailNoticeUser")] - public class TrialEmailNoticeUser : Entity - { - #region 导航属性 + #region 导航属性 - #endregion - - [JsonIgnore] - public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; } - public UserTypeEnum UserType { get; set; } - public Guid TrialEmailNoticeConfigId { get; set; } - public EmailUserType EmailUserType { get; set; } - } + #endregion + [JsonIgnore] + public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; } + public UserTypeEnum UserType { get; set; } + public Guid TrialEmailNoticeConfigId { get; set; } + public EmailUserType EmailUserType { get; set; } } + diff --git a/IRaCIS.Core.Domain/Financial/CalculateTask.cs b/IRaCIS.Core.Domain/Financial/CalculateTask.cs index 56eb3ae35..4f7e90279 100644 --- a/IRaCIS.Core.Domain/Financial/CalculateTask.cs +++ b/IRaCIS.Core.Domain/Financial/CalculateTask.cs @@ -1,12 +1,10 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("CalculateTask")] +public class CalculateTask : Entity { - [Table("CalculateTask")] - public class CalculateTask : Entity - { - public Guid ReviewerId { get; set; } + public Guid ReviewerId { get; set; } - [Required] - public string YearMonth { get; set; } = string.Empty; - public bool IsLock { get; set; } - } + [Required] + public string YearMonth { get; set; } = string.Empty; + public bool IsLock { get; set; } } diff --git a/IRaCIS.Core.Domain/Financial/ExchangeRate.cs b/IRaCIS.Core.Domain/Financial/ExchangeRate.cs index c38f35124..dae421741 100644 --- a/IRaCIS.Core.Domain/Financial/ExchangeRate.cs +++ b/IRaCIS.Core.Domain/Financial/ExchangeRate.cs @@ -1,12 +1,10 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("ExchangeRate")] +public class ExchangeRate : BaseFullAuditEntity { - [Table("ExchangeRate")] - public class ExchangeRate : BaseFullAuditEntity - { - public string YearMonth { get; set; } = string.Empty; + public string YearMonth { get; set; } = string.Empty; - [DecimalPrecision(18, 2)] - public decimal Rate { get; set; } + [DecimalPrecision(18, 2)] + public decimal Rate { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Financial/Payment.cs b/IRaCIS.Core.Domain/Financial/Payment.cs index 3b8f447fa..181a0fff5 100644 --- a/IRaCIS.Core.Domain/Financial/Payment.cs +++ b/IRaCIS.Core.Domain/Financial/Payment.cs @@ -1,33 +1,31 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("Payment")] +public partial class Payment : BaseFullAuditEntity { + public Guid DoctorId { get; set; } + public string YearMonth { get; set; } = string.Empty; + public bool IsLock { get; set; } + public DateTime YearMonthDate { get; set; } - [Table("Payment")] - public partial class Payment : BaseFullAuditEntity - { - public Guid DoctorId { get; set; } - public string YearMonth { get; set; } = string.Empty; - public bool IsLock { get; set; } - public DateTime YearMonthDate { get; set; } + [DecimalPrecision(18, 2)] + public decimal PaymentUSD { get; set; } - [DecimalPrecision(18, 2)] - public decimal PaymentUSD { get; set; } + [DecimalPrecision(18, 4)] + public decimal PaymentCNY { get; set; } - [DecimalPrecision(18, 4)] - public decimal PaymentCNY { get; set; } + [DecimalPrecision(18, 2)] + public decimal ExchangeRate { get; set; } + [DecimalPrecision(18, 4)] + public decimal AdjustmentCNY { get; set; } - [DecimalPrecision(18, 2)] - public decimal ExchangeRate { get; set; } - [DecimalPrecision(18, 4)] - public decimal AdjustmentCNY { get; set; } + [DecimalPrecision(18, 2)] + public decimal AdjustmentUSD { get; set; } + public DateTime CalculateTime { get; set; } = DateTime.Now; - [DecimalPrecision(18, 2)] - public decimal AdjustmentUSD { get; set; } - public DateTime CalculateTime { get; set; } = DateTime.Now; + [StringLength(100)] + public string CalculateUser { get; set; } = string.Empty; - [StringLength(100)] - public string CalculateUser { get; set; } = string.Empty; - - [StringLength(500)] - public string Note { get; set; } = string.Empty; - } + [StringLength(500)] + public string Note { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs b/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs index 09059afa1..d7fed93c6 100644 --- a/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs +++ b/IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs @@ -1,24 +1,22 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("PaymentAdjustment")] +public partial class PaymentAdjustment : BaseFullAuditEntity { - [Table("PaymentAdjustment")] - public partial class PaymentAdjustment : BaseFullAuditEntity - { - public Guid ReviewerId { get; set; } + public Guid ReviewerId { get; set; } - public DateTime YearMonthDate { get; set; } - public string YearMonth { get; set; } = string.Empty; + public DateTime YearMonthDate { get; set; } + public string YearMonth { get; set; } = string.Empty; - [DecimalPrecision(18, 2)] - public decimal AdjustmentUSD { get; set; } + [DecimalPrecision(18, 2)] + public decimal AdjustmentUSD { get; set; } - [DecimalPrecision(18, 4)] - public decimal AdjustmentCNY { get; set; } - public Guid TrialId { get; set; } = Guid.Empty; + [DecimalPrecision(18, 4)] + public decimal AdjustmentCNY { get; set; } + public Guid TrialId { get; set; } = Guid.Empty; - [DecimalPrecision(18, 2)] - public decimal ExchangeRate { get; set; } - public bool IsLock { get; set; } = false; - public string Note { get; set; } = string.Empty; + [DecimalPrecision(18, 2)] + public decimal ExchangeRate { get; set; } + public bool IsLock { get; set; } = false; + public string Note { get; set; } = string.Empty; - } } diff --git a/IRaCIS.Core.Domain/Financial/PaymentDetail.cs b/IRaCIS.Core.Domain/Financial/PaymentDetail.cs index 39090d816..2886ed2f5 100644 --- a/IRaCIS.Core.Domain/Financial/PaymentDetail.cs +++ b/IRaCIS.Core.Domain/Financial/PaymentDetail.cs @@ -1,40 +1,38 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("PaymentDetail")] +public partial class PaymentDetail : BaseFullAuditEntity { - [Table("PaymentDetail")] - public partial class PaymentDetail : BaseFullAuditEntity - { - public Guid PaymentId { get; set; } - public Guid DoctorId { get; set; } - public string YearMonth { get; set; } = string.Empty; - public Guid TrialId { get; set; } + public Guid PaymentId { get; set; } + public Guid DoctorId { get; set; } + public string YearMonth { get; set; } = string.Empty; + public Guid TrialId { get; set; } - [StringLength(50)] - public string TrialCode { get; set; } = string.Empty; + [StringLength(50)] + public string TrialCode { get; set; } = string.Empty; - [StringLength(50)] - public string PaymentType { get; set; } = string.Empty; - public int Count { get; set; } + [StringLength(50)] + public string PaymentType { get; set; } = string.Empty; + public int Count { get; set; } - [DecimalPrecision(18, 2)] - public decimal BasePrice { get; set; } + [DecimalPrecision(18, 2)] + public decimal BasePrice { get; set; } - [DecimalPrecision(18, 2)] - public decimal PersonalAdditional { get; set; } + [DecimalPrecision(18, 2)] + public decimal PersonalAdditional { get; set; } - [DecimalPrecision(18, 2)] - public decimal TrialAdditional { get; set; } + [DecimalPrecision(18, 2)] + public decimal TrialAdditional { get; set; } - [DecimalPrecision(18, 2)] - public decimal ExchangeRate { get; set; } + [DecimalPrecision(18, 2)] + public decimal ExchangeRate { get; set; } - [DecimalPrecision(18, 2)] - public decimal PaymentUSD { get; set; } + [DecimalPrecision(18, 2)] + public decimal PaymentUSD { get; set; } - [DecimalPrecision(18, 4)] - public decimal PaymentCNY { get; set; } + [DecimalPrecision(18, 4)] + public decimal PaymentCNY { get; set; } - public int ShowTypeOrder { get; set; } - public int ShowCodeOrder { get; set; } + public int ShowTypeOrder { get; set; } + public int ShowCodeOrder { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Financial/RankPrice.cs b/IRaCIS.Core.Domain/Financial/RankPrice.cs index 5d026d935..63eeff2db 100644 --- a/IRaCIS.Core.Domain/Financial/RankPrice.cs +++ b/IRaCIS.Core.Domain/Financial/RankPrice.cs @@ -1,40 +1,38 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("RankPrice")] +public partial class RankPrice : BaseFullAuditEntity { - [Table("RankPrice")] - public partial class RankPrice : BaseFullAuditEntity - { - [StringLength(200)] - public string RankName { get; set; } = string.Empty; + [StringLength(200)] + public string RankName { get; set; } = string.Empty; - [DecimalPrecision(18, 2)] - public decimal Timepoint { get; set; } + [DecimalPrecision(18, 2)] + public decimal Timepoint { get; set; } - [DecimalPrecision(18, 2)] - public decimal TimepointIn24H { get; set; } + [DecimalPrecision(18, 2)] + public decimal TimepointIn24H { get; set; } - [DecimalPrecision(18, 2)] - public decimal TimepointIn48H { get; set; } + [DecimalPrecision(18, 2)] + public decimal TimepointIn48H { get; set; } - [DecimalPrecision(18, 2)] - public decimal Adjudication { get; set; } + [DecimalPrecision(18, 2)] + public decimal Adjudication { get; set; } - [DecimalPrecision(18, 2)] - public decimal AdjudicationIn24H { get; set; } + [DecimalPrecision(18, 2)] + public decimal AdjudicationIn24H { get; set; } - [DecimalPrecision(18, 2)] - public decimal AdjudicationIn48H { get; set; } + [DecimalPrecision(18, 2)] + public decimal AdjudicationIn48H { get; set; } - [DecimalPrecision(18, 2)] - public decimal Global { get; set; } + [DecimalPrecision(18, 2)] + public decimal Global { get; set; } - [DecimalPrecision(18, 2)] - public decimal Training { get; set; } + [DecimalPrecision(18, 2)] + public decimal Training { get; set; } - [DecimalPrecision(18, 2)] - public decimal Downtime { get; set; } + [DecimalPrecision(18, 2)] + public decimal Downtime { get; set; } - [DecimalPrecision(18, 2)] - public decimal RefresherTraining { get; set; } - public int ShowOrder { get; set; } - } + [DecimalPrecision(18, 2)] + public decimal RefresherTraining { get; set; } + public int ShowOrder { get; set; } } diff --git a/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs b/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs index a6f6a91e5..2a3af1d04 100644 --- a/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs +++ b/IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs @@ -1,24 +1,20 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("TrialPaymentPrice")] +public partial class TrialPaymentPrice : BaseFullAuditEntity { - [Table("TrialPaymentPrice")] - public partial class TrialPaymentPrice : BaseFullAuditEntity - { - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Trial Trial { get; set; } + public Trial Trial { get; set; } - [DecimalPrecision(18, 2)] - public decimal TrialAdditional { get; set; } = 0; + [DecimalPrecision(18, 2)] + public decimal TrialAdditional { get; set; } = 0; - public string SowName { get; set; } = string.Empty; - public string SowPath { get; set; } = string.Empty; + public string SowName { get; set; } = string.Empty; + public string SowPath { get; set; } = string.Empty; - [DecimalPrecision(18, 2)] - public decimal AdjustmentMultiple { get; set; } = 1; + [DecimalPrecision(18, 2)] + public decimal AdjustmentMultiple { get; set; } = 1; - /// - /// Ƿ ΪĿ - /// - public bool? IsNewTrial { get; set; } = false; - } + [Comment("Ƿ ΪĿ")] + public bool? IsNewTrial { get; set; } = false; } diff --git a/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs b/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs index 8a8cdb94e..b5fae3c1c 100644 --- a/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs +++ b/IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs @@ -1,39 +1,37 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("TrialRevenuesPrice")] +public class TrialRevenuesPrice : BaseFullAuditEntity { - [Table("TrialRevenuesPrice")] - public class TrialRevenuesPrice : BaseFullAuditEntity - { - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - [DecimalPrecision(18, 2)] - public decimal Timepoint { get; set; } + [DecimalPrecision(18, 2)] + public decimal Timepoint { get; set; } - [DecimalPrecision(18, 2)] - public decimal TimepointIn24H { get; set; } + [DecimalPrecision(18, 2)] + public decimal TimepointIn24H { get; set; } - [DecimalPrecision(18, 2)] - public decimal TimepointIn48H { get; set; } + [DecimalPrecision(18, 2)] + public decimal TimepointIn48H { get; set; } - [DecimalPrecision(18, 2)] - public decimal Adjudication { get; set; } + [DecimalPrecision(18, 2)] + public decimal Adjudication { get; set; } - [DecimalPrecision(18, 2)] - public decimal AdjudicationIn24H { get; set; } + [DecimalPrecision(18, 2)] + public decimal AdjudicationIn24H { get; set; } - [DecimalPrecision(18, 2)] - public decimal AdjudicationIn48H { get; set; } + [DecimalPrecision(18, 2)] + public decimal AdjudicationIn48H { get; set; } - [DecimalPrecision(18, 2)] - public decimal Global { get; set; } + [DecimalPrecision(18, 2)] + public decimal Global { get; set; } - [DecimalPrecision(18, 2)] - public decimal Training { get; set; } + [DecimalPrecision(18, 2)] + public decimal Training { get; set; } - [DecimalPrecision(18, 2)] - public decimal Downtime { get; set; } + [DecimalPrecision(18, 2)] + public decimal Downtime { get; set; } - [DecimalPrecision(18, 2)] - public decimal RefresherTraining { get; set; } + [DecimalPrecision(18, 2)] + public decimal RefresherTraining { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs b/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs index 9655a2642..27b5a894d 100644 --- a/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs +++ b/IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs @@ -1,31 +1,29 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public class TrialRevenuesPriceVerification : Entity { - public class TrialRevenuesPriceVerification : Entity - { - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid ReviewerId { get; set; } + public Guid ReviewerId { get; set; } - public string YearMonth { get; set; } = string.Empty; + public string YearMonth { get; set; } = string.Empty; - public bool Training { get; set; } = false; + public bool Training { get; set; } = false; - public bool Downtime { get; set; } = false; + public bool Downtime { get; set; } = false; - public bool Global { get; set; } = false; + public bool Global { get; set; } = false; - public bool Timepoint { get; set; } = false; + public bool Timepoint { get; set; } = false; - public bool TimepointIn24H { get; set; } = false; + public bool TimepointIn24H { get; set; } = false; - public bool TimepointIn48H { get; set; } = false; + public bool TimepointIn48H { get; set; } = false; - public bool Adjudication { get; set; } = false; + public bool Adjudication { get; set; } = false; - public bool AdjudicationIn24H { get; set; } = false; + public bool AdjudicationIn24H { get; set; } = false; - public bool AdjudicationIn48H { get; set; } = false; - public bool RefresherTraining { get; set; } = false; - public DateTime WorkLoadDate { get; set; } - } + public bool AdjudicationIn48H { get; set; } = false; + public bool RefresherTraining { get; set; } = false; + public DateTime WorkLoadDate { get; set; } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Financial/VolumeReward.cs b/IRaCIS.Core.Domain/Financial/VolumeReward.cs index e05088f70..a86019977 100644 --- a/IRaCIS.Core.Domain/Financial/VolumeReward.cs +++ b/IRaCIS.Core.Domain/Financial/VolumeReward.cs @@ -1,12 +1,10 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("VolumeReward")] +public partial class VolumeReward : BaseFullAuditEntity { - [Table("VolumeReward")] - public partial class VolumeReward : BaseFullAuditEntity - { - [DecimalPrecision(18, 2)] - public decimal Price { get; set; } - public int Min { get; set; } - public int Max { get; set; } + [DecimalPrecision(18, 2)] + public decimal Price { get; set; } + public int Min { get; set; } + public int Max { get; set; } - } } diff --git a/IRaCIS.Core.Domain/GlobalUsings.cs b/IRaCIS.Core.Domain/GlobalUsings.cs index 15bfebe57..c7a91c2b9 100644 --- a/IRaCIS.Core.Domain/GlobalUsings.cs +++ b/IRaCIS.Core.Domain/GlobalUsings.cs @@ -1,6 +1,6 @@ global using Microsoft.EntityFrameworkCore; +global using Newtonsoft.Json; global using System; global using System.Collections.Generic; global using System.ComponentModel.DataAnnotations; global using System.ComponentModel.DataAnnotations.Schema; -global using Newtonsoft.Json; diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs index f944f043c..0bc511099 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs @@ -68,7 +68,7 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId public string PatientSex { get; set; } = null!; - [Comment(" 序列Id 避免内存移动")] + [Comment("序列Id 避免内存移动")] public Guid SeqId { get; set; } public int SeriesCount { get; set; } @@ -76,7 +76,7 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId [StringLength(400)] public string StudyCode { get; set; } = null!; - [Comment(" DicomTag.StudyID")] + [Comment("DicomTag.StudyID")] public string StudyId { get; set; } = null!; [StringLength(500)] @@ -92,7 +92,7 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId public string TriggerTime { get; set; } = null!; - [Comment(" 上传时间")] + [Comment("上传时间")] public DateTime? UploadedTime { get; set; } public string Uploader { get; set; } = null!; diff --git a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs index 2da94d504..ec6832dfb 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs @@ -51,7 +51,7 @@ public class StudyMonitor : BaseAddAuditEntity public string StudyCode { get; set; } = null!; - [Comment(" Dicom/非Dicom")] + [Comment("Dicom/非Dicom")] public Guid StudyId { get; set; } public Guid SubjectId { get; set; } diff --git a/IRaCIS.Core.Domain/Image/ImageShare.cs b/IRaCIS.Core.Domain/Image/ImageShare.cs index 9ef10ef53..e478aa77a 100644 --- a/IRaCIS.Core.Domain/Image/ImageShare.cs +++ b/IRaCIS.Core.Domain/Image/ImageShare.cs @@ -1,17 +1,15 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public class ImageShare : Entity { - public class ImageShare : Entity - { - #region 导航属性 + #region 导航属性 - #endregion - public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } - public Guid StudyId { get; set; } + #endregion + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } + public Guid StudyId { get; set; } - public DateTime ExpireTime { get; set; } + public DateTime ExpireTime { get; set; } - public string Password { get; set; } = string.Empty; + public string Password { get; set; } = string.Empty; - } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs b/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs index 1222b52c4..fe53e8121 100644 --- a/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/NoneDicomStudy.cs @@ -1,46 +1,42 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("NoneDicomStudy")] +public class NoneDicomStudy : BaseFullAuditEntity { - /// - ///NoneDicomStudy - /// - [Table("NoneDicomStudy")] - public class NoneDicomStudy : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List NoneDicomFileList { get; set; } + #region 导航属性 + [JsonIgnore] + public List NoneDicomFileList { get; set; } - [JsonIgnore] - public List TaskNoneDicomFileList { get; set; } + [JsonIgnore] + public List TaskNoneDicomFileList { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - public Subject Subject { get; set; } + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + public Subject Subject { get; set; } - #endregion - public string StudyCode { get; set; } = string.Empty; + #endregion + public string StudyCode { get; set; } = string.Empty; - public int FileCount { get; set; } + public int FileCount { get; set; } - public int Code { get; set; } + public int Code { get; set; } - public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } - public Guid SubjectVisitId { get; set; } - public string BodyPart { get; set; } = string.Empty; - public string Modality { get; set; } = string.Empty; + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } + public Guid SubjectVisitId { get; set; } + public string BodyPart { get; set; } = string.Empty; + public string Modality { get; set; } = string.Empty; - public DateTime ImageDate { get; set; } - public string Description { get; set; } = string.Empty; - public string VideoName { get; set; } = string.Empty; + public DateTime ImageDate { get; set; } + public string Description { get; set; } = string.Empty; + public string VideoName { get; set; } = string.Empty; - public string VideoObjectName { get; set; } = string.Empty; + public string VideoObjectName { get; set; } = string.Empty; - public DateTime? UploadVideoTime { get; set; } + public DateTime? UploadVideoTime { get; set; } - public string VideoUrl { get; set; } = string.Empty; - - } + public string VideoUrl { get; set; } = string.Empty; } + diff --git a/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs b/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs index 2ab5c13ec..9929e5d22 100644 --- a/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs +++ b/IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs @@ -1,35 +1,31 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("NoneDicomStudyFile")] +public class NoneDicomStudyFile : BaseAddAuditEntity { + #region 导航属性 + [ForeignKey("NoneDicomStudyId")] + [JsonIgnore] + public NoneDicomStudy NoneDicomStudy { get; set; } + [JsonIgnore] + public VisitTask VisitTask { get; set; } - [Table("NoneDicomStudyFile")] - public class NoneDicomStudyFile : BaseAddAuditEntity - { - #region 导航属性 - [ForeignKey("NoneDicomStudyId")] - [JsonIgnore] - public NoneDicomStudy NoneDicomStudy { get; set; } - [JsonIgnore] - public VisitTask VisitTask { get; set; } + [ForeignKey("OriginNoneDicomStudyId")] + [JsonIgnore] + public NoneDicomStudy OriginNoneDicomStudy { get; set; } + #endregion + public Guid NoneDicomStudyId { get; set; } + public string Path { get; set; } = string.Empty; + public string FileName { get; set; } = string.Empty; - [ForeignKey("OriginNoneDicomStudyId")] - [JsonIgnore] - public NoneDicomStudy OriginNoneDicomStudy { get; set; } - #endregion - public Guid NoneDicomStudyId { get; set; } - public string Path { get; set; } = string.Empty; - public string FileName { get; set; } = string.Empty; + public string FileType { get; set; } = string.Empty; - public string FileType { get; set; } = string.Empty; - - public long? FileSize { get; set; } - #region 跟任务绑定 同时区分检查 - - public Guid? VisitTaskId { get; set; } - /// - /// 为了不影响原始检查，跟任务绑定的 NoneDicomStudyId 为guid空 这个字段记录跟原始检查绑 - /// - public Guid? OriginNoneDicomStudyId { get; set; } - #endregion - } + public long? FileSize { get; set; } + #region 跟任务绑定 同时区分检查 + public Guid? VisitTaskId { get; set; } + [Comment("为了不影响原始检查，跟任务绑定的 NoneDicomStudyId 为guid空 这个字段记录跟原始检查绑")] + public Guid? OriginNoneDicomStudyId { get; set; } + #endregion } + diff --git a/IRaCIS.Core.Domain/Image/SCPImageUpload.cs b/IRaCIS.Core.Domain/Image/SCPImageUpload.cs index 2f70ba805..c0031ab0f 100644 --- a/IRaCIS.Core.Domain/Image/SCPImageUpload.cs +++ b/IRaCIS.Core.Domain/Image/SCPImageUpload.cs @@ -1,27 +1,23 @@ -namespace IRaCIS.Core.Domain.Models -{ - /// - ///SCPImageUpload - /// - [Table("SCPImageUpload")] - public class SCPImageUpload : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } +namespace IRaCIS.Core.Domain.Models; - [JsonIgnore] - public TrialSite TrialSite { get; set; } - #endregion - public string CallingAE { get; set; } = string.Empty; - public string CalledAE { get; set; } = string.Empty; - public string CallingAEIP { get; set; } = string.Empty; - public DateTime StartTime { get; set; } - public DateTime EndTime { get; set; } - public int FileCount { get; set; } - public long FileSize { get; set; } - public int StudyCount { get; set; } - public Guid TrialId { get; set; } - public Guid TrialSiteId { get; set; } - } +[Table("SCPImageUpload")] +public class SCPImageUpload : BaseAddAuditEntity +{ + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + + [JsonIgnore] + public TrialSite TrialSite { get; set; } + #endregion + public string CallingAE { get; set; } = string.Empty; + public string CalledAE { get; set; } = string.Empty; + public string CallingAEIP { get; set; } = string.Empty; + public DateTime StartTime { get; set; } + public DateTime EndTime { get; set; } + public int FileCount { get; set; } + public long FileSize { get; set; } + public int StudyCount { get; set; } + public Guid TrialId { get; set; } + public Guid TrialSiteId { get; set; } } diff --git a/IRaCIS.Core.Domain/Image/SCPInstance.cs b/IRaCIS.Core.Domain/Image/SCPInstance.cs index 7a04eeeb8..4846df139 100644 --- a/IRaCIS.Core.Domain/Image/SCPInstance.cs +++ b/IRaCIS.Core.Domain/Image/SCPInstance.cs @@ -1,41 +1,39 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("SCPInstance")] +public class SCPInstance : BaseFullAuditEntity, IEntitySeqId { - [Table("SCPInstance")] - public class SCPInstance : BaseFullAuditEntity, IEntitySeqId - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("SeriesId")] - public SCPSeries SCPSeries { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("SeriesId")] + public SCPSeries SCPSeries { get; set; } - [JsonIgnore] - [ForeignKey("StudyId")] - public SCPStudy SCPStudy { get; set; } - #endregion - public Guid SeqId { get; set; } - public Guid StudyId { get; set; } - public Guid SeriesId { get; set; } - public string StudyInstanceUid { get; set; } = string.Empty; - public string SeriesInstanceUid { get; set; } = string.Empty; - public string SopInstanceUid { get; set; } = string.Empty; - public int InstanceNumber { get; set; } - public DateTime? InstanceTime { get; set; } - public bool CPIStatus { get; set; } - public int ImageRows { get; set; } - public int ImageColumns { get; set; } - public int SliceLocation { get; set; } - public string SliceThickness { get; set; } = string.Empty; - public int NumberOfFrames { get; set; } - public string PixelSpacing { get; set; } = string.Empty; + [JsonIgnore] + [ForeignKey("StudyId")] + public SCPStudy SCPStudy { get; set; } + #endregion + public Guid SeqId { get; set; } + public Guid StudyId { get; set; } + public Guid SeriesId { get; set; } + public string StudyInstanceUid { get; set; } = string.Empty; + public string SeriesInstanceUid { get; set; } = string.Empty; + public string SopInstanceUid { get; set; } = string.Empty; + public int InstanceNumber { get; set; } + public DateTime? InstanceTime { get; set; } + public bool CPIStatus { get; set; } + public int ImageRows { get; set; } + public int ImageColumns { get; set; } + public int SliceLocation { get; set; } + public string SliceThickness { get; set; } = string.Empty; + public int NumberOfFrames { get; set; } + public string PixelSpacing { get; set; } = string.Empty; - public string ImagerPixelSpacing { get; set; } = string.Empty; - public string FrameOfReferenceUID { get; set; } = string.Empty; - public string WindowCenter { get; set; } = string.Empty; - public string WindowWidth { get; set; } = string.Empty; + public string ImagerPixelSpacing { get; set; } = string.Empty; + public string FrameOfReferenceUID { get; set; } = string.Empty; + public string WindowCenter { get; set; } = string.Empty; + public string WindowWidth { get; set; } = string.Empty; - public bool Anonymize { get; set; } - public string Path { get; set; } = string.Empty; + public bool Anonymize { get; set; } + public string Path { get; set; } = string.Empty; - public long? FileSize { get; set; } - } + public long? FileSize { get; set; } } diff --git a/IRaCIS.Core.Domain/Image/SCPPatient.cs b/IRaCIS.Core.Domain/Image/SCPPatient.cs index e60badc11..44269b077 100644 --- a/IRaCIS.Core.Domain/Image/SCPPatient.cs +++ b/IRaCIS.Core.Domain/Image/SCPPatient.cs @@ -1,31 +1,29 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("SCPPatient")] +public class SCPPatient : BaseFullAuditEntity { - [Table("SCPPatient")] - public class SCPPatient : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List SCPStudyList { get; set; } - [JsonIgnore] - public Subject Subject { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - [JsonIgnore] - public TrialSite TrialSite { get; set; } - #endregion - public string PatientIdStr { get; set; } = string.Empty; - public string PatientName { get; set; } = string.Empty; - public string PatientAge { get; set; } = string.Empty; - public string PatientSex { get; set; } = string.Empty; - public string PatientBirthDate { get; set; } = string.Empty; + #region 导航属性 + [JsonIgnore] + public List SCPStudyList { get; set; } + [JsonIgnore] + public Subject Subject { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + public TrialSite TrialSite { get; set; } + #endregion + public string PatientIdStr { get; set; } = string.Empty; + public string PatientName { get; set; } = string.Empty; + public string PatientAge { get; set; } = string.Empty; + public string PatientSex { get; set; } = string.Empty; + public string PatientBirthDate { get; set; } = string.Empty; - public DateTime? EarliestStudyTime { get; set; } + public DateTime? EarliestStudyTime { get; set; } - public DateTime? LatestStudyTime { get; set; } + public DateTime? LatestStudyTime { get; set; } - public DateTime LatestPushTime { get; set; } - public Guid? SubjectId { get; set; } - public Guid TrialId { get; set; } - public Guid TrialSiteId { get; set; } - } + public DateTime LatestPushTime { get; set; } + public Guid? SubjectId { get; set; } + public Guid TrialId { get; set; } + public Guid TrialSiteId { get; set; } } diff --git a/IRaCIS.Core.Domain/Image/SCPSeries.cs b/IRaCIS.Core.Domain/Image/SCPSeries.cs index 953f5e79a..bdf2e933a 100644 --- a/IRaCIS.Core.Domain/Image/SCPSeries.cs +++ b/IRaCIS.Core.Domain/Image/SCPSeries.cs @@ -1,41 +1,39 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("SCPSeries")] +public class SCPSeries : BaseFullDeleteAuditEntity, IEntitySeqId { - [Table("SCPSeries")] - public class SCPSeries : BaseFullDeleteAuditEntity, IEntitySeqId - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("StudyId")] - public SCPStudy SCPStudy { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("StudyId")] + public SCPStudy SCPStudy { get; set; } - [JsonIgnore] - public List SCPInstanceList { get; set; } - #endregion - public Guid SeqId { get; set; } - public Guid StudyId { get; set; } - public string StudyInstanceUid { get; set; } = string.Empty; - public string SeriesInstanceUid { get; set; } = string.Empty; - public int SeriesNumber { get; set; } - public DateTime? SeriesTime { get; set; } - public string Modality { get; set; } = string.Empty; - public string Description { get; set; } = string.Empty; - public int InstanceCount { get; set; } - public string SliceThickness { get; set; } = string.Empty; + [JsonIgnore] + public List SCPInstanceList { get; set; } + #endregion + public Guid SeqId { get; set; } + public Guid StudyId { get; set; } + public string StudyInstanceUid { get; set; } = string.Empty; + public string SeriesInstanceUid { get; set; } = string.Empty; + public int SeriesNumber { get; set; } + public DateTime? SeriesTime { get; set; } + public string Modality { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; + public int InstanceCount { get; set; } + public string SliceThickness { get; set; } = string.Empty; - public string ImagePositionPatient { get; set; } = string.Empty; - public string ImageOrientationPatient { get; set; } = string.Empty; - public string BodyPartExamined { get; set; } = string.Empty; - public string SequenceName { get; set; } = string.Empty; - public string ProtocolName { get; set; } = string.Empty; - public string ImagerPixelSpacing { get; set; } = string.Empty; + public string ImagePositionPatient { get; set; } = string.Empty; + public string ImageOrientationPatient { get; set; } = string.Empty; + public string BodyPartExamined { get; set; } = string.Empty; + public string SequenceName { get; set; } = string.Empty; + public string ProtocolName { get; set; } = string.Empty; + public string ImagerPixelSpacing { get; set; } = string.Empty; - public string AcquisitionTime { get; set; } = string.Empty; - public string AcquisitionNumber { get; set; } = string.Empty; - public string TriggerTime { get; set; } = string.Empty; + public string AcquisitionTime { get; set; } = string.Empty; + public string AcquisitionNumber { get; set; } = string.Empty; + public string TriggerTime { get; set; } = string.Empty; - public string BodyPartForEdit { get; set; } = string.Empty; + public string BodyPartForEdit { get; set; } = string.Empty; - public string ImageResizePath { get; set; } = string.Empty; + public string ImageResizePath { get; set; } = string.Empty; - } } diff --git a/IRaCIS.Core.Domain/Image/SCPStudy.cs b/IRaCIS.Core.Domain/Image/SCPStudy.cs index 4c8c0f9c6..8828a531a 100644 --- a/IRaCIS.Core.Domain/Image/SCPStudy.cs +++ b/IRaCIS.Core.Domain/Image/SCPStudy.cs @@ -1,67 +1,65 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("SCPStudy")] +public class SCPStudy : BaseFullDeleteAuditEntity, IEntitySeqId { - [Table("SCPStudy")] - public class SCPStudy : BaseFullDeleteAuditEntity, IEntitySeqId - { - #region 导航属性 - [JsonIgnore] - public List InstanceList { get; set; } + #region 导航属性 + [JsonIgnore] + public List InstanceList { get; set; } - [JsonIgnore] - public List SeriesList { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + public List SeriesList { get; set; } + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } - [JsonIgnore] - public TrialSite TrialSite { get; set; } + [JsonIgnore] + public TrialSite TrialSite { get; set; } - [ForeignKey("PatientId")] - [JsonIgnore] - public SCPPatient Patient { get; set; } + [ForeignKey("PatientId")] + [JsonIgnore] + public SCPPatient Patient { get; set; } - #endregion - public Guid SeqId { get; set; } + #endregion + public Guid SeqId { get; set; } - public Guid PatientId { 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; - public string Description { get; set; } = string.Empty; - public int SeriesCount { get; set; } = 0; - public int InstanceCount { get; set; } = 0; + public string StudyInstanceUid { get; set; } = string.Empty; + public DateTime? StudyTime { get; set; } + public string Modalities { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; + public int SeriesCount { get; set; } = 0; + public int InstanceCount { get; set; } = 0; - public string InstitutionName { get; set; } = string.Empty; - public string PatientIdStr { get; set; } = string.Empty; - public string PatientName { get; set; } = string.Empty; - public string PatientAge { get; set; } = string.Empty; - public string PatientSex { get; set; } = string.Empty; + public string InstitutionName { get; set; } = string.Empty; + public string PatientIdStr { get; set; } = string.Empty; + public string PatientName { get; set; } = string.Empty; + public string PatientAge { get; set; } = string.Empty; + public string PatientSex { get; set; } = string.Empty; - public string StudyId { get; set; } = string.Empty; - public string AccessionNumber { get; set; } = string.Empty; - public string PatientBirthDate { get; set; } = string.Empty; - public string AcquisitionTime { get; set; } = string.Empty; - public string AcquisitionNumber { get; set; } = string.Empty; - public string TriggerTime { get; set; } = string.Empty; + public string StudyId { get; set; } = string.Empty; + public string AccessionNumber { get; set; } = string.Empty; + public string PatientBirthDate { get; set; } = string.Empty; + public string AcquisitionTime { get; set; } = string.Empty; + public string AcquisitionNumber { get; set; } = string.Empty; + public string TriggerTime { get; set; } = string.Empty; - public string BodyPartExamined { get; set; } = string.Empty; + public string BodyPartExamined { get; set; } = string.Empty; - public string BodyPartForEdit { get; set; } = string.Empty; + public string BodyPartForEdit { get; set; } = string.Empty; - public string ModalityForEdit { get; set; } = string.Empty; + public string ModalityForEdit { get; set; } = string.Empty; - public string CallingAE { get; set; } = string.Empty; + public string CallingAE { get; set; } = string.Empty; - public string CalledAE { get; set; } = string.Empty; + public string CalledAE { get; set; } = string.Empty; - public bool IsUploadFinished { get; set; } - public Guid TrialId { get; set; } - public Guid TrialSiteId { get; set; } + public bool IsUploadFinished { get; set; } + public Guid TrialId { get; set; } + public Guid TrialSiteId { get; set; } - public Guid? SubjectVisitId { get; set; } - } + public Guid? SubjectVisitId { get; set; } } diff --git a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs index 8b451a254..b25b84e60 100644 --- a/IRaCIS.Core.Domain/Image/SystemAnonymization.cs +++ b/IRaCIS.Core.Domain/Image/SystemAnonymization.cs @@ -1,25 +1,21 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SystemAnonymization")] +public class SystemAnonymization : BaseFullAuditEntity { - /// - ///SystemAnonymization - /// - [Table("SystemAnonymization")] - public class SystemAnonymization : BaseFullAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - public string Group { get; set; } = String.Empty; + #endregion + public string Group { get; set; } = String.Empty; - public string Element { get; set; } = String.Empty; - public string TagDescription { get; set; } = String.Empty; - public string TagDescriptionCN { get; set; } = string.Empty; - public string ReplaceValue { get; set; } = String.Empty; - public string ValueRepresentation { get; set; } = String.Empty; - public bool IsAdd { get; set; } - - public bool IsEnable { get; set; } - public bool IsFixed { get; set; } - } + public string Element { get; set; } = String.Empty; + public string TagDescription { get; set; } = String.Empty; + public string TagDescriptionCN { get; set; } = string.Empty; + public string ReplaceValue { get; set; } = String.Empty; + public string ValueRepresentation { get; set; } = String.Empty; + public bool IsAdd { get; set; } + public bool IsEnable { get; set; } + public bool IsFixed { get; set; } } + diff --git a/IRaCIS.Core.Domain/Image/TaskInstance.cs b/IRaCIS.Core.Domain/Image/TaskInstance.cs index 20e6a4bed..7bb2cf1f2 100644 --- a/IRaCIS.Core.Domain/Image/TaskInstance.cs +++ b/IRaCIS.Core.Domain/Image/TaskInstance.cs @@ -1,47 +1,45 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public class TaskInstance : BaseFullAuditEntity, IEntitySeqId { - public class TaskInstance : BaseFullAuditEntity, IEntitySeqId - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("SeriesId")] - public TaskSeries TaskSeries { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("SeriesId")] + public TaskSeries TaskSeries { get; set; } - [JsonIgnore] - [ForeignKey("StudyId")] - public TaskStudy TaskStudy { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("StudyId")] + public TaskStudy TaskStudy { get; set; } + #endregion - public Guid SeqId { get; set; } - public Guid StudyId { get; set; } - public Guid SeriesId { get; set; } - public string StudyInstanceUid { get; set; } = string.Empty; - public string SeriesInstanceUid { get; set; } = string.Empty; - public string SopInstanceUid { get; set; } = string.Empty; - public int InstanceNumber { get; set; } - public DateTime? InstanceTime { get; set; } - public bool CPIStatus { get; set; } - public int ImageRows { get; set; } - public int ImageColumns { get; set; } - public int SliceLocation { get; set; } - public string SliceThickness { get; set; } = string.Empty; - public int NumberOfFrames { get; set; } - public string PixelSpacing { get; set; } = string.Empty; + public Guid SeqId { get; set; } + public Guid StudyId { get; set; } + public Guid SeriesId { get; set; } + public string StudyInstanceUid { get; set; } = string.Empty; + public string SeriesInstanceUid { get; set; } = string.Empty; + public string SopInstanceUid { get; set; } = string.Empty; + public int InstanceNumber { get; set; } + public DateTime? InstanceTime { get; set; } + public bool CPIStatus { get; set; } + public int ImageRows { get; set; } + public int ImageColumns { get; set; } + public int SliceLocation { get; set; } + public string SliceThickness { get; set; } = string.Empty; + public int NumberOfFrames { get; set; } + public string PixelSpacing { get; set; } = string.Empty; - public string ImagerPixelSpacing { get; set; } = string.Empty; - public string FrameOfReferenceUID { get; set; } = string.Empty; - public string WindowCenter { get; set; } = string.Empty; - public string WindowWidth { get; set; } = string.Empty; + public string ImagerPixelSpacing { get; set; } = string.Empty; + public string FrameOfReferenceUID { get; set; } = string.Empty; + public string WindowCenter { get; set; } = string.Empty; + public string WindowWidth { get; set; } = string.Empty; - public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } - public Guid VisitTaskId { get; set; } - public bool Anonymize { get; set; } - public string Path { get; set; } = string.Empty; + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } + public Guid VisitTaskId { get; set; } + public bool Anonymize { get; set; } + public string Path { get; set; } = string.Empty; - public string HtmlPath { get; set; } = string.Empty; + public string HtmlPath { get; set; } = string.Empty; - public long? FileSize { get; set; } + public long? FileSize { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Image/TaskSeries.cs b/IRaCIS.Core.Domain/Image/TaskSeries.cs index 424c3bdc5..9f9211724 100644 --- a/IRaCIS.Core.Domain/Image/TaskSeries.cs +++ b/IRaCIS.Core.Domain/Image/TaskSeries.cs @@ -1,42 +1,40 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId { - public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("StudyId")] - public TaskStudy TaskStudy { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("StudyId")] + public TaskStudy TaskStudy { get; set; } - [JsonIgnore] - public List InstanceList { get; set; } - #endregion - public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } - public Guid VisitTaskId { get; set; } - public Guid SeqId { get; set; } - public Guid StudyId { get; set; } - public string StudyInstanceUid { get; set; } = String.Empty; - public string SeriesInstanceUid { get; set; } = String.Empty; - public int SeriesNumber { get; set; } - public DateTime? SeriesTime { get; set; } - public string Modality { get; set; } = String.Empty; - public string Description { get; set; } = String.Empty; - public int InstanceCount { get; set; } - public string SliceThickness { get; set; } = String.Empty; + [JsonIgnore] + public List InstanceList { get; set; } + #endregion + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } + public Guid VisitTaskId { get; set; } + public Guid SeqId { get; set; } + public Guid StudyId { get; set; } + public string StudyInstanceUid { get; set; } = String.Empty; + public string SeriesInstanceUid { get; set; } = String.Empty; + public int SeriesNumber { get; set; } + public DateTime? SeriesTime { get; set; } + public string Modality { get; set; } = String.Empty; + public string Description { get; set; } = String.Empty; + public int InstanceCount { get; set; } + public string SliceThickness { get; set; } = String.Empty; - public string ImagePositionPatient { get; set; } = String.Empty; - public string ImageOrientationPatient { get; set; } = String.Empty; - public string BodyPartExamined { get; set; } = String.Empty; - public string SequenceName { get; set; } = String.Empty; - public string ProtocolName { get; set; } = String.Empty; - public string ImagerPixelSpacing { get; set; } = String.Empty; + public string ImagePositionPatient { get; set; } = String.Empty; + public string ImageOrientationPatient { get; set; } = String.Empty; + public string BodyPartExamined { get; set; } = String.Empty; + public string SequenceName { get; set; } = String.Empty; + public string ProtocolName { get; set; } = String.Empty; + public string ImagerPixelSpacing { get; set; } = String.Empty; - public string AcquisitionTime { get; set; } = string.Empty; - public string AcquisitionNumber { get; set; } = string.Empty; - public string TriggerTime { get; set; } = string.Empty; - public string BodyPartForEdit { get; set; } = string.Empty; + public string AcquisitionTime { get; set; } = string.Empty; + public string AcquisitionNumber { get; set; } = string.Empty; + public string TriggerTime { get; set; } = string.Empty; + public string BodyPartForEdit { get; set; } = string.Empty; - public string ImageResizePath { get; set; } = string.Empty; + public string ImageResizePath { get; set; } = string.Empty; - } } diff --git a/IRaCIS.Core.Domain/Image/TaskStudy.cs b/IRaCIS.Core.Domain/Image/TaskStudy.cs index 62dd664a2..b570e636d 100644 --- a/IRaCIS.Core.Domain/Image/TaskStudy.cs +++ b/IRaCIS.Core.Domain/Image/TaskStudy.cs @@ -1,58 +1,56 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId { - public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } - [JsonIgnore] - public List DicomStudyMonitorList { get; set; } = new List(); + [JsonIgnore] + public List DicomStudyMonitorList { get; set; } = new List(); - [JsonIgnore] - public List InstanceList { get; set; } + [JsonIgnore] + public List InstanceList { get; set; } - [JsonIgnore] - public List SeriesList { get; set; } + [JsonIgnore] + public List SeriesList { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } + #endregion - public Guid SeqId { get; set; } - public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } - public Guid VisitTaskId { get; set; } - public int Code { get; set; } = 0; + public Guid SeqId { get; set; } + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } + public Guid VisitTaskId { get; set; } + public int Code { get; set; } = 0; - public string StudyCode { get; set; } = string.Empty; + public string StudyCode { get; set; } = string.Empty; - public string StudyInstanceUid { get; set; } = string.Empty; - public DateTime? StudyTime { get; set; } - public string Modalities { get; set; } = string.Empty; + public string StudyInstanceUid { get; set; } = string.Empty; + public DateTime? StudyTime { get; set; } + public string Modalities { get; set; } = string.Empty; - public string Description { get; set; } = string.Empty; - public int SeriesCount { get; set; } = 0; - public int InstanceCount { get; set; } = 0; - public string InstitutionName { get; set; } = string.Empty; - public string PatientId { get; set; } = string.Empty; - public string PatientName { get; set; } = string.Empty; - public string PatientAge { get; set; } = string.Empty; - public string PatientSex { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; + public int SeriesCount { get; set; } = 0; + public int InstanceCount { get; set; } = 0; + public string InstitutionName { get; set; } = string.Empty; + public string PatientId { get; set; } = string.Empty; + public string PatientName { get; set; } = string.Empty; + public string PatientAge { get; set; } = string.Empty; + public string PatientSex { get; set; } = string.Empty; - public string StudyId { get; set; } = string.Empty; - public string AccessionNumber { get; set; } = string.Empty; - public string PatientBirthDate { get; set; } = string.Empty; - public string AcquisitionTime { get; set; } = string.Empty; - public string AcquisitionNumber { get; set; } = string.Empty; - public string TriggerTime { get; set; } = string.Empty; + public string StudyId { get; set; } = string.Empty; + public string AccessionNumber { get; set; } = string.Empty; + public string PatientBirthDate { get; set; } = string.Empty; + public string AcquisitionTime { get; set; } = string.Empty; + public string AcquisitionNumber { get; set; } = string.Empty; + public string TriggerTime { get; set; } = string.Empty; - public string BodyPartExamined { get; set; } = string.Empty; + public string BodyPartExamined { get; set; } = string.Empty; - public string BodyPartForEdit { get; set; } = string.Empty; + public string BodyPartForEdit { get; set; } = string.Empty; - public string ModalityForEdit { get; set; } = string.Empty; - } + public string ModalityForEdit { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs index ca00c2816..79a6bfe77 100644 --- a/IRaCIS.Core.Domain/Image/TrialDicomAE.cs +++ b/IRaCIS.Core.Domain/Image/TrialDicomAE.cs @@ -1,25 +1,21 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialDicomAE")] +public class TrialDicomAE : BaseFullAuditEntity { - /// - ///DicomAE - /// - [Table("TrialDicomAE")] - public class TrialDicomAE : BaseFullAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - public Guid TrialId { get; set; } - public string CalledAE { get; set; } = string.Empty; + #endregion + public Guid TrialId { get; set; } + public string CalledAE { get; set; } = string.Empty; - public string IP { get; set; } = string.Empty; - public int Port { get; set; } - public string Modality { get; set; } = string.Empty; - public string Description { get; set; } = string.Empty; - public DateTime? LatestTestTime { get; set; } + public string IP { get; set; } = string.Empty; + public int Port { get; set; } + public string Modality { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; + public DateTime? LatestTestTime { get; set; } - public bool? IsTestOK { get; set; } - - } + public bool? IsTestOK { get; set; } } + diff --git a/IRaCIS.Core.Domain/Image/TrialImageDownload.cs b/IRaCIS.Core.Domain/Image/TrialImageDownload.cs index 893392557..e7ed768f1 100644 --- a/IRaCIS.Core.Domain/Image/TrialImageDownload.cs +++ b/IRaCIS.Core.Domain/Image/TrialImageDownload.cs @@ -1,44 +1,42 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("TrialImageDownload")] +public class TrialImageDownload : BaseFullAuditEntity { - [Table("TrialImageDownload")] - public class TrialImageDownload : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } - #endregion + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public string SubjectCode { get; set; } + public string SubjectCode { get; set; } - public bool IsSuccess { get; set; } + public bool IsSuccess { get; set; } - public DateTime DownloadStartTime { get; set; } - public DateTime? DownloadEndTime { get; set; } + public DateTime DownloadStartTime { get; set; } + public DateTime? DownloadEndTime { get; set; } - public string VisitName { get; set; } + public string VisitName { get; set; } - public ImageType ImageType { get; set; } + public ImageType ImageType { get; set; } - public int NoneDicomStudyCount { get; set; } + public int NoneDicomStudyCount { get; set; } - public int DicomStudyCount { get; set; } + public int DicomStudyCount { get; set; } - public int ImageCount { get; set; } - public long ImageSize { get; set; } + public int ImageCount { get; set; } + public long ImageSize { get; set; } - public string IP { get; set; } + public string IP { get; set; } - } - - public enum ImageType - { - Dicom = 1, - - NoneDicom = 2, - - DicomAndNoneDicom = 3 - }; } + +public enum ImageType +{ + Dicom = 1, + + NoneDicom = 2, + + DicomAndNoneDicom = 3 +}; diff --git a/IRaCIS.Core.Domain/Institution/CRO.cs b/IRaCIS.Core.Domain/Institution/CRO.cs index fa20a7f9f..03940aca7 100644 --- a/IRaCIS.Core.Domain/Institution/CRO.cs +++ b/IRaCIS.Core.Domain/Institution/CRO.cs @@ -16,7 +16,7 @@ public class CRO : BaseFullAuditEntity [StringLength(1000)] public string CRONameCN { get; set; } = null!; - [Comment(" ǷĿ")] + [Comment("ǷĿ")] public bool IsTrialLevel { get; set; } public Guid? TrialId { get; set; } diff --git a/IRaCIS.Core.Domain/Institution/Hospital.cs b/IRaCIS.Core.Domain/Institution/Hospital.cs index 8cb055263..a2b82551a 100644 --- a/IRaCIS.Core.Domain/Institution/Hospital.cs +++ b/IRaCIS.Core.Domain/Institution/Hospital.cs @@ -1,30 +1,26 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("Hospital")] +public class Hospital : BaseFullAuditEntity { - [Table("Hospital")] - public class Hospital : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("SiteId")] - public Site Site { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("SiteId")] + public Site Site { get; set; } - [JsonIgnore] - public List DoctorList { get; set; } - #endregion - public string HospitalName { get; set; } = string.Empty; - public string UniversityAffiliated { get; set; } = string.Empty; - public string Country { get; set; } = string.Empty; - public string Province { get; set; } = string.Empty; - public string City { get; set; } = string.Empty; + [JsonIgnore] + public List DoctorList { get; set; } + #endregion + public string HospitalName { get; set; } = string.Empty; + public string UniversityAffiliated { get; set; } = string.Empty; + public string Country { get; set; } = string.Empty; + public string Province { get; set; } = string.Empty; + public string City { get; set; } = string.Empty; - public string HospitalNameCN { get; set; } = string.Empty; - public string UniversityAffiliatedCN { get; set; } = string.Empty; - public string CountryCN { get; set; } = string.Empty; - public string ProvinceCN { get; set; } = string.Empty; - public string CityCN { get; set; } = string.Empty; - /// - /// 中心Id - /// - public Guid? SiteId { get; set; } = Guid.Empty; - } + public string HospitalNameCN { get; set; } = string.Empty; + public string UniversityAffiliatedCN { get; set; } = string.Empty; + public string CountryCN { get; set; } = string.Empty; + public string ProvinceCN { get; set; } = string.Empty; + public string CityCN { get; set; } = string.Empty; + [Comment("中心Id")] + public Guid? SiteId { get; set; } = Guid.Empty; } diff --git a/IRaCIS.Core.Domain/Institution/Site.cs b/IRaCIS.Core.Domain/Institution/Site.cs index 0798c73d9..f2b60e0bd 100644 --- a/IRaCIS.Core.Domain/Institution/Site.cs +++ b/IRaCIS.Core.Domain/Institution/Site.cs @@ -1,37 +1,35 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("Site")] +public partial class Site : BaseFullAuditEntity { - [Table("Site")] - public partial class Site : BaseFullAuditEntity - { - #region - [JsonIgnore] - [ForeignKey("HospitalId")] - public Hospital Hospital { get; set; } - [JsonIgnore] - public List TrialSiteList { get; set; } - #endregion + #region + [JsonIgnore] + [ForeignKey("HospitalId")] + public Hospital Hospital { get; set; } + [JsonIgnore] + public List TrialSiteList { get; set; } + #endregion - public string SiteName { get; set; } = string.Empty; - public string SiteNameCN { get; set; } = string.Empty; - public string AliasName { get; set; } = string.Empty; - public string SiteCode { get; set; } = string.Empty; + public string SiteName { get; set; } = string.Empty; + public string SiteNameCN { get; set; } = string.Empty; + public string AliasName { get; set; } = string.Empty; + public string SiteCode { get; set; } = string.Empty; - public int Code { get; set; } + public int Code { get; set; } - public string City { get; set; } = string.Empty; - public string Country { get; set; } = string.Empty; - public Guid? HospitalId { get; set; } - public int State { get; set; } + public string City { get; set; } = string.Empty; + public string Country { get; set; } = string.Empty; + public Guid? HospitalId { get; set; } + public int State { get; set; } - public string Province { get; set; } = string.Empty; + public string Province { get; set; } = string.Empty; - public string UniqueCode { get; set; } = string.Empty; + public string UniqueCode { get; set; } = string.Empty; - public string Address { get; set; } = string.Empty; + public string Address { get; set; } = string.Empty; - public string DirectorName { get; set; } = string.Empty; - public string DirectorPhone { get; set; } = string.Empty; - public string ContactName { get; set; } = string.Empty; - public string ContactPhone { get; set; } = string.Empty; - } + public string DirectorName { get; set; } = string.Empty; + public string DirectorPhone { get; set; } = string.Empty; + public string ContactName { get; set; } = string.Empty; + public string ContactPhone { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Institution/Sponsor.cs b/IRaCIS.Core.Domain/Institution/Sponsor.cs index 47210df49..495c376df 100644 --- a/IRaCIS.Core.Domain/Institution/Sponsor.cs +++ b/IRaCIS.Core.Domain/Institution/Sponsor.cs @@ -1,17 +1,15 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("Sponsor")] +public partial class Sponsor : BaseFullAuditEntity { - [Table("Sponsor")] - public partial class Sponsor : BaseFullAuditEntity - { - #region + #region - #endregion - public string SponsorName { get; set; } = String.Empty; - public string SponsorNameCN { get; set; } = String.Empty; + #endregion + public string SponsorName { get; set; } = String.Empty; + public string SponsorNameCN { get; set; } = String.Empty; - public string SponsorCode { get; set; } = String.Empty; + public string SponsorCode { get; set; } = String.Empty; - public bool IsTrialLevel { get; set; } - public Guid? TrialId { get; set; } - } + public bool IsTrialLevel { get; set; } + public Guid? TrialId { get; set; } } diff --git a/IRaCIS.Core.Domain/Management/Menu.cs b/IRaCIS.Core.Domain/Management/Menu.cs index 780c0592f..9840a60ab 100644 --- a/IRaCIS.Core.Domain/Management/Menu.cs +++ b/IRaCIS.Core.Domain/Management/Menu.cs @@ -1,52 +1,50 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("Menu")] +public class Menu : BaseFullAuditEntity { - [Table("Menu")] - public class Menu : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List UserTypeMenuList { get; set; } - #endregion - //上级菜单 - public Guid? ParentId { get; set; } = Guid.Empty; + #region 导航属性 + [JsonIgnore] + public List UserTypeMenuList { get; set; } + #endregion + //上级菜单 + public Guid? ParentId { get; set; } = Guid.Empty; - // 类型（M目录 C菜单 F按钮 L链接） - public string MenuType { get; set; } = string.Empty; + // 类型（M目录 C菜单 F按钮 L链接） + public string MenuType { get; set; } = string.Empty; - public string MenuIcon { get; set; } = string.Empty; + public string MenuIcon { get; set; } = string.Empty; - public string MenuName { get; set; } = string.Empty; + public string MenuName { get; set; } = string.Empty; - //路由地址 - public string Path { get; set; } = string.Empty; + //路由地址 + public string Path { get; set; } = string.Empty; - //组件路径 - public string Component { get; set; } = string.Empty; + //组件路径 + public string Component { get; set; } = string.Empty; - public int ShowOrder { get; set; } + public int ShowOrder { get; set; } - //启用 禁用 - public bool IsEnable { get; set; } = true; + //启用 禁用 + public bool IsEnable { get; set; } = true; - public bool IsCache { get; set; } = false; + public bool IsCache { get; set; } = false; - public bool IsDisplay { get; set; } + public bool IsDisplay { get; set; } - public bool IsInTabDisplay { get; set; } + public bool IsInTabDisplay { get; set; } - public bool IsExternalLink { get; set; } + public bool IsExternalLink { get; set; } - //权限点 - public string PermissionStr { get; set; } = string.Empty; + //权限点 + public string PermissionStr { get; set; } = string.Empty; - //Api 接口地址 - public string ApiPath { get; set; } = string.Empty; + //Api 接口地址 + public string ApiPath { get; set; } = string.Empty; - public string Note { get; set; } = string.Empty; + public string Note { get; set; } = string.Empty; - public string Meta { get; set; } = string.Empty; + public string Meta { get; set; } = string.Empty; - public string Redirect { get; set; } = string.Empty; - public string LanguageMark { get; set; } = string.Empty; - } + public string Redirect { get; set; } = string.Empty; + public string LanguageMark { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs index 9b5bd3e47..fbc323887 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs @@ -1,46 +1,42 @@ using IRaCIS.Core.Domain.Share.Management; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SystemNotice")] +public class SystemNotice : BaseFullAuditEntity { - /// - ///SystemNotice - /// - [Table("SystemNotice")] - public class SystemNotice : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List NoticeUserTypeList { get; set; } = new List(); - [JsonIgnore] - public List NoticeUserReadList { get; set; } = new List(); + #region 导航属性 + [JsonIgnore] + public List NoticeUserTypeList { get; set; } = new List(); + [JsonIgnore] + public List NoticeUserReadList { get; set; } = new List(); - #endregion - public string NoticeContent { get; set; } = string.Empty; + #endregion + public string NoticeContent { get; set; } = string.Empty; - public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; } + public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; } - public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; } + public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; } - public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; } + public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; } - public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; } + public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; } - public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; } + public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; } - public DateTime? StartDate { get; set; } + public DateTime? StartDate { get; set; } - public DateTime? EndDate { get; set; } + public DateTime? EndDate { get; set; } - public string FileName { get; set; } = string.Empty; + public string FileName { get; set; } = string.Empty; - public string Path { get; set; } = string.Empty; + public string Path { get; set; } = string.Empty; - public Guid? PublishedUserId { get; set; } + public Guid? PublishedUserId { get; set; } - public User PublishedUser { get; set; } + public User PublishedUser { get; set; } - public DateTime? PublishedTime { get; set; } - - } + public DateTime? PublishedTime { get; set; } } + diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs index cc7de23b6..e189c350b 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs @@ -1,17 +1,13 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SystemNoticeUserRead")] +public class SystemNoticeUserRead : BaseAddAuditEntity { - /// - ///SystemNoticeUserRead - /// - [Table("SystemNoticeUserRead")] - public class SystemNoticeUserRead : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - - public Guid SystemNoticeId { get; set; } - } + #endregion + public Guid SystemNoticeId { get; set; } } + diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs index a32bf1c52..2129c641a 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs @@ -1,21 +1,17 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SystemNoticeUserType")] +public class SystemNoticeUserType : BaseAddAuditEntity { - /// - ///SystemNoticeUserType - /// - [Table("SystemNoticeUserType")] - public class SystemNoticeUserType : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] + #region 导航属性 + [JsonIgnore] - [ForeignKey("UserTypeId")] - public UserType NoticeUserType { get; set; } - #endregion - - public Guid SystemNoticeId { get; set; } - public Guid UserTypeId { get; set; } - } + [ForeignKey("UserTypeId")] + public UserType NoticeUserType { get; set; } + #endregion + public Guid SystemNoticeId { get; set; } + public Guid UserTypeId { get; set; } } + diff --git a/IRaCIS.Core.Domain/Management/Role.cs b/IRaCIS.Core.Domain/Management/Role.cs index cf33589c6..d57a2ab1d 100644 --- a/IRaCIS.Core.Domain/Management/Role.cs +++ b/IRaCIS.Core.Domain/Management/Role.cs @@ -1,17 +1,15 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("Role")] +public partial class Role : BaseFullAuditEntity { - [Table("Role")] - public partial class Role : BaseFullAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - public string RoleName { get; set; } = string.Empty; + #endregion + public string RoleName { get; set; } = string.Empty; - public string RoleDescription { get; set; } = string.Empty; + public string RoleDescription { get; set; } = string.Empty; - public int Status { get; set; } - public int PrivilegeLevel { get; set; } //权限级别 + public int Status { get; set; } + public int PrivilegeLevel { get; set; } //权限级别 - } } diff --git a/IRaCIS.Core.Domain/Management/User.cs b/IRaCIS.Core.Domain/Management/User.cs index d17490dd7..1ac7d9fc9 100644 --- a/IRaCIS.Core.Domain/Management/User.cs +++ b/IRaCIS.Core.Domain/Management/User.cs @@ -26,7 +26,7 @@ public class User : BaseFullAuditEntity #endregion - [Comment(" Զлһ")] + [Comment("Զлһ")] public bool AutoCutNextTask { get; set; } public int Code { get; set; } @@ -34,7 +34,7 @@ public class User : BaseFullAuditEntity [StringLength(400)] public string DepartmentName { get; set; } = null!; - [Comment(" ҽ˺ź󣬻ֵ")] + [Comment("ҽ˺ź󣬻ֵ")] public Guid? DoctorId { get; set; } public string EMail { get; set; } = null!; @@ -44,15 +44,15 @@ public class User : BaseFullAuditEntity public string FirstName { get; set; } = null!; - [Comment(" ״ε¼Ҫ޸")] + [Comment("״ε¼Ҫ޸")] public bool IsFirstAdd { get; set; } = true; public bool IsTestUser { get; set; } - [Comment(" ڲû ⲿû")] + [Comment("ڲû ⲿû")] public bool IsZhiZhun { get; set; } - [Comment(" һ޸ʱ")] + [Comment("һ޸ʱ")] public DateTime? LastChangePassWordTime { get; set; } public string LastLoginIP { get; set; } = null!; diff --git a/IRaCIS.Core.Domain/Management/UserFeedBack.cs b/IRaCIS.Core.Domain/Management/UserFeedBack.cs index 242a74723..0b6872cc4 100644 --- a/IRaCIS.Core.Domain/Management/UserFeedBack.cs +++ b/IRaCIS.Core.Domain/Management/UserFeedBack.cs @@ -1,37 +1,33 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("UserFeedBack")] +public class UserFeedBack : BaseFullAuditEntity { - /// - ///UserFeedBack - /// - [Table("UserFeedBack")] - public class UserFeedBack : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - [JsonIgnore] - public Subject Subject { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - public TrialSite TrialSite { get; set; } - [JsonIgnore] - public VisitTask VisitTask { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + public Subject Subject { get; set; } + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + public TrialSite TrialSite { get; set; } + [JsonIgnore] + public VisitTask VisitTask { get; set; } - [NotMapped] - public List FeedBackScreenshotList => JsonConvert.DeserializeObject>(ScreenshotListStr); - #endregion - public Guid? VisitTaskId { get; set; } + [NotMapped] + public List FeedBackScreenshotList => JsonConvert.DeserializeObject>(ScreenshotListStr); + #endregion + public Guid? VisitTaskId { get; set; } - public Guid? SubjectId { get; set; } - public Guid? SubjectVisitId { get; set; } - public int QuestionType { get; set; } + public Guid? SubjectId { get; set; } + public Guid? SubjectVisitId { get; set; } + public int QuestionType { get; set; } - public string QuestionDescription { get; set; } = string.Empty; - public int State { get; set; } - public Guid? TrialSiteId { get; set; } - public Guid? TrialId { get; set; } + public string QuestionDescription { get; set; } = string.Empty; + public int State { get; set; } + public Guid? TrialSiteId { get; set; } + public Guid? TrialId { get; set; } - public string ScreenshotListStr { get; set; } = string.Empty; - } + public string ScreenshotListStr { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Management/UserLog.cs b/IRaCIS.Core.Domain/Management/UserLog.cs index a6b61c174..93a342d2b 100644 --- a/IRaCIS.Core.Domain/Management/UserLog.cs +++ b/IRaCIS.Core.Domain/Management/UserLog.cs @@ -1,76 +1,64 @@ -namespace IRaCIS.Core.Domain.Models +using System.ComponentModel; + +namespace IRaCIS.Core.Domain.Models; + +[Table("UserLog")] +public class UserLog : BaseAddAuditEntity { - /// - ///UserLog - /// - [Table("UserLog")] - public class UserLog : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public User LoginUser { get; set; } + #region 导航属性 + [JsonIgnore] + public User LoginUser { get; set; } - [JsonIgnore] - public User OptUser { get; set; } - #endregion - public string IP { get; set; } = string.Empty; - public string LoginFaildName { get; set; } = string.Empty; - public UserOptType OptType { get; set; } - public string LoginPassword { get; set; } = string.Empty; - public Guid? LoginUserId { get; set; } + [JsonIgnore] + public User OptUser { get; set; } + #endregion + public string IP { get; set; } = string.Empty; + public string LoginFaildName { get; set; } = string.Empty; + public UserOptType OptType { get; set; } + public string LoginPassword { get; set; } = string.Empty; + public Guid? LoginUserId { get; set; } - public Guid? OptUserId { get; set; } - public string IPRegion { get; set; } = string.Empty; - - } - - /// - /// 登录或者登出 锁定类型 - /// - public enum UserOptType - { - - /// - /// 用户登录 - /// - Login = 1, - - /// - /// 用户登出 - /// - LoginOut = 2, - - /// - ///账号或者密码错误 - /// - AccountOrPasswordError = 3, - - /// - /// 账号锁定 - /// - AccountLocked = 4, - - //账号启用 - AccountEnable = 5, - - //登录锁定账户 - LoginLockedAccount = 6, - - //修改密码 - LoginModifyPassword = 7, - - UnloginModifyPasswoed = 8, - - //admin 重置密码 - ResetPassword = 9, - - DeleteUser = 10, - - UpdateUser = 11, - - MFALogin = 12, - - MFALoginFail = 13, - } + public Guid? OptUserId { get; set; } + public string IPRegion { get; set; } = string.Empty; } + +[Description("登录或者登出 锁定类型")] +public enum UserOptType +{ + + [Description("用户登录")] + Login = 1, + + [Description("用户登出")] + LoginOut = 2, + + [Description("账号或者密码错误")] + AccountOrPasswordError = 3, + + [Description("账号锁定")] + AccountLocked = 4, + + //账号启用 + AccountEnable = 5, + + //登录锁定账户 + LoginLockedAccount = 6, + + //修改密码 + LoginModifyPassword = 7, + + UnloginModifyPasswoed = 8, + + //admin 重置密码 + ResetPassword = 9, + + DeleteUser = 10, + + UpdateUser = 11, + + MFALogin = 12, + + MFALoginFail = 13, +} + diff --git a/IRaCIS.Core.Domain/Management/UserPassWordLog.cs b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs index 69875c00a..534c9d9d1 100644 --- a/IRaCIS.Core.Domain/Management/UserPassWordLog.cs +++ b/IRaCIS.Core.Domain/Management/UserPassWordLog.cs @@ -1,23 +1,15 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("UserPassWordLog")] +public class UserPassWordLog : BaseAddAuditEntity { - /// - ///UserPassWordLog - /// - [Table("UserPassWordLog")] - public class UserPassWordLog : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - /// - /// 用户Id - /// - public Guid UserId { get; set; } + [Comment("用户Id")] + public Guid UserId { get; set; } - /// - /// 密码 - /// - public string PassWord { get; set; } = string.Empty; - } + [Comment("密码")] + public string PassWord { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Management/UserType.cs b/IRaCIS.Core.Domain/Management/UserType.cs index f5d4e4496..a9cd45513 100644 --- a/IRaCIS.Core.Domain/Management/UserType.cs +++ b/IRaCIS.Core.Domain/Management/UserType.cs @@ -1,32 +1,30 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public class UserType : Entity { - public class UserType : Entity - { - #region 导航属性 - [JsonIgnore] - public List UserTypeMenuList { get; set; } - [JsonIgnore] - public List UserTypeGroupList { get; set; } + #region 导航属性 + [JsonIgnore] + public List UserTypeMenuList { get; set; } + [JsonIgnore] + public List UserTypeGroupList { get; set; } - [JsonIgnore] - public List SystemDocNeedConfirmedUserTypeList { get; set; } + [JsonIgnore] + public List SystemDocNeedConfirmedUserTypeList { get; set; } - [JsonIgnore] - public List UserList { get; set; } - #endregion - public UserTypeEnum UserTypeEnum { get; set; } + [JsonIgnore] + public List UserList { get; set; } + #endregion + public UserTypeEnum UserTypeEnum { get; set; } - public string UserTypeName { get; set; } = string.Empty; + public string UserTypeName { get; set; } = string.Empty; - public string Description { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; - public int Order { get; set; } + public int Order { get; set; } - public string UserTypeShortName { get; set; } = string.Empty; + public string UserTypeShortName { get; set; } = string.Empty; - public bool IsEnable { get; set; } = true; - public string PermissionStr { get; set; } = string.Empty; - } + public bool IsEnable { get; set; } = true; + public string PermissionStr { get; set; } = string.Empty; } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Management/UserTypeGroup.cs b/IRaCIS.Core.Domain/Management/UserTypeGroup.cs index 079163d40..9b67c163a 100644 --- a/IRaCIS.Core.Domain/Management/UserTypeGroup.cs +++ b/IRaCIS.Core.Domain/Management/UserTypeGroup.cs @@ -1,22 +1,18 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("UserTypeGroup")] +public class UserTypeGroup : Entity { - /// - ///UserTypeGroup - /// - [Table("UserTypeGroup")] - public class UserTypeGroup : Entity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("DictionaryId")] - public Dictionary Group { get; set; } - - [JsonIgnore] - [ForeignKey("UserTypeId")] - public UserType UserType { get; set; } - #endregion - public Guid UserTypeId { get; set; } - public Guid DictionaryId { 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; } + public Guid DictionaryId { get; set; } } + diff --git a/IRaCIS.Core.Domain/Management/UserTypeMenu.cs b/IRaCIS.Core.Domain/Management/UserTypeMenu.cs index b5b1bf7c5..0c0037468 100644 --- a/IRaCIS.Core.Domain/Management/UserTypeMenu.cs +++ b/IRaCIS.Core.Domain/Management/UserTypeMenu.cs @@ -1,18 +1,16 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("UserTypeMenu")] +public partial class UserTypeMenu : Entity { - [Table("UserTypeMenu")] - public partial class UserTypeMenu : Entity - { - #region + #region - [JsonIgnore] - [ForeignKey("UserTypeId")] - public UserType UserType { get; set; } - [JsonIgnore] - public Menu Menu { get; set; } - #endregion + [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; } - } + public Guid UserTypeId { get; set; } + public Guid MenuId { get; set; } } diff --git a/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs b/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs index 8759bd78c..365b4b336 100644 --- a/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs +++ b/IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs @@ -11,10 +11,10 @@ public class CheckChallengeDialog : BaseAddAuditEntity public SubjectVisit SubjectVisit { get; set; } #endregion - [Comment(" CRC是否需要回复 前端使用")] + [Comment("CRC是否需要回复 前端使用")] public bool? IsCRCNeedReply { get; set; } - [Comment(" 核查的检查信息Json")] + [Comment("核查的检查信息Json")] [MaxLength] public string ParamInfo { get; set; } = null!; @@ -23,7 +23,7 @@ public class CheckChallengeDialog : BaseAddAuditEntity [MaxLength] public string TalkContent { get; set; } = null!; - [Comment(" 核查过程中的操作用户类型")] + [Comment("核查过程中的操作用户类型")] public UserTypeEnum UserTypeEnum { get; set; } } diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs index 920a8c945..6d6708ef9 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs @@ -1,25 +1,21 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("PreviousHistory")] +public class PreviousHistory : BaseAddAuditEntity { - /// - ///PreviousHistory - /// - [Table("PreviousHistory")] - public class PreviousHistory : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - #endregion - public DateTime? StartTime { get; set; } - - public DateTime? EndTime { get; set; } - public int? IsPD { get; set; } - public Guid SubjectVisitId { get; set; } - public bool IsSubjectLevel { get; set; } - public string Path { get; set; } = String.Empty; - public string FileName { get; set; } = String.Empty; - public string Position { get; set; } = String.Empty; - public Guid ClinicalDataTrialSetId { get; set; } - } + #region 导航属性 + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + #endregion + public DateTime? StartTime { get; set; } + public DateTime? EndTime { get; set; } + public int? IsPD { get; set; } + public Guid SubjectVisitId { get; set; } + public bool IsSubjectLevel { get; set; } + public string Path { get; set; } = String.Empty; + public string FileName { get; set; } = String.Empty; + public string Position { get; set; } = String.Empty; + public Guid ClinicalDataTrialSetId { get; set; } } + diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs index 11468c6bd..0cbda156d 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs @@ -1,33 +1,27 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("PreviousOther")] +public class PreviousOther : BaseAddAuditEntity { - /// - ///PreviousOther - /// - [Table("PreviousOther")] - public class PreviousOther : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - #endregion + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + #endregion - public DateTime? StartTime { get; set; } - public DateTime? EndTime { get; set; } - public bool IsPD { get; set; } + public DateTime? StartTime { get; set; } + public DateTime? EndTime { get; set; } + public bool IsPD { get; set; } - public Guid SubjectVisitId { get; set; } - public bool IsSubjectLevel { get; set; } - public string Path { get; set; } = String.Empty; - public string FileName { get; set; } = String.Empty; - public string TreatmentType { get; set; } = String.Empty; + public Guid SubjectVisitId { get; set; } + public bool IsSubjectLevel { get; set; } + public string Path { get; set; } = String.Empty; + public string FileName { get; set; } = String.Empty; + public string TreatmentType { get; set; } = String.Empty; - /// - /// 临床数据类型Id - /// - [Required] - public Guid ClinicalDataTrialSetId { get; set; } - - } + [Comment("临床数据类型Id")] + [Required] + public Guid ClinicalDataTrialSetId { get; set; } } + diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs index d7d27bb86..c8905ffb9 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs @@ -1,42 +1,32 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("PreviousPDF")] +public class PreviousPDF : BaseAddAuditEntity { - /// - ///PreviousPDF - /// - [Table("PreviousPDF")] - public class PreviousPDF : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } + #region 导航属性 + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } - #endregion - public Guid SubjectVisitId { get; set; } + #endregion + public Guid SubjectVisitId { get; set; } - public string Path { get; set; } = string.Empty; + public string Path { get; set; } = string.Empty; - public string FileName { get; set; } = string.Empty; - public bool? IsVisist { get; set; } + public string FileName { get; set; } = string.Empty; + public bool? IsVisist { get; set; } - /// - /// 临床级别 - /// - public ClinicalLevel? ClinicalLevel { get; set; } + [Comment("临床级别")] + public ClinicalLevel? ClinicalLevel { get; set; } - /// - /// 数据类型 - /// - public ClinicalDataType? DataType { get; set; } + [Comment("数据类型")] + public ClinicalDataType? DataType { get; set; } - /// - /// 上传方式 - /// - public ClinicalUploadType? UploadType { get; set; } + [Comment("上传方式")] + public ClinicalUploadType? UploadType { get; set; } - public Guid? TrialId { get; set; } + public Guid? TrialId { get; set; } - public Guid? SubjectId { get; set; } + public Guid? SubjectId { get; set; } - } } diff --git a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs index 27cb7cc7c..87094d45e 100644 --- a/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs +++ b/IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs @@ -1,31 +1,25 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("PreviousSurgery")] +public class PreviousSurgery : BaseAddAuditEntity { - /// - ///PreviousSurgery - /// - [Table("PreviousSurgery")] - public class PreviousSurgery : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - public DateTime? OperationTime { get; set; } + #endregion + public DateTime? OperationTime { get; set; } - public Guid SubjectVisitId { get; set; } + public Guid SubjectVisitId { get; set; } - public bool IsSubjectLevel { get; set; } + public bool IsSubjectLevel { get; set; } - public string Path { get; set; } = String.Empty; + public string Path { get; set; } = String.Empty; - public string FileName { get; set; } = String.Empty; + public string FileName { get; set; } = String.Empty; - public string OperationName { get; set; } = String.Empty; + public string OperationName { get; set; } = String.Empty; - /// - /// 临床数据类型Id - /// - [Required] - public Guid ClinicalDataTrialSetId { get; set; } - } + [Comment("临床数据类型Id")] + [Required] + public Guid ClinicalDataTrialSetId { get; set; } } diff --git a/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs b/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs index 0f5f9195f..4678ae6d5 100644 --- a/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs +++ b/IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs @@ -1,18 +1,14 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("一致性核查文件")] +[Table("InspectionFile")] +public class InspectionFile : BaseAddAuditEntity { - /// - /// 一致性核查文件 - /// - [Table("InspectionFile")] - public class InspectionFile : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - public string FileName { get; set; } = string.Empty; - public string RelativePath { get; set; } = string.Empty; + public string FileName { get; set; } = string.Empty; + public string RelativePath { get; set; } = string.Empty; - public Guid TrialId { get; set; } - } + public Guid TrialId { get; set; } } diff --git a/IRaCIS.Core.Domain/QC/QCChallenge.cs b/IRaCIS.Core.Domain/QC/QCChallenge.cs index 7261ccce2..93723e13d 100644 --- a/IRaCIS.Core.Domain/QC/QCChallenge.cs +++ b/IRaCIS.Core.Domain/QC/QCChallenge.cs @@ -1,57 +1,55 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public class QCChallenge : BaseAddAuditEntity { - public class QCChallenge : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("LatestReplyUserId")] - public User LatestReplyUser { get; set; } - [JsonIgnore] - //导航属性 - [ForeignKey("SubjectVisitId")] - public SubjectVisit SubjectVisit { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("LatestReplyUserId")] + public User LatestReplyUser { get; set; } + [JsonIgnore] + //导航属性 + [ForeignKey("SubjectVisitId")] + public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - public List DialogList { get; set; } = new List(); + [JsonIgnore] + public List DialogList { get; set; } = new List(); - #endregion - public Guid TrialId { get; set; } - public Guid SubjectVisitId { get; set; } + #endregion + public Guid TrialId { get; set; } + public Guid SubjectVisitId { get; set; } - public DateTime? DeadlineTime { get; set; } + public DateTime? DeadlineTime { get; set; } - public string Note { get; set; } = string.Empty; + public string Note { get; set; } = string.Empty; - public QCChanllengeReuploadEnum ReuploadEnum { get; set; } - public DateTime? ReUploadedTime { get; set; } + public QCChanllengeReuploadEnum ReuploadEnum { get; set; } + public DateTime? ReUploadedTime { get; set; } - public string ReUploader { get; set; } = string.Empty; + public string ReUploader { get; set; } = string.Empty; - public Guid? ReUploadUserId { get; set; } + public Guid? ReUploadUserId { get; set; } - public TrialQCProcess QCProcessEnum { get; set; } + public TrialQCProcess QCProcessEnum { get; set; } - public CurrentQC CurrentQCEnum { get; set; } + public CurrentQC CurrentQCEnum { get; set; } - public DateTime? LatestMsgTime { get; set; } - public Guid? LatestReplyUserId { get; set; } - public string ChallengeCode { get; set; } = string.Empty; + public DateTime? LatestMsgTime { get; set; } + public Guid? LatestReplyUserId { get; set; } + public string ChallengeCode { get; set; } = string.Empty; - public int Code { get; set; } - public bool IsClosed { get; set; } + public int Code { get; set; } + public bool IsClosed { get; set; } - public DateTime? ClosedTime { get; set; } + public DateTime? ClosedTime { get; set; } - public string ClosedUser { get; set; } = string.Empty; - public QCChallengeCloseEnum CloseResonEnum { get; set; } + public string ClosedUser { get; set; } = string.Empty; + public QCChallengeCloseEnum CloseResonEnum { get; set; } - public string Content { get; set; } = string.Empty; + public string Content { get; set; } = string.Empty; - public string ActionContent { get; set; } = string.Empty; + public string ActionContent { get; set; } = string.Empty; - public UserTypeEnum UserTypeEnum { get; set; } - public string ChallengeType { get; set; } = string.Empty; - } + public UserTypeEnum UserTypeEnum { get; set; } + public string ChallengeType { get; set; } = string.Empty; } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs b/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs index 605b3e895..f52d1d943 100644 --- a/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs +++ b/IRaCIS.Core.Domain/QC/QCChallengeDialog.cs @@ -1,20 +1,18 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public class QCChallengeDialog : BaseAddAuditEntity { - public class QCChallengeDialog : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public QCChallenge QCChallenge { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + public QCChallenge QCChallenge { get; set; } + #endregion - public string TalkContent { get; set; } = string.Empty; + public string TalkContent { get; set; } = string.Empty; - public Guid QCChallengeId { get; set; } + public Guid QCChallengeId { get; set; } - public Guid SubjectVisitId { get; set; } + public Guid SubjectVisitId { get; set; } - public UserTypeEnum UserTypeEnum { get; set; } - } + public UserTypeEnum UserTypeEnum { get; set; } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/QC/QCQuestion.cs b/IRaCIS.Core.Domain/QC/QCQuestion.cs index b92925c70..0b3d9f6b2 100644 --- a/IRaCIS.Core.Domain/QC/QCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/QCQuestion.cs @@ -1,33 +1,29 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("QCQuestion")] +public class QCQuestion : BaseFullAuditEntity { - /// - ///QCQuestionConfigure - /// - [Table("QCQuestion")] - public class QCQuestion : BaseFullAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - [ForeignKey("ParentId")] - public QCQuestion ParentQuestion { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("ParentId")] + public QCQuestion ParentQuestion { get; set; } + #endregion - public string QuestionName { get; set; } = string.Empty; - /// 语言类型 - public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - public bool IsRequired { get; set; } + public string QuestionName { get; set; } = string.Empty; + /// 语言类型 + public LanguageType LanguageType { get; set; } = LanguageType.Chinese; + public bool IsRequired { get; set; } - public bool IsEnable { get; set; } + public bool IsEnable { get; set; } - /// 下拉框、文本、单选、多选 - public string Type { get; set; } = string.Empty; + /// 下拉框、文本、单选、多选 + public string Type { get; set; } = string.Empty; - public string TypeValue { get; set; } = string.Empty; + public string TypeValue { get; set; } = string.Empty; - public string ParentTriggerValue { get; set; } = string.Empty; - public Guid? ParentId { get; set; } - public int ShowOrder { get; set; } - } + public string ParentTriggerValue { get; set; } = string.Empty; + public Guid? ParentId { get; set; } + public int ShowOrder { get; set; } } diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs index 05286a5d6..3a1ce9213 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestion.cs @@ -1,38 +1,34 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialQCQuestion")] +public class TrialQCQuestion : BaseFullAuditEntity { - /// - ///TrialQCQuestionConfigure - /// - [Table("TrialQCQuestion")] - public class TrialQCQuestion : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("ParentId")] - public TrialQCQuestion ParentQCQuestion { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + [ForeignKey("ParentId")] + public TrialQCQuestion ParentQCQuestion { get; set; } - [JsonIgnore] - public List TrialQCQuestionAnswerList { get; set; } + [JsonIgnore] + public List TrialQCQuestionAnswerList { get; set; } - #endregion - public Guid TrialId { get; set; } - public string QuestionName { get; set; } = string.Empty; - /// 语言类型 + #endregion + public Guid TrialId { get; set; } + public string QuestionName { get; set; } = string.Empty; + /// 语言类型 - public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - public bool IsRequired { get; set; } - public bool IsEnable { get; set; } + public LanguageType LanguageType { get; set; } = LanguageType.Chinese; + public bool IsRequired { get; set; } + public bool IsEnable { get; set; } - /// 下拉框、文本、单选、多选 - public string Type { get; set; } = string.Empty; - public Guid? ParentId { get; set; } - public string TypeValue { get; set; } = string.Empty; - public string ParentTriggerValue { get; set; } = string.Empty; - public int ShowOrder { get; set; } + /// 下拉框、文本、单选、多选 + public string Type { get; set; } = string.Empty; + public Guid? ParentId { get; set; } + public string TypeValue { get; set; } = string.Empty; + public string ParentTriggerValue { get; set; } = string.Empty; + public int ShowOrder { get; set; } - public bool? IsConfirm { get; set; } - } + public bool? IsConfirm { get; set; } } diff --git a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs index 68c79b541..a802ec7b3 100644 --- a/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs @@ -1,26 +1,22 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialQCQuestionAnswer")] +public class TrialQCQuestionAnswer : BaseFullAuditEntity { - /// - ///TrialQCQuestionRecord - /// - [Table("TrialQCQuestionAnswer")] - public class TrialQCQuestionAnswer : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public TrialQCQuestion TrialQCQuestionConfigure { get; set; } - #endregion - public Guid TrialId { get; set; } + #region 导航属性 + [JsonIgnore] + public TrialQCQuestion TrialQCQuestionConfigure { get; set; } + #endregion + public Guid TrialId { get; set; } - public string Answer { get; set; } = string.Empty; + public string Answer { get; set; } = string.Empty; - public TrialQCProcess QCProcessEnum { get; set; } + public TrialQCProcess QCProcessEnum { get; set; } - // 1代表第一个人QC数据 2 代表第二个人QC数据 - public CurrentQC CurrentQCEnum { get; set; } + // 1代表第一个人QC数据 2 代表第二个人QC数据 + public CurrentQC CurrentQCEnum { get; set; } - public Guid SubjectVisitId { get; set; } - public Guid TrialQCQuestionConfigureId { get; set; } - } + public Guid SubjectVisitId { get; set; } + public Guid TrialQCQuestionConfigureId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs index 04df9b416..13fe3b48c 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs @@ -1,51 +1,39 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SubjectAdditionalEvaluationResult")] +public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity { - /// - ///SubjectAdditionalEvaluationResult - /// - [Table("SubjectAdditionalEvaluationResult")] - public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialReadingQuestionId")] - public ReadingQuestionTrial TrialReadingQuestion { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialReadingQuestionId")] + public ReadingQuestionTrial TrialReadingQuestion { get; set; } - #endregion - public Guid TrialReadingQuestionId { get; set; } + #endregion + public Guid TrialReadingQuestionId { get; set; } - public Guid SubjectId { get; set; } + public Guid SubjectId { get; set; } - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - public Guid? VisitTaskId { get; set; } + public Guid? VisitTaskId { get; set; } - public string Answer { get; set; } = string.Empty; + public string Answer { get; set; } = string.Empty; - /// - /// 附加评估答案翻译字典 - /// + [Comment("附加评估答案翻译字典")] - public string TranslateDictionaryCode { get; set; } = string.Empty; + public string TranslateDictionaryCode { get; set; } = string.Empty; - /// - /// 是否是最终结果 - /// + [Comment("是否是最终结果")] - public bool IsFinalResult { get; set; } + public bool IsFinalResult { get; set; } - /// - /// 最终结果 - /// + [Comment("最终结果")] - public string FinalAnswer { get; set; } = string.Empty; + public string FinalAnswer { get; set; } = string.Empty; - /// - /// 最终结果翻字典 - /// + [Comment("最终结果翻字典")] - public string FinalTranslateDictionaryCode { get; set; } = string.Empty; - - } + public string FinalTranslateDictionaryCode { get; set; } = string.Empty; } + diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs index 9cdf1a3cd..698234fd0 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs @@ -1,29 +1,23 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SubjectCriteriaEvaluation")] +public class SubjectCriteriaEvaluation : BaseFullAuditEntity { - /// - ///SubjectCriteriaEvaluation - /// - [Table("SubjectCriteriaEvaluation")] - public class SubjectCriteriaEvaluation : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Subject subject { get; set; } + #region 导航属性 + [JsonIgnore] + public Subject subject { get; set; } - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - [JsonIgnore] - public List SubjectCriteriaEvaluationVisitFilterList { get; set; } - #endregion - public Guid SubjectId { get; set; } + [JsonIgnore] + public List SubjectCriteriaEvaluationVisitFilterList { get; set; } + #endregion + public Guid SubjectId { get; set; } - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - /// - /// 是否参与评估 - /// - public bool IsJoinEvaluation { get; set; } - } + [Comment("是否参与评估")] + public bool IsJoinEvaluation { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs index 5cca5ffd8..9e062ce7a 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs @@ -1,66 +1,54 @@ -namespace IRaCIS.Core.Domain.Models +using System.ComponentModel; + +namespace IRaCIS.Core.Domain.Models; + +[Table("SubjectCriteriaEvaluationVisitFilter")] +public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity { - /// - ///SubjectCriteriaEvaluationVisitFilter - /// - [Table("SubjectCriteriaEvaluationVisitFilter")] - public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - [JsonIgnore] - public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + [JsonIgnore] + public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { get; set; } - [JsonIgnore] + [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - #endregion - public Guid SubjectId { get; set; } - public Guid TrialReadingCriterionId { get; set; } - public Guid SubjectVisitId { get; set; } + public SubjectVisit SubjectVisit { get; set; } + #endregion + public Guid SubjectId { get; set; } + public Guid TrialReadingCriterionId { get; set; } + public Guid SubjectVisitId { get; set; } - /// - /// 影像筛选状态 - /// - public ImageFilterState ImageFilterState { get; set; } + [Comment("影像筛选状态")] + public ImageFilterState ImageFilterState { get; set; } - /// - /// 影像判断结果 - /// - public ImageDeterminationResultState ImageDeterminationResultState { get; set; } + [Comment("影像判断结果")] + public ImageDeterminationResultState ImageDeterminationResultState { get; set; } - /// - /// 是否已生成任务 - /// - public bool IsGeneratedTask { get; set; } - - } - - /// - /// 影像确认结果 - /// - public enum ImageDeterminationResultState - { - //待定 - None = 0, - //通过 - Passed = 1, - } - - /// - /// 影像筛选状态 - /// - public enum ImageFilterState - { - //默认值 待筛选 - None = 0, - - Filtering = 1, - - //筛选已完成 - Finished = 2 - } + [Comment("是否已生成任务")] + public bool IsGeneratedTask { get; set; } } + +[Description("影像确认结果")] +public enum ImageDeterminationResultState +{ + //待定 + None = 0, + //通过 + Passed = 1, +} + +[Description("影像筛选状态")] +public enum ImageFilterState +{ + //默认值 待筛选 + None = 0, + + Filtering = 1, + + //筛选已完成 + Finished = 2 +} + diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs index e984b202f..44ef90192 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs @@ -1,35 +1,31 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SubjectCriteriaEvaluationVisitStudyFilter")] +public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity { - /// - ///SubjectCriteriaEvaluationVisitStudyFilter - /// - [Table("SubjectCriteriaEvaluationVisitStudyFilter")] - public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } - [ForeignKey("SeriesId")] - [JsonIgnore] - public DicomSeries Series { get; set; } - [ForeignKey("StudyId")] - [JsonIgnore] - public DicomStudy Study { get; set; } - #endregion - public Guid TrialReadingCriterionId { get; set; } + [ForeignKey("SeriesId")] + [JsonIgnore] + public DicomSeries Series { get; set; } + [ForeignKey("StudyId")] + [JsonIgnore] + public DicomStudy Study { get; set; } + #endregion + public Guid TrialReadingCriterionId { get; set; } - public Guid SubjectVisitId { get; set; } - public Guid StudyId { get; set; } + public Guid SubjectVisitId { get; set; } + public Guid StudyId { get; set; } - public Guid SeriesId { get; set; } - public bool IsConfirmed { get; set; } - - public bool IsReading { get; set; } - } + public Guid SeriesId { get; set; } + public bool IsConfirmed { get; set; } + public bool IsReading { get; set; } } + diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs index b1f7d2054..c87222642 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs @@ -18,7 +18,7 @@ public class ClinicalDataSystemSet : BaseAddAuditEntity [StringLength(400)] public string ClinicalDataSetEnName { get; set; } = null!; - [Comment(" 枚举(字典里面取的)")] + [Comment("枚举(字典里面取的)")] public int ClinicalDataSetEnum { get; set; } public string ClinicalDataSetName { get; set; } = null!; diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs index a51b34ec7..0811ad58f 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs @@ -1,83 +1,65 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("项目的临床数据")] +[Table("ReadingClinicalData")] +public class ReadingClinicalData : BaseAddAuditEntity { - /// - /// 项目的临床数据 - /// - [Table("ReadingClinicalData")] - public class ReadingClinicalData : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - [ForeignKey("ClinicalDataTrialSetId")] + [JsonIgnore] + [ForeignKey("ClinicalDataTrialSetId")] - public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } + public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } - [JsonIgnore] - [ForeignKey("StudyId")] - public DicomStudy DicomStudy { get; set; } + [JsonIgnore] + [ForeignKey("StudyId")] + public DicomStudy DicomStudy { get; set; } - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("ReadingId")] - public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + [ForeignKey("ReadingId")] + public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } - [JsonIgnore] - [ForeignKey("ReadingId")] + [JsonIgnore] + [ForeignKey("ReadingId")] - public ReadModule ReadModule { get; set; } + public ReadModule ReadModule { get; set; } - /// - /// PDF文件 - /// - [JsonIgnore] - public List ReadingClinicalDataPDFList { get; set; } - #endregion + [Comment("PDF文件")] + [JsonIgnore] + public List ReadingClinicalDataPDFList { get; set; } + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - /// - /// 访视Id 或者模块Id - /// - public Guid ReadingId { get; set; } + [Comment("访视Id 或者模块Id")] + public Guid ReadingId { get; set; } - public Guid? StudyId { get; set; } - public Guid SubjectId { get; set; } + public Guid? StudyId { get; set; } + public Guid SubjectId { get; set; } - /// - /// 临床数据类型Id - /// - public Guid ClinicalDataTrialSetId { get; set; } + [Comment("临床数据类型Id")] + public Guid ClinicalDataTrialSetId { get; set; } - /// - /// 是否为访视 - /// xiu - public bool IsVisit { get; set; } - /// - /// 是否签名 - /// - public bool IsSign { get; set; } + [Comment("是否为访视")] + public bool IsVisit { get; set; } + [Comment("是否签名")] + public bool IsSign { get; set; } - /// - /// 是否盲化 - /// - public bool? IsBlind { get; set; } + [Comment("是否盲化")] + public bool? IsBlind { get; set; } - /// - /// 是否完整 - /// - public bool? IsComplete { get; set; } - public int FileCount { get; set; } - //临床数据状态 - public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } - } + [Comment("是否完整")] + public bool? IsComplete { get; set; } + public int FileCount { get; set; } + //临床数据状态 + public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs index f7bf7cdb1..87f459aa2 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs @@ -1,26 +1,20 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("项目的临床数据")] +[Table("ReadingClinicalDataPDF")] +public class ReadingClinicalDataPDF : BaseAddAuditEntity { - /// - /// 项目的临床数据 - /// - [Table("ReadingClinicalDataPDF")] - public class ReadingClinicalDataPDF : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("ReadingClinicalDataId")] - public ReadingClinicalData ReadingClinicalData { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + [ForeignKey("ReadingClinicalDataId")] + public ReadingClinicalData ReadingClinicalData { get; set; } + #endregion - /// - /// 阅片临床数据ID - /// - public Guid ReadingClinicalDataId { get; set; } + [Comment("阅片临床数据ID")] + public Guid ReadingClinicalDataId { get; set; } - public string Path { get; set; } = string.Empty; - public string FileName { get; set; } = string.Empty; - public int Size { get; set; } = 0; + public string Path { get; set; } = string.Empty; + public string FileName { get; set; } = string.Empty; + public int Size { get; set; } = 0; - public string Type { get; set; } = string.Empty; - } + public string Type { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs index f63164a9f..ce57a5dfb 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs @@ -1,91 +1,69 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("一致性分析临床数据")] +[Table("ReadingConsistentClinicalData")] +public class ReadingConsistentClinicalData : BaseAddAuditEntity { - /// - /// 一致性分析临床数据 - /// - [Table("ReadingConsistentClinicalData")] - public class ReadingConsistentClinicalData : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("ClinicalDataTrialSetId")] + #region 导航属性 + [JsonIgnore] + [ForeignKey("ClinicalDataTrialSetId")] - public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } + public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } - [JsonIgnore] - [ForeignKey("StudyId")] - public DicomStudy DicomStudy { get; set; } + [JsonIgnore] + [ForeignKey("StudyId")] + public DicomStudy DicomStudy { get; set; } - [JsonIgnore] - [ForeignKey("TrialId")] + [JsonIgnore] + [ForeignKey("TrialId")] - public Trial Trial { get; set; } + public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("ReadingId")] + [JsonIgnore] + [ForeignKey("ReadingId")] - public SubjectVisit SubjectVisit { get; set; } + public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] + [JsonIgnore] + [ForeignKey("SubjectId")] - public Subject Subject { get; set; } + public Subject Subject { get; set; } - [JsonIgnore] - [ForeignKey("ReadingId")] + [JsonIgnore] + [ForeignKey("ReadingId")] - public ReadModule ReadModule { get; set; } + public ReadModule ReadModule { get; set; } - /// - /// PDF文件 - /// - [JsonIgnore] - public List ReadingClinicalDataPDFList { get; set; } - #endregion - /// - /// 项目ID - /// - public Guid TrialId { get; set; } + [Comment("PDF文件")] + [JsonIgnore] + public List ReadingClinicalDataPDFList { get; set; } + #endregion + [Comment("项目ID")] + public Guid TrialId { get; set; } - /// - /// 访视Id 或者模块Id - /// - public Guid ReadingId { get; set; } + [Comment("访视Id 或者模块Id")] + public Guid ReadingId { get; set; } - public Guid? StudyId { get; set; } + public Guid? StudyId { get; set; } - /// - /// 受试者ID - /// - public Guid SubjectId { get; set; } + [Comment("受试者ID")] + public Guid SubjectId { get; set; } - /// - /// 临床数据类型Id - /// - public Guid ClinicalDataTrialSetId { get; set; } + [Comment("临床数据类型Id")] + public Guid ClinicalDataTrialSetId { get; set; } - /// - /// 是否为访视 - /// xiu - public bool IsVisit { get; set; } - /// - /// 是否签名 - /// - public bool IsSign { get; set; } + [Comment("是否为访视")] + public bool IsVisit { get; set; } + [Comment("是否签名")] + public bool IsSign { get; set; } - /// - /// 是否盲化 - /// - public bool? IsBlind { get; set; } = false; + [Comment("是否盲化")] + public bool? IsBlind { get; set; } = false; - /// - /// 是否完整 - /// - public bool? IsComplete { get; set; } = true; - public int FileCount { get; set; } - //临床数据状态 - public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } - } + [Comment("是否完整")] + public bool? IsComplete { get; set; } = true; + public int FileCount { get; set; } + //临床数据状态 + public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs index 5160d1478..bdc8e6fa7 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs @@ -1,30 +1,22 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("一致性分析临床数据")] +[Table("ReadingConsistentClinicalDataPDF")] +public class ReadingConsistentClinicalDataPDF : BaseAddAuditEntity { - /// - /// 一致性分析临床数据 - /// - [Table("ReadingConsistentClinicalDataPDF")] - public class ReadingConsistentClinicalDataPDF : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("ReadingConsistentClinicalDataId")] - public ReadingConsistentClinicalData ReadingConsistentClinicalData { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + [ForeignKey("ReadingConsistentClinicalDataId")] + public ReadingConsistentClinicalData ReadingConsistentClinicalData { get; set; } + #endregion - /// - /// 阅片临床数据ID - /// - public Guid ReadingConsistentClinicalDataId { get; set; } + [Comment("阅片临床数据ID")] + public Guid ReadingConsistentClinicalDataId { get; set; } - public string Path { get; set; } = string.Empty; - public string FileName { get; set; } = string.Empty; + public string Path { get; set; } = string.Empty; + public string FileName { get; set; } = string.Empty; - public int Size { get; set; } = 0; + public int Size { get; set; } = 0; - /// - /// 文件类型 - /// - public string Type { get; set; } = string.Empty; - } + [Comment("文件类型")] + public string Type { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs index 48c409552..cd64843a6 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs @@ -1,24 +1,20 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialClinicalDataSetCriterion")] +public class TrialClinicalDataSetCriterion : BaseFullAuditEntity { - /// - ///TrialClinicalDataSetCriterion - /// - [Table("TrialClinicalDataSetCriterion")] - public class TrialClinicalDataSetCriterion : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] + #region 导航属性 + [JsonIgnore] - [ForeignKey("TrialClinicalDataSetId")] - public ClinicalDataTrialSet TrialClinicalDataSet { get; set; } - [JsonIgnore] - [ForeignKey("TrialReadingCriterionId")] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion - - public Guid TrialClinicalDataSetId { get; set; } - public Guid TrialReadingCriterionId { get; set; } - } + [ForeignKey("TrialClinicalDataSetId")] + public ClinicalDataTrialSet TrialClinicalDataSet { get; set; } + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion + public Guid TrialClinicalDataSetId { get; set; } + public Guid TrialReadingCriterionId { get; set; } } + diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs index 0aefbf6ab..2f88c8c72 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs @@ -1,153 +1,101 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("系统临床数据问题")] +[Table("SystemClinicalQuestion")] +public class SystemClinicalQuestion : BaseAddAuditEntity { - /// - ///系统临床数据问题 - /// - [Table("SystemClinicalQuestion")] - public class SystemClinicalQuestion : BaseAddAuditEntity - { - #region 导航属性 - /// - /// 分组 - /// - [JsonIgnore] - [ForeignKey("GroupId")] - public SystemClinicalQuestion GroupQuestin { get; set; } + #region 导航属性 + [Comment("分组")] + [JsonIgnore] + [ForeignKey("GroupId")] + public SystemClinicalQuestion GroupQuestin { get; set; } - [NotMapped] - public List CalculateQuestionList + [NotMapped] + public List CalculateQuestionList + { + get { - get + + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) { - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - + return new List(); } + } - #endregion - /// - /// 项目临床数据Id - /// - public Guid SystemClinicalId { get; set; } - - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; - - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 临床问题类型(分组，单选。) - /// - public string ClinicalQuestionType { get; set; } = string.Empty; - - /// - /// 问题标识 - /// - public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; } - - /// - /// 最大长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 最大行数 - /// - public int? MaxQuestionCount { get; set; } - - /// - /// 临床数据选项类型(无，自定义) - /// - public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } - - /// - /// 分组Id - /// - public Guid? GroupId { get; set; } - - /// - /// 自定义选项 - /// - public string TypeValue { get; set; } = string.Empty; - - /// - /// 字典Code - /// - public string DictionaryCode { get; set; } = string.Empty; - - /// - /// 排序 - /// - public int ShowOrder { get; set; } = 0; - - /// - /// 是否必填 - /// - public IsRequired IsRequired { get; set; } - - /// - /// 关联Value - /// - public string RelevanceValue { get; set; } = string.Empty; - - /// - /// 关联ID - /// - public Guid? RelevanceId { get; set; } - /// - /// 父问题Id - /// - public Guid? ParentId { get; set; } - - /// - /// 父问题触发值 - /// - public string ParentTriggerValue { get; set; } = string.Empty; - - /// - /// 显示类型 - /// - public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show; - - /// - /// 是否是检查日期 - /// - public bool IsCheckDate { get; set; } - - /// - /// 小数点位数 - /// - public int? DigitPlaces { get; set; } - - /// - /// 单位 - /// - public string Unit { get; set; } = string.Empty; - - /// - /// 自定义计算标记 - /// - public ClinicalCalculateMark? CustomCalculateMark { get; set; } - - /// - /// 自定义计算问题 - /// - public string CalculateQuestions { get; set; } = "[]"; } + #endregion + [Comment("项目临床数据Id")] + public Guid SystemClinicalId { get; set; } + + [Comment("问题名称")] + public string QuestionName { get; set; } = string.Empty; + + [Comment("问题英文名称")] + public string QuestionEnName { get; set; } = string.Empty; + + [Comment("临床问题类型(分组，单选。)")] + public string ClinicalQuestionType { get; set; } = string.Empty; + + [Comment("问题标识")] + public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; } + + [Comment("最大长度")] + public int? MaxAnswerLength { get; set; } + + [Comment("最大行数")] + public int? MaxQuestionCount { get; set; } + + [Comment("临床数据选项类型(无，自定义)")] + public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } + + [Comment("分组Id")] + public Guid? GroupId { get; set; } + + [Comment("自定义选项")] + public string TypeValue { get; set; } = string.Empty; + + [Comment("字典Code")] + public string DictionaryCode { get; set; } = string.Empty; + + [Comment("排序")] + public int ShowOrder { get; set; } = 0; + + [Comment("是否必填")] + public IsRequired IsRequired { get; set; } + + [Comment("关联Value")] + public string RelevanceValue { get; set; } = string.Empty; + + [Comment("关联ID")] + public Guid? RelevanceId { get; set; } + [Comment("父问题Id")] + public Guid? ParentId { get; set; } + + [Comment("父问题触发值")] + public string ParentTriggerValue { get; set; } = string.Empty; + + [Comment("显示类型")] + public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show; + + [Comment("是否是检查日期")] + public bool IsCheckDate { get; set; } + + [Comment("小数点位数")] + public int? DigitPlaces { get; set; } + + [Comment("单位")] + public string Unit { get; set; } = string.Empty; + + [Comment("自定义计算标记")] + public ClinicalCalculateMark? CustomCalculateMark { get; set; } + + [Comment("自定义计算问题")] + public string CalculateQuestions { get; set; } = "[]"; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs index eb72eafb0..1a084ca80 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs @@ -1,110 +1,74 @@ using IRaCIS.Core.Domain.Share; using System.Linq; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("系统临床表格问题")] +[Table("SystemClinicalTableQuestion")] +public class SystemClinicalTableQuestion : BaseAddAuditEntity { - /// - /// 系统临床表格问题 - /// - [Table("SystemClinicalTableQuestion")] - public class SystemClinicalTableQuestion : BaseAddAuditEntity + #region 导航属性 + [NotMapped] + public List RelevanceValueList { - #region 导航属性 - [NotMapped] - public List RelevanceValueList + get { - get + try { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } + return this.RelevanceValue.Split(',').ToList(); } + catch (Exception) + { + return new List(); + } } - #endregion - /// - /// 系统临床数据Id - /// - public Guid SystemClinicalId { get; set; } - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; - - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 临床问题类型(分组，单选。) - /// - public string ClinicalTableQuestionType { get; set; } = string.Empty; - - /// - /// 问题标识 - /// - public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; } - - /// - /// 最大长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 临床数据选项类型(无，自定义) - /// - public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } - - /// - /// 自定义选项 - /// - public string TypeValue { get; set; } = string.Empty; - - /// - /// 字典Code - /// - public string DictionaryCode { get; set; } = string.Empty; - - /// - /// 排序 - /// - public int ShowOrder { get; set; } - - /// - /// 是否必填 - /// - public IsRequired IsRequired { get; set; } - /// - /// 外层问题Id - /// - public Guid QuestionId { get; set; } - - /// - /// 小数点位数 - /// - public int? DigitPlaces { get; set; } - - /// - /// 单位 - /// - public string Unit { get; set; } = string.Empty; - - /// - /// 关联ID - /// - public Guid? RelevanceId { get; set; } - - /// - /// 关联Value - /// - public string RelevanceValue { get; set; } = string.Empty; } + #endregion + [Comment("系统临床数据Id")] + public Guid SystemClinicalId { get; set; } + + [Comment("问题名称")] + public string QuestionName { get; set; } = string.Empty; + + [Comment("问题英文名称")] + public string QuestionEnName { get; set; } = string.Empty; + + [Comment("临床问题类型(分组，单选。)")] + public string ClinicalTableQuestionType { get; set; } = string.Empty; + + [Comment("问题标识")] + public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; } + + [Comment("最大长度")] + public int? MaxAnswerLength { get; set; } + + [Comment("临床数据选项类型(无，自定义)")] + public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } + + [Comment("自定义选项")] + public string TypeValue { get; set; } = string.Empty; + + [Comment("字典Code")] + public string DictionaryCode { get; set; } = string.Empty; + + [Comment("排序")] + public int ShowOrder { get; set; } + + [Comment("是否必填")] + public IsRequired IsRequired { get; set; } + [Comment("外层问题Id")] + public Guid QuestionId { get; set; } + + [Comment("小数点位数")] + public int? DigitPlaces { get; set; } + + [Comment("单位")] + public string Unit { get; set; } = string.Empty; + + [Comment("关联ID")] + public Guid? RelevanceId { get; set; } + + [Comment("关联Value")] + public string RelevanceValue { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs index 29c6d6adb..0b03b1a0f 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs @@ -1,161 +1,107 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("项目临床数据问题")] +[Table("TrialClinicalQuestion")] +public class TrialClinicalQuestion : BaseAddAuditEntity { - /// - ///项目临床数据问题 - /// - [Table("TrialClinicalQuestion")] - public class TrialClinicalQuestion : BaseAddAuditEntity + #region 导航属性 + [NotMapped] + public List CalculateQuestionList { - #region 导航属性 - [NotMapped] - public List CalculateQuestionList + get { - get + + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) { - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - + return new List(); } + } - [JsonIgnore] - [ForeignKey("TrialClinicalId")] - public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } - #endregion - - /// - /// 项目临床数据Id - /// - public Guid TrialClinicalId { get; set; } - - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; - - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 临床问题类型(分组，单选。) - /// - public string ClinicalQuestionType { get; set; } = string.Empty; - - /// - /// 问题标识 - /// - public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; } - - /// - /// 最大长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 最大行数 - /// - public int? MaxQuestionCount { get; set; } - - /// - /// 临床数据选项类型(无，自定义) - /// - public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } - - /// - /// 分组Id - /// - public Guid? GroupId { get; set; } - - /// - /// 自定义选项 - /// - public string TypeValue { get; set; } = string.Empty; - - /// - /// 字典Code - /// - public string DictionaryCode { get; set; } = string.Empty; - - /// - /// 排序 - /// - public int ShowOrder { get; set; } = 0; - - /// - /// 是否必填 - /// - public IsRequired IsRequired { get; set; } - - /// - /// 关联Value - /// - public string RelevanceValue { get; set; } = string.Empty; - - /// - /// 关联ID - /// - public Guid? RelevanceId { get; set; } - - /// - /// 系统临床问题Id - /// - public Guid? SystemClinicalQuestionId { get; set; } - /// - /// 父问题Id - /// - public Guid? ParentId { get; set; } - - /// - /// 父问题触发值 - /// - public string ParentTriggerValue { get; set; } = string.Empty; - - /// - /// 显示类型 - /// - public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show; - - /// - /// 是否是检查日期 - /// - public bool IsCheckDate { get; set; } - - /// - /// 自定义计算标记 - /// - public ClinicalCalculateMark? CustomCalculateMark { get; set; } - - /// - /// 分组 - /// - [JsonIgnore] - [ForeignKey("GroupId")] - public TrialClinicalQuestion GroupQuestin { get; set; } - - /// - /// 自定义计算问题 - /// - public string CalculateQuestions { get; set; } = "[]"; - /// - /// 小数点位数 - /// - public int? DigitPlaces { get; set; } - - /// - /// 单位 - /// - public string Unit { get; set; } = string.Empty; } + [JsonIgnore] + [ForeignKey("TrialClinicalId")] + public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } + #endregion + + [Comment("项目临床数据Id")] + public Guid TrialClinicalId { get; set; } + + [Comment("问题名称")] + public string QuestionName { get; set; } = string.Empty; + + [Comment("问题英文名称")] + public string QuestionEnName { get; set; } = string.Empty; + + [Comment("临床问题类型(分组，单选。)")] + public string ClinicalQuestionType { get; set; } = string.Empty; + + [Comment("问题标识")] + public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; } + + [Comment("最大长度")] + public int? MaxAnswerLength { get; set; } + + [Comment("最大行数")] + public int? MaxQuestionCount { get; set; } + + [Comment("临床数据选项类型(无，自定义)")] + public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } + + [Comment("分组Id")] + public Guid? GroupId { get; set; } + + [Comment("自定义选项")] + public string TypeValue { get; set; } = string.Empty; + + [Comment("字典Code")] + public string DictionaryCode { get; set; } = string.Empty; + + [Comment("排序")] + public int ShowOrder { get; set; } = 0; + + [Comment("是否必填")] + public IsRequired IsRequired { get; set; } + + [Comment("关联Value")] + public string RelevanceValue { get; set; } = string.Empty; + + [Comment("关联ID")] + public Guid? RelevanceId { get; set; } + + [Comment("系统临床问题Id")] + public Guid? SystemClinicalQuestionId { get; set; } + [Comment("父问题Id")] + public Guid? ParentId { get; set; } + + [Comment("父问题触发值")] + public string ParentTriggerValue { get; set; } = string.Empty; + + [Comment("显示类型")] + public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show; + + [Comment("是否是检查日期")] + public bool IsCheckDate { get; set; } + + [Comment("自定义计算标记")] + public ClinicalCalculateMark? CustomCalculateMark { get; set; } + + [Comment("分组")] + [JsonIgnore] + [ForeignKey("GroupId")] + public TrialClinicalQuestion GroupQuestin { get; set; } + + [Comment("自定义计算问题")] + public string CalculateQuestions { get; set; } = "[]"; + [Comment("小数点位数")] + public int? DigitPlaces { get; set; } + + [Comment("单位")] + public string Unit { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs index b21d0a800..cf2874c77 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs @@ -1,127 +1,85 @@ using IRaCIS.Core.Domain.Share; using System.Linq; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("项目临床表格问题")] +[Table("TrialClinicalTableQuestion")] +public class TrialClinicalTableQuestion : BaseAddAuditEntity { - /// - /// 项目临床表格问题 - /// - [Table("TrialClinicalTableQuestion")] - public class TrialClinicalTableQuestion : BaseAddAuditEntity + #region 导航属性 + + [NotMapped] + public List RelevanceValueList { - #region 导航属性 - - [NotMapped] - public List RelevanceValueList + get { - get + try { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } + return this.RelevanceValue.Split(',').ToList(); } + catch (Exception) + { + return new List(); + } } - #endregion - /// - /// 项目临床数据Id - /// - public Guid TrialClinicalId { get; set; } - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; - - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 临床问题类型(分组，单选。) - /// - public string ClinicalTableQuestionType { get; set; } = string.Empty; - - /// - /// 问题标识 - /// - public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; } - - /// - /// 最大长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 临床数据选项类型(无，自定义) - /// - public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } - - /// - /// 自定义选项 - /// - public string TypeValue { get; set; } = string.Empty; - - /// - /// 字典Code - /// - public string DictionaryCode { get; set; } = string.Empty; - - /// - /// 排序 - /// - public int ShowOrder { get; set; } - - /// - /// 是否必填 - /// - public IsRequired IsRequired { get; set; } - - /// - /// 外层问题Id - /// - public Guid QuestionId { get; set; } - - /// - /// 系统表格问题Id - /// - public Guid? SystemTableQuestionId { get; set; } - - /// - /// 自定义计算标记 - /// - public ClinicalCalculateMark? ClinicalCalculateMarkEnum { get; set; } - - /// - /// 自定义计算问题 - /// - public string CalculateQuestions { get; set; } = "[]"; - - /// - /// 小数点位数 - /// - public int? DigitPlaces { get; set; } - - /// - /// 单位 - /// - public string Unit { get; set; } = string.Empty; - - /// - /// 关联ID - /// - public Guid? RelevanceId { get; set; } - - /// - /// 关联Value - /// - public string RelevanceValue { get; set; } = string.Empty; } + #endregion + [Comment("项目临床数据Id")] + public Guid TrialClinicalId { get; set; } + + [Comment("问题名称")] + public string QuestionName { get; set; } = string.Empty; + + [Comment("问题英文名称")] + public string QuestionEnName { get; set; } = string.Empty; + + [Comment("临床问题类型(分组，单选。)")] + public string ClinicalTableQuestionType { get; set; } = string.Empty; + + [Comment("问题标识")] + public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; } + + [Comment("最大长度")] + public int? MaxAnswerLength { get; set; } + + [Comment("临床数据选项类型(无，自定义)")] + public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } + + [Comment("自定义选项")] + public string TypeValue { get; set; } = string.Empty; + + [Comment("字典Code")] + public string DictionaryCode { get; set; } = string.Empty; + + [Comment("排序")] + public int ShowOrder { get; set; } + + [Comment("是否必填")] + public IsRequired IsRequired { get; set; } + + [Comment("外层问题Id")] + public Guid QuestionId { get; set; } + + [Comment("系统表格问题Id")] + public Guid? SystemTableQuestionId { get; set; } + + [Comment("自定义计算标记")] + public ClinicalCalculateMark? ClinicalCalculateMarkEnum { get; set; } + + [Comment("自定义计算问题")] + public string CalculateQuestions { get; set; } = "[]"; + + [Comment("小数点位数")] + public int? DigitPlaces { get; set; } + + [Comment("单位")] + public string Unit { get; set; } = string.Empty; + + [Comment("关联ID")] + public Guid? RelevanceId { get; set; } + + [Comment("关联Value")] + public string RelevanceValue { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs index 42abb8c1e..4f788fe8b 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalAnswerRowInfo.cs @@ -6,14 +6,14 @@ public class ClinicalAnswerRowInfo : BaseAddAuditEntity #region 导航属性 #endregion - [Comment(" 表单Id")] + [Comment("表单Id")] public Guid ClinicalFormId { get; set; } - [Comment(" 问题Id")] + [Comment("问题Id")] public Guid QuestionId { get; set; } public int RowIndex { get; set; } - [Comment(" 受试者Id")] + [Comment("受试者Id")] public Guid SubjectId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs index 5b14beb0d..762945f62 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalForm.cs @@ -13,18 +13,18 @@ public class ClinicalForm : BaseAddAuditEntity public Subject Subject { get; set; } #endregion - [Comment(" 检查日期")] + [Comment("检查日期")] public DateTime? CheckDate { get; set; } public Guid ClinicalDataTrialSetId { get; set; } - [Comment(" 截图地址")] + [Comment("截图地址")] [StringLength(4000)] public string PicturePath { get; set; } = null!; public Guid? ReadingId { get; set; } - [Comment(" 受试者Id")] + [Comment("受试者Id")] public Guid SubjectId { get; set; } public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs index 86afb43e2..61a020d45 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalQuestionAnswer.cs @@ -15,12 +15,12 @@ public class ClinicalQuestionAnswer : BaseAddAuditEntity public Guid ClinicalDataTrialSetId { get; set; } - [Comment(" 表单Id")] + [Comment("表单Id")] public Guid ClinicalFormId { get; set; } - [Comment(" 问题Id")] + [Comment("问题Id")] public Guid QuestionId { get; set; } - [Comment(" 受试者Id")] + [Comment("受试者Id")] public Guid SubjectId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs index be050c550..e7b342a4a 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ClinicalTableAnswer.cs @@ -10,20 +10,20 @@ public partial class ClinicalTableAnswer : BaseAddAuditEntity public ClinicalAnswerRowInfo ClinicalAnswerRowInfo { get; set; } #endregion - [Comment(" 答案")] + [Comment("答案")] [StringLength(4000)] public string Answer { get; set; } = null!; - [Comment(" 表单Id")] + [Comment("表单Id")] public Guid ClinicalFormId { get; set; } - [Comment(" 问题Id")] + [Comment("问题Id")] public Guid QuestionId { get; set; } - [Comment(" 答案行的Id")] + [Comment("答案行的Id")] public Guid RowId { get; set; } - [Comment(" 受试者Id")] + [Comment("受试者Id")] public Guid SubjectId { get; set; } public Guid TableQuestionId { get; set; } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs index 3a0a5c7e3..39491b1b0 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs @@ -1,26 +1,20 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("ReadModuleCriterionFrom")] +public class ReadModuleCriterionFrom : BaseAddAuditEntity { - /// - ///ReadModuleCriterionFrom - /// - [Table("ReadModuleCriterionFrom")] - public class ReadModuleCriterionFrom : BaseAddAuditEntity - { - #region 导航属性 - [ForeignKey("ReadModuleId")] - public Guid ReadModuleId { get; set; } + #region 导航属性 + [ForeignKey("ReadModuleId")] + public Guid ReadModuleId { get; set; } - [JsonIgnore] - [ForeignKey("ClinicalFormId")] - public ClinicalForm ClinicalForm { get; set; } - #endregion - public Guid SubjectId { get; set; } + [JsonIgnore] + [ForeignKey("ClinicalFormId")] + public ClinicalForm ClinicalForm { get; set; } + #endregion + public Guid SubjectId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - /// - /// 表单Id - /// - public Guid ClinicalFormId { get; set; } - } + [Comment("表单Id")] + public Guid ClinicalFormId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs index ded59da36..7d0bad7f1 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicalReviewDialog.cs @@ -1,105 +1,71 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("阅片医学审核对话")] +[Table("ReadingMedicalReviewDialog")] +public class ReadingMedicalReviewDialog : BaseAddAuditEntity { - /// - ///阅片医学审核对话 - /// - [Table("ReadingMedicalReviewDialog")] - public class ReadingMedicalReviewDialog : BaseAddAuditEntity + #region 导航属性 + [JsonIgnore] + [ForeignKey("TaskMedicalReviewId")] + public TaskMedicalReview TaskMedicalReview { get; set; } + [Comment("文件")] + [NotMapped] + public List FileList { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TaskMedicalReviewId")] - public TaskMedicalReview TaskMedicalReview { get; set; } - /// - /// 文件 - /// - [NotMapped] - public List FileList + get { - get + try { - try - { - var result = JsonConvert.DeserializeObject>(this.ImagePath); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - + var result = JsonConvert.DeserializeObject>(this.ImagePath); + return result == null ? new List() : result; } + catch (Exception) + { + + return new List(); + } + } - - #endregion - /// - /// 医学审核Id - /// - public Guid TaskMedicalReviewId { get; set; } - - /// - /// 任务Id - /// - public Guid VisitTaskId { get; set; } - - /// - /// 对话内容 - /// - public string Content { get; set; } = string.Empty; - - /// - /// 用户角色 - /// - public string UserTypeShortName { get; set; } = string.Empty; - - /// - /// 医学审核对话关闭原因 - /// - public MedicalDialogClose? MedicalDialogCloseEnum { get; set; } - - /// - /// 用户角色枚举 - /// - public int UserTypeEnumInt { get; set; } - /// - /// 阅片人是否认同 - /// - public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } = MedicalReviewDoctorUserIdea.defalut; - - /// - /// 是否有问题 - /// - public bool IsHaveQuestion { get; set; } = false; - - /// - /// 质询问题 - /// - public string Questioning { get; set; } = string.Empty; - - /// - /// 审核建议 - /// - public AuditAdvice AuditAdviceEnum { get; set; } = AuditAdvice.None; - - /// - /// 不同意重阅原因 - /// - public string DisagreeReason { get; set; } = string.Empty; - /// - /// 是否申请重阅 - /// - public bool? IsApplyHeavyReading { get; set; } - /// - /// 图片路径 - /// - public string ImagePath { get; set; } = string.Empty; - - /// - /// 文件名称 - /// - public string FileName { get; set; } = string.Empty; } + + #endregion + [Comment("医学审核Id")] + public Guid TaskMedicalReviewId { get; set; } + + [Comment("任务Id")] + public Guid VisitTaskId { get; set; } + + [Comment("对话内容")] + public string Content { get; set; } = string.Empty; + + [Comment("用户角色")] + public string UserTypeShortName { get; set; } = string.Empty; + + [Comment("医学审核对话关闭原因")] + public MedicalDialogClose? MedicalDialogCloseEnum { get; set; } + + [Comment("用户角色枚举")] + public int UserTypeEnumInt { get; set; } + [Comment("阅片人是否认同")] + public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } = MedicalReviewDoctorUserIdea.defalut; + + [Comment("是否有问题")] + public bool IsHaveQuestion { get; set; } = false; + + [Comment("质询问题")] + public string Questioning { get; set; } = string.Empty; + + [Comment("审核建议")] + public AuditAdvice AuditAdviceEnum { get; set; } = AuditAdvice.None; + + [Comment("不同意重阅原因")] + public string DisagreeReason { get; set; } = string.Empty; + [Comment("是否申请重阅")] + public bool? IsApplyHeavyReading { get; set; } + [Comment("图片路径")] + public string ImagePath { get; set; } = string.Empty; + + [Comment("文件名称")] + public string FileName { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs index 58a2a17e0..d716b6a02 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineQuestionAnswer.cs @@ -1,29 +1,21 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("阅片医学问题答案")] +[Table("ReadingMedicineQuestionAnswer")] +public class ReadingMedicineQuestionAnswer : BaseFullAuditEntity { - /// - /// 阅片医学问题答案 - /// - [Table("ReadingMedicineQuestionAnswer")] - public class ReadingMedicineQuestionAnswer : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TaskMedicalReviewId")] - public TaskMedicalReview TaskMedicalReview { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + [ForeignKey("TaskMedicalReviewId")] + public TaskMedicalReview TaskMedicalReview { get; set; } + #endregion - /// - /// 医学审核问题Id - /// - public Guid ReadingMedicineQuestionId { get; set; } + [Comment("医学审核问题Id")] + public Guid ReadingMedicineQuestionId { get; set; } - /// - /// 医学审核Id - /// + [Comment("医学审核Id")] - public Guid TaskMedicalReviewId { get; set; } + public Guid TaskMedicalReviewId { get; set; } - public Guid VisitTaskId { get; set; } - public string Answer { get; set; } = string.Empty; - } + public Guid VisitTaskId { get; set; } + public string Answer { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs index efa6b5072..8de2b0b64 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineSystemQuestion.cs @@ -1,72 +1,48 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("阅片医学审核系统问题")] +[Table("ReadingMedicineSystemQuestion")] +public class ReadingMedicineSystemQuestion : BaseFullAuditEntity { - /// - /// 阅片医学审核系统问题 - /// - [Table("ReadingMedicineSystemQuestion")] - public class ReadingMedicineSystemQuestion : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] + #region 导航属性 + [JsonIgnore] - [ForeignKey("ParentId")] - public ReadingMedicineSystemQuestion ParentQuestion { get; set; } - //// |1|2| 这种保存 - // public string CriterionEnumStr { get; set; } = string.Empty; + [ForeignKey("ParentId")] + public ReadingMedicineSystemQuestion ParentQuestion { get; set; } + //// |1|2| 这种保存 + // public string CriterionEnumStr { get; set; } = string.Empty; - // [NotMapped] - // public List CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList( - #endregion - /// - /// 类型 - /// - public string Type { get; set; } = string.Empty; + // [NotMapped] + // public List CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList( + #endregion + [Comment("类型")] + public string Type { get; set; } = string.Empty; - /// - /// 父问题触发 - /// - public string ParentTriggerValue { get; set; } = string.Empty; + [Comment("父问题触发")] + public string ParentTriggerValue { get; set; } = string.Empty; - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; + [Comment("问题名称")] + public string QuestionName { get; set; } = string.Empty; - /// - /// 语言类型 - /// - public LanguageType LanguageType { get; set; } = LanguageType.Chinese; + [Comment("语言类型")] + public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - /// - /// 是否是必须 - /// - public bool IsRequired { get; set; } - /// - /// 排序 - /// - public int ShowOrder { get; set; } + [Comment("是否是必须")] + public bool IsRequired { get; set; } + [Comment("排序")] + public int ShowOrder { get; set; } - /// - /// 父问题ID - /// - public Guid? ParentId { get; set; } - /// - /// 类型值 - /// - public string TypeValue { get; set; } = string.Empty; - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } + [Comment("父问题ID")] + public Guid? ParentId { get; set; } + [Comment("类型值")] + public string TypeValue { get; set; } = string.Empty; + [Comment("是否启用")] + public bool IsEnable { get; set; } - /// - /// 任务类型 - /// - public ReadingCategory ReadingCategory { get; set; } - public CriterionType? CriterionTypeEnum { get; set; } + [Comment("任务类型")] + public ReadingCategory ReadingCategory { get; set; } + public CriterionType? CriterionTypeEnum { get; set; } - public bool IsGeneral { get; set; } - } + public bool IsGeneral { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs index d78464e56..0280f6fb0 100644 --- a/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/MedicalAudit/ReadingMedicineTrialQuestion.cs @@ -1,82 +1,52 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("阅片医学审核项目问题")] +[Table("ReadingMedicineTrialQuestion")] +public class ReadingMedicineTrialQuestion : BaseFullAuditEntity { - /// - ///阅片医学审核项目问题 - /// - [Table("ReadingMedicineTrialQuestion")] - public class ReadingMedicineTrialQuestion : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("ParentId")] - public ReadingMedicineTrialQuestion ParentQuestion { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + [ForeignKey("ParentId")] + public ReadingMedicineTrialQuestion ParentQuestion { get; set; } + #endregion - /// - /// 类型 - /// - public string Type { get; set; } = string.Empty; + [Comment("类型")] + public string Type { get; set; } = string.Empty; - /// - /// 父问题触发值 - /// - public string ParentTriggerValue { get; set; } = string.Empty; + [Comment("父问题触发值")] + public string ParentTriggerValue { get; set; } = string.Empty; - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; + [Comment("问题名称")] + public string QuestionName { get; set; } = string.Empty; - /// - /// 语言类型 - /// - public LanguageType LanguageType { get; set; } = LanguageType.Chinese; - /// - /// 类型值 - /// - public string TypeValue { get; set; } = string.Empty; - /// - /// 项目ID - /// - public Guid TrialId { get; set; } + [Comment("语言类型")] + public LanguageType LanguageType { get; set; } = LanguageType.Chinese; + [Comment("类型值")] + public string TypeValue { get; set; } = string.Empty; + [Comment("项目ID")] + public Guid TrialId { get; set; } - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } + [Comment("是否启用")] + public bool IsEnable { get; set; } - /// - /// 是否必须 - /// - public bool IsRequired { get; set; } + [Comment("是否必须")] + public bool IsRequired { get; set; } - /// - /// 排序 - /// - public int ShowOrder { get; set; } + [Comment("排序")] + public int ShowOrder { get; set; } - /// - /// 父问题 - /// - public Guid? ParentId { get; set; } + [Comment("父问题")] + public Guid? ParentId { get; set; } - /// - /// 是否确认 - /// - public bool IsConfirm { get; set; } + [Comment("是否确认")] + public bool IsConfirm { get; set; } - /// - /// 任务类型 - /// - public ReadingCategory ReadingCategory { get; set; } + [Comment("任务类型")] + public ReadingCategory ReadingCategory { get; set; } - /// - /// 项目标准 - /// - public Guid TrialReadingCriterionId { get; set; } + [Comment("项目标准")] + public Guid TrialReadingCriterionId { get; set; } - public Guid? SystemQuestionId { get; set; } - } + public Guid? SystemQuestionId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs index 8c9fe53ea..2e1d61f1a 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganInfo.cs @@ -1,81 +1,49 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("OrganInfo")] +public class OrganInfo : BaseAddAuditEntity { - /// - ///OrganInfo - /// - [Table("OrganInfo")] - public class OrganInfo : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - /// - /// 分类 - /// - public string Classification { get; set; } = string.Empty; + #endregion + [Comment("分类")] + public string Classification { get; set; } = string.Empty; - /// - /// 分类 英文 - /// - public string ClassificationEN { get; set; } = string.Empty; + [Comment("分类 英文")] + public string ClassificationEN { get; set; } = string.Empty; - /// - /// 部位 - /// - public string Part { get; set; } = string.Empty; + [Comment("部位")] + public string Part { get; set; } = string.Empty; - /// - /// 部位 英文 - /// - public string PartEN { get; set; } = string.Empty; + [Comment("部位 英文")] + public string PartEN { get; set; } = string.Empty; - /// - /// TULOC 器官 - /// - public string TULOC { get; set; } = string.Empty; + [Comment("TULOC 器官")] + public string TULOC { get; set; } = string.Empty; - /// - /// TULOC 器官 英文 - /// - public string TULOCEN { get; set; } = string.Empty; + [Comment("TULOC 器官 英文")] + public string TULOCEN { get; set; } = string.Empty; - /// - /// 位置 - /// - public string TULAT { get; set; } = string.Empty; - /// - /// 位置 英文 - /// - public string TULATEN { get; set; } = string.Empty; + [Comment("位置")] + public string TULAT { get; set; } = string.Empty; + [Comment("位置 英文")] + public string TULATEN { get; set; } = string.Empty; - /// - /// 备注 - /// - public string Remark { get; set; } = string.Empty; - /// - /// 是否是淋巴结 - /// - public IsLymph IsLymphNodes { get; set; } + [Comment("备注")] + public string Remark { get; set; } = string.Empty; + [Comment("是否是淋巴结")] + public IsLymph IsLymphNodes { get; set; } - /// - /// 器官类型 - /// - public OrganType OrganType { get; set; } + [Comment("器官类型")] + public OrganType OrganType { get; set; } - /// - /// 标准Id - /// - public Guid SystemCriterionId { get; set; } - /// - /// 是否可编辑位置 - /// - public bool IsCanEditPosition { get; set; } + [Comment("标准Id")] + public Guid SystemCriterionId { get; set; } + [Comment("是否可编辑位置")] + public bool IsCanEditPosition { get; set; } - /// - /// 序号 - /// - public int ShowOrder { get; set; } = 0; - } + [Comment("序号")] + public int ShowOrder { get; set; } = 0; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs index 8a2e962d3..6f639e38a 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/OrganTrialInfo.cs @@ -1,91 +1,57 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("OrganTrialInfo")] +public class OrganTrialInfo : BaseAddAuditEntity { - /// - ///OrganTrialInfo - /// - [Table("OrganTrialInfo")] - public class OrganTrialInfo : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - [ForeignKey("OrganInfoId")] - public OrganInfo OrganInfo { get; set; } - #endregion - /// - /// 器官Id - /// - public Guid OrganInfoId { get; set; } + [JsonIgnore] + [ForeignKey("OrganInfoId")] + public OrganInfo OrganInfo { get; set; } + #endregion + [Comment("器官Id")] + public Guid OrganInfoId { get; set; } - /// - /// 项目Id - /// - public Guid TrialId { get; set; } + [Comment("项目Id")] + public Guid TrialId { get; set; } - public bool IsEnable { get; set; } - /// - /// 标准Id - /// - public Guid TrialCriterionId { get; set; } + public bool IsEnable { get; set; } + [Comment("标准Id")] + public Guid TrialCriterionId { get; set; } - /// - /// 部位 - /// - public string Part { get; set; } = string.Empty; + [Comment("部位")] + public string Part { get; set; } = string.Empty; - /// - /// 部位 英文 - /// - public string PartEN { get; set; } = string.Empty; + [Comment("部位 英文")] + public string PartEN { get; set; } = string.Empty; - /// - /// TULOC 器官 - /// - public string TULOC { get; set; } = string.Empty; + [Comment("TULOC 器官")] + public string TULOC { get; set; } = string.Empty; - /// - /// TULOC 器官 英文 - /// - public string TULOCEN { get; set; } = string.Empty; + [Comment("TULOC 器官 英文")] + public string TULOCEN { get; set; } = string.Empty; - /// - /// 位置 - /// - public string TULAT { get; set; } = string.Empty; - /// - /// 位置 英文 - /// - public string TULATEN { get; set; } = string.Empty; + [Comment("位置")] + public string TULAT { get; set; } = string.Empty; + [Comment("位置 英文")] + public string TULATEN { get; set; } = string.Empty; - /// - /// 是否是淋巴结 - /// - public IsLymph IsLymphNodes { get; set; } + [Comment("是否是淋巴结")] + public IsLymph IsLymphNodes { get; set; } - /// - /// 是否可编辑位置 - /// - public bool IsCanEditPosition { get; set; } + [Comment("是否可编辑位置")] + public bool IsCanEditPosition { get; set; } - /// - /// 分类 - /// - public string Classification { get; set; } = string.Empty; + [Comment("分类")] + public string Classification { get; set; } = string.Empty; - /// - /// 分类 英文 - /// - public string ClassificationEN { get; set; } = string.Empty; + [Comment("分类 英文")] + public string ClassificationEN { get; set; } = string.Empty; - /// - /// 序号 - /// - public int ShowOrder { get; set; } = 0; + [Comment("序号")] + public int ShowOrder { get; set; } = 0; - /// - /// 器官类型 - /// - public OrganType? OrganType { get; set; } - } + [Comment("器官类型")] + public OrganType? OrganType { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs index 5a49ff49e..40274de18 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingCriterionPage.cs @@ -1,38 +1,24 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("阅片标准分页")] +[Table("ReadingCriterionPage")] +public class ReadingCriterionPage : BaseAddAuditEntity { - /// - ///阅片标准分页 - /// - [Table("ReadingCriterionPage")] - public class ReadingCriterionPage : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List ReadingQuestionList { get; set; } = new List(); - #endregion - /// - /// 项目ID - /// - public Guid TrialId { get; set; } + #region 导航属性 + [JsonIgnore] + public List ReadingQuestionList { get; set; } = new List(); + #endregion + [Comment("项目ID")] + public Guid TrialId { get; set; } - /// - /// 分页名称 - /// - public string PageName { get; set; } = string.Empty; + [Comment("分页名称")] + public string PageName { get; set; } = string.Empty; - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } - /// - /// 是否公共分页 - /// - public bool IsPublicPage { get; set; } = false; + [Comment("是否启用")] + public bool IsEnable { get; set; } + [Comment("是否公共分页")] + public bool IsPublicPage { get; set; } = false; - /// - /// 排序 - /// - public int ShowOrder { get; set; } = 0; - public Guid ReadingQuestionCriterionTrialId { get; set; } - } + [Comment("排序")] + public int ShowOrder { get; set; } = 0; + public Guid ReadingQuestionCriterionTrialId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs index 586bfe3ff..d66033e92 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionSystem.cs @@ -1,62 +1,38 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("系统阅片标准")] +[Table("ReadingQuestionCriterionSystem")] +public class ReadingQuestionCriterionSystem : BaseAddAuditEntity { - /// - /// 系统阅片标准 - /// - [Table("ReadingQuestionCriterionSystem")] - public class ReadingQuestionCriterionSystem : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List ReadingQuestionSystemList { get; set; } = new List(); - #endregion - /// - /// 标准 - /// - public string CriterionName { get; set; } = string.Empty; + #region 导航属性 + [JsonIgnore] + public List ReadingQuestionSystemList { get; set; } = new List(); + #endregion + [Comment("标准")] + public string CriterionName { get; set; } = string.Empty; - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } + [Comment("是否启用")] + public bool IsEnable { get; set; } - /// - /// 排序 - /// - public int ShowOrder { get; set; } + [Comment("排序")] + public int ShowOrder { get; set; } - /// - /// 是否完成配置 - /// - public bool IsCompleteConfig { get; set; } - /// - /// 确认时间 - /// - public DateTime ConfirmTime { get; set; } + [Comment("是否完成配置")] + public bool IsCompleteConfig { get; set; } + [Comment("确认时间")] + public DateTime ConfirmTime { get; set; } - /// - /// 描述 - /// - public string Description { get; set; } = string.Empty; - /// - /// 标准类型 - /// - public CriterionType CriterionType { get; set; } - /// - /// 肿瘤学阅片 - /// - public bool IsOncologyReading { get; set; } = false; + [Comment("描述")] + public string Description { get; set; } = string.Empty; + [Comment("标准类型")] + public CriterionType CriterionType { get; set; } + [Comment("肿瘤学阅片")] + public bool IsOncologyReading { get; set; } = false; - /// - /// eCRF报告是否显示在图像页面 - /// - public bool IseCRFShowInDicomReading { get; set; } = false; + [Comment("eCRF报告是否显示在图像页面")] + public bool IseCRFShowInDicomReading { get; set; } = false; - /// - /// 是否必须全局阅片 - /// - public bool IsMustGlobalReading { get; set; } = false; - } + [Comment("是否必须全局阅片")] + public bool IsMustGlobalReading { get; set; } = false; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index 3a6297592..3d48fc91f 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -1,271 +1,185 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("项目阅片标准")] +[Table("ReadingQuestionCriterionTrial")] +public class ReadingQuestionCriterionTrial : BaseAddAuditEntity { - /// - /// 项目阅片标准 - /// - [Table("ReadingQuestionCriterionTrial")] - public class ReadingQuestionCriterionTrial : BaseAddAuditEntity - { - #region 导航属性 - [ForeignKey("TrialId")] - [JsonIgnore] - public Trial Trial { get; set; } + #region 导航属性 + [ForeignKey("TrialId")] + [JsonIgnore] + public Trial Trial { get; set; } - [JsonIgnore] + [JsonIgnore] - public List ReadingQuestionTrialList = new List(); + public List ReadingQuestionTrialList = new List(); - [JsonIgnore] + [JsonIgnore] - public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); - [JsonIgnore] + public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); + [JsonIgnore] - public List VisitTaskList { get; set; } + public List VisitTaskList { get; set; } - [JsonIgnore] + [JsonIgnore] - public List TrialClinicalDataSetCriterionList { get; set; } + public List TrialClinicalDataSetCriterionList { get; set; } - #endregion - /// - /// 系统标准ID - /// - public Guid? ReadingQuestionCriterionSystemId { get; set; } + #endregion + [Comment("系统标准ID")] + public Guid? ReadingQuestionCriterionSystemId { get; set; } - /// - /// 项目Id - /// - public Guid TrialId { get; set; } + [Comment("项目Id")] + public Guid TrialId { get; set; } - /// - /// 标准 - /// - public string CriterionName { get; set; } = string.Empty; + [Comment("标准")] + public string CriterionName { get; set; } = string.Empty; - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } + [Comment("是否启用")] + public bool IsEnable { get; set; } - /// - /// 排序 - /// - public int ShowOrder { get; set; } + [Comment("排序")] + public int ShowOrder { get; set; } - /// - /// 是否完成配置 - /// - public bool IsCompleteConfig { get; set; } - /// - /// 描述 - /// - public string Description { get; set; } = string.Empty; + [Comment("是否完成配置")] + public bool IsCompleteConfig { get; set; } + [Comment("描述")] + public string Description { get; set; } = string.Empty; - /// - /// 是否确认 - /// - public bool IsConfirm { get; set; } + [Comment("是否确认")] + public bool IsConfirm { get; set; } - /// - /// 表单类型 - /// + [Comment("表单类型")] - public FormType FormType { get; set; } = FormType.SinglePage; - /// - /// 修约小数点 - /// - public int? DigitPlaces { get; set; } = 1; + public FormType FormType { get; set; } = FormType.SinglePage; + [Comment("修约小数点")] + public int? DigitPlaces { get; set; } = 1; - /// - /// 评估结果 - /// - public string EvaluationResult { get; set; } = string.Empty; + [Comment("评估结果")] + public string EvaluationResult { get; set; } = string.Empty; - /// - /// 全局阅片评估更新类型 - /// - public string GlobalUpdateType { get; set; } = string.Empty; - /// - /// 评估原因 - /// - public string EvaluationReason { get; set; } = StaticData.International("CriterionTrial_EvaluationReason"); - /// - /// 是否显示详情 - /// - public bool IsShowDetail { get; set; } = true; + [Comment("全局阅片评估更新类型")] + public string GlobalUpdateType { get; set; } = string.Empty; + [Comment("评估原因")] + public string EvaluationReason { get; set; } = StaticData.International("CriterionTrial_EvaluationReason"); + [Comment("是否显示详情")] + public bool IsShowDetail { get; set; } = true; - /// - /// 同步时间 - /// - public DateTime SynchronizeTime { get; set; } - /// - /// 同步器官时间 - /// - public DateTime? SynchronizeOriginalTime { get; set; } + [Comment("同步时间")] + public DateTime SynchronizeTime { get; set; } + [Comment("同步器官时间")] + public DateTime? SynchronizeOriginalTime { get; set; } - /// - /// 标准类型 - /// - public CriterionType CriterionType { get; set; } + [Comment("标准类型")] + public CriterionType CriterionType { get; set; } - /// - /// 是否加急 - /// - public bool IsUrgent { get; set; } = false; + [Comment("是否加急")] + public bool IsUrgent { get; set; } = false; - /// - /// eCRF报告是否显示在图像页面 - /// - public bool IseCRFShowInDicomReading { get; set; } = false; + [Comment("eCRF报告是否显示在图像页面")] + public bool IseCRFShowInDicomReading { get; set; } = false; - #region 阅片单元配置 新加 - public string CriterionModalitys { get; set; } = string.Empty; + #region 阅片单元配置 新加 + public string CriterionModalitys { get; set; } = string.Empty; - /// - /// 阅片平台 - /// - public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.PACS; + [Comment("阅片平台")] + public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.PACS; - /// - /// 阅片工具 - /// - public ReadingTool? ReadingTool { get; set; } + [Comment("阅片工具")] + public ReadingTool? ReadingTool { get; set; } - /// - /// 任务组织级别 - /// - public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } - /// - /// 阅片是否显示受试者信息 - /// - public bool IsReadingShowSubjectInfo { get; set; } = true; + [Comment("任务组织级别")] + public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } + [Comment("阅片是否显示受试者信息")] + public bool IsReadingShowSubjectInfo { get; set; } = true; - /// - /// IR阅片页面是否可以查看既往任务结果 - /// - public bool IsReadingShowPreviousResults { get; set; } = true; - /// - /// 是确认医学审核问题 - /// + [Comment("IR阅片页面是否可以查看既往任务结果")] + public bool IsReadingShowPreviousResults { get; set; } = true; + [Comment("是确认医学审核问题")] - public bool IsConfirmMedicineQuestion { get; set; } = false; - /// - /// 仲裁对象 - /// - public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading; - /// - /// 阅片模式 - /// - public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; - /// - /// 存在阅片期 - /// - public bool IsReadingPeriod { get; set; } = true; + public bool IsConfirmMedicineQuestion { get; set; } = false; + [Comment("仲裁对象")] + public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading; + [Comment("阅片模式")] + public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; + [Comment("存在阅片期")] + public bool IsReadingPeriod { get; set; } = true; - /// - /// 是否生成全局阅片任务 - /// - public bool IsGlobalReading { get; set; } = true; + [Comment("是否生成全局阅片任务")] + public bool IsGlobalReading { get; set; } = true; - /// - /// 是否签名 - /// - public bool IsSigned { get; set; } = false; - /// - /// 仲裁阅片 - /// - public bool IsArbitrationReading { get; set; } = true; - /// - /// 肿瘤学阅片 原字段 IsClinicalReading - /// - public bool IsOncologyReading { get; set; } + [Comment("是否签名")] + public bool IsSigned { get; set; } = false; + [Comment("仲裁阅片")] + public bool IsArbitrationReading { get; set; } = true; + [Comment("肿瘤学阅片 原字段 IsClinicalReading")] + public bool IsOncologyReading { get; set; } - /// - /// 是否系统设置了 肿瘤学 - /// - public bool IsSystemSetOncology { get; set; } = true; + [Comment("是否系统设置了 肿瘤学")] + public bool IsSystemSetOncology { get; set; } = true; - /// - /// 任务展示访视 读片任务显示是否顺序 - /// - public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder; - //任务分配对象 - public TaskAllocateObj TaskAllocateObjEnum { get; set; } - //后续访视任务自动分配 - public bool IsFollowVisitAutoAssign { get; set; } = true; + [Comment("任务展示访视 读片任务显示是否顺序")] + public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder; + //任务分配对象 + public TaskAllocateObj TaskAllocateObjEnum { get; set; } + //后续访视任务自动分配 + public bool IsFollowVisitAutoAssign { get; set; } = true; - //后续全局自动分配 - public bool IsFollowGlobalVisitAutoAssign { get; set; } = true; + //后续全局自动分配 + public bool IsFollowGlobalVisitAutoAssign { get; set; } = true; - public bool IsFollowJudgeTaskAutoAssign { get; set; } = true; + public bool IsFollowJudgeTaskAutoAssign { get; set; } = true; - public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; + public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - //后续访视自动分配默认状态 - public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; + //后续访视自动分配默认状态 + public TaskAllocateDefaultState FollowVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - //后续全局自动分配默认状态 - public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - /// - /// 阅片信息签名时间 - /// - public DateTime? ReadingInfoSignTime { get; set; } + //后续全局自动分配默认状态 + public TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; + [Comment("阅片信息签名时间")] + public DateTime? ReadingInfoSignTime { get; set; } - /// - /// 是否必须全局阅片 - /// - public bool IsMustGlobalReading { get; set; } = false; - //是否附加评估 - public bool IsAdditionalAssessment { get; set; } - //自动 手动生成任务 - public bool IsAutoCreate { get; set; } = true; - #endregion - /// - /// 阅片过程下载影像 - /// - public ReadingImageDownload ImageDownloadEnum { get; set; } + [Comment("是否必须全局阅片")] + public bool IsMustGlobalReading { get; set; } = false; + //是否附加评估 + public bool IsAdditionalAssessment { get; set; } + //自动 手动生成任务 + public bool IsAutoCreate { get; set; } = true; + #endregion + [Comment("阅片过程下载影像")] + public ReadingImageDownload ImageDownloadEnum { get; set; } - /// - /// 阅片过程上传影像 - /// - public ReadingImageUpload ImageUploadEnum { get; set; } + [Comment("阅片过程上传影像")] + public ReadingImageUpload ImageUploadEnum { get; set; } - /// - /// 是否影像筛选 - /// - public bool IsImageFilter { get; set; } - } - - public enum ReadingImageDownload - { - None = 0, - - /// - /// 按病例 - /// - Subejct = 1, - Visit = 2, - } - - public enum ReadingImageUpload - { - None = 0, - - /// - /// 按病例 - /// - IRReadingSubejctEnable = 1, - - IRReadingVisitEnable = 2, - } - public enum ReadingOrder - { - Random = 0, - - InOrder = 1, - - SubjectRandom = 2, - } + [Comment("是否影像筛选")] + public bool IsImageFilter { get; set; } +} + +public enum ReadingImageDownload +{ + None = 0, + + [Comment("按病例")] + Subejct = 1, + Visit = 2, +} + +public enum ReadingImageUpload +{ + None = 0, + + [Comment("按病例")] + IRReadingSubejctEnable = 1, + + IRReadingVisitEnable = 2, +} +public enum ReadingOrder +{ + Random = 0, + + InOrder = 1, + + SubjectRandom = 2, } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs index 1cd1797a4..490a014a9 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs @@ -1,17 +1,13 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SystemCriterionDictionaryCode")] +public class SystemCriterionDictionaryCode : BaseAddAuditEntity { - /// - ///SystemCriterionDictionaryCode - /// - [Table("SystemCriterionDictionaryCode")] - public class SystemCriterionDictionaryCode : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - public Guid SystemCriterionId { get; set; } + public Guid SystemCriterionId { get; set; } - public string Code { get; set; } = string.Empty; - } + public string Code { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs index 7a9444542..de4794883 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs @@ -1,24 +1,20 @@ using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share.Reading; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialCriterionAdditionalAssessmentType")] +public class TrialCriterionAdditionalAssessmentType : BaseFullAuditEntity { - /// - ///TrialCriterionAdditionalAssessmentType - /// - [Table("TrialCriterionAdditionalAssessmentType")] - public class TrialCriterionAdditionalAssessmentType : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion - public Guid TrialReadingCriterionId { get; set; } + #region 导航属性 + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion + public Guid TrialReadingCriterionId { get; set; } - public CriterionType CriterionType { get; set; } - public AdditionalAssessmentType AdditionalAssessmentType { get; set; } - - public bool? IsSelected { get; set; } - } + public CriterionType CriterionType { get; set; } + public AdditionalAssessmentType AdditionalAssessmentType { get; set; } + public bool? IsSelected { get; set; } } + diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs index 5ecee2470..9cf5f1986 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs @@ -1,18 +1,14 @@ -namespace IRaCIS.Core.Domain.Models -{ - /// - ///TrialCriterionDictionaryCode - /// - [Table("TrialCriterionDictionaryCode")] - public class TrialCriterionDictionaryCode : BaseAddAuditEntity - { - #region 导航属性 - [ForeignKey("TrialCriterionId")] - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion - public Guid TrialCriterionId { get; set; } +namespace IRaCIS.Core.Domain.Models; - public string Code { get; set; } = string.Empty; - } +[Table("TrialCriterionDictionaryCode")] +public class TrialCriterionDictionaryCode : BaseAddAuditEntity +{ + #region 导航属性 + [ForeignKey("TrialCriterionId")] + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion + public Guid TrialCriterionId { get; set; } + + public string Code { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs index a1cab8fd2..94e5b47e2 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs @@ -1,274 +1,192 @@ using IRaCIS.Core.Domain.Share; using System.Linq; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("系统阅片问题")] +[Table("ReadingQuestionSystem")] +public class ReadingQuestionSystem : BaseAddAuditEntity { - /// - /// 系统阅片问题 - /// - [Table("ReadingQuestionSystem")] - public class ReadingQuestionSystem : BaseAddAuditEntity + #region 导航属性 + [JsonIgnore] + [ForeignKey("GroupId")] + public ReadingQuestionSystem GroupInfo { get; set; } + [JsonIgnore] + [ForeignKey("ReadingQuestionCriterionSystemId")] + public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; } + + [JsonIgnore] + [ForeignKey("ParentId")] + public ReadingQuestionSystem ParentReadingQuestionSystem { get; set; } + [JsonIgnore] + [ForeignKey("RelevanceId")] + public ReadingQuestionSystem RelevanceReadingQuestionSystem { get; set; } + + [NotMapped] + public List ParentTriggerValueList { - #region 导航属性 - [JsonIgnore] - [ForeignKey("GroupId")] - public ReadingQuestionSystem GroupInfo { get; set; } - [JsonIgnore] - [ForeignKey("ReadingQuestionCriterionSystemId")] - public ReadingQuestionCriterionSystem ReadingQuestionCriterionSystem { get; set; } - - [JsonIgnore] - [ForeignKey("ParentId")] - public ReadingQuestionSystem ParentReadingQuestionSystem { get; set; } - [JsonIgnore] - [ForeignKey("RelevanceId")] - public ReadingQuestionSystem RelevanceReadingQuestionSystem { get; set; } - - [NotMapped] - public List ParentTriggerValueList + get { - get + try { - try - { - return this.ParentTriggerValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } + return this.ParentTriggerValue.Split(',').ToList(); } - - } - [NotMapped] - public List RelevanceValueList - { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } - - [NotMapped] - public List HighlightAnswerList - { - get + catch (Exception) { - try - { - var result = JsonConvert.DeserializeObject>(this.HighlightAnswer); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - + return new List(); } } - #endregion - /// - /// 系统标准Id - /// - public Guid ReadingQuestionCriterionSystemId { get; set; } - /// - /// 类型 - /// - public string Type { get; set; } = string.Empty; - - /// - /// 父问题触发 - /// - public string ParentTriggerValue { get; set; } = string.Empty; - - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; - - /// - /// 是否是必须 - /// - public IsRequired IsRequired { get; set; } - - /// - /// 排序 - /// - public int ShowOrder { get; set; } - - /// - /// 父问题ID - /// - public Guid? ParentId { get; set; } - - /// - /// 类型值 - /// - public string TypeValue { get; set; } = string.Empty; - - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } - /// - /// 是否是裁判问题 - /// - public bool IsJudgeQuestion { get; set; } - - /// - /// 备注 - /// - public string Remark { get; set; } = string.Empty; - - /// - /// 关联ID - /// - public Guid? RelevanceId { get; set; } - - /// - /// 关联Value - /// - public string RelevanceValue { get; set; } = string.Empty; - - /// - /// 分组 - /// - public string GroupName { get; set; } = string.Empty; - - /// - /// 图片数量 - /// - public int ImageCount { get; set; } = 1; - - /// - /// 是否显示 - /// - public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show; - - /// - /// 最大问题数 - /// - public int? MaxQuestionCount { get; set; } - - /// - /// 病灶类型 - /// - public LesionType? LesionType { get; set; } - - /// - /// 问题类型 - /// - public QuestionType? QuestionType { get; set; } - - /// - /// 是否显示在Dicom阅片中 - /// - public bool IsShowInDicom { get; set; } = false; - - /// - /// 序号标记 - /// - public string OrderMark { get; set; } = string.Empty; - - /// - /// 字典code - /// - public string DictionaryCode { get; set; } = string.Empty; - /// - /// 问题类型 - /// - public TableQuestionType? QuestionGenre { get; set; } - - /// - /// 全局阅片显示类型 - /// - public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow; - - /// - /// 转化显示类型 - /// - public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All; - - /// - /// 默认值 - /// - public string DefaultValue { get; set; } = string.Empty; - - /// - /// 数值类型 - /// - public ValueOfType? ValueType { get; set; } - - /// - /// 单位 - /// - public ValueUnit? Unit { get; set; } - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 问题英文分组 - /// - public string GroupEnName { get; set; } = string.Empty; - - /// - /// 限制编辑 - /// - public LimitEdit LimitEdit { get; set; } = LimitEdit.None; - - /// - /// 限制显示 - /// - public LimitShow LimitShow { get; set; } = LimitShow.AllShow; - - /// - /// 数据来源 - /// - public DataSources DataSource { get; set; } = DataSources.ManualEntry; - - /// - /// 最大答案长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 分组ID - /// - public Guid? GroupId { get; set; } - - /// - /// 文件类型 - /// - public string FileType { get; set; } = string.Empty; - - /// - /// 分组分类 - /// - public GroupClassify? GroupClassify { get; set; } - - /// - /// 问题分类 - /// - public QuestionClassify? QuestionClassify { get; set; } - - /// - /// 高亮问题的答案 - /// - public string HighlightAnswer { get; set; } = "[]"; } + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + + [NotMapped] + public List HighlightAnswerList + { + get + { + + try + { + var result = JsonConvert.DeserializeObject>(this.HighlightAnswer); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + #endregion + [Comment("系统标准Id")] + public Guid ReadingQuestionCriterionSystemId { get; set; } + + [Comment("类型")] + public string Type { get; set; } = string.Empty; + + [Comment("父问题触发")] + public string ParentTriggerValue { get; set; } = string.Empty; + + [Comment("问题名称")] + public string QuestionName { get; set; } = string.Empty; + + [Comment("是否是必须")] + public IsRequired IsRequired { get; set; } + + [Comment("排序")] + public int ShowOrder { get; set; } + + [Comment("父问题ID")] + public Guid? ParentId { get; set; } + + [Comment("类型值")] + public string TypeValue { get; set; } = string.Empty; + + [Comment("是否启用")] + public bool IsEnable { get; set; } + [Comment("是否是裁判问题")] + public bool IsJudgeQuestion { get; set; } + + [Comment("备注")] + public string Remark { get; set; } = string.Empty; + + [Comment("关联ID")] + public Guid? RelevanceId { get; set; } + + [Comment("关联Value")] + public string RelevanceValue { get; set; } = string.Empty; + + [Comment("分组")] + public string GroupName { get; set; } = string.Empty; + + [Comment("图片数量")] + public int ImageCount { get; set; } = 1; + + [Comment("是否显示")] + public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show; + + [Comment("最大问题数")] + public int? MaxQuestionCount { get; set; } + + [Comment("病灶类型")] + public LesionType? LesionType { get; set; } + + [Comment("问题类型")] + public QuestionType? QuestionType { get; set; } + + [Comment("是否显示在Dicom阅片中")] + public bool IsShowInDicom { get; set; } = false; + + [Comment("序号标记")] + public string OrderMark { get; set; } = string.Empty; + + [Comment("字典code")] + public string DictionaryCode { get; set; } = string.Empty; + [Comment("问题类型")] + public TableQuestionType? QuestionGenre { get; set; } + + [Comment("全局阅片显示类型")] + public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow; + + [Comment("转化显示类型")] + public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All; + + [Comment("默认值")] + public string DefaultValue { get; set; } = string.Empty; + + [Comment("数值类型")] + public ValueOfType? ValueType { get; set; } + + [Comment("单位")] + public ValueUnit? Unit { get; set; } + [Comment("问题英文名称")] + public string QuestionEnName { get; set; } = string.Empty; + + [Comment("问题英文分组")] + public string GroupEnName { get; set; } = string.Empty; + + [Comment("限制编辑")] + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + + [Comment("限制显示")] + public LimitShow LimitShow { get; set; } = LimitShow.AllShow; + + [Comment("数据来源")] + public DataSources DataSource { get; set; } = DataSources.ManualEntry; + + [Comment("最大答案长度")] + public int? MaxAnswerLength { get; set; } + + [Comment("分组ID")] + public Guid? GroupId { get; set; } + + [Comment("文件类型")] + public string FileType { get; set; } = string.Empty; + + [Comment("分组分类")] + public GroupClassify? GroupClassify { get; set; } + + [Comment("问题分类")] + public QuestionClassify? QuestionClassify { get; set; } + + [Comment("高亮问题的答案")] + public string HighlightAnswer { get; set; } = "[]"; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs index 4f979d6ec..7d76f620f 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs @@ -1,377 +1,265 @@ using IRaCIS.Core.Domain.Share; using System.Linq; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("项目阅片问题")] +[Table("ReadingQuestionTrial")] +public class ReadingQuestionTrial : BaseAddAuditEntity { - /// - /// 项目阅片问题 - /// - [Table("ReadingQuestionTrial")] - public class ReadingQuestionTrial : BaseAddAuditEntity + #region 导航属性 + [Comment("分页标准")] + [ForeignKey("ReadingCriterionPageId")] + [JsonIgnore] + public ReadingCriterionPage ReadingCriterionPage { get; set; } + [JsonIgnore] + [ForeignKey("ParentId")] + public ReadingQuestionTrial ParentReadingQuestionTrial { get; set; } + [JsonIgnore] + [ForeignKey("RelevanceId")] + public ReadingQuestionTrial RelevanceReadingQuestionTrial { get; set; } + [JsonIgnore] + [ForeignKey("ReadingQuestionCriterionTrialId")] + public ReadingQuestionCriterionTrial ReadingQuestionCriterionTrial { get; set; } + + [JsonIgnore] + public List ReadingTableQuestionTrialList { get; set; } + [JsonIgnore] + [ForeignKey("GroupId")] + public ReadingQuestionTrial GroupInfo { get; set; } + + [NotMapped] + public List ParentTriggerValueList { - #region 导航属性 - /// - /// 分页标准 - /// - [ForeignKey("ReadingCriterionPageId")] - [JsonIgnore] - public ReadingCriterionPage ReadingCriterionPage { get; set; } - [JsonIgnore] - [ForeignKey("ParentId")] - public ReadingQuestionTrial ParentReadingQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("RelevanceId")] - public ReadingQuestionTrial RelevanceReadingQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("ReadingQuestionCriterionTrialId")] - public ReadingQuestionCriterionTrial ReadingQuestionCriterionTrial { get; set; } - - [JsonIgnore] - public List ReadingTableQuestionTrialList { get; set; } - [JsonIgnore] - [ForeignKey("GroupId")] - public ReadingQuestionTrial GroupInfo { get; set; } - - [NotMapped] - public List ParentTriggerValueList + get { - get + try { - try - { - return this.ParentTriggerValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } + return this.ParentTriggerValue.Split(',').ToList(); } - - } - [NotMapped] - public List RelevanceValueList - { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } - [NotMapped] - public List CalculateQuestionList - { - get + catch (Exception) { - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - + return new List(); } } - [NotMapped] - public List HighlightAnswerList - { - get - { - - try - { - var result = JsonConvert.DeserializeObject>(this.HighlightAnswer); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - - } - } - #endregion - public bool IsAdditional { get; set; } - /// - /// 项目标准Id - /// - public Guid ReadingQuestionCriterionTrialId { get; set; } - - /// - /// 项目Id - /// - public Guid TrialId { get; set; } - - /// - /// 类型 - /// - public string Type { get; set; } = string.Empty; - - /// - /// 父问题触发 - /// - public string ParentTriggerValue { get; set; } = string.Empty; - - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; - - /// - /// 是否是必须 - /// - public IsRequired IsRequired { get; set; } - - /// - /// 排序 - /// - public int ShowOrder { get; set; } - - /// - /// 父问题ID - /// - public Guid? ParentId { get; set; } - /// - /// 类型值 - /// - public string TypeValue { get; set; } = string.Empty; - - public bool IsEnable { get; set; } - - /// - /// 是否是裁判问题 - /// - public bool IsJudgeQuestion { get; set; } - - /// - /// 病灶类型 - /// - public LesionType? LesionType { get; set; } - - /// - /// 问题类型 - /// - public QuestionType? QuestionType { get; set; } - - /// - /// 全局阅片显示类型 - /// - public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow; - /// - /// 转化显示类型 - /// - public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All; - - /// - /// 备注 - /// - public string Remark { get; set; } = string.Empty; - - /// - /// 分组 - /// - public string GroupName { get; set; } = string.Empty; - /// - /// 系统问题ID - /// - public Guid? ReadingQuestionSystemId { get; set; } - - /// - /// 系统标准的ParentId - /// - public Guid? SystemParentId { get; set; } - - /// - /// 答案分组 - /// - public string AnswerGroup { get; set; } = string.Empty; - - /// - /// 答案组合 - /// - public string AnswerCombination { get; set; } = string.Empty; - - /// - /// 裁判类型 - /// - public JudgeTypeEnum JudgeType { get; set; } = JudgeTypeEnum.AnswerDisaffinity; - - /// - /// 裁判百分比或绝对值的相差值 - /// - public decimal? JudgeDifferenceValue { get; set; } - - /// - /// 裁判百分比或绝对值的相差值匹配规则 - /// - public JudgeDifferenceType JudgeDifferenceType { get; set; } - /// - /// 标准分页Id - /// - public Guid? ReadingCriterionPageId { get; set; } - - /// - /// 关联ID - /// - public Guid? RelevanceId { get; set; } - - /// - /// 关联Value - /// - public string RelevanceValue { get; set; } = string.Empty; - - /// - /// 图片数量 - /// - public int ImageCount { get; set; } = 1; - - /// - /// 是否显示 - /// - public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show; - - /// - /// 默认值 - /// - public string DefaultValue { get; set; } = string.Empty; - - /// - /// 最大问题数 - /// - public int? MaxQuestionCount { get; set; } - - /// - /// 最大答案长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 文件类型 - /// - public string FileType { get; set; } = string.Empty; - - /// - /// 是否显示在Dicom阅片中 - /// - public bool IsShowInDicom { get; set; } = false; - /// - /// 序号标记 - /// - public string OrderMark { get; set; } = string.Empty; - - /// - /// 字典code - /// - public string DictionaryCode { get; set; } = string.Empty; - - /// - /// 问题类型 - /// - public TableQuestionType? QuestionGenre { get; set; } - - /// - /// 数值类型 - /// - public ValueOfType? ValueType { get; set; } - - /// - /// 单位 - /// - public ValueUnit? Unit { get; set; } - - /// - /// 自定义单位 - /// - public string CustomUnit { get; set; } = string.Empty; - /// - /// 自定义计算标记 - /// - public CustomCalculateMark? CustomCalculateMark { get; set; } - - /// - /// 限制编辑 - /// - public LimitEdit LimitEdit { get; set; } = LimitEdit.None; - - /// - /// 限制显示 - /// - public LimitShow LimitShow { get; set; } = LimitShow.AllShow; - - /// - /// 自定义计算标记 - /// - public string CalculateQuestions { get; set; } = "[]"; - - /// - /// 数据来源 - /// - public DataSources DataSource { get; set; } = DataSources.ManualEntry; - - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 问题英文分组 - /// - public string GroupEnName { get; set; } = string.Empty; - - /// - /// 分类算法 - /// - public string ClassifyAlgorithms { get; set; } = string.Empty; - - /// - /// 分类问题Id - /// - public Guid? ClassifyQuestionId { get; set; } - - /// - /// 是否复制病灶 - /// - public bool IsCopyLesions { get; set; } = false; - - /// - /// 分组ID - /// - public Guid? GroupId { get; set; } - /// - /// 分组分类 - /// - public GroupClassify? GroupClassify { get; set; } - /// - /// 问题分类 - /// - public QuestionClassify? QuestionClassify { get; set; } - /// - /// 高亮问题的答案 - /// - public string HighlightAnswer { get; set; } = "[]"; - } - public class CalculateInfo - { - public bool IsTable { get; set; } - - public Guid? QuestionId { get; set; } - - public Guid? TableQuestionId { get; set; } - } + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + [NotMapped] + public List CalculateQuestionList + { + get + { + + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + + [NotMapped] + public List HighlightAnswerList + { + get + { + + try + { + var result = JsonConvert.DeserializeObject>(this.HighlightAnswer); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + #endregion + public bool IsAdditional { get; set; } + [Comment("项目标准Id")] + public Guid ReadingQuestionCriterionTrialId { get; set; } + + [Comment("项目Id")] + public Guid TrialId { get; set; } + + [Comment("类型")] + public string Type { get; set; } = string.Empty; + + [Comment("父问题触发")] + public string ParentTriggerValue { get; set; } = string.Empty; + + [Comment("问题名称")] + public string QuestionName { get; set; } = string.Empty; + + [Comment("是否是必须")] + public IsRequired IsRequired { get; set; } + + [Comment("排序")] + public int ShowOrder { get; set; } + + [Comment("父问题ID")] + public Guid? ParentId { get; set; } + [Comment("类型值")] + public string TypeValue { get; set; } = string.Empty; + + public bool IsEnable { get; set; } + + [Comment("是否是裁判问题")] + public bool IsJudgeQuestion { get; set; } + + [Comment("病灶类型")] + public LesionType? LesionType { get; set; } + + [Comment("问题类型")] + public QuestionType? QuestionType { get; set; } + + [Comment("全局阅片显示类型")] + public GlobalReadingShowType GlobalReadingShowType { get; set; } = GlobalReadingShowType.NotShow; + [Comment("转化显示类型")] + public ConvertShowType ConvertShowType { get; set; } = ConvertShowType.All; + + [Comment("备注")] + public string Remark { get; set; } = string.Empty; + + [Comment("分组")] + public string GroupName { get; set; } = string.Empty; + [Comment("系统问题ID")] + public Guid? ReadingQuestionSystemId { get; set; } + + [Comment("系统标准的ParentId")] + public Guid? SystemParentId { get; set; } + + [Comment("答案分组")] + public string AnswerGroup { get; set; } = string.Empty; + + [Comment("答案组合")] + public string AnswerCombination { get; set; } = string.Empty; + + [Comment("裁判类型")] + public JudgeTypeEnum JudgeType { get; set; } = JudgeTypeEnum.AnswerDisaffinity; + + [Comment("裁判百分比或绝对值的相差值")] + public decimal? JudgeDifferenceValue { get; set; } + + [Comment("裁判百分比或绝对值的相差值匹配规则")] + public JudgeDifferenceType JudgeDifferenceType { get; set; } + [Comment("标准分页Id")] + public Guid? ReadingCriterionPageId { get; set; } + + [Comment("关联ID")] + public Guid? RelevanceId { get; set; } + + [Comment("关联Value")] + public string RelevanceValue { get; set; } = string.Empty; + + [Comment("图片数量")] + public int ImageCount { get; set; } = 1; + + [Comment("是否显示")] + public ShowQuestion ShowQuestion { get; set; } = ShowQuestion.Show; + + [Comment("默认值")] + public string DefaultValue { get; set; } = string.Empty; + + [Comment("最大问题数")] + public int? MaxQuestionCount { get; set; } + + [Comment("最大答案长度")] + public int? MaxAnswerLength { get; set; } + + [Comment("文件类型")] + public string FileType { get; set; } = string.Empty; + + [Comment("是否显示在Dicom阅片中")] + public bool IsShowInDicom { get; set; } = false; + [Comment("序号标记")] + public string OrderMark { get; set; } = string.Empty; + + [Comment("字典code")] + public string DictionaryCode { get; set; } = string.Empty; + + [Comment("问题类型")] + public TableQuestionType? QuestionGenre { get; set; } + + [Comment("数值类型")] + public ValueOfType? ValueType { get; set; } + + [Comment("单位")] + public ValueUnit? Unit { get; set; } + + [Comment("自定义单位")] + public string CustomUnit { get; set; } = string.Empty; + [Comment("自定义计算标记")] + public CustomCalculateMark? CustomCalculateMark { get; set; } + + [Comment("限制编辑")] + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + + [Comment("限制显示")] + public LimitShow LimitShow { get; set; } = LimitShow.AllShow; + + [Comment("自定义计算标记")] + public string CalculateQuestions { get; set; } = "[]"; + + [Comment("数据来源")] + public DataSources DataSource { get; set; } = DataSources.ManualEntry; + + [Comment("问题英文名称")] + public string QuestionEnName { get; set; } = string.Empty; + + [Comment("问题英文分组")] + public string GroupEnName { get; set; } = string.Empty; + + [Comment("分类算法")] + public string ClassifyAlgorithms { get; set; } = string.Empty; + + [Comment("分类问题Id")] + public Guid? ClassifyQuestionId { get; set; } + + [Comment("是否复制病灶")] + public bool IsCopyLesions { get; set; } = false; + + [Comment("分组ID")] + public Guid? GroupId { get; set; } + [Comment("分组分类")] + public GroupClassify? GroupClassify { get; set; } + [Comment("问题分类")] + public QuestionClassify? QuestionClassify { get; set; } + [Comment("高亮问题的答案")] + public string HighlightAnswer { get; set; } = "[]"; +} +public class CalculateInfo +{ + public bool IsTable { get; set; } + + public Guid? QuestionId { get; set; } + + public Guid? TableQuestionId { get; set; } + } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs index 8b2be4886..8b9bd47ac 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingSystemCriterionDictionary.cs @@ -1,30 +1,24 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("ReadingSystemCriterionDictionary")] +public class ReadingSystemCriterionDictionary : BaseAddAuditEntity { - /// - ///ReadingCriterionDictionary - /// - [Table("ReadingSystemCriterionDictionary")] - public class ReadingSystemCriterionDictionary : BaseAddAuditEntity - { - #region + #region - [JsonIgnore] - [ForeignKey("DictionaryId")] - public Dictionary Dictionary { get; set; } - #endregion - public Guid CriterionId { get; set; } - public Guid DictionaryId { get; set; } - public bool IsSystemCriterion { get; set; } = false; + [JsonIgnore] + [ForeignKey("DictionaryId")] + public Dictionary Dictionary { get; set; } + #endregion + public Guid CriterionId { get; set; } + public Guid DictionaryId { get; set; } + public bool IsSystemCriterion { get; set; } = false; - public string ParentCode { get; set; } = string.Empty; - public bool IsBaseLineUse { get; set; } = false; - public bool IsFollowVisitUse { get; set; } = false; + public string ParentCode { get; set; } = string.Empty; + public bool IsBaseLineUse { get; set; } = false; + public bool IsFollowVisitUse { get; set; } = false; - /// - /// ׼ֵ - /// - public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General; - } + [Comment("׼ֵ")] + public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } = CrterionDictionaryGroup.General; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index 1b1646ab7..d84ae5af4 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -1,191 +1,133 @@ using IRaCIS.Core.Domain.Share; using System.Linq; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("系统表格问题")] +[Table("ReadingTableQuestionSystem")] +public class ReadingTableQuestionSystem : BaseAddAuditEntity { - /// - ///系统表格问题 - /// - [Table("ReadingTableQuestionSystem")] - public class ReadingTableQuestionSystem : BaseAddAuditEntity + #region 导航属性 + [ForeignKey("DependParentId")] + [JsonIgnore] + public ReadingTableQuestionSystem DependParentQuestion { get; set; } + + [NotMapped] + public List ParentTriggerValueList { - #region 导航属性 - [ForeignKey("DependParentId")] - [JsonIgnore] - public ReadingTableQuestionSystem DependParentQuestion { get; set; } - - [NotMapped] - public List ParentTriggerValueList + get { - get + try { - try - { - return this.ParentTriggerValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } + return this.ParentTriggerValue.Split(',').ToList(); } - - } - [NotMapped] - public List RelevanceValueList - { - get + catch (Exception) { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - return new List(); - } + return new List(); } - } - #endregion - /// - /// 系统表的问题Id ReadingQuestionSystem的Id - /// - public Guid ReadingQuestionId { get; set; } - - public string Type { get; set; } = string.Empty; - public Guid? ParentId { get; set; } - - /// - ///父问题触发值 - /// - public string ParentTriggerValue { get; set; } = string.Empty; - - /// - /// 问题名称 - /// - public string QuestionName { get; set; } = string.Empty; - - /// - /// IsRequired - /// - public IsRequired IsRequired { get; set; } - - /// - /// 排序号 - /// - public int ShowOrder { get; set; } - - /// - /// 值 - /// - public string TypeValue { get; set; } = string.Empty; - - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } - - public string Remark { get; set; } = string.Empty; - - /// - /// 显示父问题 - /// - public Guid? RelevanceId { get; set; } - - /// - /// 显示父问题的值 - /// - public string RelevanceValue { get; set; } = string.Empty; - - /// - /// 是否显示 - /// - public int ShowQuestion { get; set; } - - /// - /// 最大问题数 - /// - public int? MaxRowCount { get; set; } - - /// - /// 数据表名称 - /// - public string DataTableName { get; set; } = string.Empty; - - /// - /// 数据列 - /// - public string DataTableColumn { get; set; } = string.Empty; - /// - /// 关联父问题 - /// - public Guid? DependParentId { get; set; } - - /// - /// 是否关联 - /// - public IsDepend IsDepend { get; set; } - - /// - /// 表格问题类型 - /// - public TableQuestionType? TableQuestionType { get; set; } - - /// - /// 系统标准Id - /// - public Guid SystemCriterionId { get; set; } - - /// - /// 问题标识 - /// - public QuestionMark? QuestionMark { get; set; } - - /// - /// 字典code - /// - public string DictionaryCode { get; set; } = string.Empty; - /// - /// 数值类型 - /// - public ValueOfType? ValueType { get; set; } - - /// - /// 单位 - /// - public ValueUnit? Unit { get; set; } - - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 数据来源 - /// - public DataSources DataSource { get; set; } = DataSources.ManualEntry; - - /// - /// 限制编辑 - /// - public LimitEdit LimitEdit { get; set; } = LimitEdit.None; - - /// - /// 最大答案长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 文件类型 - /// - public string? FileType { get; set; } = string.Empty; - - /// - /// 问题分类 - /// - public QuestionClassify? QuestionClassify { get; set; } } + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + #endregion + + [Comment("系统表的问题Id ReadingQuestionSystem的Id")] + public Guid ReadingQuestionId { get; set; } + + public string Type { get; set; } = string.Empty; + public Guid? ParentId { get; set; } + + [Comment("父问题触发值")] + public string ParentTriggerValue { get; set; } = string.Empty; + + [Comment("问题名称")] + public string QuestionName { get; set; } = string.Empty; + + + public IsRequired IsRequired { get; set; } + + [Comment("排序号")] + public int ShowOrder { get; set; } + + [Comment("值")] + public string TypeValue { get; set; } = string.Empty; + + [Comment("是否启用")] + public bool IsEnable { get; set; } + + public string Remark { get; set; } = string.Empty; + + [Comment("显示父问题")] + public Guid? RelevanceId { get; set; } + + [Comment("显示父问题的值")] + public string RelevanceValue { get; set; } = string.Empty; + + [Comment("是否显示")] + public int ShowQuestion { get; set; } + + [Comment("最大问题数")] + public int? MaxRowCount { get; set; } + + [Comment("数据表名称")] + public string DataTableName { get; set; } = string.Empty; + + [Comment("数据列")] + public string DataTableColumn { get; set; } = string.Empty; + [Comment("关联父问题")] + public Guid? DependParentId { get; set; } + + [Comment("是否关联")] + public IsDepend IsDepend { get; set; } + + [Comment("表格问题类型")] + public TableQuestionType? TableQuestionType { get; set; } + + [Comment("系统标准Id")] + public Guid SystemCriterionId { get; set; } + + [Comment("问题标识")] + public QuestionMark? QuestionMark { get; set; } + + [Comment("字典code")] + public string DictionaryCode { get; set; } = string.Empty; + [Comment("数值类型")] + public ValueOfType? ValueType { get; set; } + + [Comment("单位")] + public ValueUnit? Unit { get; set; } + + [Comment("问题英文名称")] + public string QuestionEnName { get; set; } = string.Empty; + + [Comment("数据来源")] + public DataSources DataSource { get; set; } = DataSources.ManualEntry; + + [Comment("限制编辑")] + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + + [Comment("最大答案长度")] + public int? MaxAnswerLength { get; set; } + + [Comment("文件类型")] + public string? FileType { get; set; } = string.Empty; + + [Comment("问题分类")] + public QuestionClassify? QuestionClassify { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index d804861c1..030c95818 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -1,184 +1,148 @@ using IRaCIS.Core.Domain.Share; using System.Linq; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("项目阅片问题")] +[Table("ReadingTableQuestionTrial")] +public class ReadingTableQuestionTrial : BaseAddAuditEntity { - /// - /// 项目阅片问题 - /// - [Table("ReadingTableQuestionTrial")] - public class ReadingTableQuestionTrial : BaseAddAuditEntity + #region 导航属性 + [JsonIgnore] + [ForeignKey("DependParentId")] + public ReadingTableQuestionTrial DependParentQuestion { get; set; } + + [JsonIgnore] + [ForeignKey("ReadingQuestionId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + [NotMapped] + public List ParentTriggerValueList { - #region 导航属性 - [JsonIgnore] - [ForeignKey("DependParentId")] - public ReadingTableQuestionTrial DependParentQuestion { get; set; } - - [JsonIgnore] - [ForeignKey("ReadingQuestionId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - [NotMapped] - public List ParentTriggerValueList + get { - get + try { - try - { - return this.ParentTriggerValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } + return this.ParentTriggerValue.Split(',').ToList(); } - - } - [NotMapped] - public List RelevanceValueList - { - get + catch (Exception) { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } - [NotMapped] - public List CalculateQuestionList - { - get - { - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } + return new List(); } } - #endregion - public Guid TrialId { get; set; } - - /// - /// 项目问题的Id ReadingQuestionTrial的id - /// - public Guid ReadingQuestionId { get; set; } - public string Type { get; set; } = string.Empty; - public Guid? ParentId { get; set; } - - public string ParentTriggerValue { get; set; } = string.Empty; - public string QuestionName { get; set; } = string.Empty; - public IsRequired IsRequired { get; set; } - - public int ShowOrder { get; set; } - - public string TypeValue { get; set; } = string.Empty; - public bool IsEnable { get; set; } - - public string Remark { get; set; } = string.Empty; - public Guid? RelevanceId { get; set; } - - public string RelevanceValue { get; set; } = string.Empty; - - public int ShowQuestion { get; set; } - public int? MaxRowCount { get; set; } - - public string DataTableName { get; set; } = string.Empty; - - public string DataTableColumn { get; set; } = string.Empty; - - public TableQuestionType? TableQuestionType { get; set; } - - public Guid? DependParentId { get; set; } - - public IsDepend IsDepend { get; set; } - public Guid TrialCriterionId { get; set; } - - /// - /// 问题标识 - /// - public QuestionMark? QuestionMark { get; set; } - /// - /// 字典code - /// - public string DictionaryCode { get; set; } = string.Empty; - - /// - /// 数值类型 - /// - public ValueOfType? ValueType { get; set; } - - /// - /// 单位 - /// - public ValueUnit? Unit { get; set; } - - /// - /// 自定义单位 - /// - public string CustomUnit { get; set; } = string.Empty; - - /// - /// 自定义计算标记 - /// - public CustomCalculateMark? CustomCalculateMark { get; set; } - - /// - /// 限制编辑 - /// - public LimitEdit LimitEdit { get; set; } = LimitEdit.None; - - /// - /// 自定义计算标记 - /// - public string CalculateQuestions { get; set; } = "[]"; - - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; - - /// - /// 数据来源 - /// - public DataSources DataSource { get; set; } = DataSources.ManualEntry; - - /// - /// 最大答案长度 - /// - public int? MaxAnswerLength { get; set; } - - /// - /// 文件类型 - /// - public string FileType { get; set; } = string.Empty; - - /// - /// 问题分类 - /// - public QuestionClassify? QuestionClassify { get; set; } - /// - /// 复制病灶的时候 是否复制这个问题 - /// - public bool IsCopy { get; set; } = false; - - /// - /// 系统表格问题Id - /// - public Guid? SystemTableQuestionId { get; set; } } + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + [NotMapped] + public List CalculateQuestionList + { + get + { + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); + } + + } + } + #endregion + + public Guid TrialId { get; set; } + + [Comment("项目问题的Id ReadingQuestionTrial的id")] + public Guid ReadingQuestionId { get; set; } + public string Type { get; set; } = string.Empty; + public Guid? ParentId { get; set; } + + public string ParentTriggerValue { get; set; } = string.Empty; + public string QuestionName { get; set; } = string.Empty; + public IsRequired IsRequired { get; set; } + + public int ShowOrder { get; set; } + + public string TypeValue { get; set; } = string.Empty; + public bool IsEnable { get; set; } + + public string Remark { get; set; } = string.Empty; + public Guid? RelevanceId { get; set; } + + public string RelevanceValue { get; set; } = string.Empty; + + public int ShowQuestion { get; set; } + public int? MaxRowCount { get; set; } + + public string DataTableName { get; set; } = string.Empty; + + public string DataTableColumn { get; set; } = string.Empty; + + public TableQuestionType? TableQuestionType { get; set; } + + public Guid? DependParentId { get; set; } + + public IsDepend IsDepend { get; set; } + public Guid TrialCriterionId { get; set; } + + [Comment("问题标识")] + public QuestionMark? QuestionMark { get; set; } + [Comment("字典code")] + public string DictionaryCode { get; set; } = string.Empty; + + [Comment("数值类型")] + public ValueOfType? ValueType { get; set; } + + [Comment("单位")] + public ValueUnit? Unit { get; set; } + + [Comment("自定义单位")] + public string CustomUnit { get; set; } = string.Empty; + + [Comment("自定义计算标记")] + public CustomCalculateMark? CustomCalculateMark { get; set; } + + [Comment("限制编辑")] + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + + [Comment("自定义计算标记")] + public string CalculateQuestions { get; set; } = "[]"; + + [Comment("问题英文名称")] + public string QuestionEnName { get; set; } = string.Empty; + + [Comment("数据来源")] + public DataSources DataSource { get; set; } = DataSources.ManualEntry; + + [Comment("最大答案长度")] + public int? MaxAnswerLength { get; set; } + + [Comment("文件类型")] + public string FileType { get; set; } = string.Empty; + + [Comment("问题分类")] + public QuestionClassify? QuestionClassify { get; set; } + [Comment("复制病灶的时候 是否复制这个问题")] + public bool IsCopy { get; set; } = false; + + [Comment("系统表格问题Id")] + public Guid? SystemTableQuestionId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs index 026d80d24..21027755d 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTrialCriterionDictionary.cs @@ -1,31 +1,27 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("ReadingTrialCriterionDictionary")] +public class ReadingTrialCriterionDictionary : BaseAddAuditEntity { - /// - ///ReadingTrialCriterionDictionary - /// - [Table("ReadingTrialCriterionDictionary")] - public class ReadingTrialCriterionDictionary : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("DictionaryId")] - public Dictionary Dictionary { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("DictionaryId")] + public Dictionary Dictionary { get; set; } - [ForeignKey("CriterionId")] - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion - public Guid CriterionId { get; set; } + [ForeignKey("CriterionId")] + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion + public Guid CriterionId { get; set; } - public Guid DictionaryId { get; set; } - public string ParentCode { get; set; } = string.Empty; + public Guid DictionaryId { get; set; } + public string ParentCode { get; set; } = string.Empty; - public bool IsBaseLineUse { get; set; } + public bool IsBaseLineUse { get; set; } - public bool IsFollowVisitUse { get; set; } + public bool IsFollowVisitUse { get; set; } - public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } - } + public CrterionDictionaryGroup CrterionDictionaryGroup { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs index d14b2b149..af607976a 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingCustomTag.cs @@ -1,25 +1,21 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("ReadingCustomTag")] +public class ReadingCustomTag : BaseAddAuditEntity { - /// - ///ReadingCustomTag - /// - [Table("ReadingCustomTag")] - public class ReadingCustomTag : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - public Guid VisitTaskId { get; set; } + public Guid VisitTaskId { get; set; } - public Guid? StudyId { get; set; } - public Guid? SeriesId { get; set; } + public Guid? StudyId { get; set; } + public Guid? SeriesId { get; set; } - public Guid? InstanceId { get; set; } + public Guid? InstanceId { get; set; } - public string MeasureData { get; set; } = string.Empty; + public string MeasureData { get; set; } = string.Empty; - public int? NumberOfFrames { get; set; } + public int? NumberOfFrames { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs index 55c54b9a6..dceb1e6be 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingGlobalTaskInfo.cs @@ -1,54 +1,40 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("阅片全局任务信息")] +[Table("ReadingGlobalTaskInfo")] +public class ReadingGlobalTaskInfo : BaseAddAuditEntity { - /// - /// 阅片全局任务信息 - /// - [Table("ReadingGlobalTaskInfo")] - public class ReadingGlobalTaskInfo : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TaskId")] - public VisitTask VisitTask { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("TaskId")] + public VisitTask VisitTask { get; set; } - [JsonIgnore] - [ForeignKey("GlobalTaskId")] - public VisitTask GlobalVisitTask { get; set; } - [JsonIgnore] - [ForeignKey("QuestionId")] - public ReadingQuestionTrial TrialReadingQuestion { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("GlobalTaskId")] + public VisitTask GlobalVisitTask { get; set; } + [JsonIgnore] + [ForeignKey("QuestionId")] + public ReadingQuestionTrial TrialReadingQuestion { get; set; } + #endregion - /// - /// 全局任务Id - /// - public Guid GlobalTaskId { get; set; } + [Comment("全局任务Id")] + public Guid GlobalTaskId { get; set; } - /// - /// 原任务ID - /// + [Comment("原任务ID")] - public Guid TaskId { get; set; } + public Guid TaskId { get; set; } - /// - /// 问题ID - /// - public Guid? QuestionId { get; set; } + [Comment("问题ID")] + public Guid? QuestionId { get; set; } - /// - /// 问题答案 - /// + [Comment("问题答案")] - public string Answer { get; set; } = string.Empty; - public Guid TrialId { get; set; } + public string Answer { get; set; } = string.Empty; + public Guid TrialId { get; set; } - /// - /// 全局答案类型 - /// - public GlobalAnswerType GlobalAnswerType { get; set; } + [Comment("全局答案类型")] + public GlobalAnswerType GlobalAnswerType { get; set; } - public Guid SubjectId { get; set; } + public Guid SubjectId { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs index 679e62fae..a2612e8df 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingJudgeInfo.cs @@ -1,33 +1,23 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("阅片裁判信息")] +[Table("ReadingJudgeInfo")] +public class ReadingJudgeInfo : BaseAddAuditEntity { - /// - ///阅片裁判信息 - /// - [Table("ReadingJudgeInfo")] - public class ReadingJudgeInfo : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - /// - /// 第一个任务ID - /// - [Required] - public Guid TaskIdOne { get; set; } + #endregion + [Comment("第一个任务ID")] + [Required] + public Guid TaskIdOne { get; set; } - /// - /// 第二个任务ID - /// - [Required] - public Guid TaskIdTwo { get; set; } + [Comment("第二个任务ID")] + [Required] + public Guid TaskIdTwo { get; set; } - /// - /// 裁判任务ID - /// - [Required] - public Guid JudgeTaskId { get; set; } - public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } + [Comment("裁判任务ID")] + [Required] + public Guid JudgeTaskId { get; set; } + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs index dff2ced8e..440cf2fee 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingOncologyTaskInfo.cs @@ -1,48 +1,32 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("阅片肿瘤学 针对访视任务 添加了一个结果")] +[Table("ReadingOncologyTaskInfo")] +public class ReadingOncologyTaskInfo : BaseAddAuditEntity { - /// - /// 阅片肿瘤学 针对访视任务 添加了一个结果 - /// - [Table("ReadingOncologyTaskInfo")] - public class ReadingOncologyTaskInfo : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - [ForeignKey("OncologyTaskId")] - public VisitTask OncologyVisitTask { get; set; } + [JsonIgnore] + [ForeignKey("OncologyTaskId")] + public VisitTask OncologyVisitTask { get; set; } - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } - #endregion - /// - /// 肿瘤学 阅片任务ID - /// - public Guid OncologyTaskId { get; set; } + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + #endregion + [Comment("肿瘤学 阅片任务ID")] + public Guid OncologyTaskId { get; set; } - /// - /// 产生肿瘤学阅片任务的 访视类型的阅片任务Id - /// - public Guid VisitTaskId { get; set; } + [Comment("产生肿瘤学阅片任务的 访视类型的阅片任务Id")] + public Guid VisitTaskId { get; set; } - /// - /// 结果 - /// - public string EvaluationResult { get; set; } = string.Empty; + [Comment("结果")] + public string EvaluationResult { get; set; } = string.Empty; - /// - /// 原因 - /// - public string EvaluationReason { get; set; } = string.Empty; - /// - /// 项目Id - /// - public Guid TrialId { get; set; } + [Comment("原因")] + public string EvaluationReason { get; set; } = string.Empty; + [Comment("项目Id")] + public Guid TrialId { get; set; } - /// - /// 受试者Id - /// - public Guid SubjectId { get; set; } - } + [Comment("受试者Id")] + public Guid SubjectId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index 233f2b5bc..171c7c2e7 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -1,137 +1,107 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("表格问题答案行数据")] +[Table("ReadingTableAnswerRowInfo")] +public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity { - /// - /// 表格问题答案行数据 - /// - [Table("ReadingTableAnswerRowInfo")] - public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("InstanceId")] - public DicomInstance Instance { get; set; } - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } - [JsonIgnore] - [ForeignKey("OrganInfoId")] - public OrganInfo OrganInfo { get; set; } - [JsonIgnore] - [ForeignKey("SplitRowId")] - public ReadingTableAnswerRowInfo SplitRow { get; set; } - [JsonIgnore] - [ForeignKey("MergeRowId")] - public ReadingTableAnswerRowInfo MergeRow { get; set; } - [JsonIgnore] - [ForeignKey("QuestionId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - //病灶答案表 - [JsonIgnore] - public List LesionAnswerList { get; set; } = new List(); - #endregion - public Guid QuestionId { get; set; } - public Guid VisitTaskId { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("InstanceId")] + public DicomInstance Instance { get; set; } + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + [JsonIgnore] + [ForeignKey("OrganInfoId")] + public OrganInfo OrganInfo { get; set; } + [JsonIgnore] + [ForeignKey("SplitRowId")] + public ReadingTableAnswerRowInfo SplitRow { get; set; } + [JsonIgnore] + [ForeignKey("MergeRowId")] + public ReadingTableAnswerRowInfo MergeRow { get; set; } + [JsonIgnore] + [ForeignKey("QuestionId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + //病灶答案表 + [JsonIgnore] + public List LesionAnswerList { get; set; } = new List(); + #endregion + public Guid QuestionId { get; set; } + public Guid VisitTaskId { get; set; } - public Guid TrialId { get; set; } - public Guid? InstanceId { get; set; } + public Guid TrialId { get; set; } + public Guid? InstanceId { get; set; } - public Guid? SeriesId { get; set; } - public Guid? StudyId { get; set; } + public Guid? SeriesId { get; set; } + public Guid? StudyId { get; set; } - public Guid? OtherInstanceId { get; set; } + public Guid? OtherInstanceId { get; set; } - public Guid? OtherSeriesId { get; set; } + public Guid? OtherSeriesId { get; set; } - public Guid? OtherStudyId { get; set; } + public Guid? OtherStudyId { get; set; } - public string OtherMarkTool { get; set; } = string.Empty; + public string OtherMarkTool { get; set; } = string.Empty; - public string OtherPicturePath { get; set; } = string.Empty; + public string OtherPicturePath { get; set; } = string.Empty; - public int? OtherNumberOfFrames { get; set; } + public int? OtherNumberOfFrames { get; set; } - public bool IsCanEditPosition { get; set; } = false; - /// - /// 是Dicom阅片 - /// - public bool IsDicomReading { get; set; } = true; + public bool IsCanEditPosition { get; set; } = false; + [Comment("是Dicom阅片")] + public bool IsDicomReading { get; set; } = true; - public decimal RowIndex { get; set; } + public decimal RowIndex { get; set; } - public string MeasureData { get; set; } = string.Empty; + public string MeasureData { get; set; } = string.Empty; - /// - /// 是否是当前任务添加 - /// - public bool IsCurrentTaskAdd { get; set; } = false; + [Comment("是否是当前任务添加")] + public bool IsCurrentTaskAdd { get; set; } = false; - public Guid? SplitRowId { get; set; } + public Guid? SplitRowId { get; set; } - public Guid? MergeRowId { get; set; } + public Guid? MergeRowId { get; set; } - public string BlindName { get; set; } = string.Empty; + public string BlindName { get; set; } = string.Empty; - public string OrderMark { get; set; } = string.Empty; + public string OrderMark { get; set; } = string.Empty; - /// - /// 截图地址 - /// - public string PicturePath { get; set; } = string.Empty; + [Comment("截图地址")] + public string PicturePath { get; set; } = string.Empty; - /// - /// 第一次添加的任务ID - /// - public decimal FristAddTaskNum { get; set; } = 0; + [Comment("第一次添加的任务ID")] + public decimal FristAddTaskNum { get; set; } = 0; - /// - /// 首次添加任务ID - /// - public Guid FristAddTaskId { get; set; } + [Comment("首次添加任务ID")] + public Guid FristAddTaskId { get; set; } - /// - /// 融合的PTSeriesId - /// - public Guid? PTSeriesId { get; set; } + [Comment("融合的PTSeriesId")] + public Guid? PTSeriesId { get; set; } - /// - /// 融合的CTSeriesId - /// - public Guid? CTSeriesId { get; set; } + [Comment("融合的CTSeriesId")] + public Guid? CTSeriesId { get; set; } - public SplitOrMergeType? SplitOrMergeType { get; set; } - public int? NumberOfFrames { get; set; } - /// - /// 器官Id - /// - public Guid? OrganInfoId { get; set; } - /// - /// 窗宽WW - /// - public decimal? WW { get; set; } + public SplitOrMergeType? SplitOrMergeType { get; set; } + public int? NumberOfFrames { get; set; } + [Comment("器官Id")] + public Guid? OrganInfoId { get; set; } + [Comment("窗宽WW")] + public decimal? WW { get; set; } - /// - /// 窗位WL - /// - public decimal? WL { get; set; } + [Comment("窗位WL")] + public decimal? WL { get; set; } - /// - /// 来自于哪个标记 - /// - public string FromMark { get; set; } = string.Empty; + [Comment("来自于哪个标记")] + public string FromMark { get; set; } = string.Empty; - /// - /// 报告页面显示来自于哪个标记 - /// - public string ReportMark { get; set; } = string.Empty; - public string OtherMeasureData { get; set; } = string.Empty; - //病灶编号 - public string RowMark { get; set; } = string.Empty; + [Comment("报告页面显示来自于哪个标记")] + public string ReportMark { get; set; } = string.Empty; + public string OtherMeasureData { get; set; } = string.Empty; + //病灶编号 + public string RowMark { get; set; } = string.Empty; - /// - /// 标记工具 - /// - public string MarkTool { get; set; } = string.Empty; - } + [Comment("标记工具")] + public string MarkTool { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs index fb726a788..97677cb71 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableQuestionAnswer.cs @@ -1,41 +1,35 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("ReadingTableQuestionAnswer")] +public class ReadingTableQuestionAnswer : BaseFullDeleteAuditEntity { - /// - ///ReadingTableQuestionAnswer - /// - [Table("ReadingTableQuestionAnswer")] - public class ReadingTableQuestionAnswer : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("RowId")] + #region 导航属性 + [JsonIgnore] + [ForeignKey("RowId")] - public ReadingTableAnswerRowInfo Lesion { get; set; } - [JsonIgnore] - [ForeignKey("QuestionId")] + public ReadingTableAnswerRowInfo Lesion { get; set; } + [JsonIgnore] + [ForeignKey("QuestionId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("TableQuestionId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + [JsonIgnore] + [ForeignKey("TableQuestionId")] - public ReadingTableQuestionTrial ReadingTableQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } - #endregion - public Guid QuestionId { get; set; } + public ReadingTableQuestionTrial ReadingTableQuestionTrial { get; set; } + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + #endregion + public Guid QuestionId { get; set; } - /// - /// 表格问题Id - /// - public Guid TableQuestionId { get; set; } + [Comment("表格问题Id")] + public Guid TableQuestionId { get; set; } - public Guid VisitTaskId { get; set; } + public Guid VisitTaskId { get; set; } - public Guid TrialId { get; set; } - public decimal RowIndex { get; set; } + public Guid TrialId { get; set; } + public decimal RowIndex { get; set; } - public string Answer { get; set; } = string.Empty; - public Guid RowId { get; set; } - } + public string Answer { get; set; } = string.Empty; + public Guid RowId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs index a5c9edaf0..848c88297 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionAnswer.cs @@ -1,49 +1,35 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("阅片任务答案")] +[Table("ReadingTaskQuestionAnswer")] +public class ReadingTaskQuestionAnswer : BaseAddAuditEntity { - /// - /// 阅片任务答案 - /// - [Table("ReadingTaskQuestionAnswer")] - public class ReadingTaskQuestionAnswer : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } - [JsonIgnore] - [ForeignKey("ReadingQuestionTrialId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - #endregion - /// - /// 项目问题Id - /// - public Guid ReadingQuestionTrialId { get; set; } + [JsonIgnore] + [ForeignKey("ReadingQuestionTrialId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + #endregion + [Comment("项目问题Id")] + public Guid ReadingQuestionTrialId { get; set; } - /// - /// 项目问题标准Id - /// - public Guid ReadingQuestionCriterionTrialId { get; set; } + [Comment("项目问题标准Id")] + public Guid ReadingQuestionCriterionTrialId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } + public Guid SubjectId { get; set; } - public Guid VisitTaskId { get; set; } + public Guid VisitTaskId { get; set; } - /// - /// 答案 - /// - public string Answer { get; set; } = string.Empty; + [Comment("答案")] + public string Answer { get; set; } = string.Empty; - /// - /// 全局阅片修改的答案 - /// - public string GlobalChangeAnswer { get; set; } = string.Empty; - /// - /// 全局阅片是否修改 - /// - public bool IsGlobalChange { get; set; } = false; - } + [Comment("全局阅片修改的答案")] + public string GlobalChangeAnswer { get; set; } = string.Empty; + [Comment("全局阅片是否修改")] + public bool IsGlobalChange { get; set; } = false; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs index 5bd7fc1bb..e186db9f6 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskQuestionMark.cs @@ -1,52 +1,49 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + + +[Table("ReadingTaskQuestionMark")] +public class ReadingTaskQuestionMark : BaseAddAuditEntity { - /// - /// - /// - [Table("ReadingTaskQuestionMark")] - public class ReadingTaskQuestionMark : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("QuestionId")] - public ReadingQuestionTrial ReadingQuestionTrial { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("QuestionId")] + public ReadingQuestionTrial ReadingQuestionTrial { get; set; } - [JsonIgnore] - [ForeignKey("VisitTaskId")] - public VisitTask VisitTask { get; set; } - #endregion - public Guid VisitTaskId { get; set; } + [JsonIgnore] + [ForeignKey("VisitTaskId")] + public VisitTask VisitTask { get; set; } + #endregion + public Guid VisitTaskId { get; set; } - public Guid QuestionId { get; set; } + public Guid QuestionId { get; set; } - public Guid? InstanceId { get; set; } + public Guid? InstanceId { get; set; } - public Guid? SeriesId { get; set; } - public Guid? StudyId { get; set; } - public string MarkTool { get; set; } = string.Empty; + public Guid? SeriesId { get; set; } + public Guid? StudyId { get; set; } + public string MarkTool { get; set; } = string.Empty; - public string PicturePath { get; set; } = string.Empty; + public string PicturePath { get; set; } = string.Empty; - public int? NumberOfFrames { get; set; } + public int? NumberOfFrames { get; set; } - public string MeasureData { get; set; } = string.Empty; - public Guid? FirstAddTaskId { get; set; } + public string MeasureData { get; set; } = string.Empty; + public Guid? FirstAddTaskId { get; set; } - public QuestionType? QuestionType { get; set; } - public string OrderMarkName { get; set; } = string.Empty; + public QuestionType? QuestionType { get; set; } + public string OrderMarkName { get; set; } = string.Empty; - public Guid? OtherInstanceId { get; set; } + public Guid? OtherInstanceId { get; set; } - public Guid? OtherSeriesId { get; set; } + public Guid? OtherSeriesId { get; set; } - public Guid? OtherStudyId { get; set; } + public Guid? OtherStudyId { get; set; } - public string OtherMarkTool { get; set; } = string.Empty; + public string OtherMarkTool { get; set; } = string.Empty; - public string OtherPicturePath { get; set; } = string.Empty; + public string OtherPicturePath { get; set; } = string.Empty; - public int? OtherNumberOfFrames { get; set; } - public string OtherMeasureData { get; set; } = string.Empty; - } + public int? OtherNumberOfFrames { get; set; } + public string OtherMeasureData { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs index cfd9ba307..e29012ef7 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTaskRelation.cs @@ -1,32 +1,22 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("任务关系表")] +[Table("ReadingTaskRelation")] +public class ReadingTaskRelation : BaseAddAuditEntity { - /// - ///任务关系表 - /// - [Table("ReadingTaskRelation")] - public class ReadingTaskRelation : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - [ForeignKey("TaskId")] - [JsonIgnore] - public VisitTask VisitTask { get; set; } - #endregion + [ForeignKey("TaskId")] + [JsonIgnore] + public VisitTask VisitTask { get; set; } + #endregion - /// - /// 任务ID - /// - public Guid TaskId { get; set; } + [Comment("任务ID")] + public Guid TaskId { get; set; } - /// - /// 关联的任务ID - /// - public Guid RelevanceTaskId { get; set; } + [Comment("关联的任务ID")] + public Guid RelevanceTaskId { get; set; } - /// - /// 类型具体解释 看枚举 - /// - public RelevanceType RelevanceType { get; set; } - } + [Comment("类型具体解释 看枚举")] + public RelevanceType RelevanceType { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs index 2b392e552..bb378978e 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs @@ -1,101 +1,75 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("读片模块")] +[Table("ReadModule")] +public class ReadModule : BaseFullDeleteAuditEntity { - /// - ///读片模块 - /// - [Table("ReadModule")] - public class ReadModule : BaseFullDeleteAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - /// - /// 受试者 - /// - [ForeignKey("SubjectId")] + [JsonIgnore] + [Comment("受试者")] + [ForeignKey("SubjectId")] - public Subject Subject { get; set; } + public Subject Subject { get; set; } - [JsonIgnore] - /// - /// 阅片期配置 - /// - [ForeignKey("ReadingPeriodSetId")] - public ReadingPeriodSet ReadingPeriodSet { get; set; } + [JsonIgnore] + [Comment("阅片期配置")] + [ForeignKey("ReadingPeriodSetId")] + public ReadingPeriodSet ReadingPeriodSet { get; set; } - [JsonIgnore] - /// - /// 访视 - /// - [ForeignKey("SubjectVisitId")] - public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + [Comment("访视")] + [ForeignKey("SubjectVisitId")] + public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } - [JsonIgnore] - public List ReadModuleCriterionFromList { get; set; } = new List(); - [JsonIgnore] - public List ModuleTaskList { get; set; } - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } + [JsonIgnore] + public List ReadModuleCriterionFromList { get; set; } = new List(); + [JsonIgnore] + public List ModuleTaskList { get; set; } + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - [JsonIgnore] - public List ReadingClinicalDataList { get; set; } - #endregion - public Guid SubjectId { get; set; } + [JsonIgnore] + public List ReadingClinicalDataList { get; set; } + #endregion + public Guid SubjectId { get; set; } - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - /// - /// 模块类型 - /// - public ModuleTypeEnum ModuleType { get; set; } + [Comment("模块类型")] + public ModuleTypeEnum ModuleType { get; set; } - /// - /// 模块名称 - /// - public string ModuleName { get; set; } = string.Empty; + [Comment("模块名称")] + public string ModuleName { get; set; } = string.Empty; - /// - /// 是否加急 - /// - public bool? IsUrgent { get; set; } + [Comment("是否加急")] + public bool? IsUrgent { get; set; } - public Guid SubjectVisitId { get; set; } - /// - /// 阅片计划ID - /// - public Guid? ReadingPeriodSetId { get; set; } + public Guid SubjectVisitId { get; set; } + [Comment("阅片计划ID")] + public Guid? ReadingPeriodSetId { get; set; } - public Guid TrialId { get; set; } - public bool IsCRCConfirm { get; set; } = false; + public Guid TrialId { get; set; } + public bool IsCRCConfirm { get; set; } = false; - public bool IsPMConfirm { get; set; } = false; + public bool IsPMConfirm { get; set; } = false; - public bool IsNotNeedPMConfirm { get; set; } = false; + public bool IsNotNeedPMConfirm { get; set; } = false; - /// - /// CRC是否正在申请撤回 - /// - public bool IsCRCApplicationRevoke { get; set; } = false; - /// - /// 临床数据是否完整 - /// - public bool? IsClinicalDataComplete { get; set; } + [Comment("CRC是否正在申请撤回")] + public bool IsCRCApplicationRevoke { get; set; } = false; + [Comment("临床数据是否完整")] + public bool? IsClinicalDataComplete { get; set; } - /// - /// 临床数据是否盲化 - /// - public bool? IsClinicalDataBlind { get; set; } + [Comment("临床数据是否盲化")] + public bool? IsClinicalDataBlind { get; set; } - /// - /// 阅片配置的类型 - /// - public ReadingSetType ReadingSetType { get; set; } + [Comment("阅片配置的类型")] + public ReadingSetType ReadingSetType { get; set; } - public ReadingStatusEnum ReadingStatus { get; set; } = ReadingStatusEnum.TaskAllocate; - } + public ReadingStatusEnum ReadingStatus { get; set; } = ReadingStatusEnum.TaskAllocate; } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs index 61b634829..662bb4162 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodPlan.cs @@ -1,34 +1,24 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("阅片计划")] +[Table("ReadingPeriodPlan")] +public class ReadingPeriodPlan : BaseFullDeleteAuditEntity { - /// - /// 阅片计划 - /// - [Table("ReadingPeriodPlan")] - public class ReadingPeriodPlan : BaseFullDeleteAuditEntity - { - #region 导航属性 - // - /// 访视 - /// - [ForeignKey("SubjectVisitId")] - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } + #region 导航属性 + // + /// 访视 + /// + [ForeignKey("SubjectVisitId")] + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } - /// - /// 阅片期配置 - /// - [ForeignKey("ReadingPeriodSetId")] - [JsonIgnore] - public ReadingPeriodSet ReadingPeriodSet { get; set; } - #endregion - /// - /// 阅片期配置ID - /// - public Guid ReadingPeriodSetId { get; set; } + [Comment("阅片期配置")] + [ForeignKey("ReadingPeriodSetId")] + [JsonIgnore] + public ReadingPeriodSet ReadingPeriodSet { get; set; } + #endregion + [Comment("阅片期配置ID")] + public Guid ReadingPeriodSetId { get; set; } - /// - /// 访视 - /// - public Guid SubjectVisitId { get; set; } - } + [Comment("访视")] + public Guid SubjectVisitId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs index 2b8a61a50..4aae7fac6 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs @@ -1,76 +1,50 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("阅片期设置 只会设计到所有人 或者某个Site 针对全局")] +[Table("ReadingPeriodSet")] +public class ReadingPeriodSet : BaseFullDeleteAuditEntity { - /// - ///阅片期设置 只会设计到所有人 或者某个Site 针对全局 - /// - [Table("ReadingPeriodSet")] - public class ReadingPeriodSet : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List ReadingPeriodSites { get; set; } = new List(); - [JsonIgnore] - /// - /// 访视模板 - /// - [ForeignKey("VisitStageId")] - public VisitStage VisitStage { get; set; } + #region 导航属性 + [JsonIgnore] + public List ReadingPeriodSites { get; set; } = new List(); + [JsonIgnore] + [Comment("访视模板")] + [ForeignKey("VisitStageId")] + public VisitStage VisitStage { get; set; } - /// - /// 阅片期计划 - /// - [JsonIgnore] - public List ReadingPeriodPlanList { get; set; } = new List(); - #endregion + [Comment("阅片期计划")] + [JsonIgnore] + public List ReadingPeriodPlanList { get; set; } = new List(); + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - /// - /// 阅片期名称 - /// - public string ReadingPeriodName { get; set; } = string.Empty; + [Comment("阅片期名称")] + public string ReadingPeriodName { get; set; } = string.Empty; - /// - /// 阅片范围 - /// - public ReadingScopeEnum ReadingScope { get; set; } + [Comment("阅片范围")] + public ReadingScopeEnum ReadingScope { get; set; } - /// - /// 截止日期 - /// - public DateTime? ExpirationDate { get; set; } + [Comment("截止日期")] + public DateTime? ExpirationDate { get; set; } - /// - /// 截止访视 - /// - public decimal? ExpirationVisitNum { get; set; } + [Comment("截止访视")] + public decimal? ExpirationVisitNum { get; set; } - /// - /// 访视计划ID - /// - public Guid? VisitStageId { get; set; } - /// - /// 是否生效 - /// - public ReadingPeriodStatus IsTakeEffect { get; set; } + [Comment("访视计划ID")] + public Guid? VisitStageId { get; set; } + [Comment("是否生效")] + public ReadingPeriodStatus IsTakeEffect { get; set; } - /// - /// 生效时间 - /// - public DateTime? EffectOfTime { get; set; } - /// - /// 是否为全局阅片 - /// - public bool IsGlobal { get; set; } - - /// - /// 阅片配置的类型 - /// - public ReadingSetType ReadingSetType { get; set; } - } + [Comment("生效时间")] + public DateTime? EffectOfTime { get; set; } + [Comment("是否为全局阅片")] + public bool IsGlobal { get; set; } + [Comment("阅片配置的类型")] + public ReadingSetType ReadingSetType { get; set; } } + diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs index 7b09cfcfd..ef9267381 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSite.cs @@ -1,26 +1,20 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("阅片期和中心关联")] +[Table("ReadingPeriodSite")] +public class ReadingPeriodSite : BaseAddAuditEntity { - /// - /// 阅片期和中心关联 - /// - [Table("ReadingPeriodSite")] - public class ReadingPeriodSite : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public TrialSite TrialSite { get; set; } + #region 导航属性 + [JsonIgnore] + public TrialSite TrialSite { get; set; } - [JsonIgnore] - public ReadingPeriodSet ReadingPeriodSet { get; set; } - #endregion - /// - ///阅片期配置ID - /// + [JsonIgnore] + public ReadingPeriodSet ReadingPeriodSet { get; set; } + #endregion + [Comment("阅片期配置ID")] - public Guid ReadingPeriodSetId { get; set; } + public Guid ReadingPeriodSetId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid TrialSiteId { get; set; } - } + public Guid TrialSiteId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs index 281274257..de2f4e9ab 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/DefaultShortcutKey.cs @@ -1,41 +1,31 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("ShortcutKey")] +public class ShortcutKey : BaseAddAuditEntity { - /// - ///ShortcutKey - /// - [Table("ShortcutKey")] - public class ShortcutKey : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - /// - /// 对应的键盘按键 - /// - public string Keyboardkey { get; set; } = string.Empty; + #endregion + [Comment("对应的键盘按键")] + public string Keyboardkey { get; set; } = string.Empty; - /// - /// 按键枚举 - /// - public int ShortcutKeyEnum { get; set; } + [Comment("按键枚举")] + public int ShortcutKeyEnum { get; set; } - /// - /// 影像工具类型 - /// - public int ImageToolType { get; set; } - public Guid UserId { get; set; } + [Comment("影像工具类型")] + public int ImageToolType { get; set; } + public Guid UserId { get; set; } - public bool AltKey { get; set; } = false; + public bool AltKey { get; set; } = false; - public bool CtrlKey { get; set; } = false; + public bool CtrlKey { get; set; } = false; - public bool ShiftKey { get; set; } = false; + public bool ShiftKey { get; set; } = false; - public bool MetaKey { get; set; } = false; + public bool MetaKey { get; set; } = false; - public string Text { get; set; } = string.Empty; + public string Text { get; set; } = string.Empty; - public string Code { get; set; } = string.Empty; + public string Code { get; set; } = string.Empty; - } } diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs index c6d77a3f0..788812768 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs @@ -1,25 +1,19 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("UserWLTemplate")] +public class UserWLTemplate : BaseAddAuditEntity { - /// - ///UserWLTemplate - /// - [Table("UserWLTemplate")] - public class UserWLTemplate : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - public string TemplateName { get; set; } = string.Empty; - public Guid UserId { get; set; } - public int WW { get; set; } - public int WL { get; set; } - public int ShowOrder { get; set; } = 0; + public string TemplateName { get; set; } = string.Empty; + public Guid UserId { get; set; } + public int WW { get; set; } + public int WL { get; set; } + public int ShowOrder { get; set; } = 0; - /// - /// 是否为默认 - /// - public bool IsPitchOn { get; set; } = true; + [Comment("是否为默认")] + public bool IsPitchOn { get; set; } = true; - } } diff --git a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs index f428a09cf..2473e229d 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs @@ -1,32 +1,20 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("IRECIST1Point1肿瘤评估(系统标准)")] +[Table("TumorAssessment_IRECIST1Point1")] +public class TumorAssessment_IRECIST1Point1 : Entity { - /// - ///IRECIST1Point1肿瘤评估(系统标准) - /// - [Table("TumorAssessment_IRECIST1Point1")] - public class TumorAssessment_IRECIST1Point1 : Entity - { - /// - /// 靶病灶 - /// - public TargetAssessment TargetLesion { get; set; } + [Comment("靶病灶")] + public TargetAssessment TargetLesion { get; set; } - /// - /// 非靶病灶 - /// - public NoTargetAssessment NonTargetLesions { get; set; } + [Comment("非靶病灶")] + public NoTargetAssessment NonTargetLesions { get; set; } - /// - /// 新病灶 - /// - public NewLesionAssessment NewLesion { get; set; } - - /// - /// 整体疗效 - /// - public OverallAssessment OverallEfficacy { get; set; } - } + [Comment("新病灶")] + public NewLesionAssessment NewLesion { get; set; } + [Comment("整体疗效")] + public OverallAssessment OverallEfficacy { get; set; } } + diff --git a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs index 25f110f8a..d7c5be11f 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs @@ -1,32 +1,20 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("RECIST1Point1肿瘤评估(系统标准)")] +[Table("TumorAssessment_RECIST1Point1")] +public class TumorAssessment_RECIST1Point1 : Entity { - /// - ///RECIST1Point1肿瘤评估(系统标准) - /// - [Table("TumorAssessment_RECIST1Point1")] - public class TumorAssessment_RECIST1Point1 : Entity - { - /// - /// 靶病灶 - /// - public TargetAssessment TargetLesion { get; set; } + [Comment("靶病灶")] + public TargetAssessment TargetLesion { get; set; } - /// - /// 非靶病灶 - /// - public NoTargetAssessment NonTargetLesions { get; set; } + [Comment("非靶病灶")] + public NoTargetAssessment NonTargetLesions { get; set; } - /// - /// 新病灶 - /// - public NewLesionAssessment NewLesion { get; set; } - - /// - /// 整体疗效 - /// - public OverallAssessment OverallEfficacy { get; set; } - } + [Comment("新病灶")] + public NewLesionAssessment NewLesion { get; set; } + [Comment("整体疗效")] + public OverallAssessment OverallEfficacy { get; set; } } + diff --git a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs index 561bd6811..2e28f96b7 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs @@ -1,32 +1,20 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("RECIST1Point1BM肿瘤评估(系统标准)")] +[Table("TumorAssessment_RECIST1Point1BM")] +public class TumorAssessment_RECIST1Point1BM : Entity { - /// - ///RECIST1Point1BM肿瘤评估(系统标准) - /// - [Table("TumorAssessment_RECIST1Point1BM")] - public class TumorAssessment_RECIST1Point1BM : Entity - { - /// - /// 靶病灶 - /// - public TargetAssessment TargetLesion { get; set; } + [Comment("靶病灶")] + public TargetAssessment TargetLesion { get; set; } - /// - /// 非靶病灶 - /// - public NoTargetAssessment NonTargetLesions { get; set; } + [Comment("非靶病灶")] + public NoTargetAssessment NonTargetLesions { get; set; } - /// - /// 新病灶 - /// - public NewLesionAssessment NewLesion { get; set; } - - /// - /// 整体疗效 - /// - public OverallAssessment OverallEfficacy { get; set; } - } + [Comment("新病灶")] + public NewLesionAssessment NewLesion { get; set; } + [Comment("整体疗效")] + public OverallAssessment OverallEfficacy { get; set; } } + diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs index 2bcdd96f1..40d617847 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs @@ -1,28 +1,24 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialSiteEquipmentSurvey")] +public class TrialSiteEquipmentSurvey : BaseFullAuditEntity { - /// - ///TrialSiteEquipmentSurvey - /// - [Table("TrialSiteEquipmentSurvey")] - public class TrialSiteEquipmentSurvey : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialSiteSurveyId")] - public TrialSiteSurvey TrialSiteSurvey { get; set; } - [JsonIgnore] - [ForeignKey("EquipmentTypeId")] - public Dictionary EquipmentType { get; set; } - #endregion - public Guid TrialSiteSurveyId { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialSiteSurveyId")] + public TrialSiteSurvey TrialSiteSurvey { get; set; } + [JsonIgnore] + [ForeignKey("EquipmentTypeId")] + public Dictionary EquipmentType { get; set; } + #endregion + public Guid TrialSiteSurveyId { get; set; } - public Guid EquipmentTypeId { get; set; } - public string Parameters { get; set; } = string.Empty; + public Guid EquipmentTypeId { get; set; } + public string Parameters { get; set; } = string.Empty; - public string ManufacturerName { get; set; } = string.Empty; - public string ScannerType { get; set; } = string.Empty; - - public string Note { get; set; } = string.Empty; - } + public string ManufacturerName { get; set; } = string.Empty; + public string ScannerType { get; set; } = string.Empty; + public string Note { get; set; } = string.Empty; } + diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs index b59565b16..4f9746640 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs @@ -1,59 +1,55 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialSiteSurvey")] +public class TrialSiteSurvey : BaseFullDeleteAuditEntity { - /// - ///TrialSiteSurvey - /// - [Table("TrialSiteSurvey")] - public class TrialSiteSurvey : BaseFullDeleteAuditEntity - { - #region 导航属性 - // 必须 { get; set; } 否则 翻译出错 - [JsonIgnore] - public List TrialSiteUserSurveyList { get; set; } = new List(); - [JsonIgnore] - public List TrialSiteEquipmentSurveyList { get; set; } = new List(); + #region 导航属性 + // 必须 { get; set; } 否则 翻译出错 + [JsonIgnore] + public List TrialSiteUserSurveyList { get; set; } = new List(); + [JsonIgnore] + public List TrialSiteEquipmentSurveyList { get; set; } = new List(); - [JsonIgnore] - public TrialSite TrialSite { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - [JsonIgnore] - public User ReviewerUser { get; set; } - [JsonIgnore] - public User PreliminaryUser { get; set; } - #endregion + [JsonIgnore] + public TrialSite TrialSite { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + public User ReviewerUser { get; set; } + [JsonIgnore] + public User PreliminaryUser { get; set; } + #endregion - public Guid TrialSiteId { get; set; } + public Guid TrialSiteId { get; set; } - public TrialSiteSurveyEnum State { get; set; } = TrialSiteSurveyEnum.ToSubmit; - public Guid TrialId { get; set; } - public string UserName { get; set; } = string.Empty; + public TrialSiteSurveyEnum State { get; set; } = TrialSiteSurveyEnum.ToSubmit; + public Guid TrialId { get; set; } + public string UserName { get; set; } = string.Empty; - public string Phone { get; set; } = string.Empty; - public string Email { get; set; } = string.Empty; - public int AverageEngravingCycle { get; set; } + public string Phone { get; set; } = string.Empty; + public string Email { get; set; } = string.Empty; + public int AverageEngravingCycle { get; set; } - public bool IsConfirmImagingTechnologist { get; set; } + public bool IsConfirmImagingTechnologist { get; set; } - public string NotConfirmReson { get; set; } = string.Empty; + public string NotConfirmReson { get; set; } = string.Empty; - public int EfficacyEvaluatorType { get; set; } + public int EfficacyEvaluatorType { get; set; } - public bool IsFollowStudyParameters { get; set; } + public bool IsFollowStudyParameters { get; set; } - public string NotFollowReson { get; set; } = string.Empty; + public string NotFollowReson { get; set; } = string.Empty; - public string LatestBackReason { get; set; } = string.Empty; + public string LatestBackReason { get; set; } = string.Empty; - public Guid? PreliminaryUserId { get; set; } + public Guid? PreliminaryUserId { get; set; } - public Guid? ReviewerUserId { get; set; } + public Guid? ReviewerUserId { get; set; } - public DateTime? PreliminaryTime { get; set; } - - public DateTime? ReviewerTime { get; set; } - } + public DateTime? PreliminaryTime { get; set; } + public DateTime? ReviewerTime { get; set; } } + diff --git a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs index 088d3a8f4..023f3d5ee 100644 --- a/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs +++ b/IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs @@ -1,47 +1,43 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialSiteUserSurvey")] +public class TrialSiteUserSurvey : BaseFullAuditEntity { - /// - ///TrialSiteUserSurvey - /// - [Table("TrialSiteUserSurvey")] - public class TrialSiteUserSurvey : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialSiteSurveyId")] - public TrialSiteSurvey TrialSiteSurvey { get; set; } - [JsonIgnore] - [ForeignKey("UserTypeId")] - public UserType UserTypeRole { get; set; } - #endregion - public Guid TrialSiteSurveyId { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialSiteSurveyId")] + public TrialSiteSurvey TrialSiteSurvey { get; set; } + [JsonIgnore] + [ForeignKey("UserTypeId")] + public UserType UserTypeRole { get; set; } + #endregion + public Guid TrialSiteSurveyId { get; set; } - public Guid? UserTypeId { get; set; } - public int? TrialRoleCode { get; set; } + public Guid? UserTypeId { get; set; } + public int? TrialRoleCode { get; set; } - public string Phone { get; set; } = string.Empty; + public string Phone { get; set; } = string.Empty; - public string Email { get; set; } = string.Empty; + public string Email { get; set; } = string.Empty; - public string FirstName { get; set; } = string.Empty; - public string LastName { get; set; } = string.Empty; + public string FirstName { get; set; } = string.Empty; + public string LastName { get; set; } = string.Empty; - public string OrganizationName { get; set; } = string.Empty; + public string OrganizationName { get; set; } = string.Empty; - public Guid? SystemUserId { get; set; } + public Guid? SystemUserId { get; set; } - public bool IsGenerateAccount { get; set; } + public bool IsGenerateAccount { get; set; } - public bool IsGenerateSuccess { get; set; } - public TrialSiteUserStateEnum InviteState { get; set; } = TrialSiteUserStateEnum.WaitSent; + public bool IsGenerateSuccess { get; set; } + public TrialSiteUserStateEnum InviteState { get; set; } = TrialSiteUserStateEnum.WaitSent; - public bool IsJoin { get; set; } - public bool IsHistoryUser { get; set; } + public bool IsJoin { get; set; } + public bool IsHistoryUser { get; set; } - public bool? IsHistoryUserDeleted { get; set; } - - public bool? IsHistoryUserOriginDeleted { get; set; } - } + public bool? IsHistoryUserDeleted { get; set; } + public bool? IsHistoryUserOriginDeleted { get; set; } } + diff --git a/IRaCIS.Core.Domain/Trial/DataInspection.cs b/IRaCIS.Core.Domain/Trial/DataInspection.cs index 8eb6cd7ac..9ba310d6a 100644 --- a/IRaCIS.Core.Domain/Trial/DataInspection.cs +++ b/IRaCIS.Core.Domain/Trial/DataInspection.cs @@ -13,32 +13,32 @@ public class DataInspection : BaseAddAuditEntity public VisitTask VisitTask { get; set; } #endregion - [Comment(" 批次Id")] + [Comment("批次Id")] public Guid BatchId { get; set; } - [Comment(" 子类")] + [Comment("子类")] public Guid? ChildrenTypeId { get; set; } - [Comment(" 创建人姓名")] + [Comment("创建人姓名")] public string CreateUserName { get; set; } = string.Empty; public string CreateUserRealName { get; set; } = string.Empty; - [Comment(" 阅片医生")] + [Comment("阅片医生")] public Guid? DoctorUserId { get; set; } - [Comment(" 被稽查实体名")] + [Comment("被稽查实体名")] public string EntityName { get; set; } = string.Empty; - [Comment(" 要稽查对象Id")] + [Comment("要稽查对象Id")] public Guid? GeneralId { get; set; } - [Comment(" 标识")] + [Comment("标识")] public string Identification { get; set; } = string.Empty; public string IP { get; set; } = string.Empty; - [Comment(" 是否是前端添加")] + [Comment("是否是前端添加")] public bool? IsFrontAdd { get; set; } public bool? IsSign { get; set; } @@ -46,13 +46,13 @@ public class DataInspection : BaseAddAuditEntity [MaxLength] public string? JsonDetail { get; set; } - [Comment(" 上一条json")] + [Comment("上一条json")] [MaxLength] public string? LastJsonDetail { get; set; } public Guid? ModuleTypeId { get; set; } - [Comment(" 被稽查对象外键1")] + [Comment("被稽查对象外键1")] public Guid? ObjectRelationParentId { get; set; } public Guid? ObjectRelationParentId2 { get; set; } @@ -63,12 +63,12 @@ public class DataInspection : BaseAddAuditEntity public Guid? OptTypeId { get; set; } - [Comment(" 父ID")] + [Comment("父ID")] public Guid? ParentId { get; set; } public string Reason { get; set; } = string.Empty; - [Comment(" 角色名称")] + [Comment("角色名称")] public string RoleName { get; set; } = string.Empty; public Guid? SignId { get; set; } @@ -83,7 +83,7 @@ public class DataInspection : BaseAddAuditEntity public Guid? TrialSiteId { get; set; } - [Comment(" 访视计划ID")] + [Comment("访视计划ID")] public Guid? VisitStageId { get; set; } public Guid? VisitTaskId { get; set; } diff --git a/IRaCIS.Core.Domain/Trial/Enroll.cs b/IRaCIS.Core.Domain/Trial/Enroll.cs index 6da04af8f..a62cd937e 100644 --- a/IRaCIS.Core.Domain/Trial/Enroll.cs +++ b/IRaCIS.Core.Domain/Trial/Enroll.cs @@ -1,59 +1,55 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("Enroll")] +public partial class Enroll : BaseFullAuditEntity { - [Table("Enroll")] - public partial class Enroll : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialId")] - public virtual Trial Trial { get; set; } - [JsonIgnore] - public virtual Doctor Doctor { get; set; } - [JsonIgnore] - public User DoctorUser { get; set; } - [JsonIgnore] - public List EnrollReadingCategoryList { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialId")] + public virtual Trial Trial { get; set; } + [JsonIgnore] + public virtual Doctor Doctor { get; set; } + [JsonIgnore] + public User DoctorUser { get; set; } + [JsonIgnore] + public List EnrollReadingCategoryList { get; set; } - [JsonIgnore] - public List EnrollReadingCriteriaList { get; set; } - #endregion - public Guid DoctorId { get; set; } - public Guid TrialId { get; set; } - public Guid? AttachmentId { get; set; } - public EnrollStatus EnrollStatus { get; set; } + [JsonIgnore] + public List EnrollReadingCriteriaList { get; set; } + #endregion + public Guid DoctorId { get; set; } + public Guid TrialId { get; set; } + public Guid? AttachmentId { get; set; } + public EnrollStatus EnrollStatus { get; set; } - public decimal? AdjustmentMultiple { get; set; } - public DateTime? EnrollTime { get; set; } - public DateTime? OutEnrollTime { get; set; } + public decimal? AdjustmentMultiple { get; set; } + public DateTime? EnrollTime { get; set; } + public DateTime? OutEnrollTime { get; set; } - public string Memo { get; set; } = string.Empty; + public string Memo { get; set; } = string.Empty; - public int ReviewerReadingType { get; set; } = 0; + public int ReviewerReadingType { get; set; } = 0; - public int? Training { get; set; } + public int? Training { get; set; } - public int? RefresherTraining { get; set; } + public int? RefresherTraining { get; set; } - public int? Timepoint { get; set; } + public int? Timepoint { get; set; } - public int? Timepoint48H { get; set; } + public int? Timepoint48H { get; set; } - public int? Timepoint24H { get; set; } + public int? Timepoint24H { get; set; } - public int? Adjudication { get; set; } + public int? Adjudication { get; set; } - public int? Adjudication48H { get; set; } + public int? Adjudication48H { get; set; } - public int? Adjudication24H { get; set; } + public int? Adjudication24H { get; set; } - public int? Global { get; set; } + public int? Global { get; set; } - public int? Downtime { get; set; } - /// - /// 生成账号 加入到项目中后 赋值 - /// - public Guid? DoctorUserId { get; set; } - } + public int? Downtime { get; set; } + [Comment("生成账号 加入到项目中后 赋值")] + public Guid? DoctorUserId { get; set; } } diff --git a/IRaCIS.Core.Domain/Trial/EnrollDetail.cs b/IRaCIS.Core.Domain/Trial/EnrollDetail.cs index d374a61fc..26dba2af9 100644 --- a/IRaCIS.Core.Domain/Trial/EnrollDetail.cs +++ b/IRaCIS.Core.Domain/Trial/EnrollDetail.cs @@ -1,22 +1,20 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("EnrollDetail")] +public partial class EnrollDetail : BaseAddAuditEntity { - [Table("EnrollDetail")] - public partial class EnrollDetail : BaseAddAuditEntity - { - #region - [JsonIgnore] - public virtual TrialStatusDetail TrialDetail { get; set; } - [JsonIgnore] - public Doctor Doctor { get; set; } - #endregion - public Guid DoctorId { get; set; } - public Guid TrialId { get; set; } - public EnrollStatus EnrollStatus { get; set; } - public Guid? EnrollId { get; set; } - public string Memo { get; set; } = string.Empty; - public int OptUserType { get; set; } - public Guid TrialDetailId { get; set; } - } + #region + [JsonIgnore] + public virtual TrialStatusDetail TrialDetail { get; set; } + [JsonIgnore] + public Doctor Doctor { get; set; } + #endregion + public Guid DoctorId { get; set; } + public Guid TrialId { get; set; } + public EnrollStatus EnrollStatus { get; set; } + public Guid? EnrollId { get; set; } + public string Memo { get; set; } = string.Empty; + public int OptUserType { get; set; } + public Guid TrialDetailId { get; set; } } diff --git a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs index d33687845..36b022fad 100644 --- a/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs +++ b/IRaCIS.Core.Domain/Trial/EnrollReadingCategory.cs @@ -1,20 +1,16 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models -{ - /// - ///EnrollReadingCategory - /// - [Table("EnrollReadingCategory")] - public class EnrollReadingCategory : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("EnrollId")] - public Enroll Enroll { get; set; } - #endregion - public Guid EnrollId { get; set; } - public ReadingCategory ReadingCategory { get; set; } - public Guid TrialReadingCriterionId { get; set; } - } +namespace IRaCIS.Core.Domain.Models; +[Table("EnrollReadingCategory")] +public class EnrollReadingCategory : BaseAddAuditEntity +{ + #region 导航属性 + [JsonIgnore] + [ForeignKey("EnrollId")] + public Enroll Enroll { get; set; } + #endregion + public Guid EnrollId { get; set; } + public ReadingCategory ReadingCategory { get; set; } + public Guid TrialReadingCriterionId { get; set; } } + diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 5cacc7d93..006c3d9f1 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -1,314 +1,268 @@ using IRaCIS.Core.Domain.Share; using System.Linq; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("Trial")] +public partial class Trial : BaseFullDeleteAuditEntity { - [Table("Trial")] - public partial class Trial : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("SponsorId")] - public Sponsor Sponsor { get; set; } - [JsonIgnore] - [ForeignKey("CROId")] - public CRO CRO { get; set; } - [JsonIgnore] - public List TrialBodyPartList { get; set; } - [JsonIgnore] - public List TaskMedicalReviewList { get; set; } - [JsonIgnore] - public List TaskConsistentRuleList { get; set; } - [JsonIgnore] - public List SubjectDoctorUserList { get; set; } = new List(); - [JsonIgnore] - public List VisitTaskList { get; set; } = new List() { }; + #region 导航属性 + [JsonIgnore] + [ForeignKey("SponsorId")] + public Sponsor Sponsor { get; set; } + [JsonIgnore] + [ForeignKey("CROId")] + public CRO CRO { get; set; } + [JsonIgnore] + public List TrialBodyPartList { get; set; } + [JsonIgnore] + public List TaskMedicalReviewList { get; set; } + [JsonIgnore] + public List TaskConsistentRuleList { get; set; } + [JsonIgnore] + public List SubjectDoctorUserList { get; set; } = new List(); + [JsonIgnore] + public List VisitTaskList { get; set; } = new List() { }; - [JsonIgnore] - public List VisitTaskReReadingList { get; set; } - [JsonIgnore] - public List TrialSiteSurveyList { get; set; } = new List(); + [JsonIgnore] + public List VisitTaskReReadingList { get; set; } + [JsonIgnore] + public List TrialSiteSurveyList { get; set; } = new List(); - [JsonIgnore] - public List TrialDocumentList { get; set; } - [JsonIgnore] - public List EnrollList { get; set; } = new List(); - [JsonIgnore] - public List WorkloadList { get; set; } = new List(); - [JsonIgnore] - public List TrialUserList { get; set; } = new List(); - [JsonIgnore] - public List TrialReadingCriterionList { get; set; } = new List(); - [JsonIgnore] - public List SubjectList { get; set; } = new List(); - [JsonIgnore] - public List SubjectVisitList { get; set; } = new List(); - [JsonIgnore] - public List StudyList { get; set; } = new List(); - [JsonIgnore] - public List TrialSiteList { get; set; } = new List(); - [JsonIgnore] - public List TrialSiteUserList { get; set; } = new List(); - [JsonIgnore] - public List ReadModuleList { get; set; } = new List(); - [JsonIgnore] - public List UserFeedBackList { get; set; } = new List(); - [JsonIgnore] - [ForeignKey("IndicationTypeId")] - public Dictionary IndicationType { get; set; } - [JsonIgnore] - [ForeignKey("PhaseId")] - public Dictionary Phase { get; set; } - [JsonIgnore] - [ForeignKey("ReviewModeId")] - public Dictionary ReviewMode { get; set; } + [JsonIgnore] + public List TrialDocumentList { get; set; } + [JsonIgnore] + public List EnrollList { get; set; } = new List(); + [JsonIgnore] + public List WorkloadList { get; set; } = new List(); + [JsonIgnore] + public List TrialUserList { get; set; } = new List(); + [JsonIgnore] + public List TrialReadingCriterionList { get; set; } = new List(); + [JsonIgnore] + public List SubjectList { get; set; } = new List(); + [JsonIgnore] + public List SubjectVisitList { get; set; } = new List(); + [JsonIgnore] + public List StudyList { get; set; } = new List(); + [JsonIgnore] + public List TrialSiteList { get; set; } = new List(); + [JsonIgnore] + public List TrialSiteUserList { get; set; } = new List(); + [JsonIgnore] + public List ReadModuleList { get; set; } = new List(); + [JsonIgnore] + public List UserFeedBackList { get; set; } = new List(); + [JsonIgnore] + [ForeignKey("IndicationTypeId")] + public Dictionary IndicationType { get; set; } + [JsonIgnore] + [ForeignKey("PhaseId")] + public Dictionary Phase { get; set; } + [JsonIgnore] + [ForeignKey("ReviewModeId")] + public Dictionary ReviewMode { get; set; } - //[JsonIgnore] + //[JsonIgnore] - //public List TrialClinicalDataSetCriterionList { get; set; } + //public List TrialClinicalDataSetCriterionList { get; set; } - [JsonIgnore] - public List ClinicalDataTrialSetList { get; set; } = new List { }; - [JsonIgnore] - public List ClinicalTrialProjectDetails { get; set; } = new List { }; - [JsonIgnore] - public List TrialDicList { get; set; } = new List(); + [JsonIgnore] + public List ClinicalDataTrialSetList { get; set; } = new List { }; + [JsonIgnore] + public List ClinicalTrialProjectDetails { get; set; } = new List { }; + [JsonIgnore] + public List TrialDicList { get; set; } = new List(); - [JsonIgnore] - public List ReadingClinicalDataList { get; set; } + [JsonIgnore] + public List ReadingClinicalDataList { get; set; } - [JsonIgnore] - public List TrialStateChangeList { get; set; } = new List(); - #endregion + [JsonIgnore] + public List TrialStateChangeList { get; set; } = new List(); + #endregion - public Guid IndicationTypeId { get; set; } = Guid.Empty; - public Guid? PhaseId { get; set; } = Guid.Empty; + public Guid IndicationTypeId { get; set; } = Guid.Empty; + public Guid? PhaseId { get; set; } = Guid.Empty; - [StringLength(100)] - public string TrialCode { get; set; } = string.Empty; + [StringLength(100)] + public string TrialCode { get; set; } = string.Empty; - public int Code { get; set; } + public int Code { get; set; } - [StringLength(512)] - public string Indication { get; set; } = string.Empty; + [StringLength(512)] + public string Indication { get; set; } = string.Empty; - //入组那一块的状态 - //[ConcurrencyCheck] - public int TrialEnrollStatus { get; set; } + //入组那一块的状态 + //[ConcurrencyCheck] + public int TrialEnrollStatus { get; set; } - //启动状态 - [StringLength(500)] - public string TrialStatusStr { get; set; } = StaticData.TrialState.TrialInitializing; + //启动状态 + [StringLength(500)] + public string TrialStatusStr { get; set; } = StaticData.TrialState.TrialInitializing; - public Guid? CROId { get; set; } = Guid.Empty; + public Guid? CROId { get; set; } = Guid.Empty; - public Guid? SponsorId { get; set; } = Guid.Empty; - public Guid? ReviewModeId { get; set; } = Guid.Empty; - [StringLength(500)] - public string ProjectCycle { get; set; } = string.Empty; - public int ExpectedPatients { get; set; } + public Guid? SponsorId { get; set; } = Guid.Empty; + public Guid? ReviewModeId { get; set; } = Guid.Empty; + [StringLength(500)] + public string ProjectCycle { get; set; } = string.Empty; + public int ExpectedPatients { get; set; } - public decimal TimePointsPerPatient { get; set; } + public decimal TimePointsPerPatient { get; set; } - public int GRRReviewers { get; set; } + public int GRRReviewers { get; set; } - public int TotalReviewers { get; set; } + public int TotalReviewers { get; set; } - [StringLength(500)] - public string ReviewProtocol { get; set; } = string.Empty; + [StringLength(500)] + public string ReviewProtocol { get; set; } = string.Empty; - [StringLength(500)] - public string MessageFromClient { get; set; } = string.Empty; + [StringLength(500)] + public string MessageFromClient { get; set; } = string.Empty; - public string Note { get; set; } = string.Empty; - public string ReviewProtocolName { get; set; } = string.Empty; - public string MessageFromClientName { get; set; } = string.Empty; - public int Expedited { get; set; } - public string DeclarationTypes { get; set; } = string.Empty; + public string Note { get; set; } = string.Empty; + public string ReviewProtocolName { get; set; } = string.Empty; + public string MessageFromClientName { get; set; } = string.Empty; + public int Expedited { get; set; } + public string DeclarationTypes { get; set; } = string.Empty; - [NotMapped] - public List DeclarationTypeEnumList => DeclarationTypes.Split('|', StringSplitOptions.RemoveEmptyEntries) - .Select(s => Enum.Parse(typeof(DeclarationType), s)).Cast().ToList(); + [NotMapped] + public List DeclarationTypeEnumList => DeclarationTypes.Split('|', StringSplitOptions.RemoveEmptyEntries) + .Select(s => Enum.Parse(typeof(DeclarationType), s)).Cast().ToList(); - [NotMapped] - public List AttendedReviewerTypeEnumList => AttendedReviewerTypes.Split('|', StringSplitOptions.RemoveEmptyEntries) - .Select(s => Enum.Parse(typeof(AttendedReviewerType), s)).Cast().ToList(); + [NotMapped] + public List AttendedReviewerTypeEnumList => AttendedReviewerTypes.Split('|', StringSplitOptions.RemoveEmptyEntries) + .Select(s => Enum.Parse(typeof(AttendedReviewerType), s)).Cast().ToList(); - public string AttendedReviewerTypes { get; set; } = string.Empty; + public string AttendedReviewerTypes { get; set; } = string.Empty; - public string TrialExtraConfigJsonStr { get; set; } = string.Empty; + public string TrialExtraConfigJsonStr { get; set; } = string.Empty; - public bool VisitPlanConfirmed { get; set; } + public bool VisitPlanConfirmed { get; set; } - /// - /// 受试者编号具体规则 - /// - public string SubjectCodeRule { get; set; } = StaticData.International("Trial_number"); - /// - /// 是否 提醒受试者编号规则 - /// - public bool IsNoticeSubjectCodeRule { get; set; } = true; + [Comment("受试者编号具体规则")] + public string SubjectCodeRule { get; set; } = StaticData.International("Trial_number"); + [Comment("是否 提醒受试者编号规则")] + public bool IsNoticeSubjectCodeRule { get; set; } = true; - /// - /// 是否 有基准时间（首次给药时间） - /// - public bool IsHaveFirstGiveMedicineDate { get; set; } = true; + [Comment("是否 有基准时间（首次给药时间）")] + public bool IsHaveFirstGiveMedicineDate { get; set; } = true; - /// - /// 是否有 受试者年龄 - /// - public bool IsHaveSubjectAge { get; set; } = false; - /// - /// 是否有 入组性确认 - /// - public bool IsEnrollementQualificationConfirm { get; set; } = false; - /// - /// 出组后计划外访视名称 - /// - public string OutEnrollmentVisitName { get; set; } = "EOT"; - /// - /// 是否 验证拍片日期 - /// - public bool IsVerifyVisitImageDate { get; set; } = true; - /// - /// 临床信息传输 1：系统录入 2：系统录入+PDF 0：无 - /// - public int ClinicalInformationTransmissionEnum { get; set; } = 1; + [Comment("是否有 受试者年龄")] + public bool IsHaveSubjectAge { get; set; } = false; + [Comment("是否有 入组性确认")] + public bool IsEnrollementQualificationConfirm { get; set; } = false; + [Comment("出组后计划外访视名称")] + public string OutEnrollmentVisitName { get; set; } = "EOT"; + [Comment("是否 验证拍片日期")] + public bool IsVerifyVisitImageDate { get; set; } = true; + [Comment("临床信息传输 1：系统录入 2：系统录入+PDF 0：无")] + public int ClinicalInformationTransmissionEnum { get; set; } = 1; - /// - /// 是否审核 临床信息 - /// - public bool IsCRAAuditClinicalInformation { get; set; } = false; + [Comment("是否审核 临床信息")] + public bool IsCRAAuditClinicalInformation { get; set; } = false; - /// - /// QC流程 0 不审，1 单审，2双审 - /// - public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.DoubleAudit; + [Comment("QC流程 0 不审，1 单审，2双审")] + public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.DoubleAudit; - /// - /// 影像一致性核查 - /// - public bool IsImageConsistencyVerification { get; set; } = true; + [Comment("影像一致性核查")] + public bool IsImageConsistencyVerification { get; set; } = true; - /// - /// 影像导出 - /// - public bool IsImageExport { get; set; } = false; + [Comment("影像导出")] + public bool IsImageExport { get; set; } = false; - public bool IsSubjectSecondCodeView { get; set; } - //阅片方式 - public int ReadingMode { get; set; } = 1; + public bool IsSubjectSecondCodeView { get; set; } + //阅片方式 + public int ReadingMode { get; set; } = 1; - public int ChangeDefalutDays { get; set; } = 5; + public int ChangeDefalutDays { get; set; } = 5; - /// - /// 跨项目复制 - /// - public bool IsImageReplicationAcrossTrial { get; set; } = false; - public string BodyPartTypes { get; set; } = "鼻咽部|脑部|颈部|胸部|上/下腹部|盆腔|全身|其他"; - public string Modalitys { get; set; } = string.Empty; + [Comment("跨项目复制")] + public bool IsImageReplicationAcrossTrial { get; set; } = false; + public string BodyPartTypes { get; set; } = "鼻咽部|脑部|颈部|胸部|上/下腹部|盆腔|全身|其他"; + public string Modalitys { get; set; } = string.Empty; - [NotMapped] - public List ModalityList => Modalitys.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).ToList(); - public string PreliminaryAuditReuploadText { get; set; } = string.Empty; + [NotMapped] + public List ModalityList => Modalitys.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).ToList(); + public string PreliminaryAuditReuploadText { get; set; } = string.Empty; - public string ReviewAuditReuploadText { get; set; } = string.Empty; - //PD 进展是否显示 配置访视 是否显示 PD进展 (从而可以设置状态) - public bool IsPDProgressView { get; set; } + public string ReviewAuditReuploadText { get; set; } = string.Empty; + //PD 进展是否显示 配置访视 是否显示 PD进展 (从而可以设置状态) + public bool IsPDProgressView { get; set; } - //研究方案号 - public string ResearchProgramNo { get; set; } = string.Empty; + //研究方案号 + public string ResearchProgramNo { get; set; } = string.Empty; - //实验名称 - public string ExperimentName { get; set; } = string.Empty; + //实验名称 + public string ExperimentName { get; set; } = string.Empty; - //主研单位 - public string MainResearchUnit { get; set; } = string.Empty; + //主研单位 + public string MainResearchUnit { get; set; } = string.Empty; - // 负责人PI - public string HeadPI { get; set; } = string.Empty; + // 负责人PI + public string HeadPI { get; set; } = string.Empty; - public bool IsUrgent { get; set; } + public bool IsUrgent { get; set; } - /// - /// 项目类型 1 正式项目、0 非正式项目 2是培训项目 - /// time - public TrialType TrialType { get; set; } - public int PlanSiteCount { get; set; } + [Comment("项目类型 1 正式项目、0 非正式项目 2是培训项目")] + public TrialType TrialType { get; set; } + public int PlanSiteCount { get; set; } - public int PlanVisitCount { get; set; } + public int PlanVisitCount { get; set; } - public DateTime? TrialFinishedTime { get; set; } + public DateTime? TrialFinishedTime { get; set; } - public bool IsSubjectSexView { get; set; } = false; + public bool IsSubjectSexView { get; set; } = false; - //配置Suject Edit页面 是否显示 加急 - public bool IsSubjectExpeditedView { get; set; } = false; + //配置Suject Edit页面 是否显示 加急 + public bool IsSubjectExpeditedView { get; set; } = false; - public bool IsTrialStart { get; set; } = false; - //QC 问题流程 + public bool IsTrialStart { get; set; } = false; + //QC 问题流程 - public User QCQuestionConfirmedUser { get; set; } - public Guid? QCQuestionConfirmedUserId { get; set; } - public DateTime? QCQuestionConfirmedTime { get; set; } + public User QCQuestionConfirmedUser { get; set; } + public Guid? QCQuestionConfirmedUserId { get; set; } + public DateTime? QCQuestionConfirmedTime { get; set; } - /// - /// 项目完成时间 - /// - public DateTime? TrialFinishTime { get; set; } + [Comment("项目完成时间")] + public DateTime? TrialFinishTime { get; set; } - public int? DigitPlaces { get; set; } = 1; + public int? DigitPlaces { get; set; } = 1; - public bool IsTrialProcessConfirmed { get; set; } - public bool IsTrialBasicLogicConfirmed { get; set; } - public bool IsTrialUrgentConfirmed { get; set; } + public bool IsTrialProcessConfirmed { get; set; } + public bool IsTrialBasicLogicConfirmed { get; set; } + public bool IsTrialUrgentConfirmed { get; set; } - public bool IsQCQuestionConfirmed { get; set; } - /// - /// 同步临床数据时间 - /// - public DateTime? SyncClinicalDataTime { get; set; } - public string BlindBaseLineName { get; set; } = "Baseline"; + public bool IsQCQuestionConfirmed { get; set; } + [Comment("同步临床数据时间")] + public DateTime? SyncClinicalDataTime { get; set; } + public string BlindBaseLineName { get; set; } = "Baseline"; - public string BlindFollowUpPrefix { get; set; } = "Follow-up"; + public string BlindFollowUpPrefix { get; set; } = "Follow-up"; - public int IndicationEnum { get; set; } = -1; + public int IndicationEnum { get; set; } = -1; - public string VitrualSiteCode { get; set; } = string.Empty; + public string VitrualSiteCode { get; set; } = string.Empty; - #region 邮件配置 - /// - /// 发件箱账号 - /// - public string EmailFromEmail { get; set; } = string.Empty; + #region 邮件配置 + [Comment("发件箱账号")] + public string EmailFromEmail { get; set; } = string.Empty; - /// - /// 发件人 - /// - public string EmailFromName { get; set; } = string.Empty; + [Comment("发件人")] + public string EmailFromName { get; set; } = string.Empty; - /// - /// 密码/授权码 - /// - public string EmailAuthorizationCode { get; set; } = string.Empty; + [Comment("密码/授权码")] + public string EmailAuthorizationCode { get; set; } = string.Empty; - /// - /// SMTP服务器 - /// - public string EmailSMTPServerAddress { get; set; } = string.Empty; + [Comment("SMTP服务器")] + public string EmailSMTPServerAddress { get; set; } = string.Empty; - /// - /// SMTP端口 - /// - public int EmailSMTPServerPort { get; set; } + [Comment("SMTP端口")] + public int EmailSMTPServerPort { get; set; } - /// - /// 是否配置过邮箱 - /// - public bool IsConfigureEmail { get; set; } = false; - #endregion - public bool IsPACSConnect { get; set; } + [Comment("是否配置过邮箱")] + public bool IsConfigureEmail { get; set; } = false; + #endregion + public bool IsPACSConnect { get; set; } - public bool IsTrialPACSConfirmed { get; set; } - } + public bool IsTrialPACSConfirmed { get; set; } } diff --git a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs index 84db50346..966ca6ef8 100644 --- a/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs +++ b/IRaCIS.Core.Domain/Trial/TrialBodyPart.cs @@ -1,23 +1,19 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialBodyPart")] +public class TrialBodyPart : BaseAddAuditEntity { - /// - ///TrialBodyPart - /// - [Table("TrialBodyPart")] - public class TrialBodyPart : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } - #endregion + #endregion - public string Code { get; set; } = string.Empty; - public string Name { get; set; } = string.Empty; - public string NameCN { get; set; } = string.Empty; - public Guid TrialId { get; set; } - public bool IsHandAdd { get; set; } + public string Code { get; set; } = string.Empty; + public string Name { get; set; } = string.Empty; + public string NameCN { get; set; } = string.Empty; + public Guid TrialId { get; set; } + public bool IsHandAdd { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Trial/TrialDictionary.cs b/IRaCIS.Core.Domain/Trial/TrialDictionary.cs index 8ce457c5f..c6ab6511b 100644 --- a/IRaCIS.Core.Domain/Trial/TrialDictionary.cs +++ b/IRaCIS.Core.Domain/Trial/TrialDictionary.cs @@ -1,18 +1,16 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("TrialDictionary")] +public partial class TrialDictionary : Entity { - [Table("TrialDictionary")] - public partial class TrialDictionary : Entity - { - #region - [JsonIgnore] - public virtual Trial Trial { get; set; } - [JsonIgnore] - public virtual Dictionary Dictionary { get; set; } - #endregion - public string KeyName { get; set; } = string.Empty; + #region + [JsonIgnore] + public virtual Trial Trial { get; set; } + [JsonIgnore] + public virtual Dictionary Dictionary { get; set; } + #endregion + public string KeyName { get; set; } = string.Empty; - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid DictionaryId { get; set; } - } + public Guid DictionaryId { get; set; } } diff --git a/IRaCIS.Core.Domain/Trial/TrialSign.cs b/IRaCIS.Core.Domain/Trial/TrialSign.cs index 153f3188c..52a4ed8f2 100644 --- a/IRaCIS.Core.Domain/Trial/TrialSign.cs +++ b/IRaCIS.Core.Domain/Trial/TrialSign.cs @@ -1,24 +1,20 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialSign")] +public class TrialSign : BaseAddAuditEntity { - /// - ///TrialSign - /// - [Table("TrialSign")] - public class TrialSign : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion - public Guid? TrialId { get; set; } - public Guid? SubjectVisitId { get; set; } - //关联基础数据 - public Guid? SignCodeId { get; set; } + #endregion + public Guid? TrialId { get; set; } + public Guid? SubjectVisitId { get; set; } + //关联基础数据 + public Guid? SignCodeId { get; set; } - public string SignCode { get; set; } = string.Empty; + public string SignCode { get; set; } = string.Empty; - public string SignText { get; set; } = string.Empty; + public string SignText { get; set; } = string.Empty; - public bool IsCompleted { get; set; } + public bool IsCompleted { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs index 0cacbef80..4f835a95b 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs @@ -1,22 +1,18 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialStateChange")] +public class TrialStateChange : BaseAddAuditEntity { - /// - ///TrialStateChange - /// - [Table("TrialStateChange")] - public class TrialStateChange : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - #endregion - - public Guid TrialId { get; set; } - public string OriginState { get; set; } = String.Empty; - public string NowState { get; set; } = String.Empty; - public string Reason { get; set; } = String.Empty; - } + #endregion + public Guid TrialId { get; set; } + public string OriginState { get; set; } = String.Empty; + public string NowState { get; set; } = String.Empty; + public string Reason { get; set; } = String.Empty; } + diff --git a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs index d668e69fa..12a055fa5 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs @@ -1,20 +1,18 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("TrialStatus")] +public partial class TrialStatusDetail : BaseAddAuditEntity { - [Table("TrialStatus")] - public partial class TrialStatusDetail : BaseAddAuditEntity - { - #region - [JsonIgnore] - public List IntoGroupDetails { get; set; } + #region + [JsonIgnore] + public List IntoGroupDetails { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - #endregion - public Guid TrialId { get; set; } - public int TrialStatus { get; set; } + [JsonIgnore] + public Trial Trial { get; set; } + #endregion + public Guid TrialId { get; set; } + public int TrialStatus { get; set; } - public string Memo { get; set; } = string.Empty; + public string Memo { get; set; } = string.Empty; - public int OptUserType { get; set; } - } + public int OptUserType { get; set; } } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs index 0667ce14e..5255a30d6 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs @@ -1,29 +1,27 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public class TrialAudit : Entity { - public class TrialAudit : Entity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } - #endregion - public int AuditType { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } + #endregion + public int AuditType { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid StudyId { get; set; } = Guid.Empty; + public Guid StudyId { get; set; } = Guid.Empty; - public Guid? SubjectId { get; set; } + public Guid? SubjectId { get; set; } - public Guid OptUserId { get; set; } + public Guid OptUserId { get; set; } - public string OptUser { get; set; } = string.Empty; + public string OptUser { get; set; } = string.Empty; - public DateTime OptTime { get; set; } = DateTime.Now; - public string Note { get; set; } = string.Empty; + public DateTime OptTime { get; set; } = DateTime.Now; + public string Note { get; set; } = string.Empty; - public string Detail { get; set; } = string.Empty; - } + public string Detail { get; set; } = string.Empty; } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs index fe28016d5..94d3870f4 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs @@ -1,44 +1,38 @@ using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialExternalUser")] +public class TrialExternalUser : BaseFullAuditEntity { - /// - ///TrialExternalUser - /// - [Table("TrialExternalUser")] - public class TrialExternalUser : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - #endregion - public Guid TrialId { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + #endregion + public Guid TrialId { get; set; } - public Guid UserTypeId { get; set; } + public Guid UserTypeId { get; set; } - public string Phone { get; set; } = String.Empty; + public string Phone { get; set; } = String.Empty; - /// + /// - public string Email { get; set; } = String.Empty; - public string FirstName { get; set; } = String.Empty; + public string Email { get; set; } = String.Empty; + public string FirstName { get; set; } = String.Empty; - public string LastName { get; set; } = String.Empty; - public string OrganizationName { get; set; } = String.Empty; - public bool IsSystemUser { get; set; } - public Guid SystemUserId { get; set; } - public bool IsJoin { get; set; } - public DateTime? ExpireTime { get; set; } + public string LastName { get; set; } = String.Empty; + public string OrganizationName { get; set; } = String.Empty; + public bool IsSystemUser { get; set; } + public Guid SystemUserId { get; set; } + public bool IsJoin { get; set; } + public DateTime? ExpireTime { get; set; } - public DateTime? ConfirmTime { get; set; } + public DateTime? ConfirmTime { get; set; } - public string RejectReason { get; set; } = String.Empty; + public string RejectReason { get; set; } = String.Empty; - /// - /// 邀请状态 - /// - [Required] - public TrialExternalUserStateEnum InviteState { get; set; } = TrialExternalUserStateEnum.WaitSent; - - } + [Comment("邀请状态")] + [Required] + public TrialExternalUserStateEnum InviteState { get; set; } = TrialExternalUserStateEnum.WaitSent; } + diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs index 0503d40c1..cbd24e017 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs @@ -1,44 +1,40 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +public class TrialSite : BaseFullDeleteAuditEntity { - public class TrialSite : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] + #region 导航属性 + [JsonIgnore] - [ForeignKey("SiteId")] - public Site Site { get; set; } + [ForeignKey("SiteId")] + public Site Site { get; set; } - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - /// - /// Site 下面有多个访视记录 - /// - [JsonIgnore] - public List SubjectVisitList { get; set; } - [JsonIgnore] - public List TrialSiteSurveyList { get; set; } - //Site 由多个人负责 - [JsonIgnore] - public List CRCUserList { get; set; } + [Comment("Site 下面有多个访视记录")] + [JsonIgnore] + public List SubjectVisitList { get; set; } + [JsonIgnore] + public List TrialSiteSurveyList { get; set; } + //Site 由多个人负责 + [JsonIgnore] + public List CRCUserList { get; set; } - [JsonIgnore] - public List SubjectList { get; set; } + [JsonIgnore] + public List SubjectList { get; set; } - [JsonIgnore] + [JsonIgnore] - public List TrialSiteDicomAEList { get; set; } - #endregion - public Guid TrialId { get; set; } + public List TrialSiteDicomAEList { get; set; } + #endregion + public Guid TrialId { get; set; } - public Guid? SiteId { get; set; } + public Guid? SiteId { get; set; } - public string TrialSiteCode { get; set; } = String.Empty; + public string TrialSiteCode { get; set; } = String.Empty; - public string TrialSiteName { get; set; } = String.Empty; + public string TrialSiteName { get; set; } = String.Empty; - public string TrialSiteAliasName { get; set; } = String.Empty; - public DateTime? EnabledTime { get; set; } - } + public string TrialSiteAliasName { get; set; } = String.Empty; + public DateTime? EnabledTime { get; set; } } \ No newline at end of file diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs index 61b305678..ca1456e00 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs @@ -1,23 +1,19 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialSiteDicomAE")] +public class TrialSiteDicomAE : BaseFullDeleteAuditEntity { - /// - ///TrialSiteDicomAE - /// - [Table("TrialSiteDicomAE")] - public class TrialSiteDicomAE : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - public TrialSite TrialSite { get; set; } - #endregion - public Guid TrialId { get; set; } - - public Guid TrialSiteId { get; set; } - public string CallingAE { get; set; } = string.Empty; - public string IP { get; set; } = string.Empty; - public string Port { get; set; } = string.Empty; - public string Description { get; set; } = string.Empty; - } + #region 导航属性 + [JsonIgnore] + public TrialSite TrialSite { get; set; } + #endregion + public Guid TrialId { get; set; } + public Guid TrialSiteId { get; set; } + public string CallingAE { get; set; } = string.Empty; + public string IP { get; set; } = string.Empty; + public string Port { get; set; } = string.Empty; + public string Description { get; set; } = string.Empty; } + diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs index 278cfc563..8e27612ac 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs @@ -1,28 +1,24 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("TrialSiteUser")] +public class TrialSiteUser : BaseFullDeleteAuditEntity { - /// - ///UserTrialSite - /// - [Table("TrialSiteUser")] - public class TrialSiteUser : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("UserId")] - public User User { get; set; } - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("UserId")] + public User User { get; set; } + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - [JsonIgnore] - public TrialSite TrialSite { get; set; } + [JsonIgnore] + public TrialSite TrialSite { get; set; } - #endregion - public Guid TrialSiteId { get; set; } + #endregion + public Guid TrialSiteId { get; set; } - public Guid UserId { get; set; } + public Guid UserId { get; set; } - public Guid TrialId { get; set; } - } + public Guid TrialId { get; set; } } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs index a524d7528..e55df9ecc 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs @@ -1,25 +1,21 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Comment("运维人员与项目关联关系表 - 实体")] +[Table("TrialUser")] +public partial class TrialUser : BaseFullDeleteAuditEntity { - /// - /// 运维人员与项目关联关系表 - 实体 - /// - [Table("TrialUser")] - public partial class TrialUser : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } - [JsonIgnore] - [ForeignKey("UserId")] - public User User { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("UserId")] + public User User { get; set; } + #endregion - public Guid UserId { get; set; } - public Guid TrialId { get; set; } + public Guid UserId { get; set; } + public Guid TrialId { get; set; } - public DateTime? RemoveTime { get; set; } + public DateTime? RemoveTime { get; set; } - public DateTime? JoinTime { get; set; } - } + public DateTime? JoinTime { get; set; } } diff --git a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs deleted file mode 100644 index 5873ebde2..000000000 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs +++ /dev/null @@ -1,30 +0,0 @@ -namespace IRaCIS.Core.Domain.Models -{ - /// - ///TrialUserPreparation - /// - [Table("TrialUserPreparation ")] - public class TrialUserPreparation : BaseFullAuditEntity - { - - #region 导航属性 - [JsonIgnore] - public User User { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - #endregion - - public Guid UserId { get; set; } - - public Guid TrialId { get; set; } - - public DateTime? ExpireTime { get; set; } - - public bool? IsJoin { get; set; } - - public DateTime? JoinTime { get; set; } - - public string RejectReason { get; set; } = string.Empty; - } - -} diff --git a/IRaCIS.Core.Domain/Visit/Subject.cs b/IRaCIS.Core.Domain/Visit/Subject.cs index 4f8d4db69..07947f65f 100644 --- a/IRaCIS.Core.Domain/Visit/Subject.cs +++ b/IRaCIS.Core.Domain/Visit/Subject.cs @@ -82,7 +82,7 @@ public class Subject : BaseFullDeleteAuditEntity public DateTime? BirthDate { get; set; } - [Comment("知情同意书签署日期")] + [Comment("知情同意书签署日期")] public DateTime? SignDate { get; set; } public DateTime? FirstGiveMedicineTime { get; set; } diff --git a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs index 965fa091d..e1fd71ac2 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs @@ -1,20 +1,16 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SubjectCanceDoctor")] +public class SubjectCanceDoctor : BaseAddAuditEntity { - /// - ///SubjectCanceDoctor - /// - [Table("SubjectCanceDoctor")] - public class SubjectCanceDoctor : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Subject Subject { get; set; } - #endregion - public Guid SubjectId { get; set; } + #region 导航属性 + [JsonIgnore] + public Subject Subject { get; set; } + #endregion + public Guid SubjectId { get; set; } - public string Note { get; set; } = string.Empty; - - public Guid? TrialReadingCriterionId { get; set; } - } + public string Note { get; set; } = string.Empty; + public Guid? TrialReadingCriterionId { get; set; } } + diff --git a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs index ca21f3740..21d799bb4 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs @@ -1,4 +1,5 @@ using IRaCIS.Core.Domain.Share; +using System.ComponentModel; namespace IRaCIS.Core.Domain.Models; [Comment("受试者访视")] @@ -171,24 +172,16 @@ public class SubjectVisit : BaseFullDeleteAuditEntity public Guid? SubmitUserId { get; set; } public ReadingStatusEnum ReadingStatus { get; set; } } -/// -/// 影像下载打包状态 -/// +[Description("影像下载打包状态")] public enum PackState { - /// - /// 待打包 - /// + [Description("待打包")] WaitPack = 0, - /// - /// 打包中 - /// + [Description("打包中")] Packing = 1, - /// - /// 打包完成 - /// + [Description("打包完成")] Packed = 2 } diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs index c4606961e..06e8da986 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs @@ -1,21 +1,17 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("VisitPlanInfluenceStat")] +public class VisitPlanInfluenceStat : BaseAddAuditEntity { - /// - ///VisitPlanInfluenceStudystat - /// - [Table("VisitPlanInfluenceStat")] - public class VisitPlanInfluenceStat : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - public List InfluenceStudyList { get; set; } = new List(); + [JsonIgnore] + public List InfluenceStudyList { get; set; } = new List(); - #endregion + #endregion - public Guid TrialId { get; set; } - - public int InconsistentCount { get; set; } - } + public Guid TrialId { get; set; } + public int InconsistentCount { get; set; } } + diff --git a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs index bc82d208a..03ff71df3 100644 --- a/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs +++ b/IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs @@ -1,38 +1,34 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("VisitPlanInfluenceStudy")] +public class VisitPlanInfluenceStudy : BaseAddAuditEntity { - /// - ///VisitPlanInfluenceSubjectVisit - /// - [Table("VisitPlanInfluenceStudy")] - public class VisitPlanInfluenceStudy : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] - [ForeignKey("VisitPlanInfluenceStatId")] - public VisitPlanInfluenceStat VisitPlanInfluenceStat { get; set; } - [JsonIgnore] - public SubjectVisit SubjectVisit { get; set; } - #endregion - public Guid SubjectVisitId { get; set; } + #region 导航属性 + [JsonIgnore] + [ForeignKey("VisitPlanInfluenceStatId")] + public VisitPlanInfluenceStat VisitPlanInfluenceStat { get; set; } + [JsonIgnore] + public SubjectVisit SubjectVisit { get; set; } + #endregion + public Guid SubjectVisitId { get; set; } - public Guid StudyId { get; set; } + public Guid StudyId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public bool IsDicomStudy { get; set; } + public bool IsDicomStudy { get; set; } - public string Modality { get; set; } = string.Empty; + public string Modality { get; set; } = string.Empty; - public bool IsOverWindowNowNotOverWindow { get; set; } + public bool IsOverWindowNowNotOverWindow { get; set; } - public DateTime? StudyTime { get; set; } + public DateTime? StudyTime { get; set; } - public string HistoryWindow { get; set; } = string.Empty; + public string HistoryWindow { get; set; } = string.Empty; - public string NowWindow { get; set; } = string.Empty; + public string NowWindow { get; set; } = string.Empty; - public Guid VisitPlanInfluenceStatId { get; set; } - - } + public Guid VisitPlanInfluenceStatId { get; set; } } + diff --git a/IRaCIS.Core.Domain/Visit/VisitStage.cs b/IRaCIS.Core.Domain/Visit/VisitStage.cs index dc2ba7db8..931711ac7 100644 --- a/IRaCIS.Core.Domain/Visit/VisitStage.cs +++ b/IRaCIS.Core.Domain/Visit/VisitStage.cs @@ -1,32 +1,30 @@ -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; +[Table("VisitStage")] +public class VisitStage : BaseFullDeleteAuditEntity { - [Table("VisitStage")] - public class VisitStage : BaseFullDeleteAuditEntity - { - #region 导航属性 - [JsonIgnore] - public Trial Trial { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + public Trial Trial { get; set; } + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public string BlindName { get; set; } = string.Empty; + public string BlindName { get; set; } = string.Empty; - [DecimalPrecision(18, 1)] - public decimal VisitNum { get; set; } - public string VisitName { get; set; } = string.Empty; - public int VisitDay { get; set; } - public string Description { get; set; } = string.Empty; + [DecimalPrecision(18, 1)] + public decimal VisitNum { get; set; } + public string VisitName { get; set; } = string.Empty; + public int VisitDay { get; set; } + public string Description { get; set; } = string.Empty; - public bool IsConfirmed { get; set; } = false; + public bool IsConfirmed { get; set; } = false; - public bool NeedGlobal { get; set; } = false; + public bool NeedGlobal { get; set; } = false; - public bool IsBaseLine { get; set; } = false; + public bool IsBaseLine { get; set; } = false; - public int VisitWindowLeft { get; set; } - public int VisitWindowRight { get; set; } + public int VisitWindowLeft { get; set; } + public int VisitWindowRight { get; set; } - public bool IsHaveFirstConfirmed { get; set; } - } + public bool IsHaveFirstConfirmed { get; set; } } diff --git a/IRaCIS.Core.Domain/_Config/_AppSettings.cs b/IRaCIS.Core.Domain/_Config/_AppSettings.cs index 7a2f980eb..3cfb87de5 100644 --- a/IRaCIS.Core.Domain/_Config/_AppSettings.cs +++ b/IRaCIS.Core.Domain/_Config/_AppSettings.cs @@ -1,175 +1,163 @@ using IRaCIS.Core.Domain.Models; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration.Json; +using System.ComponentModel; -namespace IRaCIS.Core.Domain.Share +namespace IRaCIS.Core.Domain.Share; + +[Description("多环境 配置环境实体")] +public class ServiceVerifyConfigOption { - /// - /// 多环境 配置环境实体 - /// - public class ServiceVerifyConfigOption + public bool OpenUserComplexPassword { get; set; } + + public bool OpenSignDocumentBeforeWork { get; set; } + + public bool OpenTrialRelationDelete { get; set; } + + public bool OpenLoginLimit { get; set; } + + public int LoginMaxFailCount { get; set; } + + public int LoginFailLockMinutes { get; set; } + + public int AutoLoginOutMinutes { get; set; } + + public bool OpenLoginMFA { get; set; } + + [Description("连续阅片时间 (min)")] + public int ContinuousReadingTimeMin { get; set; } + + [Description("休息时间 (min)")] + public int ReadingRestTimeMin { get; set; } + [Description("是否需要修改密码")] + public bool IsNeedChangePassWord { get; set; } + + [Description("修改密码的天数")] + public int ChangePassWordDays { get; set; } + +} + +public class SystemEmailSendConfig +{ + public int Port { get; set; } + + public string Host { get; set; } = string.Empty; + public string FromEmail { get; set; } = string.Empty; + + public string FromName { get; set; } = string.Empty; + + public string AuthorizationCode { get; set; } = string.Empty; + + public string SiteUrl { get; set; } = string.Empty; + + public string OrganizationName { get; set; } = string.Empty; + public string OrganizationNameCN { get; set; } = string.Empty; + + public string CompanyName { get; set; } = string.Empty; + + public string CompanyNameCN { get; set; } = string.Empty; + + public string CompanyShortName { get; set; } = string.Empty; + + public string CompanyShortNameCN { get; set; } = string.Empty; +} + +public class SystemEmailSendConfigView +{ + public string CompanyName { get; set; } = string.Empty; + + public string CompanyNameCN { get; set; } = string.Empty; + + public string CompanyShortName { get; set; } = string.Empty; + + public string CompanyShortNameCN { get; set; } = string.Empty; +} + +public class SystemPacsConfig +{ + public int Port { get; set; } + + public string IP { get; set; } = string.Empty; +} +public class IRCEncreptOption +{ + public string Base64RSAPublicKey { get; set; } + + public string Base64RSAPrivateKey { get; set; } + public bool IsResponseEncreptEnable { get; set; } + + public List ApiPathList { get; set; } +} + +public class IRaCISBasicConfigOption +{ + public string DoctorCodePrefix { get; set; } + public string UserCodePrefix { get; set; } + public string QCChallengeCodePrefix { get; set; } + public string DicomStudyCodePrefix { get; set; } + public string TaskStudyCodePrefix { get; set; } + public string NoneDicomStudyCodePrefix { get; set; } + public int ImageShareExpireDays { get; set; } + public string SystemSiteCodePrefix { get; set; } + public string BlindTaskPrefix { get; set; } + public string DefaultPassword { get; set; } +} + +[Description("项目基础配置规则")] +public static class AppSettings +{ + + public static IRaCISBasicConfigOption IRaCISBasicConfig { get; set; } + + static AppSettings() { - public bool OpenUserComplexPassword { get; set; } - - public bool OpenSignDocumentBeforeWork { get; set; } - - public bool OpenTrialRelationDelete { get; set; } - - public bool OpenLoginLimit { get; set; } - - public int LoginMaxFailCount { get; set; } - - public int LoginFailLockMinutes { get; set; } - - public int AutoLoginOutMinutes { get; set; } - - public bool OpenLoginMFA { get; set; } - - /// - /// 连续阅片时间 (min) - /// - public int ContinuousReadingTimeMin { get; set; } - - /// - /// 休息时间 (min) - /// - public int ReadingRestTimeMin { get; set; } - /// - /// 是否需要修改密码 - /// - public bool IsNeedChangePassWord { get; set; } - - /// - /// 修改密码的天数 - /// - public int ChangePassWordDays { get; set; } - - } - - public class SystemEmailSendConfig - { - public int Port { get; set; } - - public string Host { get; set; } = string.Empty; - public string FromEmail { get; set; } = string.Empty; - - public string FromName { get; set; } = string.Empty; - - public string AuthorizationCode { get; set; } = string.Empty; - - public string SiteUrl { get; set; } = string.Empty; - - public string OrganizationName { get; set; } = string.Empty; - public string OrganizationNameCN { get; set; } = string.Empty; - - public string CompanyName { get; set; } = string.Empty; - - public string CompanyNameCN { get; set; } = string.Empty; - - public string CompanyShortName { get; set; } = string.Empty; - - public string CompanyShortNameCN { get; set; } = string.Empty; - } - - public class SystemEmailSendConfigView - { - public string CompanyName { get; set; } = string.Empty; - - public string CompanyNameCN { get; set; } = string.Empty; - - public string CompanyShortName { get; set; } = string.Empty; - - public string CompanyShortNameCN { get; set; } = string.Empty; - } - - public class SystemPacsConfig - { - public int Port { get; set; } - - public string IP { get; set; } = string.Empty; - } - public class IRCEncreptOption - { - public string Base64RSAPublicKey { get; set; } - - public string Base64RSAPrivateKey { get; set; } - public bool IsResponseEncreptEnable { get; set; } - - public List ApiPathList { get; set; } - } - - public class IRaCISBasicConfigOption - { - public string DoctorCodePrefix { get; set; } - public string UserCodePrefix { get; set; } - public string QCChallengeCodePrefix { get; set; } - public string DicomStudyCodePrefix { get; set; } - public string TaskStudyCodePrefix { get; set; } - public string NoneDicomStudyCodePrefix { get; set; } - public int ImageShareExpireDays { get; set; } - public string SystemSiteCodePrefix { get; set; } - public string BlindTaskPrefix { get; set; } - public string DefaultPassword { get; set; } - } - - /// - /// 项目基础配置规则 - /// - public static class AppSettings - { - - public static IRaCISBasicConfigOption IRaCISBasicConfig { get; set; } - - static AppSettings() - { - var configuration = new ConfigurationBuilder() - .Add(new JsonConfigurationSource - { - Path = "appsettings.json", - ReloadOnChange = true - }) - .Build(); - - // 手动绑定配置 - var appSettings = new IRaCISBasicConfigOption(); - configuration.GetSection("IRaCISBasicConfig").Bind(appSettings); - - IRaCISBasicConfig = appSettings; - } - //获取实体编码字符串 - public static string GetCodeStr(int codeInt, string typeStr) - { - switch (typeStr) + var configuration = new ConfigurationBuilder() + .Add(new JsonConfigurationSource { - case nameof(Doctor): - return IRaCISBasicConfig.DoctorCodePrefix + codeInt.ToString("D4"); + Path = "appsettings.json", + ReloadOnChange = true + }) + .Build(); - case nameof(User): - return IRaCISBasicConfig.UserCodePrefix + codeInt.ToString("D4"); + // 手动绑定配置 + var appSettings = new IRaCISBasicConfigOption(); + configuration.GetSection("IRaCISBasicConfig").Bind(appSettings); - case nameof(QCChallenge): - return IRaCISBasicConfig.QCChallengeCodePrefix + codeInt.ToString("D5"); + IRaCISBasicConfig = appSettings; + } + //获取实体编码字符串 + public static string GetCodeStr(int codeInt, string typeStr) + { + switch (typeStr) + { + case nameof(Doctor): + return IRaCISBasicConfig.DoctorCodePrefix + codeInt.ToString("D4"); - case nameof(NoneDicomStudy): - return IRaCISBasicConfig.NoneDicomStudyCodePrefix + codeInt.ToString("D5"); + case nameof(User): + return IRaCISBasicConfig.UserCodePrefix + codeInt.ToString("D4"); - case nameof(DicomStudy): - return IRaCISBasicConfig.DicomStudyCodePrefix + codeInt.ToString("D5"); + case nameof(QCChallenge): + return IRaCISBasicConfig.QCChallengeCodePrefix + codeInt.ToString("D5"); - case nameof(TaskStudy): - return IRaCISBasicConfig.TaskStudyCodePrefix + codeInt.ToString("D5"); + case nameof(NoneDicomStudy): + return IRaCISBasicConfig.NoneDicomStudyCodePrefix + codeInt.ToString("D5"); - case nameof(VisitTask): - return "W" + codeInt.ToString("D5"); + case nameof(DicomStudy): + return IRaCISBasicConfig.DicomStudyCodePrefix + codeInt.ToString("D5"); - case nameof(Site): - return IRaCISBasicConfig.SystemSiteCodePrefix + codeInt.ToString("D4"); + case nameof(TaskStudy): + return IRaCISBasicConfig.TaskStudyCodePrefix + codeInt.ToString("D5"); - default: - return string.Empty; - } + case nameof(VisitTask): + return "W" + codeInt.ToString("D5"); + case nameof(Site): + return IRaCISBasicConfig.SystemSiteCodePrefix + codeInt.ToString("D4"); + + default: + return string.Empty; } } + } \ No newline at end of file diff --git a/IRaCIS.Core.Test/CodeTemplates/EFCore/EntityType.t4 b/IRaCIS.Core.Test/CodeTemplates/EFCore/EntityType.t4 index 5c2804d4f..1ad870103 100644 --- a/IRaCIS.Core.Test/CodeTemplates/EFCore/EntityType.t4 +++ b/IRaCIS.Core.Test/CodeTemplates/EFCore/EntityType.t4 @@ -75,7 +75,7 @@ public partial class <#= EntityType.Name #>: BaseFullAuditEntity if (!string.IsNullOrEmpty(property.GetComment())) { #> - [Comment(" <#= code.XmlComment(property.GetComment().Replace("\\", "|").Trim()) #>")] + [Comment("<#= code.XmlComment(property.GetComment().Replace("\\", "|").Trim()) #>")] <# }