diff --git a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs index 88bb43c73..9bb15dbad 100644 --- a/IRaCIS.Core.Domain/Allocation/SubjectUser.cs +++ b/IRaCIS.Core.Domain/Allocation/SubjectUser.cs @@ -11,54 +11,52 @@ using System.Collections.Generic; using System.ComponentModel; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + + +[Comment("受试者 - 项目标准阅片医生配置表")] +[Table("SubjectUser")] +public class SubjectUser : BaseFullAuditEntity { - [Comment("受试者 - 项目标准阅片医生配置表")] - [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; } + //ChildList + [JsonIgnore] + public List EarlierSubjectUserList { get; set; } - [JsonIgnore] - public User DoctorUser { get; set; } + [JsonIgnore] + public User DoctorUser { get; set; } - [JsonIgnore] - public Subject Subject { get; set; } - #endregion + [JsonIgnore] + public Subject Subject { get; set; } + #endregion - public Arm ArmEnum { get; set; } + public Arm ArmEnum { get; set; } - public DateTime? AssignTime { get; set; } + public DateTime? AssignTime { get; set; } - public Guid DoctorUserId { get; set; } + public Guid DoctorUserId { get; set; } - public bool IsConfirmed { get; set; } + public bool IsConfirmed { get; set; } - [Comment("该属性有值 说明该医生被替换了 分配的时候 要过滤掉")] - public Guid? ReplacedSubjectUserId { get; set; } + [Comment("该属性有值 说明该医生被替换了 分配的时候 要过滤掉")] + public Guid? ReplacedSubjectUserId { get; set; } - public Guid SubjectId { get; set; } + public Guid SubjectId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - } - } diff --git a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs index a2984edc6..381ab3e14 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs @@ -10,46 +10,44 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目阅片 - 分配规则")] +[Table("TaskAllocationRule")] +public class TaskAllocationRule : BaseFullAuditEntity { - [Comment("项目阅片 - 分配规则")] - [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 DoctorUserId { get; set; } + public Guid TrialId { get; set; } + public Guid DoctorUserId { get; set; } - [Comment(" 入组表Id 可以去掉 TrialId DoctorUserId")] - public Guid EnrollId { get; set; } + [Comment(" 入组表Id 可以去掉 TrialId DoctorUserId")] + public Guid EnrollId { get; set; } - public bool IsEnable { get; set; } + public bool IsEnable { get; set; } - public bool IsJudgeDoctor { get; set; } + public bool IsJudgeDoctor { get; set; } - public string Note { get; set; } = null!; + public string Note { get; set; } = null!; - [Comment(" 计划比率")] - public int PlanReadingRatio { get; set; } + [Comment(" 计划比率")] + public int PlanReadingRatio { get; set; } - public int PlanSubjectCount { get; set; } + public int PlanSubjectCount { get; set; } - } - } diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs index ebf5e908d..310c6be98 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs @@ -12,185 +12,181 @@ using System.Linq; using Newtonsoft.Json; using Microsoft.EntityFrameworkCore; -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 ImagePath { get; set; } = string.Empty; +} +[Comment("项目阅片 - 医学审核")] +[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 { - public string FileName { get; set; } = string.Empty; - - public string ImagePath { get; set; } = string.Empty; - } - [Comment("项目阅片 - 医学审核")] - [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 { - get + + + try + { + var result = JsonConvert.DeserializeObject>(this.ImagePath); + return result == null ? new List() : result; + } + catch (Exception) { - - try - { - var result = JsonConvert.DeserializeObject>(this.ImagePath); - return result == null ? new List() : result; - } - catch (Exception) - { - - return new List(); - } - + 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; - - } + [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; } diff --git a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs index a572146ef..42fe2ea48 100644 --- a/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs +++ b/IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs @@ -10,33 +10,33 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目阅片 - 一致性分析规则")] +[Table("TaskMedicalReviewRule")] +public class TaskMedicalReviewRule : BaseFullAuditEntity { - [Comment("项目阅片 - 一致性分析规则")] - [Table("TaskMedicalReviewRule")] - public class TaskMedicalReviewRule :BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public User DoctorUser { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + public User DoctorUser { get; set; } + #endregion - public Guid DoctorUserId { get; set; } - - public bool IsEnable { get; set; } - - public string Note { get; set; } = string.Empty; + public Guid DoctorUserId { get; set; } - public Guid TrialId { get; set; } + public bool IsEnable { get; set; } - public int PlanVisitCount { get; set; } + public string Note { get; set; } = string.Empty; - public int PlanJudgeCount { get; set; } - - public int PlanGlobalCount { get; set; } + public Guid TrialId { get; set; } - public int PlanTumorCount { get; set; } + public int PlanVisitCount { get; set; } + + public int PlanJudgeCount { get; set; } + + public int PlanGlobalCount { get; set; } + + public int PlanTumorCount { get; set; } @@ -44,6 +44,6 @@ namespace IRaCIS.Core.Domain.Models - } +} + -} diff --git a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs index 2fb83df57..7eb287b20 100644 --- a/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs +++ b/IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs @@ -8,25 +8,22 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 虚拟中心编号更新记录")] +[Table("TrialVirtualSiteCodeUpdate")] +public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity { - [Comment("项目 - 虚拟中心编号更新记录")] - [Table("TrialVirtualSiteCodeUpdate")] - public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - [StringLength(250)] - public string VirturalSiteCode { get; set; } = string.Empty; + [StringLength(250)] + public string VirturalSiteCode { get; set; } = string.Empty; - } - - } diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index 62a708ec6..c48fdd4a7 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -11,428 +11,427 @@ using System.Collections.Generic; using System.Linq; using EntityFrameworkCore.Projectables; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +/// +///VisitTask +/// +[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(); + + + /// + /// 裁判结果图片地址 + /// + [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; } + + /// + /// 关联的访视任务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; } + + } diff --git a/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs b/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs index c0f4fbb4a..17389f20b 100644 --- a/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs +++ b/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs @@ -4,21 +4,20 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace IRaCIS.Core.Domain.BaseModel +namespace IRaCIS.Core.Domain.BaseModel; + +/// +/// 领域实体事件基类 +/// +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 bb525e696..3ddc671b4 100644 --- a/IRaCIS.Core.Domain/BaseModel/Entity.cs +++ b/IRaCIS.Core.Domain/BaseModel/Entity.cs @@ -5,124 +5,122 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Security.Cryptography; -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 b301d3d87..dcdb3c469 100644 --- a/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs +++ b/IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs @@ -1,27 +1,23 @@ using System; -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 DateTime CreateTime { get; set; } - - } - - - - public interface IAuditAdd : IAuditAdd - { - - } - - public interface IAuditAddWithUserName : IAuditAdd - { - public string CreateUser { get; set; } - } - + public TKey CreateUserId { get; set; } + public DateTime CreateTime { 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 05d422a16..b77992d26 100644 --- a/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs +++ b/IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs @@ -1,20 +1,14 @@ using System; -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 e0549348b..00121d5a4 100644 --- a/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs +++ b/IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs @@ -1,19 +1,16 @@ using System; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +public interface ISoftDelete where TKey : struct { - public interface ISoftDelete where TKey : struct - { - public TKey? DeleteUserId { get; set; } - public bool IsDeleted { get; set; } + public TKey? DeleteUserId { get; set; } + public bool IsDeleted { get; set; } - public DateTime? DeletedTime { get; set; } - } - - public interface ISoftDelete : ISoftDelete - { - - } + public DateTime? DeletedTime { get; set; } +} +public interface ISoftDelete : ISoftDelete +{ } diff --git a/IRaCIS.Core.Domain/Common/SystemBasicData.cs b/IRaCIS.Core.Domain/Common/SystemBasicData.cs index 384d3cdfc..aeee2c777 100644 --- a/IRaCIS.Core.Domain/Common/SystemBasicData.cs +++ b/IRaCIS.Core.Domain/Common/SystemBasicData.cs @@ -4,51 +4,48 @@ // 生成时间 2022-02-15 15:45:52 // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 using IRaCIS.Core.Domain.Share; +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("系统 - 签名模板场景配置 (需要同步)")] +[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 + #endregion - public BasicDataTypeEnum BasicDataTypeEnum { get; set; } + public BasicDataTypeEnum BasicDataTypeEnum { get; set; } - [StringLength(512)] - public string Code { get; set; } = null!; + [StringLength(512)] + public string Code { get; set; } = null!; - [StringLength(512)] - public string Description { get; set; } = null!; + [StringLength(512)] + public string Description { get; set; } = null!; - public bool IsEnable { get; set; } + public bool IsEnable { get; set; } - [StringLength(400)] - public string Name { get; set; } = null!; + [StringLength(400)] + public string Name { get; set; } = null!; - public Guid? ParentId { get; set; } + public Guid? ParentId { get; set; } - public int ShowOrder { get; set; } + public int ShowOrder { get; set; } - [StringLength(512)] - public string Value { get; set; } = null!; + [StringLength(512)] + public string Value { get; set; } = null!; - [StringLength(512)] - public string ValueCN { get; set; } = null!; + [StringLength(512)] + public string ValueCN { get; set; } = null!; - } - -} +} diff --git a/IRaCIS.Core.Domain/Dcotor/UserDoctor.cs b/IRaCIS.Core.Domain/Dcotor/UserDoctor.cs deleted file mode 100644 index 10924024f..000000000 --- a/IRaCIS.Core.Domain/Dcotor/UserDoctor.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models -{ - /// - /// 用户与医生管理关联关系表 - 实体 - /// - [Table("UserDoctor")] - public partial class UserDoctor : Entity - { - #region 导航属性 - [JsonIgnore] - public Doctor Doctor { get; set; } - [JsonIgnore] - public User User { get; set; } - #endregion - - [ForeignKey("User")] - public Guid UserId { get; set; } - - [ForeignKey("Doctor")] - public Guid DoctorId { get; set; } - - } -} diff --git a/IRaCIS.Core.Domain/Dcotor/Vacation.cs b/IRaCIS.Core.Domain/Dcotor/Vacation.cs index d135d35f3..569edcdc6 100644 --- a/IRaCIS.Core.Domain/Dcotor/Vacation.cs +++ b/IRaCIS.Core.Domain/Dcotor/Vacation.cs @@ -2,19 +2,18 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("医生 - 假期安排")] +[Table("Vacation")] +public class Vacation : BaseFullAuditEntity { - [Comment("医生 - 假期安排")] - [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/TrialDocConfirmedUser.cs b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs index bd6b1c48c..7330f38f9 100644 --- a/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs @@ -7,25 +7,25 @@ using Microsoft.EntityFrameworkCore; using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目文档签署记录")] +[Table("TrialDocConfirmedUser")] +public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity { - [Comment("项目 - 项目文档签署记录")] - [Table("TrialDocConfirmedUser")] - public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - [ForeignKey("ConfirmUserId")] - public User User { get; set; } - [JsonIgnore] - public TrialDocument TrialDocument { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("ConfirmUserId")] + public User User { get; set; } + [JsonIgnore] + public TrialDocument TrialDocument { get; set; } + #endregion - public Guid TrialDocumentId { get; set; } + public Guid TrialDocumentId { get; set; } public DateTime? ConfirmTime { get; set; } @@ -36,12 +36,12 @@ namespace IRaCIS.Core.Domain.Models public DateTime? SignFirstViewTime { get; set; } - [StringLength(512)] - public string SignText { get; set; } = string.Empty; + [StringLength(512)] + public string SignText { get; set; } = string.Empty; } -} + diff --git a/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs b/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs index c7c2e5023..526ece800 100644 --- a/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs +++ b/IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs @@ -8,24 +8,24 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目邮件收发配置用户类型")] +[Table("TrialEmailNoticeUser")] +public class TrialEmailNoticeUser : Entity { - [Comment("项目 - 项目邮件收发配置用户类型")] - [Table("TrialEmailNoticeUser")] - public class TrialEmailNoticeUser : Entity - { - #region 导航属性 - [JsonIgnore] - public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; } + #endregion - public UserTypeEnum UserType { get; set; } - - - public Guid TrialEmailNoticeConfigId { get; set; } + public UserTypeEnum UserType { get; set; } - public EmailUserType EmailUserType { 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 7d60de36e..d516d9a2f 100644 --- a/IRaCIS.Core.Domain/Financial/CalculateTask.cs +++ b/IRaCIS.Core.Domain/Financial/CalculateTask.cs @@ -2,15 +2,14 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models -{ - [Table("CalculateTask")] - public class CalculateTask : Entity - { - public Guid ReviewerId { get; set; } +namespace IRaCIS.Core.Domain.Models; - [Required] - public string YearMonth { get; set; } = string.Empty; - public bool IsLock { get; set; } - } +[Table("CalculateTask")] +public class CalculateTask : Entity +{ + public Guid ReviewerId { get; set; } + + [Required] + public string YearMonth { get; set; } = string.Empty; + public bool IsLock { get; set; } } diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs index 02d3bfabe..471b31089 100644 --- a/IRaCIS.Core.Domain/Image/DicomStudy.cs +++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs @@ -4,109 +4,108 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("DicomStudy")] +public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId { - [Table("DicomStudy")] - public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId - { - #region 导航属性 - //一个检查 由多个人管理 - //public List TrialSiteUserList { get; set; } = new List(); - [JsonIgnore] - public List DicomStudyMonitorList { get; set; } = new List(); - [JsonIgnore] - public List SeriesList { get; set; } + #region 导航属性 + //一个检查 由多个人管理 + //public List TrialSiteUserList { get; set; } = new List(); + [JsonIgnore] + public List DicomStudyMonitorList { get; set; } = new List(); + [JsonIgnore] + public List SeriesList { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } - [JsonIgnore] - [ForeignKey("SubjectVisitId")] - public SubjectVisit SubjectVisit { get; set; } + [JsonIgnore] + [ForeignKey("SubjectVisitId")] + public SubjectVisit SubjectVisit { get; set; } - [JsonIgnore] - public List ReadingClinicalDataList { get; set; } + [JsonIgnore] + public List ReadingClinicalDataList { get; set; } - [JsonIgnore] - public List ReadingConsistentClinicalDataList { get; set; } + [JsonIgnore] + public List ReadingConsistentClinicalDataList { get; set; } - [JsonIgnore] - public List SubjectCriteriaEvaluationVisitStudyFilterList { get; set; } + [JsonIgnore] + public List SubjectCriteriaEvaluationVisitStudyFilterList { get; set; } - #endregion + #endregion - public string AccessionNumber { get; set; } = null!; + public string AccessionNumber { get; set; } = null!; - public string AcquisitionNumber { get; set; } = null!; + public string AcquisitionNumber { get; set; } = null!; - public string AcquisitionTime { get; set; } = null!; + public string AcquisitionTime { get; set; } = null!; - [StringLength(512)] - public string BodyPartExamined { get; set; } = null!; + [StringLength(512)] + public string BodyPartExamined { get; set; } = null!; - public string BodyPartForEdit { get; set; } = null!; + public string BodyPartForEdit { get; set; } = null!; - public int Code { get; set; } + public int Code { get; set; } - [StringLength(1000)] - public string Description { get; set; } = null!; + [StringLength(1000)] + public string Description { get; set; } = null!; - public int InstanceCount { get; set; } + public int InstanceCount { get; set; } - [StringLength(400)] - public string InstitutionName { get; set; } = null!; + [StringLength(400)] + public string InstitutionName { get; set; } = null!; - public bool IsDoubleReview { get; set; } + public bool IsDoubleReview { get; set; } - public bool IsFromPACS { get; set; } + public bool IsFromPACS { get; set; } - public string Modalities { get; set; } = null!; + public string Modalities { get; set; } = null!; - public string ModalityForEdit { get; set; } = null!; + public string ModalityForEdit { get; set; } = null!; - public string PatientAge { get; set; } = null!; + public string PatientAge { get; set; } = null!; - public string PatientBirthDate { get; set; } = null!; + public string PatientBirthDate { get; set; } = null!; - public string PatientId { get; set; } = null!; + public string PatientId { get; set; } = null!; - public string PatientName { get; set; } = null!; + public string PatientName { get; set; } = null!; - public string PatientSex { get; set; } = null!; + public string PatientSex { get; set; } = null!; - [Comment(" 序列Id 避免内存移动")] - public Guid SeqId { get; set; } + [Comment(" 序列Id 避免内存移动")] + public Guid SeqId { get; set; } - public int SeriesCount { get; set; } + public int SeriesCount { get; set; } - [StringLength(400)] - public string StudyCode { get; set; } = null!; + [StringLength(400)] + public string StudyCode { get; set; } = null!; - [Comment(" DicomTag.StudyID")] - public string StudyId { get; set; } = null!; + [Comment(" DicomTag.StudyID")] + public string StudyId { get; set; } = null!; - [StringLength(500)] - public string StudyInstanceUid { get; set; } = null!; + [StringLength(500)] + public string StudyInstanceUid { get; set; } = null!; - public DateTime? StudyTime { get; set; } + public DateTime? StudyTime { get; set; } - public Guid SubjectId { get; set; } + public Guid SubjectId { get; set; } - public Guid SubjectVisitId { get; set; } + public Guid SubjectVisitId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public string TriggerTime { get; set; } = null!; + public string TriggerTime { get; set; } = null!; - [Comment(" 上传时间")] - public DateTime? UploadedTime { get; set; } + [Comment(" 上传时间")] + public DateTime? UploadedTime { get; set; } - public string Uploader { get; set; } = null!; + public string Uploader { get; set; } = null!; - } } diff --git a/IRaCIS.Core.Domain/Image/SCPInstance.cs b/IRaCIS.Core.Domain/Image/SCPInstance.cs index 649dc06f0..00945c007 100644 --- a/IRaCIS.Core.Domain/Image/SCPInstance.cs +++ b/IRaCIS.Core.Domain/Image/SCPInstance.cs @@ -3,75 +3,74 @@ using System; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -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 + [JsonIgnore] + [ForeignKey("StudyId")] + public SCPStudy SCPStudy { get; set; } + #endregion - public bool Anonymize { get; set; } + public bool Anonymize { get; set; } - public bool CPIStatus { get; set; } + public bool CPIStatus { get; set; } - public long? FileSize { get; set; } + public long? FileSize { get; set; } - [StringLength(500)] - public string FrameOfReferenceUID { get; set; } = null!; + [StringLength(500)] + public string FrameOfReferenceUID { get; set; } = null!; - public int ImageColumns { get; set; } + public int ImageColumns { get; set; } - public int ImageRows { get; set; } + public int ImageRows { get; set; } - [StringLength(400)] - public string ImagerPixelSpacing { get; set; } = null!; + [StringLength(400)] + public string ImagerPixelSpacing { get; set; } = null!; - public int InstanceNumber { get; set; } + public int InstanceNumber { get; set; } - public DateTime? InstanceTime { get; set; } + public DateTime? InstanceTime { get; set; } - public int NumberOfFrames { get; set; } + public int NumberOfFrames { get; set; } - [MaxLength] - [Unicode(false)] - public string Path { get; set; } = null!; + [MaxLength] + [Unicode(false)] + public string Path { get; set; } = null!; - [StringLength(400)] - public string PixelSpacing { get; set; } = null!; + [StringLength(400)] + public string PixelSpacing { get; set; } = null!; - public Guid SeqId { get; set; } + public Guid SeqId { get; set; } - public Guid SeriesId { get; set; } + public Guid SeriesId { get; set; } - public string SeriesInstanceUid { get; set; } = null!; + public string SeriesInstanceUid { get; set; } = null!; - public int SliceLocation { get; set; } + public int SliceLocation { get; set; } - [StringLength(400)] - public string SliceThickness { get; set; } = null!; + [StringLength(400)] + public string SliceThickness { get; set; } = null!; - public string SopInstanceUid { get; set; } = null!; + public string SopInstanceUid { get; set; } = null!; - public Guid StudyId { get; set; } + public Guid StudyId { get; set; } - public string StudyInstanceUid { get; set; } = null!; + public string StudyInstanceUid { get; set; } = null!; - [StringLength(400)] - public string WindowCenter { get; set; } = null!; + [StringLength(400)] + public string WindowCenter { get; set; } = null!; - [StringLength(400)] - public string WindowWidth { get; set; } = null!; + [StringLength(400)] + public string WindowWidth { get; set; } = null!; - } } diff --git a/IRaCIS.Core.Domain/Image/TaskInstance.cs b/IRaCIS.Core.Domain/Image/TaskInstance.cs index ba6acebd1..11dff6416 100644 --- a/IRaCIS.Core.Domain/Image/TaskInstance.cs +++ b/IRaCIS.Core.Domain/Image/TaskInstance.cs @@ -2,56 +2,55 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -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 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 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 5f74e1290..cf5ca01a7 100644 --- a/IRaCIS.Core.Domain/Image/TaskSeries.cs +++ b/IRaCIS.Core.Domain/Image/TaskSeries.cs @@ -3,53 +3,52 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -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 + [JsonIgnore] + public List InstanceList { 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 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 Guid TrialId { get; set; } - public Guid SubjectId { get; set; } - public Guid VisitTaskId { get; set; } + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } + public Guid VisitTaskId { get; set; } - public string BodyPartForEdit { get; set; } = string.Empty; + public string BodyPartForEdit { get; set; } = string.Empty; - public bool IsReading { get; set; } = true; + public bool IsReading { get; set; } = true; - 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 7d163196d..2ea8fcc9d 100644 --- a/IRaCIS.Core.Domain/Image/TaskStudy.cs +++ b/IRaCIS.Core.Domain/Image/TaskStudy.cs @@ -3,82 +3,81 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -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; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } - #endregion + #endregion - public Guid SeqId { get; set; } + public Guid SeqId { 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 int Code { get; set; } = 0; + 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 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 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; - //0 未知 1 单重 2 双重 - public bool IsDoubleReview { get; set; } + //0 未知 1 单重 2 双重 + public bool IsDoubleReview { get; set; } - + - } } diff --git a/IRaCIS.Core.Domain/Image/TrialImageDownload.cs b/IRaCIS.Core.Domain/Image/TrialImageDownload.cs index 3ede78094..43f3da43d 100644 --- a/IRaCIS.Core.Domain/Image/TrialImageDownload.cs +++ b/IRaCIS.Core.Domain/Image/TrialImageDownload.cs @@ -8,49 +8,48 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 影像下载监控")] +[Table("TrialImageDownload")] +public class TrialImageDownload : BaseFullAuditEntity { - [Comment("项目 - 影像下载监控")] - [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; } - [StringLength(400)] - public string VisitName { get; set; } + [StringLength(400)] + 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/Management/Menu.cs b/IRaCIS.Core.Domain/Management/Menu.cs index e68ac13ac..8f9c7d301 100644 --- a/IRaCIS.Core.Domain/Management/Menu.cs +++ b/IRaCIS.Core.Domain/Management/Menu.cs @@ -4,58 +4,57 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("后台 - 系统菜单 （需要同步）")] +[Table("Menu")] +public class Menu : BaseFullAuditEntity { - [Comment("后台 - 系统菜单 （需要同步）")] - [Table("Menu")] - public class Menu : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public List UserTypeMenuList { get; set; } - #endregion + #region 导航属性 + [JsonIgnore] + public List UserTypeMenuList { get; set; } + #endregion - public string ApiPath { get; set; } = null!; + public string ApiPath { get; set; } = null!; - [StringLength(400)] - public string Component { get; set; } = null!; + [StringLength(400)] + public string Component { get; set; } = null!; - public bool IsCache { get; set; } + public bool IsCache { get; set; } - public bool IsDisplay { get; set; } + public bool IsDisplay { get; set; } - public bool IsEnable { get; set; } + public bool IsEnable { get; set; } - public bool IsExternalLink { get; set; } + public bool IsExternalLink { get; set; } - public bool? IsInTabDisplay { get; set; } + public bool? IsInTabDisplay { get; set; } - public string LanguageMark { get; set; } = null!; + public string LanguageMark { get; set; } = null!; - public string MenuIcon { get; set; } = null!; + public string MenuIcon { get; set; } = null!; - public string MenuName { get; set; } = null!; - [Comment("类型（M目录 C菜单 F按钮 L链接）")] - public string MenuType { get; set; } = null!; + public string MenuName { get; set; } = null!; + [Comment("类型（M目录 C菜单 F按钮 L链接）")] + public string MenuType { get; set; } = null!; - public string Meta { get; set; } = null!; + public string Meta { get; set; } = null!; - [MaxLength] - public string Note { get; set; } + [MaxLength] + public string Note { get; set; } - public Guid ParentId { get; set; } + public Guid ParentId { get; set; } - [Comment("路由地址")] - [StringLength(500)] - public string Path { get; set; } = null!; + [Comment("路由地址")] + [StringLength(500)] + public string Path { get; set; } = null!; - public string PermissionStr { get; set; } = null!; + public string PermissionStr { get; set; } = null!; - public string Redirect { get; set; } = null!; + public string Redirect { get; set; } = null!; - public int ShowOrder { get; set; } + public int ShowOrder { get; set; } - } } diff --git a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs index 706965270..a5357a3b0 100644 --- a/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs +++ b/IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs @@ -8,27 +8,25 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("后台 - 系统通知用户类型配置")] +[Table("SystemNoticeUserType")] +public class SystemNoticeUserType : BaseAddAuditEntity { - [Comment("后台 - 系统通知用户类型配置")] - [Table("SystemNoticeUserType")] - public class SystemNoticeUserType : BaseAddAuditEntity - { - #region 导航属性 - [JsonIgnore] + #region 导航属性 + [JsonIgnore] - [ForeignKey("UserTypeId")] - public UserType NoticeUserType { get; set; } - #endregion + [ForeignKey("UserTypeId")] + public UserType NoticeUserType { get; set; } + #endregion - public Guid SystemNoticeId { get; set; } + public Guid SystemNoticeId { get; set; } - public Guid UserTypeId { get; set; } + public Guid UserTypeId { get; set; } - } - } diff --git a/IRaCIS.Core.Domain/Management/Role.cs b/IRaCIS.Core.Domain/Management/Role.cs index d0ca7f7f4..853559f26 100644 --- a/IRaCIS.Core.Domain/Management/Role.cs +++ b/IRaCIS.Core.Domain/Management/Role.cs @@ -2,20 +2,19 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; -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 89b77911a..cef183178 100644 --- a/IRaCIS.Core.Domain/Management/User.cs +++ b/IRaCIS.Core.Domain/Management/User.cs @@ -5,76 +5,76 @@ using System.ComponentModel.DataAnnotations.Schema; using EntityFrameworkCore.Projectables; using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("User")] +public partial class User : BaseFullAuditEntity { - [Table("User")] - public partial class User : BaseFullAuditEntity - { - #region - [ForeignKey("UserTypeId")] - public UserType UserTypeRole { get; set; } + #region + [ForeignKey("UserTypeId")] + public UserType UserTypeRole { get; set; } - [JsonIgnore] - public List SystemDocConfirmedList { get; set; } + [JsonIgnore] + public List SystemDocConfirmedList { get; set; } - [JsonIgnore] - public List UserTrials { get; set; } = new List(); + [JsonIgnore] + public List UserTrials { get; set; } = new List(); - [JsonIgnore] - public List VisitTaskList { get; set; } + [JsonIgnore] + public List VisitTaskList { get; set; } - #endregion + #endregion - [StringLength(255)] - public string UserName { get; set; } = String.Empty; + [StringLength(255)] + public string UserName { get; set; } = String.Empty; - [StringLength(255)] - public string Password { get; set; } = String.Empty; - [StringLength(255)] + [StringLength(255)] + public string Password { get; set; } = String.Empty; + [StringLength(255)] - public string LastName { 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 Phone { get; set; } = string.Empty; - public string EMail { get; set; } = string.Empty; - public int? Sex { get; set; } - public UserStateEnum Status { get; set; } = UserStateEnum.Enable; + public string Phone { get; set; } = string.Empty; + public string EMail { get; set; } = string.Empty; + public int? Sex { get; set; } + public UserStateEnum Status { get; set; } = UserStateEnum.Enable; - public DateTime? LastLoginTime { get; set; } + public DateTime? LastLoginTime { get; set; } - public Guid UserTypeId { get; set; } = Guid.Empty; + public Guid UserTypeId { get; set; } = Guid.Empty; - // ڲû ⲿû - public bool IsZhiZhun { get; set; } + // ڲû ⲿû + public bool IsZhiZhun { get; set; } - public UserTypeEnum UserTypeEnum { get; set; } + public UserTypeEnum UserTypeEnum { get; set; } - public string OrganizationName { get; set; } = String.Empty; + public string OrganizationName { get; set; } = String.Empty; - public bool PasswordChanged { get; set; } + public bool PasswordChanged { get; set; } - public string UserCode { get; set; } = string.Empty; + public string UserCode { get; set; } = string.Empty; - public int Code { get; set; } + public int Code { get; set; } - public string DepartmentName { get; set; } = String.Empty; + public string DepartmentName { get; set; } = String.Empty; - public string PositionName { get; set; } = String.Empty; + public string PositionName { get; set; } = String.Empty; - public bool IsFirstAdd { get; set; } = true; + public bool IsFirstAdd { get; set; } = true; - public string EmailToken { get; set; } = string.Empty; + public string EmailToken { get; set; } = string.Empty; - /// - /// һ޸ʱ - /// - public DateTime? LastChangePassWordTime { get; set; } + /// + /// һ޸ʱ + /// + public DateTime? LastChangePassWordTime { get; set; } /// /// LastLoginIP @@ -84,16 +84,15 @@ namespace IRaCIS.Core.Domain.Models //ҽ˺ź󣬻ֵ public Guid? DoctorId { get; set; } - public bool IsTestUser { get; set; } + public bool IsTestUser { get; set; } - /// - /// Զлһ - /// - public bool AutoCutNextTask { get; set; } = false; + /// + /// Զлһ + /// + public bool AutoCutNextTask { get; set; } = false; - [Projectable] - public string FullName => LastName + " / " + FirstName; + [Projectable] + public string FullName => LastName + " / " + FirstName; - //[Projectable] public string FullName => $"{LastName} / {FirstName}"; - } + //[Projectable] public string FullName => $"{LastName} / {FirstName}"; } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs index ee2839dad..a7978baf3 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs @@ -10,33 +10,30 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("受试者 - 参与附加评估标准配置")] +[Table("SubjectCriteriaEvaluation")] +public class SubjectCriteriaEvaluation : BaseFullAuditEntity { - [Comment("受试者 - 参与附加评估标准配置")] - [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 + [JsonIgnore] + public List SubjectCriteriaEvaluationVisitFilterList { get; set; } + #endregion - [Comment(" 是否参与评估")] - public bool IsJoinEvaluation { get; set; } + [Comment(" 是否参与评估")] + public bool IsJoinEvaluation { get; set; } - public Guid SubjectId { get; set; } + public Guid SubjectId { get; set; } - public Guid TrialReadingCriterionId { get; set; } - - - } + public Guid TrialReadingCriterionId { get; set; } } diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs index c3076b21f..13bcd4eb7 100644 --- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs +++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs @@ -8,46 +8,44 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("受试者 - 附加评估标准影像筛选检查")] +[Table("SubjectCriteriaEvaluationVisitStudyFilter")] +public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity { - [Comment("受试者 - 附加评估标准影像筛选检查")] - [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("SeriesId")] + [JsonIgnore] + public DicomSeries Series { get; set; } - [ForeignKey("StudyId")] - [JsonIgnore] - public DicomStudy Study { get; set; } - #endregion + [ForeignKey("StudyId")] + [JsonIgnore] + public DicomStudy Study { get; set; } + #endregion - [Comment(" 是否确认")] - public bool IsConfirmed { get; set; } + [Comment(" 是否确认")] + public bool IsConfirmed { get; set; } - public bool IsReading { get; set; } + public bool IsReading { get; set; } - public Guid SeriesId { get; set; } + public Guid SeriesId { get; set; } - public Guid StudyId { get; set; } + public Guid StudyId { get; set; } - public Guid SubjectVisitId { get; set; } + public Guid SubjectVisitId { get; set; } - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - } - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs index 671464c80..2d1168cc7 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs @@ -6,35 +6,31 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models -{ - [Comment("项目阅片 - 临床数据PDF文件")] - [Table("ReadingClinicalDataPDF")] - public class ReadingClinicalDataPDF : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目阅片 - 临床数据PDF文件")] +[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 - [StringLength(1000)] - public string FileName { get; set; } = null!; + [StringLength(1000)] + public string FileName { get; set; } = null!; - [StringLength(2000)] - public string Path { get; set; } = null!; + [StringLength(2000)] + public string Path { get; set; } = null!; - [Comment("阅片临床数据ID")] - public Guid ReadingClinicalDataId { get; set; } + [Comment("阅片临床数据ID")] + public Guid ReadingClinicalDataId { get; set; } - public int Size { get; set; } + public int Size { get; set; } - public string Type { get; set; } = null!; - } + public string Type { get; set; } = null!; +} - - - -} diff --git a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs index dc67f06a2..a2d48686a 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalData/TrialClinicalDataSetCriterion.cs @@ -8,30 +8,28 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目标准 - 临床数据配置")] +[Table("TrialClinicalDataSetCriterion")] +public class TrialClinicalDataSetCriterion : BaseFullAuditEntity { - [Comment("项目标准 - 临床数据配置")] - [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 + [ForeignKey("TrialClinicalDataSetId")] + public ClinicalDataTrialSet TrialClinicalDataSet { get; set; } + [JsonIgnore] + [ForeignKey("TrialReadingCriterionId")] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion - public Guid TrialClinicalDataSetId { get; set; } + public Guid TrialClinicalDataSetId { get; set; } - public Guid TrialReadingCriterionId { get; set; } + public Guid TrialReadingCriterionId { get; set; } - } - } diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs index 6be127746..8c791d0a3 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalTableQuestion.cs @@ -10,131 +10,131 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; using System.Linq; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +/// +/// 项目临床表格问题 +/// +[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 + /// + /// 项目临床数据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; + + +} + -} diff --git a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs index 35baf4dc5..34132419e 100644 --- a/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs +++ b/IRaCIS.Core.Domain/Reading/ClinicalQuestionAnswer/ReadModuleCriterionFrom.cs @@ -8,32 +8,32 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models -{ - [Comment("受试者 - 阅片模块临床表单")] - [Table("ReadModuleCriterionFrom")] - public class ReadModuleCriterionFrom : BaseAddAuditEntity +namespace IRaCIS.Core.Domain.Models; + +[Comment("受试者 - 阅片模块临床表单")] +[Table("ReadModuleCriterionFrom")] +public class ReadModuleCriterionFrom : BaseAddAuditEntity { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - [ForeignKey("ClinicalFormId")] - public ClinicalForm ClinicalForm { get; set; } - #endregion + [JsonIgnore] + [ForeignKey("ClinicalFormId")] + public ClinicalForm ClinicalForm { get; set; } + #endregion - [Comment(" 表单Id")] - public Guid ClinicalFormId { get; set; } + [Comment(" 表单Id")] + public Guid ClinicalFormId { get; set; } - [ForeignKey("ReadModuleId")] + [ForeignKey("ReadModuleId")] - [Comment(" 阅片期Id")] - public Guid ReadModuleId { get; set; } + [Comment(" 阅片期Id")] + public Guid ReadModuleId { get; set; } - [Comment(" 受试者Id")] - public Guid SubjectId { get; set; } + [Comment(" 受试者Id")] + public Guid SubjectId { get; set; } - [Comment(" 项目Id")] - public Guid TrialId { get; set; } + [Comment(" 项目Id")] + public Guid TrialId { get; set; } @@ -45,4 +45,4 @@ namespace IRaCIS.Core.Domain.Models } -} + diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs index 84f4e9a87..d1961913d 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/ReadingQuestionCriterionTrial.cs @@ -6,321 +6,318 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +/// +/// 项目阅片标准 +/// +[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(); + public List TrialCriterionAdditionalAssessmentTypeList { get; set; } = new List(); - [JsonIgnore] + [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 + /// + /// 系统标准ID + /// + public Guid? ReadingQuestionCriterionSystemId { get; set; } - /// - /// 项目Id - /// - public Guid TrialId { get; set; } + /// + /// 项目Id + /// + public Guid TrialId { get; set; } - /// - /// 标准 - /// - public string CriterionName { get; set; } = string.Empty; + /// + /// 标准 + /// + public string CriterionName { get; set; } = string.Empty; - /// - /// 是否启用 - /// - public bool IsEnable { get; set; } + /// + /// 是否启用 + /// + public bool IsEnable { get; set; } - /// - /// 排序 - /// - public int ShowOrder { get; set; } + /// + /// 排序 + /// + public int ShowOrder { get; set; } - /// - /// 是否完成配置 - /// - public bool IsCompleteConfig { get; set; } + /// + /// 是否完成配置 + /// + public bool IsCompleteConfig { get; set; } - /// - /// 描述 - /// - public string Description { get; set; } = string.Empty; + /// + /// 描述 + /// + public string Description { get; set; } = string.Empty; - /// - /// 是否确认 - /// - public bool IsConfirm { get; set; } + /// + /// 是否确认 + /// + public bool IsConfirm { get; set; } - /// - /// 表单类型 - /// + /// + /// 表单类型 + /// - public FormType FormType { get; set; } = FormType.SinglePage; + public FormType FormType { get; set; } = FormType.SinglePage; - /// - /// 修约小数点 - /// - public int? DigitPlaces { get; set; } = 1; + /// + /// 修约小数点 + /// + public int? DigitPlaces { get; set; } = 1; - /// - /// 评估结果 - /// - public string EvaluationResult { get; set; } = string.Empty; + /// + /// 评估结果 + /// + public string EvaluationResult { get; set; } = string.Empty; - /// - /// 全局阅片评估更新类型 - /// - public string GlobalUpdateType { get; set; } = string.Empty; + /// + /// 全局阅片评估更新类型 + /// + public string GlobalUpdateType { get; set; } = string.Empty; - /// - /// 评估原因 - /// - public string EvaluationReason { get; set; } = StaticData.International("CriterionTrial_EvaluationReason"); + /// + /// 评估原因 + /// + public string EvaluationReason { get; set; } = StaticData.International("CriterionTrial_EvaluationReason"); - /// - /// 是否显示详情 - /// - public bool IsShowDetail { get; set; } = true; + /// + /// 是否显示详情 + /// + public bool IsShowDetail { get; set; } = true; - /// - /// 同步时间 - /// - public DateTime SynchronizeTime { get; set; } + /// + /// 同步时间 + /// + public DateTime SynchronizeTime { get; set; } - /// - /// 同步器官时间 - /// - public DateTime? SynchronizeOriginalTime { get; set; } + /// + /// 同步器官时间 + /// + public DateTime? SynchronizeOriginalTime { get; set; } - /// - /// 标准类型 - /// - public CriterionType CriterionType { get; set; } + /// + /// 标准类型 + /// + public CriterionType CriterionType { get; set; } - /// - /// 是否加急 - /// - public bool IsUrgent { get; set; } = false; + /// + /// 是否加急 + /// + public bool IsUrgent { get; set; } = false; - /// - /// eCRF报告是否显示在图像页面 - /// - public bool IseCRFShowInDicomReading { get; set; } = false; + /// + /// eCRF报告是否显示在图像页面 + /// + public bool IseCRFShowInDicomReading { get; set; } = false; - #region 阅片单元配置 新加 + #region 阅片单元配置 新加 - public string CriterionModalitys { get; set; } = string.Empty; + public string CriterionModalitys { get; set; } = string.Empty; - /// - /// 阅片平台 - /// - public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.PACS; + /// + /// 阅片平台 + /// + public ImagePlatform ImagePlatform { get; set; } = ImagePlatform.PACS; - /// - /// 阅片工具 - /// - public ReadingTool? ReadingTool { get; set; } + /// + /// 阅片工具 + /// + public ReadingTool? ReadingTool { get; set; } - /// - /// 任务组织级别 - /// - public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } + /// + /// 任务组织级别 + /// + public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } - /// - /// 阅片是否显示受试者信息 - /// - public bool IsReadingShowSubjectInfo { get; set; } = true; + /// + /// 阅片是否显示受试者信息 + /// + public bool IsReadingShowSubjectInfo { get; set; } = true; - /// - /// IR阅片页面是否可以查看既往任务结果 - /// - public bool IsReadingShowPreviousResults { get; set; } = true; + /// + /// IR阅片页面是否可以查看既往任务结果 + /// + public bool IsReadingShowPreviousResults { get; set; } = true; - /// - /// 是确认医学审核问题 - /// + /// + /// 是确认医学审核问题 + /// - public bool IsConfirmMedicineQuestion { get; set; } = false; + public bool IsConfirmMedicineQuestion { get; set; } = false; - /// - /// 仲裁对象 - /// - public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading; + /// + /// 仲裁对象 + /// + public ArbitrationRule ArbitrationRule { get; set; } = ArbitrationRule.Reading; - /// - /// 阅片模式 - /// - public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; + /// + /// 阅片模式 + /// + public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; - /// - /// 存在阅片期 - /// - public bool IsReadingPeriod { get; set; } = true; + /// + /// 存在阅片期 + /// + public bool IsReadingPeriod { get; set; } = true; - /// - /// 是否生成全局阅片任务 - /// - public bool IsGlobalReading { get; set; } = true; + /// + /// 是否生成全局阅片任务 + /// + public bool IsGlobalReading { get; set; } = true; - /// - /// 是否签名 - /// - public bool IsSigned { get; set; } = false; + /// + /// 是否签名 + /// + public bool IsSigned { get; set; } = false; - /// - /// 仲裁阅片 - /// - public bool IsArbitrationReading { get; set; } = true; + /// + /// 仲裁阅片 + /// + public bool IsArbitrationReading { get; set; } = true; - /// - /// 肿瘤学阅片 原字段 IsClinicalReading - /// - public bool IsOncologyReading { get; set; } + /// + /// 肿瘤学阅片 原字段 IsClinicalReading + /// + public bool IsOncologyReading { get; set; } - /// - /// 是否系统设置了 肿瘤学 - /// - public bool IsSystemSetOncology { get; set; } = true; + /// + /// 是否系统设置了 肿瘤学 + /// + public bool IsSystemSetOncology { get; set; } = true; - /// - /// 任务展示访视 读片任务显示是否顺序 - /// - public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder; + /// + /// 任务展示访视 读片任务显示是否顺序 + /// + public ReadingOrder IsReadingTaskViewInOrder { get; set; } = ReadingOrder.InOrder; - //任务分配对象 - public TaskAllocateObj TaskAllocateObjEnum { get; set; } + //任务分配对象 + public TaskAllocateObj TaskAllocateObjEnum { get; set; } - //后续访视任务自动分配 - public bool IsFollowVisitAutoAssign { get; set; } = true; + //后续访视任务自动分配 + 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 TaskAllocateDefaultState FollowGlobalVisitAutoAssignDefaultState { get; set; } = TaskAllocateDefaultState.Allocated; - /// - /// 阅片信息签名时间 - /// - public DateTime? ReadingInfoSignTime { get; set; } + /// + /// 阅片信息签名时间 + /// + public DateTime? ReadingInfoSignTime { get; set; } - /// - /// 是否必须全局阅片 - /// - public bool IsMustGlobalReading { get; set; } = false; + /// + /// 是否必须全局阅片 + /// + public bool IsMustGlobalReading { get; set; } = false; - //是否附加评估 - public bool IsAdditionalAssessment { get; set; } + //是否附加评估 + public bool IsAdditionalAssessment { get; set; } - //自动 手动生成任务 - public bool IsAutoCreate { get; set; } = true; - #endregion + //自动 手动生成任务 + public bool IsAutoCreate { get; set; } = true; + #endregion - /// - /// 阅片过程下载影像 - /// - public ReadingImageDownload ImageDownloadEnum { get; set; } - - /// - /// 阅片过程上传影像 - /// - 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, - } + /// + /// 阅片过程下载影像 + /// + public ReadingImageDownload ImageDownloadEnum { get; set; } + /// + /// 阅片过程上传影像 + /// + 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, } diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs index c6b673c97..756d7d17d 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs @@ -8,17 +8,17 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目标准使用字典")] +[Table("TrialCriterionDictionaryCode")] +public class TrialCriterionDictionaryCode : BaseAddAuditEntity { - [Comment("项目 - 项目标准使用字典")] - [Table("TrialCriterionDictionaryCode")] - public class TrialCriterionDictionaryCode : BaseAddAuditEntity - { - #region 导航属性 - [ForeignKey("TrialCriterionId")] - [JsonIgnore] - public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } - #endregion + #region 导航属性 + [ForeignKey("TrialCriterionId")] + [JsonIgnore] + public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; } + #endregion public Guid TrialCriterionId { get; set; } @@ -27,7 +27,7 @@ namespace IRaCIS.Core.Domain.Models - } +} -} + diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs index 56d6660a8..27ab206eb 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs @@ -10,203 +10,203 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; using System.Linq; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +/// +///系统表格问题 +/// +[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(); } + catch (Exception) + { + return new List(); + } } - - [NotMapped] - public List RelevanceValueList - { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } - #endregion - - /// - /// 系统表的问题Id ReadingQuestionSystem的Id - /// - public Guid ReadingQuestionId { get; set; } - - public string Type { get; set; } = 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 + + /// + /// 系统表的问题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; } + + +} + + + diff --git a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs index a4be6e8ff..eb1df59c7 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs @@ -10,214 +10,214 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Collections.Generic; using System.Linq; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +/// +/// 项目阅片问题 +/// +[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 + { + return this.ParentTriggerValue.Split(',').ToList(); + } + catch (Exception) { - try - { - return this.ParentTriggerValue.Split(',').ToList(); - } - catch (Exception) - { - return new List(); - } + return new List(); + } + } + + } + + + [NotMapped] + public List RelevanceValueList + { + get + { + try + { + return this.RelevanceValue.Split(',').ToList(); + } + catch (Exception) + { + + return new List(); + } + } + + } + + + [NotMapped] + public List CalculateQuestionList + { + get + { + try + { + var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); + return result == null ? new List() : result; + } + catch (Exception) + { + + return new List(); } } + } + #endregion + + public Guid TrialId { get; set; } + + /// + /// 项目问题的Id ReadingQuestionTrial的id + /// + public Guid ReadingQuestionId { get; set; } - [NotMapped] - public List RelevanceValueList - { - get - { - try - { - return this.RelevanceValue.Split(',').ToList(); - } - catch (Exception) - { - - return new List(); - } - } - - } + public string Type { get; set; } = string.Empty; - [NotMapped] - public List CalculateQuestionList - { - get - { - try - { - var result = JsonConvert.DeserializeObject>(this.CalculateQuestions); - return result == null ? new List() : result; - } - catch (Exception) - { + public Guid? ParentId { get; set; } - 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 string ParentTriggerValue { get; set; } = string.Empty; - public Guid? ParentId { get; set; } - - public string ParentTriggerValue { get; set; } = string.Empty; + public string QuestionName { 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 IsRequired IsRequired { get; set; } + public bool IsEnable { get; set; } - public int ShowOrder { get; set; } - - public string TypeValue { get; set; } = string.Empty; + public string Remark { 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 Guid? RelevanceId { get; set; } + public int? MaxRowCount { get; set; } - public string RelevanceValue { get; set; } = string.Empty; + public string DataTableName { get; set; } = string.Empty; - public int ShowQuestion { get; set; } - + public string DataTableColumn { get; set; } = string.Empty; - public int? MaxRowCount { get; set; } + public TableQuestionType? TableQuestionType { get; set; } - public string DataTableName { get; set; } = string.Empty; + public Guid? DependParentId { get; set; } - public string DataTableColumn { get; set; } = string.Empty; - - public TableQuestionType? TableQuestionType { get; set; } - - public Guid? DependParentId { get; set; } - - public IsDepend IsDepend { get; set; } + public IsDepend IsDepend { get; set; } - public Guid TrialCriterionId { get; set; } + public Guid TrialCriterionId { get; set; } - /// - /// 问题标识 - /// - public QuestionMark? QuestionMark { get; set; } + /// + /// 问题标识 + /// + public QuestionMark? QuestionMark { get; set; } - /// - /// 字典code - /// - public string DictionaryCode { get; set; } = string.Empty; + /// + /// 字典code + /// + public string DictionaryCode { get; set; } = string.Empty; - /// - /// 数值类型 - /// - public ValueOfType? ValueType { get; set; } + /// + /// 数值类型 + /// + public ValueOfType? ValueType { get; set; } - /// - /// 单位 - /// - public ValueUnit? Unit { get; set; } + /// + /// 单位 + /// + public ValueUnit? Unit { get; set; } - /// - /// 自定义单位 - /// - public string CustomUnit { get; set; } = string.Empty; + /// + /// 自定义单位 + /// + public string CustomUnit { get; set; } = string.Empty; - /// - /// 自定义计算标记 - /// - public CustomCalculateMark? CustomCalculateMark { get; set; } + /// + /// 自定义计算标记 + /// + public CustomCalculateMark? CustomCalculateMark { get; set; } - /// - /// 限制编辑 - /// - public LimitEdit LimitEdit { get; set; } = LimitEdit.None; + /// + /// 限制编辑 + /// + public LimitEdit LimitEdit { get; set; } = LimitEdit.None; - /// - /// 自定义计算标记 - /// - public string CalculateQuestions { get; set; } = "[]"; + /// + /// 自定义计算标记 + /// + public string CalculateQuestions { get; set; } = "[]"; - /// - /// 问题英文名称 - /// - public string QuestionEnName { get; set; } = string.Empty; + /// + /// 问题英文名称 + /// + public string QuestionEnName { get; set; } = string.Empty; - /// - /// 数据来源 - /// - public DataSources DataSource { get; set; } = DataSources.ManualEntry; + /// + /// 数据来源 + /// + public DataSources DataSource { get; set; } = DataSources.ManualEntry; - /// - /// 最大答案长度 - /// - public int? MaxAnswerLength { get; set; } + /// + /// 最大答案长度 + /// + public int? MaxAnswerLength { get; set; } - /// - /// 文件类型 - /// - public string FileType { get; set; } = string.Empty; + /// + /// 文件类型 + /// + public string FileType { get; set; } = string.Empty; - /// - /// 问题分类 - /// - public QuestionClassify? QuestionClassify { get; set; } - - - - /// - /// 复制病灶的时候 是否复制这个问题 - /// - public bool IsCopy { get; set; } = false; - - /// - /// 系统表格问题Id - /// - public Guid? SystemTableQuestionId { get; set; } + /// + /// 问题分类 + /// + public QuestionClassify? QuestionClassify { get; set; } - } + /// + /// 复制病灶的时候 是否复制这个问题 + /// + public bool IsCopy { get; set; } = false; + + /// + /// 系统表格问题Id + /// + public Guid? SystemTableQuestionId { get; set; } + + + +} + + - -} diff --git a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs index c94a9fcce..17f08ad09 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingTableAnswerRowInfo.cs @@ -11,167 +11,164 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目阅片 - 表格问题行记录")] +[Table("ReadingTableAnswerRowInfo")] +public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity { - [Comment("项目阅片 - 表格问题行记录")] - [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; } + #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 + //病灶答案表 + [JsonIgnore] + public List LesionAnswerList { get; set; } = new List(); + #endregion - public Guid QuestionId { get; set; } + public Guid QuestionId { get; set; } - public Guid VisitTaskId { get; set; } + public Guid VisitTaskId { get; set; } - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public Guid? InstanceId { get; set; } + public Guid? InstanceId { get; set; } - public Guid? SeriesId { get; set; } + public Guid? SeriesId { get; set; } - public Guid? StudyId { 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; + public bool IsCanEditPosition { get; set; } = false; - /// - /// 是Dicom阅片 - /// - public bool IsDicomReading { get; set; } = true; + /// + /// 是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; + /// + /// 是否是当前任务添加 + /// + 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; + /// + /// 截图地址 + /// + public string PicturePath { get; set; } = string.Empty; - /// - /// 第一次添加的任务ID - /// - public decimal FristAddTaskNum { get; set; } = 0; + /// + /// 第一次添加的任务ID + /// + public decimal FristAddTaskNum { get; set; } = 0; - /// - /// 首次添加任务ID - /// - public Guid FristAddTaskId { get; set; } + /// + /// 首次添加任务ID + /// + public Guid FristAddTaskId { get; set; } - /// - /// 融合的PTSeriesId - /// - public Guid? PTSeriesId { get; set; } + /// + /// 融合的PTSeriesId + /// + public Guid? PTSeriesId { get; set; } - /// - /// 融合的CTSeriesId - /// - public Guid? CTSeriesId { get; set; } + /// + /// 融合的CTSeriesId + /// + public Guid? CTSeriesId { get; set; } - public SplitOrMergeType? SplitOrMergeType { get; set; } + public SplitOrMergeType? SplitOrMergeType { get; set; } - public int? NumberOfFrames { get; set; } + public int? NumberOfFrames { get; set; } - /// - /// 器官Id - /// - public Guid? OrganInfoId { get; set; } + /// + /// 器官Id + /// + public Guid? OrganInfoId { get; set; } - /// - /// 窗宽WW - /// - public decimal? WW { get; set; } + /// + /// 窗宽WW + /// + public decimal? WW { get; set; } - /// - /// 窗位WL - /// - public decimal? WL { get; set; } + /// + /// 窗位WL + /// + public decimal? WL { get; set; } - /// - /// 来自于哪个标记 - /// - public string FromMark { get; set; } = string.Empty; + /// + /// 来自于哪个标记 + /// + public string FromMark { get; set; } = string.Empty; - /// - /// 报告页面显示来自于哪个标记 - /// - public string ReportMark { get; set; } = string.Empty; + /// + /// 报告页面显示来自于哪个标记 + /// + public string ReportMark { get; set; } = string.Empty; - public string OtherMeasureData { get; set; } = string.Empty; + public string OtherMeasureData { get; set; } = string.Empty; - //病灶编号 - public string RowMark { get; set; } = string.Empty; + //病灶编号 + public string RowMark { get; set; } = string.Empty; - /// - /// 标记工具 - /// - public string MarkTool { get; set; } = string.Empty; + /// + /// 标记工具 + /// + public string MarkTool { get; set; } = string.Empty; - } - - } diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs index ea015b8cb..ec8b61d5d 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs @@ -8,30 +8,27 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("用户配置 - WL模板")] +[Table("UserWLTemplate")] +public class UserWLTemplate : BaseAddAuditEntity { - [Comment("用户配置 - WL模板")] - [Table("UserWLTemplate")] - public class UserWLTemplate : BaseAddAuditEntity - { - #region 导航属性 + #region 导航属性 - #endregion + #endregion - public string TemplateName { get; set; } = string.Empty; + public string TemplateName { get; set; } = string.Empty; - public Guid UserId { get; set; } + public Guid UserId { get; set; } - public int WW { get; set; } + public int WW { get; set; } - public int WL { get; set; } + public int WL { get; set; } - public int ShowOrder { get; set; } = 0; + public int ShowOrder { get; set; } = 0; - public bool IsPitchOn { get; set; } = true; - - } - + public bool IsPitchOn { get; set; } = true; } diff --git a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs index 1821ad796..4c17227e4 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs @@ -8,26 +8,24 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +/// +///RECIST1Point1肿瘤评估(系统标准) +/// +[Table("TumorAssessment_RECIST1Point1")] +public class TumorAssessment_RECIST1Point1 : Entity { - /// - ///RECIST1Point1肿瘤评估(系统标准) - /// - [Table("TumorAssessment_RECIST1Point1")] - public class TumorAssessment_RECIST1Point1 : Entity - { - [Comment("靶病灶")] - public TargetAssessment TargetLesion { get; set; } + [Comment("靶病灶")] + public TargetAssessment TargetLesion { get; set; } - [Comment("非靶病灶")] - public NoTargetAssessment NonTargetLesions { get; set; } + [Comment("非靶病灶")] + public NoTargetAssessment NonTargetLesions { get; set; } - [Comment("新病灶")] - public NewLesionAssessment NewLesion { get; set; } - - [Comment("整体疗效")] - 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 7c25f362d..6dd6b6557 100644 --- a/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs +++ b/IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs @@ -8,26 +8,26 @@ using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +/// +///RECIST1Point1BM肿瘤评估(系统标准) +/// +[Table("TumorAssessment_RECIST1Point1BM")] +public class TumorAssessment_RECIST1Point1BM : Entity { - /// - ///RECIST1Point1BM肿瘤评估(系统标准) - /// - [Table("TumorAssessment_RECIST1Point1BM")] - public class TumorAssessment_RECIST1Point1BM : Entity - { - [Comment("靶病灶")] - public TargetAssessment TargetLesion { get; set; } + [Comment("靶病灶")] + public TargetAssessment TargetLesion { get; set; } - [Comment("非靶病灶")] - public NoTargetAssessment NonTargetLesions { get; set; } + [Comment("非靶病灶")] + public NoTargetAssessment NonTargetLesions { get; set; } - [Comment("新病灶")] - public NewLesionAssessment NewLesion { get; set; } + [Comment("新病灶")] + public NewLesionAssessment NewLesion { get; set; } + + [Comment("整体疗效")] + public OverallAssessment OverallEfficacy { get; set; } +} - [Comment("整体疗效")] - public OverallAssessment OverallEfficacy { get; set; } - } -} diff --git a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs index 3622c50e5..15f28a1c8 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStateChange.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStateChange.cs @@ -6,32 +6,30 @@ using Microsoft.EntityFrameworkCore; using System; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("项目 - 项目状态变更记录表")] +[Table("TrialStateChange")] +public class TrialStateChange : BaseAddAuditEntity { - [Comment("项目 - 项目状态变更记录表")] - [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 + #endregion - public Guid TrialId { get; set; } + public Guid TrialId { get; set; } - public string OriginState { get; set; } = String.Empty; + public string OriginState { get; set; } = String.Empty; - public string NowState { get; set; } = String.Empty; + public string NowState { get; set; } = String.Empty; - public string Reason { 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 0f8a7f51f..0b3b1d565 100644 --- a/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs +++ b/IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs @@ -4,29 +4,28 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Comment("Ŀ - ̼¼")] +[Table("TrialStatus")] +public partial class TrialStatusDetail : BaseAddAuditEntity { - [Comment("Ŀ - ̼¼")] - [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 + [JsonIgnore] + public Trial Trial { get; set; } + #endregion - public Guid TrialId { get; set; } - public int TrialStatus { get; set; } - [StringLength(400)] - public string Memo { get; set; } = string.Empty; + public Guid TrialId { get; set; } + public int TrialStatus { get; set; } + [StringLength(400)] + 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 4bc2dbd98..919550e9f 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialAudit.cs @@ -1,34 +1,33 @@ using System; using System.ComponentModel.DataAnnotations.Schema; -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/TrialUserPreparation .cs b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs index 1b97fe6c8..c8e000e87 100644 --- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs +++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUserPreparation .cs @@ -7,36 +7,36 @@ using System; using IRaCIS.Core.Domain.Share; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +/// +///TrialUserPreparation +/// +[Table("TrialUserPreparation ")] +public class TrialUserPreparation : BaseFullAuditEntity { - /// - ///TrialUserPreparation - /// - [Table("TrialUserPreparation ")] - public class TrialUserPreparation : BaseFullAuditEntity - { - #region 导航属性 - [JsonIgnore] - public User User { get; set; } - [JsonIgnore] - public Trial Trial { get; set; } - #endregion + #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 Guid UserId { get; set; } - public bool? IsJoin { get; set; } + public Guid TrialId { get; set; } - public DateTime? JoinTime { get; set; } + public DateTime? ExpireTime { get; set; } - public string RejectReason { get; set; } = string.Empty; + public bool? IsJoin { get; set; } + + public DateTime? JoinTime { get; set; } + + public string RejectReason { get; set; } = string.Empty; - } +} + -} diff --git a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs index 2e7a566fa..5fcb3021f 100644 --- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs +++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs @@ -4,250 +4,249 @@ using System.ComponentModel.DataAnnotations.Schema; using IRaCIS.Core.Domain.Share; -namespace IRaCIS.Core.Domain.Models +namespace IRaCIS.Core.Domain.Models; + +[Table("SubjectVisit")] +public class SubjectVisit : BaseFullDeleteAuditEntity { - [Table("SubjectVisit")] - public class SubjectVisit : BaseFullDeleteAuditEntity - { - #region 导航属性 + #region 导航属性 - [JsonIgnore] - public TrialSite TrialSite { get; set; } + [JsonIgnore] + public TrialSite TrialSite { get; set; } - [JsonIgnore] - [ForeignKey("OutPlanPreviousVisitId")] - public SubjectVisit OutPlanPreviousVisit { get; set; } + [JsonIgnore] + [ForeignKey("OutPlanPreviousVisitId")] + public SubjectVisit OutPlanPreviousVisit { get; set; } - [ForeignKey("ForwardUserId")] - public User ForwardUser { get; set; } + [ForeignKey("ForwardUserId")] + public User ForwardUser { get; set; } - [JsonIgnore] - [ForeignKey("PreliminaryAuditUserId")] - public User PreliminaryAuditUser { get; set; } + [JsonIgnore] + [ForeignKey("PreliminaryAuditUserId")] + public User PreliminaryAuditUser { get; set; } - [JsonIgnore] - [ForeignKey("ReviewAuditUserId")] - public User ReviewAuditUser { get; set; } + [JsonIgnore] + [ForeignKey("ReviewAuditUserId")] + public User ReviewAuditUser { get; set; } - [JsonIgnore] - [ForeignKey("CurrentActionUserId")] - public User CurrentActionUser { get; set; } - [JsonIgnore] - [ForeignKey("SubmitUserId")] - public User SubmitUser { get; set; } + [JsonIgnore] + [ForeignKey("CurrentActionUserId")] + public User CurrentActionUser { get; set; } + [JsonIgnore] + [ForeignKey("SubmitUserId")] + public User SubmitUser { get; set; } - //导航属性 - [JsonIgnore] - [ForeignKey("TrialId")] - public Trial Trial { get; set; } + //导航属性 + [JsonIgnore] + [ForeignKey("TrialId")] + public Trial Trial { get; set; } - [JsonIgnore] - public List ReadModuleList { get; set; } + [JsonIgnore] + public List ReadModuleList { get; set; } - [JsonIgnore] - [ForeignKey("SubjectId")] - public Subject Subject { get; set; } + [JsonIgnore] + [ForeignKey("SubjectId")] + public Subject Subject { get; set; } - [JsonIgnore] - public List PreviousHistoryList { get; set; } - [JsonIgnore] - public List PreviousOtherList { get; set; } - [JsonIgnore] - public List PreviousSurgeryList { get; set; } - [JsonIgnore] - public List PreviousPDFList { get; set; } - [JsonIgnore] - public List ReadingClinicalDataList { get; set; } - [JsonIgnore] - public List CheckChallengeDialogList { get; set; } = new List(); - [JsonIgnore] - public List StudyList { get; set; } = new List(); - [JsonIgnore] - public List NoneDicomStudyList { get; set; } = new List(); + [JsonIgnore] + public List PreviousHistoryList { get; set; } + [JsonIgnore] + public List PreviousOtherList { get; set; } + [JsonIgnore] + public List PreviousSurgeryList { get; set; } + [JsonIgnore] + public List PreviousPDFList { get; set; } + [JsonIgnore] + public List ReadingClinicalDataList { get; set; } + [JsonIgnore] + public List CheckChallengeDialogList { get; set; } = new List(); + [JsonIgnore] + public List StudyList { get; set; } = new List(); + [JsonIgnore] + public List NoneDicomStudyList { get; set; } = new List(); - [JsonIgnore] - public List QCChallengeList { get; set; } = new List(); - [JsonIgnore] - public List QCChallengeDialogList { get; set; } = new List(); - [JsonIgnore] - public List VisitTaskList { get; set; } = new List(); + [JsonIgnore] + public List QCChallengeList { get; set; } = new List(); + [JsonIgnore] + public List QCChallengeDialogList { get; set; } = new List(); + [JsonIgnore] + public List VisitTaskList { get; set; } = new List(); - [JsonIgnore] - public List SubjectCriteriaEvaluationVisitFilterList { get; set; } - #endregion + [JsonIgnore] + public List SubjectCriteriaEvaluationVisitFilterList { get; set; } + #endregion - public Guid TrialSiteId { get; set; } + public Guid TrialSiteId { get; set; } - //一个访视 对应有对应Site的 TrialSiteCode + //一个访视 对应有对应Site的 TrialSiteCode - public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } + public Guid TrialId { get; set; } + public Guid SubjectId { get; set; } - public Guid? VisitStageId { get; set; } - public int VisitDay { get; set; } - public string VisitName { get; set; } = string.Empty; - public int VisitWindowLeft { get; set; } - public int VisitWindowRight { get; set; } + public Guid? VisitStageId { get; set; } + public int VisitDay { get; set; } + public string VisitName { get; set; } = string.Empty; + public int VisitWindowLeft { get; set; } + public int VisitWindowRight { get; set; } - [Column(TypeName = "decimal(18,1)")] - public decimal VisitNum { get; set; } - public string BlindName { get; set; } = string.Empty; + [Column(TypeName = "decimal(18,1)")] + public decimal VisitNum { get; set; } + public string BlindName { get; set; } = string.Empty; - public string SVUPDES { get; set; } = string.Empty; - public DateTime? SVSTDTC { get; set; } - public DateTime? SVENDTC { get; set; } - public bool InPlan { get; set; } = true; - public bool IsBaseLine { get; set; } = false; + public string SVUPDES { get; set; } = string.Empty; + public DateTime? SVSTDTC { get; set; } + public DateTime? SVENDTC { get; set; } + public bool InPlan { get; set; } = true; + public bool IsBaseLine { get; set; } = false; - //0 未执行 1 执行了 2 不可用 - public VisitExecutedEnum VisitExecuted { get; set; } = VisitExecutedEnum.UnExecuted; + //0 未执行 1 执行了 2 不可用 + public VisitExecutedEnum VisitExecuted { get; set; } = VisitExecutedEnum.UnExecuted; - public DateTime? EarliestScanDate { get; set; } + public DateTime? EarliestScanDate { get; set; } - /// - /// 最晚拍片日期 - /// - public DateTime? LatestScanDate { get; set; } - - public Guid? Auditor { get; set; } - - - //核查状态 - public CheckStateEnum CheckState { get; set; } - - //提交状态 - public SubmitStateEnum SubmitState { get; set; } - //审核状态 - public AuditStateEnum AuditState { get; set; } - public ForwardStateEnum ForwardState { get; set; } - - /// - /// 单审通过人 - /// - public Guid? PreliminaryAuditUserId { get; set; } - - /// - /// 双审通过人 - /// - public Guid? ReviewAuditUserId { get; set; } - - /// - /// 一致性核查人Id - /// - public Guid? CheckUserId { get; set; } - - public DateTime? ReviewAuditTime { get; set; } - public DateTime? PreliminaryAuditTime { get; set; } - public Guid? ForwardUserId { get; set; } - public DateTime? ForwardTime { get; set; } - - /// - /// 当前质控领取人 - /// - public Guid? CurrentActionUserId { get; set; } - public DateTime? CurrentActionUserExpireTime { get; set; } - - public DateTime? SubmitTime { get; set; } - public DateTime? CheckTime { get; set; } - - /// - /// 通过原因 - /// - public string ManualPassReason { get; set; } = string.Empty; - - public bool IsUrgent { get; set; } - - public bool IsTake { get; set; } - - public bool IsFinalVisit { get; set; } - - public ChallengeStateEnum ChallengeState { get; set; } - - public string CheckResult { get; set; } = String.Empty; - - //是否一致性核查回退 - public bool? IsCheckBack { get; set; } - - public DateTime? CheckBackTime { get; set; } - - public CheckChanllengeTypeEnum CheckChallengeState { get; set; } - public PDStateEnum PDState { get; set; } = PDStateEnum.None; - - - public DateTime? CheckPassedTime { get; set; } - - /// - /// 上一访视 - /// - public Guid? OutPlanPreviousVisitId { get; set; } - - - public RequestBackStateEnum RequestBackState { get; set; } - - - public bool IsQCConfirmedReupload { get; set; } - - public bool IsLostVisit { get; set; } - - - //是否确认了、签名了 临床数据完整性 - public bool? IsConfirmedClinicalData { get; set; } - - - public bool IsEnrollmentConfirm { get; set; } - - public bool IsVisitTaskGenerated { get; set; } - - public bool IsPMBackOrReReading { get; set; } - - /// - /// 关闭一致性质疑原因 - /// - public string CloseTheReason { get; set; } = string.Empty; - - public Guid? SubmitUserId { get; set; } - - - public ReadingStatusEnum ReadingStatus { get; set; } - - public string VisitImageZipPath { get; set; } = string.Empty; - - public PackState PackState { get; set; } - - public PackState NoDicomPackState { get; set; } - - public string VisitNoDicomImageZipPath { get; set;} = string.Empty; - } /// - /// 影像下载打包状态 + /// 最晚拍片日期 /// - public enum PackState - { + public DateTime? LatestScanDate { get; set; } - /// - /// 待打包 - /// - WaitPack = 0, + public Guid? Auditor { get; set; } - /// - /// 打包中 - /// - Packing = 1, - /// - /// 打包完成 - /// - Packed = 2 - } + //核查状态 + public CheckStateEnum CheckState { get; set; } + + //提交状态 + public SubmitStateEnum SubmitState { get; set; } + //审核状态 + public AuditStateEnum AuditState { get; set; } + public ForwardStateEnum ForwardState { get; set; } + + /// + /// 单审通过人 + /// + public Guid? PreliminaryAuditUserId { get; set; } + + /// + /// 双审通过人 + /// + public Guid? ReviewAuditUserId { get; set; } + + /// + /// 一致性核查人Id + /// + public Guid? CheckUserId { get; set; } + + public DateTime? ReviewAuditTime { get; set; } + public DateTime? PreliminaryAuditTime { get; set; } + public Guid? ForwardUserId { get; set; } + public DateTime? ForwardTime { get; set; } + + /// + /// 当前质控领取人 + /// + public Guid? CurrentActionUserId { get; set; } + public DateTime? CurrentActionUserExpireTime { get; set; } + + public DateTime? SubmitTime { get; set; } + public DateTime? CheckTime { get; set; } + + /// + /// 通过原因 + /// + public string ManualPassReason { get; set; } = string.Empty; + + public bool IsUrgent { get; set; } + + public bool IsTake { get; set; } + + public bool IsFinalVisit { get; set; } + + public ChallengeStateEnum ChallengeState { get; set; } + + public string CheckResult { get; set; } = String.Empty; + + //是否一致性核查回退 + public bool? IsCheckBack { get; set; } + + public DateTime? CheckBackTime { get; set; } + + public CheckChanllengeTypeEnum CheckChallengeState { get; set; } + public PDStateEnum PDState { get; set; } = PDStateEnum.None; + + + public DateTime? CheckPassedTime { get; set; } + + /// + /// 上一访视 + /// + public Guid? OutPlanPreviousVisitId { get; set; } + + + public RequestBackStateEnum RequestBackState { get; set; } + + + public bool IsQCConfirmedReupload { get; set; } + + public bool IsLostVisit { get; set; } + + + //是否确认了、签名了 临床数据完整性 + public bool? IsConfirmedClinicalData { get; set; } + + + public bool IsEnrollmentConfirm { get; set; } + + public bool IsVisitTaskGenerated { get; set; } + + public bool IsPMBackOrReReading { get; set; } + + /// + /// 关闭一致性质疑原因 + /// + public string CloseTheReason { get; set; } = string.Empty; + + public Guid? SubmitUserId { get; set; } + + + public ReadingStatusEnum ReadingStatus { get; set; } + + public string VisitImageZipPath { get; set; } = string.Empty; + + public PackState PackState { get; set; } + + public PackState NoDicomPackState { get; set; } + + public string VisitNoDicomImageZipPath { get; set; } = string.Empty; +} +/// +/// 影像下载打包状态 +/// +public enum PackState +{ + + /// + /// 待打包 + /// + WaitPack = 0, + + /// + /// 打包中 + /// + Packing = 1, + + /// + /// 打包完成 + /// + Packed = 2 } diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 3a666c46a..a993da691 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -227,7 +227,6 @@ public class IRaCISDBContext : DbContext public virtual DbSet ResearchPublications { get; set; } public virtual DbSet TrialExperience { get; set; } - public virtual DbSet UserDoctor { get; set; } public virtual DbSet Vacation { get; set; } public virtual DbSet Attachment { get; set; }