整理数据库实体备注
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-09-20 18:20:37 +08:00
parent d3e3ed79ba
commit 40c8a51a31
174 changed files with 5006 additions and 6652 deletions

View File

@ -207,11 +207,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<User, TrialExternalUser>().ReverseMap();
CreateMap<TrialUserPreparation, TrialUserPreparationView>()
.ForMember(t => t.UserRealName, u => u.MapFrom(c => c.User.FullName))
.ForMember(t => t.UserName, u => u.MapFrom(c => c.User.UserName))
.ForMember(t => t.UserTypeShortName, u => u.MapFrom(c => c.User.UserTypeRole.UserTypeShortName));
CreateMap<TrialExternalUser, TrialInfoWithPreparationInfo>().IncludeMembers(t => t.Trial)

View File

@ -1,47 +1,45 @@
using IRaCIS.Core.Domain.Share;
using System.ComponentModel;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Description("受试者某标准阅片用户中间关系表")]
[Table("SubjectUser")]
public class SubjectUser : BaseFullAuditEntity
{
[Description("受试者某标准阅片用户中间关系表")]
[Table("SubjectUser")]
public class SubjectUser : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
//Parent
[ForeignKey("ReplacedSubjectUserId")]
public SubjectUser ReplacedSubjectUser { get; set; }
[JsonIgnore]
//Parent
[ForeignKey("ReplacedSubjectUserId")]
public SubjectUser ReplacedSubjectUser { get; set; }
//ChildList
[JsonIgnore]
public List<SubjectUser> EarlierSubjectUserList { get; set; }
[JsonIgnore]
public User DoctorUser { get; set; }
//ChildList
[JsonIgnore]
public List<SubjectUser> EarlierSubjectUserList { get; set; }
[JsonIgnore]
public User DoctorUser { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
#endregion
[JsonIgnore]
public Subject Subject { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public DateTime? AssignTime { get; set; }
public DateTime? AssignTime { get; set; }
public Guid SubjectId { get; set; }
public Guid DoctorUserId { get; set; }
public Arm ArmEnum { get; set; }
public Guid SubjectId { get; set; }
public Guid DoctorUserId { get; set; }
public Arm ArmEnum { get; set; }
public bool IsConfirmed { get; set; } = true;
//该属性有值 说明该医生被替换了 分配的时候 要过滤掉
public Guid? ReplacedSubjectUserId { get; set; }
}
public bool IsConfirmed { get; set; } = true;
//该属性有值 说明该医生被替换了 分配的时候 要过滤掉
public Guid? ReplacedSubjectUserId { get; set; }
}

View File

@ -1,39 +1,35 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TaskAllocationRule")]
public class TaskAllocationRule : BaseFullAuditEntity
{
///<summary>
///TaskAllocationRule
///</summary>
[Table("TaskAllocationRule")]
public class TaskAllocationRule : BaseFullAuditEntity
{
#region 导航属性
#region 导航属性
[ForeignKey("DoctorUserId")]
[JsonIgnore]
public User DoctorUser { get; set; }
[ForeignKey("DoctorUserId")]
[JsonIgnore]
public User DoctorUser { get; set; }
[JsonIgnore]
public Enroll Enroll { get; set; }
[JsonIgnore]
public Enroll Enroll { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public int PlanSubjectCount { get; set; }
public bool IsEnable { get; set; }
public int PlanSubjectCount { get; set; }
public bool IsEnable { get; set; }
public string Note { get; set; } = string.Empty;
public string Note { get; set; } = string.Empty;
public Guid DoctorUserId { get; set; }
public Guid DoctorUserId { get; set; }
public Guid EnrollId { get; set; }
public Guid EnrollId { get; set; }
//是否是裁判医生 裁判医生单独加入
public bool IsJudgeDoctor { get; set; }
public int PlanReadingRatio { get; set; }
}
//是否是裁判医生 裁判医生单独加入
public bool IsJudgeDoctor { get; set; }
public int PlanReadingRatio { get; set; }
}

View File

@ -1,43 +1,39 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TaskConsistentRule")]
public class TaskConsistentRule : BaseFullAuditEntity
{
///<summary>
///TaskConsistentRule
///</summary>
[Table("TaskConsistentRule")]
public class TaskConsistentRule : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public int PlanSubjectCount { get; set; }
public int PlanSubjectCount { get; set; }
public int PlanVisitCount { get; set; }
public int PlanVisitCount { get; set; }
public int IntervalWeeks { get; set; }
public int IntervalWeeks { get; set; }
public bool IsHaveReadingPeriod { get; set; }
public bool IsHaveReadingPeriod { get; set; }
public bool IsGenerateGlobalTask { get; set; }
public bool IsGenerateGlobalTask { get; set; }
public int BlindSubjectNumberOfPlaces { get; set; }
public int BlindSubjectNumberOfPlaces { get; set; }
public string BlindTrialSiteCode { get; set; } = string.Empty;
public string BlindTrialSiteCode { get; set; } = string.Empty;
public bool IsSelfAnalysis { get; set; }
public bool IsSelfAnalysis { get; set; }
public bool IsEnable { get; set; }
public string Note { get; set; } = string.Empty;
public Guid TrialReadingCriterionId { get; set; }
}
public bool IsEnable { get; set; }
public string Note { get; set; } = string.Empty;
public Guid TrialReadingCriterionId { get; set; }
}

View File

@ -1,39 +1,35 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TaskInfluence")]
public class TaskInfluence : BaseAddAuditEntity
{
///<summary>
///TaskInfluence
///</summary>
[Table("TaskInfluence")]
public class TaskInfluence : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public VisitTask OriginalTask { get; set; }
#region 导航属性
[JsonIgnore]
public VisitTask OriginalTask { get; set; }
[JsonIgnore]
public VisitTask InfluenceTask { get; set; }
#endregion
[JsonIgnore]
public VisitTask InfluenceTask { get; set; }
#endregion
public Guid OriginalTaskId { get; set; }
public Guid OriginalTaskId { get; set; }
public Guid InfluenceTaskId { get; set; }
public Guid InfluenceTaskId { get; set; }
//对影响任务进行的操作
public ReReadingOrBackOptType OptType { get; set; }
}
public enum ReReadingOrBackOptType
{
//取消分配
CancelAssign = 0,
//对影响任务进行的操作
public ReReadingOrBackOptType OptType { get; set; }
}
public enum ReReadingOrBackOptType
{
//取消分配
CancelAssign = 0,
//失效
Abandon = 1,
//失效
Abandon = 1,
//重阅重置
//重阅重置
Return = 2,
}
Return = 2,
}

View File

@ -1,157 +1,115 @@
using IRaCIS.Core.Domain.Share;
using System.Linq;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class OSSImageInfo
{
public class OSSImageInfo
{
public string FileName { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public string ImagePath { get; set; } = string.Empty;
}
///<summary>
///TaskMedicalReview
///</summary>
[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<ReadingMedicalReviewDialog> ReadingMedicalReviewDialogList { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
/// <summary>
/// 文件
/// </summary>
[NotMapped]
public List<OSSImageInfo> FileList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
return result == null ? new List<OSSImageInfo>() : result;
}
catch (Exception)
{
return new List<OSSImageInfo>();
}
}
}
[NotMapped]
public List<Guid> PDRelationTaskIdList => PDRelationTaskIdListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Select(t => Guid.Parse(t)).ToList();
#endregion
public Guid? LatestReplyUserId { get; set; }
/// <summary>
/// 分配时间
/// </summary>
public DateTime? AllocateTime { get; set; }
/// <summary>
/// 审核状态
/// </summary>
[Required]
public MedicalReviewAuditState AuditState { get; set; }
/// <summary>
/// 审核通过时间
/// </summary>
public DateTime? AuditSignTime { get; set; }
/// <summary>
/// 阅片人是否认同
/// </summary>
public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; }
public Guid? MedicalManagerUserId { get; set; }
public Guid VisitTaskId { get; set; }
public Guid TrialId { get; set; }
/// <summary>
/// 是否有问题
/// </summary>
public bool IsHaveQuestion { get; set; } = false;
/// <summary>
/// 质询问题
/// </summary>
public string Questioning { get; set; } = string.Empty;
/// <summary>
/// 图片路径
/// </summary>
public string ImagePath { get; set; } = string.Empty;
/// <summary>
/// 审核建议
/// </summary>
public AuditAdvice AuditAdviceEnum { get; set; }
/// <summary>
/// 是否关闭对话
/// </summary>
public bool IsClosedDialog { get; set; }
/// <summary>
/// 保存问题的时间
/// </summary>
public DateTime? SaveQuestionTime { get; set; }
/// <summary>
/// 不同意重阅原因
/// </summary>
public string DisagreeReason { get; set; } = string.Empty;
/// <summary>
/// 是否申请重阅
/// </summary>
public bool IsApplyHeavyReading { get; set; } = false;
/// <summary>
/// 保存结论时间
/// </summary>
public DateTime? SaveConclusionTime { get; set; }
/// <summary>
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty;
/// <summary>
/// 是否发送消息
/// </summary>
public bool IsSendMessage { get; set; } = false;
/// <summary>
/// 医学审核对话关闭原因
/// </summary>
public MedicalDialogClose MedicalDialogCloseEnum { get; set; }
/// <summary>
/// 对话关闭原因
/// </summary>
public string DialogCloseReason { get; set; } = string.Empty;
/// <summary>
/// 无效的 为True无效
/// </summary>
public bool IsInvalid { get; set; }
public bool IsAutoGenerate { get; set; }
// | 分割
public string PDRelationTaskIdListStr { get; set; } = string.Empty;
}
public string ImagePath { get; set; } = string.Empty;
}
[Table("TaskMedicalReview")]
public class TaskMedicalReview : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public User LatestReplyUser { get; set; }
[JsonIgnore]
public User MedicalManagerUser { get; set; }
[JsonIgnore]
[ForeignKey("VisitTaskId")]
public VisitTask VisitTask { get; set; }
[JsonIgnore]
public List<ReadingMedicalReviewDialog> ReadingMedicalReviewDialogList { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
[Comment("文件")]
[NotMapped]
public List<OSSImageInfo> FileList
{
get
{
try
{
var result = JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
return result == null ? new List<OSSImageInfo>() : result;
}
catch (Exception)
{
return new List<OSSImageInfo>();
}
}
}
[NotMapped]
public List<Guid> PDRelationTaskIdList => PDRelationTaskIdListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Select(t => Guid.Parse(t)).ToList();
#endregion
public Guid? LatestReplyUserId { get; set; }
[Comment("分配时间")]
public DateTime? AllocateTime { get; set; }
[Comment("审核状态")]
[Required]
public MedicalReviewAuditState AuditState { get; set; }
[Comment("审核通过时间")]
public DateTime? AuditSignTime { get; set; }
[Comment("阅片人是否认同")]
public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; }
public Guid? MedicalManagerUserId { get; set; }
public Guid VisitTaskId { get; set; }
public Guid TrialId { get; set; }
[Comment("是否有问题")]
public bool IsHaveQuestion { get; set; } = false;
[Comment("质询问题")]
public string Questioning { get; set; } = string.Empty;
[Comment("图片路径")]
public string ImagePath { get; set; } = string.Empty;
[Comment("审核建议")]
public AuditAdvice AuditAdviceEnum { get; set; }
[Comment("是否关闭对话")]
public bool IsClosedDialog { get; set; }
[Comment("保存问题的时间")]
public DateTime? SaveQuestionTime { get; set; }
[Comment("不同意重阅原因")]
public string DisagreeReason { get; set; } = string.Empty;
[Comment("是否申请重阅")]
public bool IsApplyHeavyReading { get; set; } = false;
[Comment("保存结论时间")]
public DateTime? SaveConclusionTime { get; set; }
[Comment("文件名称")]
public string FileName { get; set; } = string.Empty;
[Comment("是否发送消息")]
public bool IsSendMessage { get; set; } = false;
[Comment("医学审核对话关闭原因")]
public MedicalDialogClose MedicalDialogCloseEnum { get; set; }
[Comment("对话关闭原因")]
public string DialogCloseReason { get; set; } = string.Empty;
[Comment("无效的 为True无效")]
public bool IsInvalid { get; set; }
public bool IsAutoGenerate { get; set; }
// | 分割
public string PDRelationTaskIdListStr { get; set; } = string.Empty;
}

View File

@ -1,34 +1,30 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TaskMedicalReviewRule")]
public class TaskMedicalReviewRule : BaseFullAuditEntity
{
///<summary>
///TaskTaskMedicalReviewRule
///</summary>
[Table("TaskMedicalReviewRule")]
public class TaskMedicalReviewRule : BaseFullAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
#endregion
public Guid DoctorUserId { get; set; }
public Guid DoctorUserId { get; set; }
public bool IsEnable { get; set; }
public bool IsEnable { get; set; }
public string Note { get; set; } = string.Empty;
public string Note { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public int PlanVisitCount { get; set; }
public int PlanVisitCount { get; set; }
public int PlanJudgeCount { get; set; }
public int PlanJudgeCount { get; set; }
public int PlanGlobalCount { get; set; }
public int PlanGlobalCount { get; set; }
public int PlanTumorCount { get; set; }
[JsonIgnore]
public User DoctorUser { get; set; }
}
public int PlanTumorCount { get; set; }
[JsonIgnore]
public User DoctorUser { get; set; }
}

View File

@ -1,17 +1,13 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TrialVirtualSiteCodeUpdate")]
public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
{
///<summary>
///TrialVirtualSiteCodeUpdate
///</summary>
[Table("TrialVirtualSiteCodeUpdate")]
public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
#endregion
public Guid TrialId { get; set; }
public string VirturalSiteCode { get; set; } = string.Empty;
}
public Guid TrialId { get; set; }
public string VirturalSiteCode { get; set; } = string.Empty;
}

View File

@ -2,348 +2,280 @@ using EntityFrameworkCore.Projectables;
using IRaCIS.Core.Domain.Share;
using System.Linq;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("VisitTask")]
public class VisitTask : BaseFullAuditEntity
{
///<summary>
///VisitTask
///</summary>
[Table("VisitTask")]
public class VisitTask : BaseFullAuditEntity
#region 导航属性
[JsonIgnore]
public List<TaskStudy> TaskStudyList { get; set; }
public List<NoneDicomStudyFile> 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<TaskMedicalReview> TaskMedicalReviewList { get; set; }
[ForeignKey("JudgeResultTaskId")]
public VisitTask JudgeResultTask { get; set; }
//影像质量 等等第一层级问题答案
[JsonIgnore]
public List<ReadingTaskQuestionAnswer> ReadingTaskQuestionAnswerList { get; set; } = new List<ReadingTaskQuestionAnswer>();
//病灶表
[JsonIgnore]
public List<ReadingTableAnswerRowInfo> LesionList { get; set; } = new List<ReadingTableAnswerRowInfo>();
//病灶答案表
[JsonIgnore]
public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>();
//重阅或者退回影像的记录中间表
[JsonIgnore]
public List<TaskInfluence> TaskInfluenceList { get; set; } = new List<TaskInfluence>();
[JsonIgnore]
//对于全局任务而言 才可以用的 关联的访视阅片结果
public List<ReadingGlobalTaskInfo> GlobalVisitResultList { get; set; } = new List<ReadingGlobalTaskInfo>();
[Comment("裁判结果图片地址")]
[NotMapped]
public List<string> JudgeResultImagePathList
{
#region 导航属性
[JsonIgnore]
public List<TaskStudy> TaskStudyList { get; set; }
public List<NoneDicomStudyFile> 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<TaskMedicalReview> TaskMedicalReviewList { get; set; }
[ForeignKey("JudgeResultTaskId")]
public VisitTask JudgeResultTask { get; set; }
//影像质量 等等第一层级问题答案
[JsonIgnore]
public List<ReadingTaskQuestionAnswer> ReadingTaskQuestionAnswerList { get; set; } = new List<ReadingTaskQuestionAnswer>();
//病灶表
[JsonIgnore]
public List<ReadingTableAnswerRowInfo> LesionList { get; set; } = new List<ReadingTableAnswerRowInfo>();
//病灶答案表
[JsonIgnore]
public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>();
//重阅或者退回影像的记录中间表
[JsonIgnore]
public List<TaskInfluence> TaskInfluenceList { get; set; } = new List<TaskInfluence>();
[JsonIgnore]
//对于全局任务而言 才可以用的 关联的访视阅片结果
public List<ReadingGlobalTaskInfo> GlobalVisitResultList { get; set; } = new List<ReadingGlobalTaskInfo>();
/// <summary>
/// 裁判结果图片地址
/// </summary>
[NotMapped]
public List<string> JudgeResultImagePathList
get
{
get
try
{
return this.JudgeResultImagePath.Trim().Split(',').ToList();
}
catch (Exception)
{
try
{
return this.JudgeResultImagePath.Trim().Split(',').ToList();
}
catch (Exception)
{
return new List<string>();
}
return new List<string>();
}
}
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public List<UserFeedBack> UserFeedBackList { get; set; }
/// <summary>
/// 关联的访视任务ID (当前任务是访视任务的话会有自己)集合
/// </summary>
[NotMapped]
public List<Guid> RelatedVisitTaskIdList
{
get
{
try
{
return JsonConvert.DeserializeObject<List<Guid>>(this.RelatedVisitTaskIds);
}
catch (Exception)
{
return new List<Guid>();
}
}
}
/// <summary>
/// 报告任务关系 包含冻结
/// </summary>
[NotMapped]
public List<Guid> ReportRelatedTaskIdList
{
get
{
try
{
return JsonConvert.DeserializeObject<List<Guid>>(this.ReportRelatedTaskIds);
}
catch (Exception)
{
return new List<Guid>();
}
}
}
/// <summary>
/// 既往任务Id 不包括自己集合
/// </summary>
[NotMapped]
public List<Guid> PastResultTaskIdList
{
get
{
try
{
return JsonConvert.DeserializeObject<List<Guid>>(this.PastResultTaskIds);
}
catch (Exception)
{
return new List<Guid>();
}
}
}
#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; }
/// <summary> 任务类型 </summary>
public ReadingCategory ReadingCategory { get; set; }
public Guid TrialId { get; set; }
/// <summary>
/// 分配时间
/// </summary>
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; }
/// <summary>
/// 加急类型
/// </summary>
public TaskUrgentType? TaskUrgentType { get; set; }
/// <summary>
/// 任务加急类型
/// </summary>
public string TaskUrgentRemake { get; set; } = string.Empty;
/// <summary>
/// 是否和编辑加急状态
/// </summary>
public bool IsCanEditUrgentState { get; set; } = true;
/// <summary>
/// 0 代表 单重阅片 产生的任务 否则就是双重 任务 1 任务 2
/// </summary>
[Required]
public Arm ArmEnum { get; set; }
/// <summary>
/// 分配状态
/// </summary>
public TaskAllocationState TaskAllocationState { get; set; }
public TaskState TaskState { get; set; }
/// <summary>
/// 重阅状态
/// </summary>
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; }
/// <summary>
/// 是否是重阅产生的,方便过滤数据
/// </summary>
public bool IsReReadingCreate { get; set; }
/// <summary>
/// PM 对该任务进行了回退 影响的任务不设置
/// </summary>
public bool IsPMSetBack { get; set; }
/// <summary> 裁判结果的任务ID </summary>
public Guid? JudgeResultTaskId { get; set; }
//随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定
public decimal VisitTaskNum { get; set; }
/// <summary>
/// 首次阅片时间
/// </summary>
public DateTime? FirstReadingTime { get; set; }
/// <summary>
/// 全局是否有更新
/// </summary>
public bool? IsGlobalHaveUpdate { get; set; }
/// <summary>
/// IR是否阅读临床数据
/// </summary>
public bool IsReadClinicalData { get; set; } = false;
/// <summary>
/// 关联的访视任务ID (当前任务是访视任务的话会有自己)
/// </summary>
public string RelatedVisitTaskIds { get; set; } = "[]";
/// <summary>
/// 报告任务关系 包含冻结
/// </summary>
public string ReportRelatedTaskIds { get; set; } = "[]";
/// <summary>
/// 既往任务Id 不包括自己
/// </summary>
public string PastResultTaskIds { get; set; } = "[]";
#region 裁判任务特有
[JsonIgnore]
//对于裁判任务而言,触发裁判的列表
public List<VisitTask> JudgeVisitList { get; set; }
/// <summary>
/// 裁判结果的备注
/// </summary>
public string JudgeResultRemark { get; set; } = string.Empty;
/// <summary>
/// 裁判结果的图片路径
/// </summary>
public string JudgeResultImagePath { get; set; } = string.Empty;
#endregion
#region 一致性分析的任务特有数据
/// <summary>
/// 阅片结果是否和原数据有差异
/// </summary>
public bool? IsAnalysisDiffToOriginalData { get; set; }
/// <summary>
/// 组件一致性和原Arm1是否有差异
/// </summary>
public bool? IsGroupDiffArm1 { get; set; }
/// <summary>
/// 组件一致性和原Arm2是否有差异
/// </summary>
public bool? IsGroupDiffArm2 { get; set; }
/// <summary>
/// 是否是一致性分析产生
/// </summary>
public bool IsAnalysisCreate { get; set; }
/// <summary>
/// 转换之前的任务Id(转化的任务才有该值)
/// </summary>
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();
/// <summary>
/// 是否修改了整体肿瘤评估
/// </summary>
public bool IsChangeTumorEvaluate { get; set; } = false;
/// <summary>
/// 重阅重置任务的 标注是转化之前的 还是转化之后的
/// </summary>
public bool IsHistoryConvertedTask { get; set; } = false;
/// <summary>
/// 是否是自身一致性
/// </summary>
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; }
/// <summary>
/// 针对产生的一致性任务而言,这个字段存储的是原始任务
/// </summary>
public Guid? ConsistentAnalysisOriginalTaskId { get; set; }
#endregion
//临床数据
public bool IsNeedClinicalDataSign { get; set; }
/// <summary>
/// 临床数据是否签名
/// </summary>
public bool IsClinicalDataSign { get; set; }
/// <summary>
/// 前序任务需要签名 但是未签名
/// </summary>
public bool IsFrontTaskNeedSignButNotSign { get; set; }
public int ImageStudyState { get; set; }
}
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public List<UserFeedBack> UserFeedBackList { get; set; }
[Comment("关联的访视任务ID (当前任务是访视任务的话会有自己)集合")]
[NotMapped]
public List<Guid> RelatedVisitTaskIdList
{
get
{
try
{
return JsonConvert.DeserializeObject<List<Guid>>(this.RelatedVisitTaskIds);
}
catch (Exception)
{
return new List<Guid>();
}
}
}
[Comment("报告任务关系 包含冻结")]
[NotMapped]
public List<Guid> ReportRelatedTaskIdList
{
get
{
try
{
return JsonConvert.DeserializeObject<List<Guid>>(this.ReportRelatedTaskIds);
}
catch (Exception)
{
return new List<Guid>();
}
}
}
[Comment("既往任务Id 不包括自己集合")]
[NotMapped]
public List<Guid> PastResultTaskIdList
{
get
{
try
{
return JsonConvert.DeserializeObject<List<Guid>>(this.PastResultTaskIds);
}
catch (Exception)
{
return new List<Guid>();
}
}
}
#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; }
/// <summary> 任务类型 </summary>
public ReadingCategory ReadingCategory { get; set; }
public Guid TrialId { get; set; }
[Comment("分配时间")]
public DateTime? AllocateTime { get; set; }
public Guid SubjectId { get; set; }
public int Code { get; set; }
public string TaskCode { get; set; } = string.Empty;
public bool IsUrgent { get; set; }
[Comment("加急类型")]
public TaskUrgentType? TaskUrgentType { get; set; }
[Comment("任务加急类型")]
public string TaskUrgentRemake { get; set; } = string.Empty;
[Comment("是否和编辑加急状态")]
public bool IsCanEditUrgentState { get; set; } = true;
[Comment("0 代表 单重阅片 产生的任务 否则就是双重 任务 1 任务 2")]
[Required]
public Arm ArmEnum { get; set; }
[Comment("分配状态")]
public TaskAllocationState TaskAllocationState { get; set; }
public TaskState TaskState { get; set; }
[Comment("重阅状态")]
public ReReadingApplyState ReReadingApplyState { get; set; }
public Guid? DoctorUserId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
//裁判任务的Id
public Guid? JudgeVisitTaskId { get; set; }
//任务阅片状态
public ReadingTaskState ReadingTaskState { get; set; }
//签名时间
public DateTime? SignTime { get; set; }
public DateTime? SuggesteFinishedTime { get; set; }
[Comment("是否是重阅产生的,方便过滤数据")]
public bool IsReReadingCreate { get; set; }
[Comment("PM 对该任务进行了回退 影响的任务不设置")]
public bool IsPMSetBack { get; set; }
/// <summary> 裁判结果的任务ID </summary>
public Guid? JudgeResultTaskId { get; set; }
//随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定
public decimal VisitTaskNum { get; set; }
[Comment("首次阅片时间")]
public DateTime? FirstReadingTime { get; set; }
[Comment("全局是否有更新")]
public bool? IsGlobalHaveUpdate { get; set; }
[Comment("IR是否阅读临床数据")]
public bool IsReadClinicalData { get; set; } = false;
[Comment("关联的访视任务ID (当前任务是访视任务的话会有自己)")]
public string RelatedVisitTaskIds { get; set; } = "[]";
[Comment("报告任务关系 包含冻结")]
public string ReportRelatedTaskIds { get; set; } = "[]";
[Comment("既往任务Id 不包括自己")]
public string PastResultTaskIds { get; set; } = "[]";
#region 裁判任务特有
[JsonIgnore]
//对于裁判任务而言,触发裁判的列表
public List<VisitTask> JudgeVisitList { get; set; }
[Comment("裁判结果的备注")]
public string JudgeResultRemark { get; set; } = string.Empty;
[Comment("裁判结果的图片路径")]
public string JudgeResultImagePath { get; set; } = string.Empty;
#endregion
#region 一致性分析的任务特有数据
[Comment("阅片结果是否和原数据有差异")]
public bool? IsAnalysisDiffToOriginalData { get; set; }
[Comment("组件一致性和原Arm1是否有差异")]
public bool? IsGroupDiffArm1 { get; set; }
[Comment("组件一致性和原Arm2是否有差异")]
public bool? IsGroupDiffArm2 { get; set; }
[Comment("是否是一致性分析产生")]
public bool IsAnalysisCreate { get; set; }
[Comment("转换之前的任务Id(转化的任务才有该值)")]
public Guid? BeforeConvertedTaskId { get; set; }
[Projectable]
[JsonIgnore]
public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask || Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId
&& t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null
&& t.TaskState == TaskState.Effect
&& t.VisitTaskNum < VisitTaskNum
&& t.IsSelfAnalysis == IsSelfAnalysis
&& t.ArmEnum == ArmEnum
).Any();
[Comment("是否修改了整体肿瘤评估")]
public bool IsChangeTumorEvaluate { get; set; } = false;
[Comment("重阅重置任务的 标注是转化之前的 还是转化之后的")]
public bool IsHistoryConvertedTask { get; set; } = false;
[Comment("是否是自身一致性")]
public bool? IsSelfAnalysis { get; set; }
public string BlindSubjectCode { get; set; } = string.Empty;
public string BlindTrialSiteCode { get; set; } = string.Empty;
//一致性分析规则Id 用于最后统计
//public Guid? TaskConsistentRuleId { get; set; }
[Comment("针对产生的一致性任务而言,这个字段存储的是原始任务")]
public Guid? ConsistentAnalysisOriginalTaskId { get; set; }
#endregion
//临床数据
public bool IsNeedClinicalDataSign { get; set; }
[Comment("临床数据是否签名")]
public bool IsClinicalDataSign { get; set; }
[Comment("前序任务需要签名 但是未签名")]
public bool IsFrontTaskNeedSignButNotSign { get; set; }
public int ImageStudyState { get; set; }
}

View File

@ -1,57 +1,53 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("重阅申请流程记录表")]
[Table("VisitTaskReReading")]
public class VisitTaskReReading : BaseFullAuditEntity
{
///<summary>
///重阅申请流程记录表
///</summary>
[Table("VisitTaskReReading")]
public class VisitTaskReReading : BaseFullAuditEntity
{
#region 导航属性
#region 导航属性
[JsonIgnore]
public User RequestReReadingUser { get; set; }
[JsonIgnore]
public User RequestReReadingUser { get; set; }
[JsonIgnore]
public VisitTask NewReReadingTask { get; set; }
[JsonIgnore]
public VisitTask RootReReadingTask { get; set; }
[JsonIgnore]
public VisitTask OriginalReReadingTask { get; set; }
[JsonIgnore]
public User RequestReReadingConfirmUser { get; set; }
[JsonIgnore]
public VisitTask NewReReadingTask { get; set; }
[JsonIgnore]
public VisitTask RootReReadingTask { get; set; }
[JsonIgnore]
public VisitTask OriginalReReadingTask { get; set; }
[JsonIgnore]
public User RequestReReadingConfirmUser { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
//重阅原始任务Id 重阅会产生新的任务
public Guid OriginalReReadingTaskId { get; set; }
//产生重阅的根任务Id
public Guid RootReReadingTaskId { get; set; }
//重阅原始任务Id 重阅会产生新的任务
public Guid OriginalReReadingTaskId { get; set; }
//产生重阅的根任务Id
public Guid RootReReadingTaskId { get; set; }
//重阅申请 产生的新任务Id
public Guid? NewReReadingTaskId { get; set; }
//重阅申请 产生的新任务Id
public Guid? NewReReadingTaskId { get; set; }
public Guid RequestReReadingUserId { get; set; }
public DateTime RequestReReadingTime { get; set; }
//申请回退类型
public RequestReReadingType RequestReReadingType { get; set; }
public string RequestReReadingReason { get; set; } = string.Empty;
public Guid RequestReReadingUserId { get; set; }
public DateTime RequestReReadingTime { get; set; }
//申请回退类型
public RequestReReadingType RequestReReadingType { get; set; }
public string RequestReReadingReason { get; set; } = string.Empty;
public string RequestReReadingRejectReason { get; set; } = string.Empty;
public string RequestReReadingRejectReason { get; set; } = string.Empty;
public RequestReReadingResult RequestReReadingResultEnum { get; set; }
public RequestReReadingResult RequestReReadingResultEnum { get; set; }
public Guid? RequestReReadingConfirmUserId { get; set; }
public bool IsCopyOrigenalForms { get; set; }
//仅仅包括全局和访视
public bool IsCopyFollowForms { get; set; }
}
public Guid? RequestReReadingConfirmUserId { get; set; }
public bool IsCopyOrigenalForms { get; set; }
//仅仅包括全局和访视
public bool IsCopyFollowForms { get; set; }
}

View File

@ -1,18 +1,16 @@
namespace IRaCIS.Core.Domain.BaseModel
using System.ComponentModel;
namespace IRaCIS.Core.Domain.BaseModel;
[Description("领域实体事件基类")]
public abstract class DomainEvent
{
/// <summary>
/// 领域实体事件基类
/// </summary>
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; }
}

View File

@ -1,107 +1,105 @@
using IRaCIS.Core.Domain.BaseModel;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public interface IAggregateRoot;
public interface IEntity<TKey>
{
public interface IAggregateRoot;
public interface IEntity<TKey>
{
abstract TKey Id { get; set; }
}
//针对dicom
public interface IEntitySeqId
{
public Guid SeqId { get; set; }
}
public abstract class Entity : IEntity<Guid>
{
[Key]
[Required]
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public Guid Id { get; set; }
#region 领域事件 仅仅允许通过提供的方法进行操作
[JsonIgnore]
private readonly List<DomainEvent> _domainEvents = [];
[JsonIgnore]
[NotMapped]
public IReadOnlyCollection<DomainEvent> 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<Guid>
{
[Key]
[Required]
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public Guid Id { get; set; }
#region 领域事件 仅仅允许通过提供的方法进行操作
[JsonIgnore]
private readonly List<DomainEvent> _domainEvents = [];
[JsonIgnore]
[NotMapped]
public IReadOnlyCollection<DomainEvent> 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

View File

@ -1,19 +1,17 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public interface IAuditAdd<TKey> where TKey : struct
{
public interface IAuditAdd<TKey> where TKey : struct
{
public TKey CreateUserId { get; set; }
public TKey CreateUserId { get; set; }
public DateTime CreateTime { get; set; }
public DateTime CreateTime { get; set; }
}
public interface IAuditAdd : IAuditAdd<Guid>
{
}
public interface IAuditAddWithUserName : IAuditAdd<Guid>
{
public string CreateUser { get; set; }
}
}
public interface IAuditAdd : IAuditAdd<Guid>
{
}
public interface IAuditAddWithUserName : IAuditAdd<Guid>
{
public string CreateUser { get; set; }
}

View File

@ -1,13 +1,11 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public interface IAuditUpdate<TKey> where TKey : struct
{
public interface IAuditUpdate<TKey> where TKey : struct
{
public TKey UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
}
public interface IAuditUpdate : IAuditUpdate<Guid>
{
}
public TKey UpdateUserId { get; set; }
public DateTime UpdateTime { get; set; }
}
public interface IAuditUpdate : IAuditUpdate<Guid>
{
}

View File

@ -1,15 +1,13 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public interface ISoftDelete<TKey> where TKey : struct
{
public TKey? DeleteUserId { get; set; }
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
}
public interface ISoftDelete : ISoftDelete<Guid>
{
public interface ISoftDelete<TKey> where TKey : struct
{
public TKey? DeleteUserId { get; set; }
public bool IsDeleted { get; set; }
public DateTime? DeletedTime { get; set; }
}
public interface ISoftDelete : ISoftDelete<Guid>
{
}
}

View File

@ -4,17 +4,17 @@ namespace IRaCIS.Core.Domain.Models;
[Table("CommonDocument")]
public class CommonDocument : BaseFullDeleteAuditEntity
{
[Comment(" 业务场景")]
[Comment("业务场景")]
public EmailBusinessScenario BusinessScenarioEnum { get; set; }
public string Code { get; set; } = null!;
[Comment(" 系统标准枚举")]
[Comment("系统标准枚举")]
public CriterionType? CriterionTypeEnum { get; set; }
public string Description { get; set; } = null!;
[Comment(" 类型-上传|导出|邮件附件")]
[Comment("类型-上传|导出|邮件附件")]
public CommonDocumentFileType FileTypeEnum { get; set; }
public string Name { get; set; } = null!;

View File

@ -26,13 +26,13 @@ public partial class Dictionary : BaseFullAuditEntity
public Guid? ConfigTypeId { get; set; }
[Comment(" 字典类型- 枚举|bool|下拉框")]
[Comment("字典类型- 枚举|bool|下拉框")]
public DicDataTypeEnum DataTypeEnum { get; set; }
[StringLength(512)]
public string Description { get; set; } = null!;
[Comment(" 是否字典类型配置")]
[Comment("是否字典类型配置")]
public bool IsConfig { get; set; }
public bool IsEnable { get; set; }

View File

@ -22,23 +22,23 @@ public class EmailNoticeConfig : BaseFullDeleteAuditEntity
public string AttachPath { get; set; } = null!;
[Comment(" 业务级别")]
[Comment("业务级别")]
public int BusinessLevelEnum { get; set; }
[Comment(" 业务模块")]
[Comment("业务模块")]
public int BusinessModuleEnum { get; set; }
[Comment(" 业务场景")]
[Comment("业务场景")]
public EmailBusinessScenario BusinessScenarioEnum { get; set; }
public string Code { get; set; } = null!;
[Comment(" 标准枚举")]
[Comment("标准枚举")]
public CriterionType? CriterionTypeEnum { get; set; }
public string Description { get; set; } = null!;
[Comment(" 发送周期")]
[Comment("发送周期")]
public string EmailCron { get; set; } = null!;
[MaxLength]
public string EmailHtmlContent { get; set; } = null!;
@ -49,18 +49,18 @@ public class EmailNoticeConfig : BaseFullDeleteAuditEntity
public string EmailTopicCN { get; set; } = null!;
[Comment(" 加急枚举")]
[Comment("加急枚举")]
public int EmailUrgentEnum { get; set; }
[Comment(" 是否自动发送")]
[Comment("是否自动发送")]
public bool IsAutoSend { get; set; }
[Comment(" 是否区分标准")]
[Comment("是否区分标准")]
public bool IsDistinguishCriteria { get; set; }
public bool IsEnable { get; set; }
[Comment(" 是否需要回执")]
[Comment("是否需要回执")]
public bool IsReturnRequired { get; set; }
public SysEmailLevel SystemLevel { get; set; }

View File

@ -10,29 +10,29 @@ public class FrontAuditConfig : BaseFullAuditEntity
[StringLength(1000)]
public string ChildDataEnLabel { get; set; } = null!;
[Comment(" 前端渲染数组 数组名 和数组值")]
[Comment("前端渲染数组 数组名 和数组值")]
[StringLength(400)]
public string ChildDataLabel { get; set; } = null!;
[Comment(" 子数据Value")]
[Comment("子数据Value")]
[StringLength(400)]
public string ChildDataValue { get; set; } = null!;
public Guid? ChildrenTypeId { get; set; }
[Comment(" 翻译的字段名 这里有可能是一个数组名 那么具体的翻译字段名就不是这个了")]
[Comment("翻译的字段名 这里有可能是一个数组名 那么具体的翻译字段名就不是这个了")]
public string Code { get; set; } = null!;
[StringLength(1000)]
public string CodeEn { get; set; } = null!;
[Comment(" 前端使用 C M")]
[Comment("前端使用 C M")]
public string ConfigType { get; set; } = null!;
[Comment(" 前端展示类型 Router ArrayTable")]
[Comment("前端展示类型 Router ArrayTable")]
public string DataType { get; set; } = null!;
[Comment(" 日期格式")]
[Comment("日期格式")]
public string DateType { get; set; } = null!;
[StringLength(512)]
@ -41,61 +41,61 @@ public class FrontAuditConfig : BaseFullAuditEntity
[StringLength(500)]
public string DescriptionCN { get; set; } = null!;
[Comment(" 翻译的字典名(单个字段翻译的时候)")]
[Comment("翻译的字典名(单个字段翻译的时候)")]
public string DictionaryCode { get; set; } = null!;
[Comment(" 字典名称-待废弃核查")]
[Comment("字典名称-待废弃核查")]
public string DictionaryKey { get; set; } = null!;
[Comment(" 枚举字典Type")]
[Comment("枚举字典Type")]
public string DictionaryType { get; set; } = null!;
[Comment(" 后端翻译的类型 对应前端界面 &quot;&quot; Dictionary Date")]
[Comment("后端翻译的类型 对应前端界面 Dictionary Date")]
public string EnumType { get; set; } = null!;
[StringLength(1000)]
public string ForeignKeyEnText { get; set; } = null!;
[Comment(" 外键表")]
[Comment("外键表")]
public string ForeignKeyTableName { get; set; } = null!;
[Comment(" 外键Text")]
[Comment("外键Text")]
[StringLength(1000)]
public string ForeignKeyText { get; set; } = null!;
[Comment(" 外键Value")]
[Comment("外键Value")]
public string ForeignKeyValue { get; set; } = null!;
[Comment(" 标识")]
[Comment("标识")]
[StringLength(400)]
public string Identification { get; set; } = null!;
[Comment(" 接口名")]
[Comment("接口名")]
public string InterfaceName { get; set; } = null!;
[Comment(" 未知是否有用-废弃核查")]
[Comment("未知是否有用-废弃核查")]
public bool IsConfig { get; set; }
public bool IsEnable { get; set; }
[Comment(" 是否完成")]
[Comment("是否完成")]
public bool IsFinish { get; set; }
[Comment(" 是否有原因")]
[Comment("是否有原因")]
public bool IsHaveReason { get; set; }
[Comment(" 是否有签名")]
[Comment("是否有签名")]
public bool IsHaveSign { get; set; }
[Comment(" 是否加入计划")]
[Comment("是否加入计划")]
public bool? IsJoinPlan { get; set; }
[Comment(" 待废弃核查")]
[Comment("待废弃核查")]
public bool IsShowByTrialConfig { get; set; }
public int IsShowParent { get; set; }
[Comment(" 是否为特殊类型")]
[Comment("是否为特殊类型")]
public bool? IsSpecialType { get; set; }
public Guid? ModuleTypeId { get; set; }
@ -111,7 +111,7 @@ public class FrontAuditConfig : BaseFullAuditEntity
[MaxLength]
public string? TableConfigJsonStr { get; set; }
[Comment(" 待废弃核查")]
[Comment("待废弃核查")]
public string TrialConfigRelyFieldName { get; set; } = null!;
[MaxLength]

View File

@ -1,36 +1,30 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("Internationalization")]
public class Internationalization : BaseFullAuditEntity
{
///<summary>
///Internationalization
///</summary>
[Table("Internationalization")]
public class Internationalization : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public PublishLog PublishLog { get; set; }
#region 导航属性
[JsonIgnore]
public PublishLog PublishLog { get; set; }
#endregion
public int ShowOrder { get; set; }
#endregion
public int ShowOrder { get; set; }
/// <summary>
/// 0 1 2 预翻译 已确认 废除
/// </summary>
public int State { get; set; }
public string Description { get; set; } = string.Empty;
[Comment("0 1 2 预翻译 已确认 废除")]
public int State { get; set; }
public string Description { get; set; } = string.Empty;
public string Code { get; set; } = string.Empty;
public string Code { get; set; } = string.Empty;
public string Value { get; set; } = string.Empty;
public string Value { get; set; } = string.Empty;
public string ValueCN { get; set; } = string.Empty;
public string ValueCN { get; set; } = string.Empty;
public int InternationalizationType { get; set; }
public string FrontType { get; set; } = string.Empty;
public string Module { get; set; } = string.Empty;
//关联版本历史记录表Id
public Guid? PublishLogId { get; set; }
}
public int InternationalizationType { get; set; }
public string FrontType { get; set; } = string.Empty;
public string Module { get; set; } = string.Empty;
//关联版本历史记录表Id
public Guid? PublishLogId { get; set; }
}

View File

@ -1,22 +1,18 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("PublishLog")]
public class PublishLog : BaseFullAuditEntity
{
///<summary>
///PublishLog
///</summary>
[Table("PublishLog")]
public class PublishLog : BaseFullAuditEntity
{
public string Version { get; set; } = string.Empty;
public string Version { get; set; } = string.Empty;
public DateTime? PublishTime { get; set; }
public DateTime? PublishTime { get; set; }
public string UpdateContent { get; set; } = string.Empty;
public string UpdateContent { get; set; } = string.Empty;
//0 开发中 ,已发布
public int State { get; set; }
//0 开发中 ,已发布
public int State { get; set; }
public bool IsCurrentVersion { get; set; }
}
public bool IsCurrentVersion { get; set; }
}

View File

@ -1,35 +1,31 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SystemBasicData")]
public class SystemBasicData : BaseFullAuditEntity
{
///<summary>
///SystemBasicData
///</summary>
[Table("SystemBasicData")]
public class SystemBasicData : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("ParentId")]
public SystemBasicData Parent { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("ParentId")]
public SystemBasicData Parent { get; set; }
#endregion
public string Name { get; set; } = string.Empty;
#endregion
public string Name { get; set; } = string.Empty;
public string Value { get; set; } = string.Empty;
public string Value { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public int ShowOrder { get; set; }
public int ShowOrder { get; set; }
public string Code { get; set; } = string.Empty;
public string Code { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public string ValueCN { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public string ValueCN { get; set; } = string.Empty;
public bool IsEnable { get; set; }
public BasicDataTypeEnum BasicDataTypeEnum { get; set; }
}
public bool IsEnable { get; set; }
public BasicDataTypeEnum BasicDataTypeEnum { get; set; }
}

View File

@ -1,27 +1,25 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("VerificationCode")]
public class VerificationCode : BaseAddAuditEntity
{
[Table("VerificationCode")]
public class VerificationCode : BaseAddAuditEntity
{
public Guid UserId { get; set; } = Guid.Empty;
public Guid UserId { get; set; } = Guid.Empty;
//验证码
public string Code { get; set; } = string.Empty;
//验证码
public string Code { get; set; } = string.Empty;
//什么类型的验证码 邮箱|手机
//什么类型的验证码 邮箱|手机
public VerifyType CodeType { get; set; }
public VerifyType CodeType { get; set; }
public bool HasSend { get; set; }
public bool HasSend { get; set; }
//发送的邮箱或者手机
public string EmailOrPhone { get; set; } = string.Empty;
//发送的邮箱或者手机
public string EmailOrPhone { get; set; } = string.Empty;
//过期时间
public DateTime ExpirationTime { get; set; }
//过期时间
public DateTime ExpirationTime { get; set; }
}
}

View File

@ -18,27 +18,27 @@ public class Attachment : BaseAddAuditEntity
[JsonIgnore]
public Doctor Doctor { get; set; }
[Comment(" 编码")]
[Comment("编码")]
[StringLength(400)]
public string Code { get; set; } = null!;
public Guid DoctorId { get; set; }
[Comment(" 过期时间")]
[Comment("过期时间")]
public DateTime? ExpiryDate { get; set; }
public string FileName { get; set; } = null!;
[Comment(" 是否正式简历")]
[Comment("是否正式简历")]
public bool IsOfficial { get; set; }
[Comment(" 1 中文 2为英文")]
[Comment("1 中文 2为英文")]
public int Language { get; set; }
[StringLength(512)]
public string Path { get; set; } = null!;
[Comment(" 文件类型名")]
[Comment("文件类型名")]
[StringLength(400)]
public string Type { get; set; } = null!;
}

View File

@ -1,21 +1,17 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("EnrollReadingCriterion")]
public class EnrollReadingCriterion : BaseAddAuditEntity
{
///<summary>
///EnrollReadingCriterion
///</summary>
[Table("EnrollReadingCriterion")]
public class EnrollReadingCriterion : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
[JsonIgnore]
[ForeignKey("EnrollId")]
public Enroll Enroll { get; set; }
#endregion
public Guid EnrollId { get; set; }
[JsonIgnore]
[ForeignKey("EnrollId")]
public Enroll Enroll { get; set; }
#endregion
public Guid EnrollId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public bool IsJoinAnalysis { get; set; }
}
public bool IsJoinAnalysis { get; set; }
}

View File

@ -1,58 +1,56 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("Postgraduate")]
public partial class Postgraduate : BaseFullAuditEntity
{
[Table("Postgraduate")]
public partial class Postgraduate : BaseFullAuditEntity
{
#region µ¼º½ÊôÐÔ
#region µ¼º½ÊôÐÔ
#endregion
#endregion
public Guid DoctorId { get; set; }
public Guid DoctorId { get; set; }
[Column(TypeName = "date")]
public DateTime? BeginDate { get; set; }
[Column(TypeName = "date")]
public DateTime? BeginDate { get; set; }
[Column(TypeName = "date")]
public DateTime? EndDate { get; set; }
[Column(TypeName = "date")]
public DateTime? EndDate { get; set; }
[StringLength(50)]
public string Training { get; set; } = string.Empty;
[StringLength(50)]
public string Training { get; set; } = string.Empty;
[StringLength(100)]
public string Major { get; set; } = string.Empty;
[StringLength(100)]
public string Major { get; set; } = string.Empty;
[StringLength(100)]
public string Hospital { get; set; } = string.Empty;
[StringLength(100)]
public string Hospital { get; set; } = string.Empty;
[StringLength(100)]
public string School { get; set; } = string.Empty;
[StringLength(100)]
public string Country { get; set; } = string.Empty;
[StringLength(100)]
public string School { get; set; } = string.Empty;
[StringLength(100)]
public string Country { get; set; } = string.Empty;
[StringLength(100)]
public string Province { get; set; } = string.Empty;
[StringLength(100)]
public string Province { get; set; } = string.Empty;
[StringLength(100)]
public string City { get; set; } = string.Empty;
[StringLength(100)]
public string City { get; set; } = string.Empty;
[StringLength(50)]
public string TrainingCN { get; set; } = string.Empty;
[StringLength(50)]
public string TrainingCN { get; set; } = string.Empty;
[StringLength(100)]
public string MajorCN { get; set; } = string.Empty;
[StringLength(100)]
public string MajorCN { get; set; } = string.Empty;
[StringLength(100)]
public string HospitalCN { get; set; } = string.Empty;
[StringLength(100)]
public string HospitalCN { get; set; } = string.Empty;
[StringLength(100)]
public string SchoolCN { get; set; } = string.Empty;
[StringLength(100)]
public string CountryCN { get; set; } = string.Empty;
[StringLength(100)]
public string SchoolCN { get; set; } = string.Empty;
[StringLength(100)]
public string CountryCN { get; set; } = string.Empty;
[StringLength(100)]
public string ProvinceCN { get; set; } = string.Empty;
[StringLength(100)]
public string ProvinceCN { get; set; } = string.Empty;
[StringLength(100)]
public string CityCN { get; set; } = string.Empty;
}
[StringLength(100)]
public string CityCN { get; set; } = string.Empty;
}

View File

@ -1,20 +1,18 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("ResearchPublication")]
public partial class ResearchPublication : BaseFullAuditEntity
{
[Table("ResearchPublication")]
public partial class ResearchPublication : BaseFullAuditEntity
{
#region µ¼º½ÊôÐÔ
#region µ¼º½ÊôÐÔ
#endregion
public Guid DoctorId { get; set; }
public string Research { get; set; } = string.Empty;
public string Grants { get; set; } = string.Empty;
public string Publications { get; set; } = string.Empty;
public string AwardsHonors { get; set; } = string.Empty;
#endregion
public Guid DoctorId { get; set; }
public string Research { get; set; } = string.Empty;
public string Grants { get; set; } = string.Empty;
public string Publications { get; set; } = string.Empty;
public string AwardsHonors { get; set; } = string.Empty;
public string ResearchCN { get; set; } = string.Empty;
public string GrantsCN { get; set; } = string.Empty;
public string PublicationsCN { get; set; } = string.Empty;
public string AwardsHonorsCN { get; set; } = string.Empty;
}
public string ResearchCN { get; set; } = string.Empty;
public string GrantsCN { get; set; } = string.Empty;
public string PublicationsCN { get; set; } = string.Empty;
public string AwardsHonorsCN { get; set; } = string.Empty;
}

View File

@ -1,25 +1,23 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TrialExperience")]
public partial class TrialExperience : BaseFullAuditEntity
{
[Table("TrialExperience")]
public partial class TrialExperience : BaseFullAuditEntity
{
#region µ¼º½ÊôÐÔ
#region µ¼º½ÊôÐÔ
[JsonIgnore]
public List<TrialExperienceCriteria> ExperienceCriteriaList { get; set; }
#endregion
public Guid DoctorId { get; set; }
[JsonIgnore]
public List<TrialExperienceCriteria> ExperienceCriteriaList { get; set; }
#endregion
public Guid DoctorId { get; set; }
public Guid? PhaseId { get; set; }
public Guid? PhaseId { get; set; }
public Dictionary Phase { get; set; }
public Dictionary Phase { get; set; }
[StringLength(512)]
public string EvaluationContent { get; set; } = string.Empty;
public int VisitReadingCount { get; set; }
[StringLength(512)]
public string EvaluationContent { get; set; } = string.Empty;
public int VisitReadingCount { get; set; }
public DateTime? StartTime { get; set; }
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
}
public DateTime? EndTime { get; set; }
}

View File

@ -1,14 +1,12 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class TrialExperienceCriteria : Entity
{
public class TrialExperienceCriteria : Entity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("EvaluationCriteriaId")]
public Dictionary EvaluationCriteria { get; set; }
#endregion
public Guid DoctorId { get; set; }
public Guid TrialExperienceId { get; set; }
public Guid EvaluationCriteriaId { get; set; }
}
#region 导航属性
[JsonIgnore]
[ForeignKey("EvaluationCriteriaId")]
public Dictionary EvaluationCriteria { get; set; }
#endregion
public Guid DoctorId { get; set; }
public Guid TrialExperienceId { get; set; }
public Guid EvaluationCriteriaId { get; set; }
}

View File

@ -1,15 +1,13 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("Vacation")]
public class Vacation : BaseFullAuditEntity
{
[Table("Vacation")]
public class Vacation : BaseFullAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
public Guid DoctorId { get; set; }
public DateTime StartDate { get; set; }
public DateTime EndDate { get; set; }
public int Status { get; set; } = 1;
#endregion
public Guid DoctorId { get; set; }
public DateTime StartDate { get; set; }
public DateTime EndDate { get; set; }
public int Status { get; set; } = 1;
}
}

View File

@ -1,28 +1,24 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SystemDocConfirmedUser")]
public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity
{
///<summary>
///SystemDocConfirmedUser
///</summary>
[Table("SystemDocConfirmedUser")]
public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity
#region 导航属性
[JsonIgnore]
public SystemDocument SystemDocument { get; set; }
{
#region 导航属性
[JsonIgnore]
public SystemDocument SystemDocument { get; set; }
[JsonIgnore]
[ForeignKey("ConfirmUserId")]
public User ConfirmUser { get; set; }
#endregion
public Guid SystemDocumentId { get; set; }
[JsonIgnore]
[ForeignKey("ConfirmUserId")]
public User ConfirmUser { get; set; }
#endregion
public Guid SystemDocumentId { get; set; }
public DateTime? ConfirmTime { get; set; }
public Guid ConfirmUserId { get; set; }
public DateTime? ConfirmTime { get; set; }
public Guid ConfirmUserId { get; set; }
public DateTime? SignFirstViewTime { get; set; }
public string SignText { get; set; } = string.Empty;
}
public DateTime? SignFirstViewTime { get; set; }
public string SignText { get; set; } = string.Empty;
}

View File

@ -1,23 +1,19 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SystemDocNeedConfirmedUserType")]
public class SystemDocNeedConfirmedUserType : Entity
{
///<summary>
///SystemDocNeedConfirmedUserType
///</summary>
[Table("SystemDocNeedConfirmedUserType")]
public class SystemDocNeedConfirmedUserType : Entity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("NeedConfirmUserTypeId")]
public UserType UserTypeRole { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("NeedConfirmUserTypeId")]
public UserType UserTypeRole { get; set; }
[JsonIgnore]
public SystemDocument SystemDocument { get; set; }
#endregion
public Guid SystemDocumentId { get; set; }
[JsonIgnore]
public SystemDocument SystemDocument { get; set; }
#endregion
public Guid SystemDocumentId { get; set; }
public Guid NeedConfirmUserTypeId { get; set; }
}
public Guid NeedConfirmUserTypeId { get; set; }
}

View File

@ -1,25 +1,21 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SystemDocument")]
public class SystemDocument : BaseFullDeleteAuditEntity
{
///<summary>
///SystemDocument
///</summary>
[Table("SystemDocument")]
public class SystemDocument : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<SystemDocConfirmedUser> SystemDocConfirmedUserList { get; set; }
[JsonIgnore]
public List<SystemDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
[ForeignKey("FileTypeId")]
public Dictionary FileType { get; set; }
#endregion
public Guid FileTypeId { get; set; }
public string Name { get; set; } = string.Empty;
public int SignViewMinimumMinutes { get; set; }
public string Path { get; set; } = string.Empty;
}
#region 导航属性
[JsonIgnore]
public List<SystemDocConfirmedUser> SystemDocConfirmedUserList { get; set; }
[JsonIgnore]
public List<SystemDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
[ForeignKey("FileTypeId")]
public Dictionary FileType { get; set; }
#endregion
public Guid FileTypeId { get; set; }
public string Name { get; set; } = string.Empty;
public int SignViewMinimumMinutes { get; set; }
public string Path { get; set; } = string.Empty;
}

View File

@ -1,23 +1,19 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///TrialDocUserTypeConfirmUser
///</summary>
[Table("TrialDocConfirmedUser")]
public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity
{
#region 导航属性
namespace IRaCIS.Core.Domain.Models;
[JsonIgnore]
[ForeignKey("ConfirmUserId")]
public User User { get; set; }
[JsonIgnore]
public TrialDocument TrialDocument { get; set; }
#endregion
public Guid TrialDocumentId { get; set; }
public DateTime? ConfirmTime { get; set; }
public Guid ConfirmUserId { get; set; }
public DateTime? SignFirstViewTime { get; set; }
public string SignText { get; set; } = string.Empty;
}
[Table("TrialDocConfirmedUser")]
public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("ConfirmUserId")]
public User User { get; set; }
[JsonIgnore]
public TrialDocument TrialDocument { get; set; }
#endregion
public Guid TrialDocumentId { get; set; }
public DateTime? ConfirmTime { get; set; }
public Guid ConfirmUserId { get; set; }
public DateTime? SignFirstViewTime { get; set; }
public string SignText { get; set; } = string.Empty;
}

View File

@ -1,23 +1,19 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TrialDocNeedConfirmedUserType")]
public class TrialDocNeedConfirmedUserType : Entity
{
///<summary>
///TrialDocumentUserConfirm
///</summary>
[Table("TrialDocNeedConfirmedUserType")]
public class TrialDocNeedConfirmedUserType : Entity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("NeedConfirmUserTypeId")]
public UserType UserTypeRole { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("NeedConfirmUserTypeId")]
public UserType UserTypeRole { get; set; }
[JsonIgnore]
public TrialDocument TrialDocument { get; set; }
#endregion
[JsonIgnore]
public TrialDocument TrialDocument { get; set; }
#endregion
public Guid TrialDocumentId { get; set; }
public Guid NeedConfirmUserTypeId { get; set; }
}
public Guid TrialDocumentId { get; set; }
public Guid NeedConfirmUserTypeId { get; set; }
}

View File

@ -1,35 +1,31 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TrialDocument")]
public class TrialDocument : BaseFullDeleteAuditEntity
{
///<summary>
///TrialDocument
///</summary>
[Table("TrialDocument")]
public class TrialDocument : BaseFullDeleteAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<TrialDocConfirmedUser> TrialDocConfirmedUserList { get; set; }
[JsonIgnore]
public List<TrialDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
#region 导航属性
[JsonIgnore]
public List<TrialDocConfirmedUser> TrialDocConfirmedUserList { get; set; }
[JsonIgnore]
public List<TrialDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("FileTypeId")]
public Dictionary FileType { get; set; }
#endregion
//需要确认的项目用户 通过TrialId 关联 用中间表过滤
public Guid FileTypeId { get; set; }
[JsonIgnore]
[ForeignKey("FileTypeId")]
public Dictionary FileType { get; set; }
#endregion
//需要确认的项目用户 通过TrialId 关联 用中间表过滤
public Guid FileTypeId { get; set; }
public string Name { get; set; } = string.Empty;
public string Name { get; set; } = string.Empty;
public string Path { get; set; } = string.Empty;
public string Path { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public string Description { get; set; } = string.Empty;
public int SignViewMinimumMinutes { get; set; }
}
public string Description { get; set; } = string.Empty;
public int SignViewMinimumMinutes { get; set; }
}

View File

@ -1,21 +1,17 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TrialEmailNoticeUser")]
public class TrialEmailNoticeUser : Entity
{
///<summary>
///TrialEmailNoticeUser
///</summary>
[Table("TrialEmailNoticeUser")]
public class TrialEmailNoticeUser : Entity
{
#region 导航属性
#region 导航属性
#endregion
[JsonIgnore]
public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; }
public UserTypeEnum UserType { get; set; }
public Guid TrialEmailNoticeConfigId { get; set; }
public EmailUserType EmailUserType { get; set; }
}
#endregion
[JsonIgnore]
public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; }
public UserTypeEnum UserType { get; set; }
public Guid TrialEmailNoticeConfigId { get; set; }
public EmailUserType EmailUserType { get; set; }
}

View File

@ -1,12 +1,10 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("CalculateTask")]
public class CalculateTask : Entity
{
[Table("CalculateTask")]
public class CalculateTask : Entity
{
public Guid ReviewerId { get; set; }
public Guid ReviewerId { get; set; }
[Required]
public string YearMonth { get; set; } = string.Empty;
public bool IsLock { get; set; }
}
[Required]
public string YearMonth { get; set; } = string.Empty;
public bool IsLock { get; set; }
}

View File

@ -1,12 +1,10 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("ExchangeRate")]
public class ExchangeRate : BaseFullAuditEntity
{
[Table("ExchangeRate")]
public class ExchangeRate : BaseFullAuditEntity
{
public string YearMonth { get; set; } = string.Empty;
public string YearMonth { get; set; } = string.Empty;
[DecimalPrecision(18, 2)]
public decimal Rate { get; set; }
[DecimalPrecision(18, 2)]
public decimal Rate { get; set; }
}
}

View File

@ -1,33 +1,31 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("Payment")]
public partial class Payment : BaseFullAuditEntity
{
public Guid DoctorId { get; set; }
public string YearMonth { get; set; } = string.Empty;
public bool IsLock { get; set; }
public DateTime YearMonthDate { get; set; }
[Table("Payment")]
public partial class Payment : BaseFullAuditEntity
{
public Guid DoctorId { get; set; }
public string YearMonth { get; set; } = string.Empty;
public bool IsLock { get; set; }
public DateTime YearMonthDate { get; set; }
[DecimalPrecision(18, 2)]
public decimal PaymentUSD { get; set; }
[DecimalPrecision(18, 2)]
public decimal PaymentUSD { get; set; }
[DecimalPrecision(18, 4)]
public decimal PaymentCNY { get; set; }
[DecimalPrecision(18, 4)]
public decimal PaymentCNY { get; set; }
[DecimalPrecision(18, 2)]
public decimal ExchangeRate { get; set; }
[DecimalPrecision(18, 4)]
public decimal AdjustmentCNY { get; set; }
[DecimalPrecision(18, 2)]
public decimal ExchangeRate { get; set; }
[DecimalPrecision(18, 4)]
public decimal AdjustmentCNY { get; set; }
[DecimalPrecision(18, 2)]
public decimal AdjustmentUSD { get; set; }
public DateTime CalculateTime { get; set; } = DateTime.Now;
[DecimalPrecision(18, 2)]
public decimal AdjustmentUSD { get; set; }
public DateTime CalculateTime { get; set; } = DateTime.Now;
[StringLength(100)]
public string CalculateUser { get; set; } = string.Empty;
[StringLength(100)]
public string CalculateUser { get; set; } = string.Empty;
[StringLength(500)]
public string Note { get; set; } = string.Empty;
}
[StringLength(500)]
public string Note { get; set; } = string.Empty;
}

View File

@ -1,24 +1,22 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("PaymentAdjustment")]
public partial class PaymentAdjustment : BaseFullAuditEntity
{
[Table("PaymentAdjustment")]
public partial class PaymentAdjustment : BaseFullAuditEntity
{
public Guid ReviewerId { get; set; }
public Guid ReviewerId { get; set; }
public DateTime YearMonthDate { get; set; }
public string YearMonth { get; set; } = string.Empty;
public DateTime YearMonthDate { get; set; }
public string YearMonth { get; set; } = string.Empty;
[DecimalPrecision(18, 2)]
public decimal AdjustmentUSD { get; set; }
[DecimalPrecision(18, 2)]
public decimal AdjustmentUSD { get; set; }
[DecimalPrecision(18, 4)]
public decimal AdjustmentCNY { get; set; }
public Guid TrialId { get; set; } = Guid.Empty;
[DecimalPrecision(18, 4)]
public decimal AdjustmentCNY { get; set; }
public Guid TrialId { get; set; } = Guid.Empty;
[DecimalPrecision(18, 2)]
public decimal ExchangeRate { get; set; }
public bool IsLock { get; set; } = false;
public string Note { get; set; } = string.Empty;
[DecimalPrecision(18, 2)]
public decimal ExchangeRate { get; set; }
public bool IsLock { get; set; } = false;
public string Note { get; set; } = string.Empty;
}
}

View File

@ -1,40 +1,38 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("PaymentDetail")]
public partial class PaymentDetail : BaseFullAuditEntity
{
[Table("PaymentDetail")]
public partial class PaymentDetail : BaseFullAuditEntity
{
public Guid PaymentId { get; set; }
public Guid DoctorId { get; set; }
public string YearMonth { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public Guid PaymentId { get; set; }
public Guid DoctorId { get; set; }
public string YearMonth { get; set; } = string.Empty;
public Guid TrialId { get; set; }
[StringLength(50)]
public string TrialCode { get; set; } = string.Empty;
[StringLength(50)]
public string TrialCode { get; set; } = string.Empty;
[StringLength(50)]
public string PaymentType { get; set; } = string.Empty;
public int Count { get; set; }
[StringLength(50)]
public string PaymentType { get; set; } = string.Empty;
public int Count { get; set; }
[DecimalPrecision(18, 2)]
public decimal BasePrice { get; set; }
[DecimalPrecision(18, 2)]
public decimal BasePrice { get; set; }
[DecimalPrecision(18, 2)]
public decimal PersonalAdditional { get; set; }
[DecimalPrecision(18, 2)]
public decimal PersonalAdditional { get; set; }
[DecimalPrecision(18, 2)]
public decimal TrialAdditional { get; set; }
[DecimalPrecision(18, 2)]
public decimal TrialAdditional { get; set; }
[DecimalPrecision(18, 2)]
public decimal ExchangeRate { get; set; }
[DecimalPrecision(18, 2)]
public decimal ExchangeRate { get; set; }
[DecimalPrecision(18, 2)]
public decimal PaymentUSD { get; set; }
[DecimalPrecision(18, 2)]
public decimal PaymentUSD { get; set; }
[DecimalPrecision(18, 4)]
public decimal PaymentCNY { get; set; }
[DecimalPrecision(18, 4)]
public decimal PaymentCNY { get; set; }
public int ShowTypeOrder { get; set; }
public int ShowCodeOrder { get; set; }
public int ShowTypeOrder { get; set; }
public int ShowCodeOrder { get; set; }
}
}

View File

@ -1,40 +1,38 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("RankPrice")]
public partial class RankPrice : BaseFullAuditEntity
{
[Table("RankPrice")]
public partial class RankPrice : BaseFullAuditEntity
{
[StringLength(200)]
public string RankName { get; set; } = string.Empty;
[StringLength(200)]
public string RankName { get; set; } = string.Empty;
[DecimalPrecision(18, 2)]
public decimal Timepoint { get; set; }
[DecimalPrecision(18, 2)]
public decimal Timepoint { get; set; }
[DecimalPrecision(18, 2)]
public decimal TimepointIn24H { get; set; }
[DecimalPrecision(18, 2)]
public decimal TimepointIn24H { get; set; }
[DecimalPrecision(18, 2)]
public decimal TimepointIn48H { get; set; }
[DecimalPrecision(18, 2)]
public decimal TimepointIn48H { get; set; }
[DecimalPrecision(18, 2)]
public decimal Adjudication { get; set; }
[DecimalPrecision(18, 2)]
public decimal Adjudication { get; set; }
[DecimalPrecision(18, 2)]
public decimal AdjudicationIn24H { get; set; }
[DecimalPrecision(18, 2)]
public decimal AdjudicationIn24H { get; set; }
[DecimalPrecision(18, 2)]
public decimal AdjudicationIn48H { get; set; }
[DecimalPrecision(18, 2)]
public decimal AdjudicationIn48H { get; set; }
[DecimalPrecision(18, 2)]
public decimal Global { get; set; }
[DecimalPrecision(18, 2)]
public decimal Global { get; set; }
[DecimalPrecision(18, 2)]
public decimal Training { get; set; }
[DecimalPrecision(18, 2)]
public decimal Training { get; set; }
[DecimalPrecision(18, 2)]
public decimal Downtime { get; set; }
[DecimalPrecision(18, 2)]
public decimal Downtime { get; set; }
[DecimalPrecision(18, 2)]
public decimal RefresherTraining { get; set; }
public int ShowOrder { get; set; }
}
[DecimalPrecision(18, 2)]
public decimal RefresherTraining { get; set; }
public int ShowOrder { get; set; }
}

View File

@ -1,24 +1,20 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TrialPaymentPrice")]
public partial class TrialPaymentPrice : BaseFullAuditEntity
{
[Table("TrialPaymentPrice")]
public partial class TrialPaymentPrice : BaseFullAuditEntity
{
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public Trial Trial { get; set; }
public Trial Trial { get; set; }
[DecimalPrecision(18, 2)]
public decimal TrialAdditional { get; set; } = 0;
[DecimalPrecision(18, 2)]
public decimal TrialAdditional { get; set; } = 0;
public string SowName { get; set; } = string.Empty;
public string SowPath { get; set; } = string.Empty;
public string SowName { get; set; } = string.Empty;
public string SowPath { get; set; } = string.Empty;
[DecimalPrecision(18, 2)]
public decimal AdjustmentMultiple { get; set; } = 1;
[DecimalPrecision(18, 2)]
public decimal AdjustmentMultiple { get; set; } = 1;
/// <summary>
/// ÊÇ·ñÓРΪÐÂÏîÄ¿
/// </summary>
public bool? IsNewTrial { get; set; } = false;
}
[Comment("ÊÇ·ñÓРΪÐÂÏîÄ¿")]
public bool? IsNewTrial { get; set; } = false;
}

View File

@ -1,39 +1,37 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TrialRevenuesPrice")]
public class TrialRevenuesPrice : BaseFullAuditEntity
{
[Table("TrialRevenuesPrice")]
public class TrialRevenuesPrice : BaseFullAuditEntity
{
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
[DecimalPrecision(18, 2)]
public decimal Timepoint { get; set; }
[DecimalPrecision(18, 2)]
public decimal Timepoint { get; set; }
[DecimalPrecision(18, 2)]
public decimal TimepointIn24H { get; set; }
[DecimalPrecision(18, 2)]
public decimal TimepointIn24H { get; set; }
[DecimalPrecision(18, 2)]
public decimal TimepointIn48H { get; set; }
[DecimalPrecision(18, 2)]
public decimal TimepointIn48H { get; set; }
[DecimalPrecision(18, 2)]
public decimal Adjudication { get; set; }
[DecimalPrecision(18, 2)]
public decimal Adjudication { get; set; }
[DecimalPrecision(18, 2)]
public decimal AdjudicationIn24H { get; set; }
[DecimalPrecision(18, 2)]
public decimal AdjudicationIn24H { get; set; }
[DecimalPrecision(18, 2)]
public decimal AdjudicationIn48H { get; set; }
[DecimalPrecision(18, 2)]
public decimal AdjudicationIn48H { get; set; }
[DecimalPrecision(18, 2)]
public decimal Global { get; set; }
[DecimalPrecision(18, 2)]
public decimal Global { get; set; }
[DecimalPrecision(18, 2)]
public decimal Training { get; set; }
[DecimalPrecision(18, 2)]
public decimal Training { get; set; }
[DecimalPrecision(18, 2)]
public decimal Downtime { get; set; }
[DecimalPrecision(18, 2)]
public decimal Downtime { get; set; }
[DecimalPrecision(18, 2)]
public decimal RefresherTraining { get; set; }
[DecimalPrecision(18, 2)]
public decimal RefresherTraining { get; set; }
}
}

View File

@ -1,31 +1,29 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class TrialRevenuesPriceVerification : Entity
{
public class TrialRevenuesPriceVerification : Entity
{
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public Guid ReviewerId { get; set; }
public Guid ReviewerId { get; set; }
public string YearMonth { get; set; } = string.Empty;
public string YearMonth { get; set; } = string.Empty;
public bool Training { get; set; } = false;
public bool Training { get; set; } = false;
public bool Downtime { get; set; } = false;
public bool Downtime { get; set; } = false;
public bool Global { get; set; } = false;
public bool Global { get; set; } = false;
public bool Timepoint { get; set; } = false;
public bool Timepoint { get; set; } = false;
public bool TimepointIn24H { get; set; } = false;
public bool TimepointIn24H { get; set; } = false;
public bool TimepointIn48H { get; set; } = false;
public bool TimepointIn48H { get; set; } = false;
public bool Adjudication { get; set; } = false;
public bool Adjudication { get; set; } = false;
public bool AdjudicationIn24H { get; set; } = false;
public bool AdjudicationIn24H { get; set; } = false;
public bool AdjudicationIn48H { get; set; } = false;
public bool RefresherTraining { get; set; } = false;
public DateTime WorkLoadDate { get; set; }
}
public bool AdjudicationIn48H { get; set; } = false;
public bool RefresherTraining { get; set; } = false;
public DateTime WorkLoadDate { get; set; }
}

View File

@ -1,12 +1,10 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("VolumeReward")]
public partial class VolumeReward : BaseFullAuditEntity
{
[Table("VolumeReward")]
public partial class VolumeReward : BaseFullAuditEntity
{
[DecimalPrecision(18, 2)]
public decimal Price { get; set; }
public int Min { get; set; }
public int Max { get; set; }
[DecimalPrecision(18, 2)]
public decimal Price { get; set; }
public int Min { get; set; }
public int Max { get; set; }
}
}

View File

@ -1,6 +1,6 @@
global using Microsoft.EntityFrameworkCore;
global using Newtonsoft.Json;
global using System;
global using System.Collections.Generic;
global using System.ComponentModel.DataAnnotations;
global using System.ComponentModel.DataAnnotations.Schema;
global using Newtonsoft.Json;

View File

@ -68,7 +68,7 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
public string PatientSex { get; set; } = null!;
[Comment(" 序列Id 避免内存移动")]
[Comment("序列Id 避免内存移动")]
public Guid SeqId { get; set; }
public int SeriesCount { get; set; }
@ -76,7 +76,7 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
[StringLength(400)]
public string StudyCode { get; set; } = null!;
[Comment(" DicomTag.StudyID")]
[Comment("DicomTag.StudyID")]
public string StudyId { get; set; } = null!;
[StringLength(500)]
@ -92,7 +92,7 @@ public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId
public string TriggerTime { get; set; } = null!;
[Comment(" 上传时间")]
[Comment("上传时间")]
public DateTime? UploadedTime { get; set; }
public string Uploader { get; set; } = null!;

View File

@ -51,7 +51,7 @@ public class StudyMonitor : BaseAddAuditEntity
public string StudyCode { get; set; } = null!;
[Comment(" Dicom/非Dicom")]
[Comment("Dicom/非Dicom")]
public Guid StudyId { get; set; }
public Guid SubjectId { get; set; }

View File

@ -1,17 +1,15 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class ImageShare : Entity
{
public class ImageShare : Entity
{
#region 导航属性
#region 导航属性
#endregion
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid StudyId { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid StudyId { get; set; }
public DateTime ExpireTime { get; set; }
public DateTime ExpireTime { get; set; }
public string Password { get; set; } = string.Empty;
public string Password { get; set; } = string.Empty;
}
}

View File

@ -1,46 +1,42 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("NoneDicomStudy")]
public class NoneDicomStudy : BaseFullAuditEntity
{
///<summary>
///NoneDicomStudy
///</summary>
[Table("NoneDicomStudy")]
public class NoneDicomStudy : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<NoneDicomStudyFile> NoneDicomFileList { get; set; }
#region 导航属性
[JsonIgnore]
public List<NoneDicomStudyFile> NoneDicomFileList { get; set; }
[JsonIgnore]
public List<NoneDicomStudyFile> TaskNoneDicomFileList { get; set; }
[JsonIgnore]
public List<NoneDicomStudyFile> TaskNoneDicomFileList { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
#endregion
public string StudyCode { get; set; } = string.Empty;
#endregion
public string StudyCode { get; set; } = string.Empty;
public int FileCount { get; set; }
public int FileCount { get; set; }
public int Code { get; set; }
public int Code { get; set; }
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid SubjectVisitId { get; set; }
public string BodyPart { get; set; } = string.Empty;
public string Modality { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid SubjectVisitId { get; set; }
public string BodyPart { get; set; } = string.Empty;
public string Modality { get; set; } = string.Empty;
public DateTime ImageDate { get; set; }
public string Description { get; set; } = string.Empty;
public string VideoName { get; set; } = string.Empty;
public DateTime ImageDate { get; set; }
public string Description { get; set; } = string.Empty;
public string VideoName { get; set; } = string.Empty;
public string VideoObjectName { get; set; } = string.Empty;
public string VideoObjectName { get; set; } = string.Empty;
public DateTime? UploadVideoTime { get; set; }
public DateTime? UploadVideoTime { get; set; }
public string VideoUrl { get; set; } = string.Empty;
}
public string VideoUrl { get; set; } = string.Empty;
}

View File

@ -1,35 +1,31 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("NoneDicomStudyFile")]
public class NoneDicomStudyFile : BaseAddAuditEntity
{
#region 导航属性
[ForeignKey("NoneDicomStudyId")]
[JsonIgnore]
public NoneDicomStudy NoneDicomStudy { get; set; }
[JsonIgnore]
public VisitTask VisitTask { get; set; }
[Table("NoneDicomStudyFile")]
public class NoneDicomStudyFile : BaseAddAuditEntity
{
#region 导航属性
[ForeignKey("NoneDicomStudyId")]
[JsonIgnore]
public NoneDicomStudy NoneDicomStudy { get; set; }
[JsonIgnore]
public VisitTask VisitTask { get; set; }
[ForeignKey("OriginNoneDicomStudyId")]
[JsonIgnore]
public NoneDicomStudy OriginNoneDicomStudy { get; set; }
#endregion
public Guid NoneDicomStudyId { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
[ForeignKey("OriginNoneDicomStudyId")]
[JsonIgnore]
public NoneDicomStudy OriginNoneDicomStudy { get; set; }
#endregion
public Guid NoneDicomStudyId { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public string FileType { get; set; } = string.Empty;
public string FileType { get; set; } = string.Empty;
public long? FileSize { get; set; }
#region 跟任务绑定 同时区分检查
public Guid? VisitTaskId { get; set; }
/// <summary>
/// 为了不影响原始检查,跟任务绑定的 NoneDicomStudyId 为guid空 这个字段记录跟原始检查绑
/// </summary>
public Guid? OriginNoneDicomStudyId { get; set; }
#endregion
}
public long? FileSize { get; set; }
#region 跟任务绑定 同时区分检查
public Guid? VisitTaskId { get; set; }
[Comment("为了不影响原始检查,跟任务绑定的 NoneDicomStudyId 为guid空 这个字段记录跟原始检查绑")]
public Guid? OriginNoneDicomStudyId { get; set; }
#endregion
}

View File

@ -1,27 +1,23 @@
namespace IRaCIS.Core.Domain.Models
{
///<summary>
///SCPImageUpload
///</summary>
[Table("SCPImageUpload")]
public class SCPImageUpload : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
namespace IRaCIS.Core.Domain.Models;
[JsonIgnore]
public TrialSite TrialSite { get; set; }
#endregion
public string CallingAE { get; set; } = string.Empty;
public string CalledAE { get; set; } = string.Empty;
public string CallingAEIP { get; set; } = string.Empty;
public DateTime StartTime { get; set; }
public DateTime EndTime { get; set; }
public int FileCount { get; set; }
public long FileSize { get; set; }
public int StudyCount { get; set; }
public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; }
}
[Table("SCPImageUpload")]
public class SCPImageUpload : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public TrialSite TrialSite { get; set; }
#endregion
public string CallingAE { get; set; } = string.Empty;
public string CalledAE { get; set; } = string.Empty;
public string CallingAEIP { get; set; } = string.Empty;
public DateTime StartTime { get; set; }
public DateTime EndTime { get; set; }
public int FileCount { get; set; }
public long FileSize { get; set; }
public int StudyCount { get; set; }
public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; }
}

View File

@ -1,41 +1,39 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SCPInstance")]
public class SCPInstance : BaseFullAuditEntity, IEntitySeqId
{
[Table("SCPInstance")]
public class SCPInstance : BaseFullAuditEntity, IEntitySeqId
{
#region 导航属性
[JsonIgnore]
[ForeignKey("SeriesId")]
public SCPSeries SCPSeries { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("SeriesId")]
public SCPSeries SCPSeries { get; set; }
[JsonIgnore]
[ForeignKey("StudyId")]
public SCPStudy SCPStudy { get; set; }
#endregion
public Guid SeqId { get; set; }
public Guid StudyId { get; set; }
public Guid SeriesId { get; set; }
public string StudyInstanceUid { get; set; } = string.Empty;
public string SeriesInstanceUid { get; set; } = string.Empty;
public string SopInstanceUid { get; set; } = string.Empty;
public int InstanceNumber { get; set; }
public DateTime? InstanceTime { get; set; }
public bool CPIStatus { get; set; }
public int ImageRows { get; set; }
public int ImageColumns { get; set; }
public int SliceLocation { get; set; }
public string SliceThickness { get; set; } = string.Empty;
public int NumberOfFrames { get; set; }
public string PixelSpacing { get; set; } = string.Empty;
[JsonIgnore]
[ForeignKey("StudyId")]
public SCPStudy SCPStudy { get; set; }
#endregion
public Guid SeqId { get; set; }
public Guid StudyId { get; set; }
public Guid SeriesId { get; set; }
public string StudyInstanceUid { get; set; } = string.Empty;
public string SeriesInstanceUid { get; set; } = string.Empty;
public string SopInstanceUid { get; set; } = string.Empty;
public int InstanceNumber { get; set; }
public DateTime? InstanceTime { get; set; }
public bool CPIStatus { get; set; }
public int ImageRows { get; set; }
public int ImageColumns { get; set; }
public int SliceLocation { get; set; }
public string SliceThickness { get; set; } = string.Empty;
public int NumberOfFrames { get; set; }
public string PixelSpacing { get; set; } = string.Empty;
public string ImagerPixelSpacing { get; set; } = string.Empty;
public string FrameOfReferenceUID { get; set; } = string.Empty;
public string WindowCenter { get; set; } = string.Empty;
public string WindowWidth { get; set; } = string.Empty;
public string ImagerPixelSpacing { get; set; } = string.Empty;
public string FrameOfReferenceUID { get; set; } = string.Empty;
public string WindowCenter { get; set; } = string.Empty;
public string WindowWidth { get; set; } = string.Empty;
public bool Anonymize { get; set; }
public string Path { get; set; } = string.Empty;
public bool Anonymize { get; set; }
public string Path { get; set; } = string.Empty;
public long? FileSize { get; set; }
}
public long? FileSize { get; set; }
}

View File

@ -1,31 +1,29 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SCPPatient")]
public class SCPPatient : BaseFullAuditEntity
{
[Table("SCPPatient")]
public class SCPPatient : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<SCPStudy> SCPStudyList { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public TrialSite TrialSite { get; set; }
#endregion
public string PatientIdStr { get; set; } = string.Empty;
public string PatientName { get; set; } = string.Empty;
public string PatientAge { get; set; } = string.Empty;
public string PatientSex { get; set; } = string.Empty;
public string PatientBirthDate { get; set; } = string.Empty;
#region 导航属性
[JsonIgnore]
public List<SCPStudy> SCPStudyList { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public TrialSite TrialSite { get; set; }
#endregion
public string PatientIdStr { get; set; } = string.Empty;
public string PatientName { get; set; } = string.Empty;
public string PatientAge { get; set; } = string.Empty;
public string PatientSex { get; set; } = string.Empty;
public string PatientBirthDate { get; set; } = string.Empty;
public DateTime? EarliestStudyTime { get; set; }
public DateTime? EarliestStudyTime { get; set; }
public DateTime? LatestStudyTime { get; set; }
public DateTime? LatestStudyTime { get; set; }
public DateTime LatestPushTime { get; set; }
public Guid? SubjectId { get; set; }
public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; }
}
public DateTime LatestPushTime { get; set; }
public Guid? SubjectId { get; set; }
public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; }
}

View File

@ -1,41 +1,39 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SCPSeries")]
public class SCPSeries : BaseFullDeleteAuditEntity, IEntitySeqId
{
[Table("SCPSeries")]
public class SCPSeries : BaseFullDeleteAuditEntity, IEntitySeqId
{
#region 导航属性
[JsonIgnore]
[ForeignKey("StudyId")]
public SCPStudy SCPStudy { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("StudyId")]
public SCPStudy SCPStudy { get; set; }
[JsonIgnore]
public List<SCPInstance> SCPInstanceList { get; set; }
#endregion
public Guid SeqId { get; set; }
public Guid StudyId { get; set; }
public string StudyInstanceUid { get; set; } = string.Empty;
public string SeriesInstanceUid { get; set; } = string.Empty;
public int SeriesNumber { get; set; }
public DateTime? SeriesTime { get; set; }
public string Modality { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public int InstanceCount { get; set; }
public string SliceThickness { get; set; } = string.Empty;
[JsonIgnore]
public List<SCPInstance> SCPInstanceList { get; set; }
#endregion
public Guid SeqId { get; set; }
public Guid StudyId { get; set; }
public string StudyInstanceUid { get; set; } = string.Empty;
public string SeriesInstanceUid { get; set; } = string.Empty;
public int SeriesNumber { get; set; }
public DateTime? SeriesTime { get; set; }
public string Modality { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public int InstanceCount { get; set; }
public string SliceThickness { get; set; } = string.Empty;
public string ImagePositionPatient { get; set; } = string.Empty;
public string ImageOrientationPatient { get; set; } = string.Empty;
public string BodyPartExamined { get; set; } = string.Empty;
public string SequenceName { get; set; } = string.Empty;
public string ProtocolName { get; set; } = string.Empty;
public string ImagerPixelSpacing { get; set; } = string.Empty;
public string ImagePositionPatient { get; set; } = string.Empty;
public string ImageOrientationPatient { get; set; } = string.Empty;
public string BodyPartExamined { get; set; } = string.Empty;
public string SequenceName { get; set; } = string.Empty;
public string ProtocolName { get; set; } = string.Empty;
public string ImagerPixelSpacing { get; set; } = string.Empty;
public string AcquisitionTime { get; set; } = string.Empty;
public string AcquisitionNumber { get; set; } = string.Empty;
public string TriggerTime { get; set; } = string.Empty;
public string AcquisitionTime { get; set; } = string.Empty;
public string AcquisitionNumber { get; set; } = string.Empty;
public string TriggerTime { get; set; } = string.Empty;
public string BodyPartForEdit { get; set; } = string.Empty;
public string BodyPartForEdit { get; set; } = string.Empty;
public string ImageResizePath { get; set; } = string.Empty;
public string ImageResizePath { get; set; } = string.Empty;
}
}

View File

@ -1,67 +1,65 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SCPStudy")]
public class SCPStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{
[Table("SCPStudy")]
public class SCPStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{
#region 导航属性
[JsonIgnore]
public List<SCPInstance> InstanceList { get; set; }
#region 导航属性
[JsonIgnore]
public List<SCPInstance> InstanceList { get; set; }
[JsonIgnore]
public List<SCPSeries> SeriesList { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
public List<SCPSeries> SeriesList { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public TrialSite TrialSite { get; set; }
[JsonIgnore]
public TrialSite TrialSite { get; set; }
[ForeignKey("PatientId")]
[JsonIgnore]
public SCPPatient Patient { get; set; }
[ForeignKey("PatientId")]
[JsonIgnore]
public SCPPatient Patient { get; set; }
#endregion
public Guid SeqId { get; set; }
#endregion
public Guid SeqId { get; set; }
public Guid PatientId { get; set; }
public Guid PatientId { get; set; }
public string StudyInstanceUid { get; set; } = string.Empty;
public DateTime? StudyTime { get; set; }
public string Modalities { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public int SeriesCount { get; set; } = 0;
public int InstanceCount { get; set; } = 0;
public string StudyInstanceUid { get; set; } = string.Empty;
public DateTime? StudyTime { get; set; }
public string Modalities { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public int SeriesCount { get; set; } = 0;
public int InstanceCount { get; set; } = 0;
public string InstitutionName { get; set; } = string.Empty;
public string PatientIdStr { get; set; } = string.Empty;
public string PatientName { get; set; } = string.Empty;
public string PatientAge { get; set; } = string.Empty;
public string PatientSex { get; set; } = string.Empty;
public string InstitutionName { get; set; } = string.Empty;
public string PatientIdStr { get; set; } = string.Empty;
public string PatientName { get; set; } = string.Empty;
public string PatientAge { get; set; } = string.Empty;
public string PatientSex { get; set; } = string.Empty;
public string StudyId { get; set; } = string.Empty;
public string AccessionNumber { get; set; } = string.Empty;
public string PatientBirthDate { get; set; } = string.Empty;
public string AcquisitionTime { get; set; } = string.Empty;
public string AcquisitionNumber { get; set; } = string.Empty;
public string TriggerTime { get; set; } = string.Empty;
public string StudyId { get; set; } = string.Empty;
public string AccessionNumber { get; set; } = string.Empty;
public string PatientBirthDate { get; set; } = string.Empty;
public string AcquisitionTime { get; set; } = string.Empty;
public string AcquisitionNumber { get; set; } = string.Empty;
public string TriggerTime { get; set; } = string.Empty;
public string BodyPartExamined { get; set; } = string.Empty;
public string BodyPartExamined { get; set; } = string.Empty;
public string BodyPartForEdit { get; set; } = string.Empty;
public string BodyPartForEdit { get; set; } = string.Empty;
public string ModalityForEdit { get; set; } = string.Empty;
public string ModalityForEdit { get; set; } = string.Empty;
public string CallingAE { get; set; } = string.Empty;
public string CallingAE { get; set; } = string.Empty;
public string CalledAE { get; set; } = string.Empty;
public string CalledAE { get; set; } = string.Empty;
public bool IsUploadFinished { get; set; }
public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; }
public bool IsUploadFinished { get; set; }
public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; }
public Guid? SubjectVisitId { get; set; }
}
public Guid? SubjectVisitId { get; set; }
}

View File

@ -1,25 +1,21 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SystemAnonymization")]
public class SystemAnonymization : BaseFullAuditEntity
{
///<summary>
///SystemAnonymization
///</summary>
[Table("SystemAnonymization")]
public class SystemAnonymization : BaseFullAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
public string Group { get; set; } = String.Empty;
#endregion
public string Group { get; set; } = String.Empty;
public string Element { get; set; } = String.Empty;
public string TagDescription { get; set; } = String.Empty;
public string TagDescriptionCN { get; set; } = string.Empty;
public string ReplaceValue { get; set; } = String.Empty;
public string ValueRepresentation { get; set; } = String.Empty;
public bool IsAdd { get; set; }
public bool IsEnable { get; set; }
public bool IsFixed { get; set; }
}
public string Element { get; set; } = String.Empty;
public string TagDescription { get; set; } = String.Empty;
public string TagDescriptionCN { get; set; } = string.Empty;
public string ReplaceValue { get; set; } = String.Empty;
public string ValueRepresentation { get; set; } = String.Empty;
public bool IsAdd { get; set; }
public bool IsEnable { get; set; }
public bool IsFixed { get; set; }
}

View File

@ -1,47 +1,45 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class TaskInstance : BaseFullAuditEntity, IEntitySeqId
{
public class TaskInstance : BaseFullAuditEntity, IEntitySeqId
{
#region 导航属性
[JsonIgnore]
[ForeignKey("SeriesId")]
public TaskSeries TaskSeries { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("SeriesId")]
public TaskSeries TaskSeries { get; set; }
[JsonIgnore]
[ForeignKey("StudyId")]
public TaskStudy TaskStudy { get; set; }
#endregion
[JsonIgnore]
[ForeignKey("StudyId")]
public TaskStudy TaskStudy { get; set; }
#endregion
public Guid SeqId { get; set; }
public Guid StudyId { get; set; }
public Guid SeriesId { get; set; }
public string StudyInstanceUid { get; set; } = string.Empty;
public string SeriesInstanceUid { get; set; } = string.Empty;
public string SopInstanceUid { get; set; } = string.Empty;
public int InstanceNumber { get; set; }
public DateTime? InstanceTime { get; set; }
public bool CPIStatus { get; set; }
public int ImageRows { get; set; }
public int ImageColumns { get; set; }
public int SliceLocation { get; set; }
public string SliceThickness { get; set; } = string.Empty;
public int NumberOfFrames { get; set; }
public string PixelSpacing { get; set; } = string.Empty;
public Guid SeqId { get; set; }
public Guid StudyId { get; set; }
public Guid SeriesId { get; set; }
public string StudyInstanceUid { get; set; } = string.Empty;
public string SeriesInstanceUid { get; set; } = string.Empty;
public string SopInstanceUid { get; set; } = string.Empty;
public int InstanceNumber { get; set; }
public DateTime? InstanceTime { get; set; }
public bool CPIStatus { get; set; }
public int ImageRows { get; set; }
public int ImageColumns { get; set; }
public int SliceLocation { get; set; }
public string SliceThickness { get; set; } = string.Empty;
public int NumberOfFrames { get; set; }
public string PixelSpacing { get; set; } = string.Empty;
public string ImagerPixelSpacing { get; set; } = string.Empty;
public string FrameOfReferenceUID { get; set; } = string.Empty;
public string WindowCenter { get; set; } = string.Empty;
public string WindowWidth { get; set; } = string.Empty;
public string ImagerPixelSpacing { get; set; } = string.Empty;
public string FrameOfReferenceUID { get; set; } = string.Empty;
public string WindowCenter { get; set; } = string.Empty;
public string WindowWidth { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid VisitTaskId { get; set; }
public bool Anonymize { get; set; }
public string Path { get; set; } = string.Empty;
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid VisitTaskId { get; set; }
public bool Anonymize { get; set; }
public string Path { get; set; } = string.Empty;
public string HtmlPath { get; set; } = string.Empty;
public string HtmlPath { get; set; } = string.Empty;
public long? FileSize { get; set; }
public long? FileSize { get; set; }
}
}

View File

@ -1,42 +1,40 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId
{
public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId
{
#region 导航属性
[JsonIgnore]
[ForeignKey("StudyId")]
public TaskStudy TaskStudy { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("StudyId")]
public TaskStudy TaskStudy { get; set; }
[JsonIgnore]
public List<TaskInstance> InstanceList { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid VisitTaskId { get; set; }
public Guid SeqId { get; set; }
public Guid StudyId { get; set; }
public string StudyInstanceUid { get; set; } = String.Empty;
public string SeriesInstanceUid { get; set; } = String.Empty;
public int SeriesNumber { get; set; }
public DateTime? SeriesTime { get; set; }
public string Modality { get; set; } = String.Empty;
public string Description { get; set; } = String.Empty;
public int InstanceCount { get; set; }
public string SliceThickness { get; set; } = String.Empty;
[JsonIgnore]
public List<TaskInstance> InstanceList { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid VisitTaskId { get; set; }
public Guid SeqId { get; set; }
public Guid StudyId { get; set; }
public string StudyInstanceUid { get; set; } = String.Empty;
public string SeriesInstanceUid { get; set; } = String.Empty;
public int SeriesNumber { get; set; }
public DateTime? SeriesTime { get; set; }
public string Modality { get; set; } = String.Empty;
public string Description { get; set; } = String.Empty;
public int InstanceCount { get; set; }
public string SliceThickness { get; set; } = String.Empty;
public string ImagePositionPatient { get; set; } = String.Empty;
public string ImageOrientationPatient { get; set; } = String.Empty;
public string BodyPartExamined { get; set; } = String.Empty;
public string SequenceName { get; set; } = String.Empty;
public string ProtocolName { get; set; } = String.Empty;
public string ImagerPixelSpacing { get; set; } = String.Empty;
public string ImagePositionPatient { get; set; } = String.Empty;
public string ImageOrientationPatient { get; set; } = String.Empty;
public string BodyPartExamined { get; set; } = String.Empty;
public string SequenceName { get; set; } = String.Empty;
public string ProtocolName { get; set; } = String.Empty;
public string ImagerPixelSpacing { get; set; } = String.Empty;
public string AcquisitionTime { get; set; } = string.Empty;
public string AcquisitionNumber { get; set; } = string.Empty;
public string TriggerTime { get; set; } = string.Empty;
public string BodyPartForEdit { get; set; } = string.Empty;
public string AcquisitionTime { get; set; } = string.Empty;
public string AcquisitionNumber { get; set; } = string.Empty;
public string TriggerTime { get; set; } = string.Empty;
public string BodyPartForEdit { get; set; } = string.Empty;
public string ImageResizePath { get; set; } = string.Empty;
public string ImageResizePath { get; set; } = string.Empty;
}
}

View File

@ -1,58 +1,56 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{
public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{
#region 导航属性
[JsonIgnore]
[ForeignKey("VisitTaskId")]
public VisitTask VisitTask { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("VisitTaskId")]
public VisitTask VisitTask { get; set; }
[JsonIgnore]
public List<StudyMonitor> DicomStudyMonitorList { get; set; } = new List<StudyMonitor>();
[JsonIgnore]
public List<StudyMonitor> DicomStudyMonitorList { get; set; } = new List<StudyMonitor>();
[JsonIgnore]
public List<TaskInstance> InstanceList { get; set; }
[JsonIgnore]
public List<TaskInstance> InstanceList { get; set; }
[JsonIgnore]
public List<TaskSeries> SeriesList { get; set; }
[JsonIgnore]
public List<TaskSeries> SeriesList { get; set; }
[JsonIgnore]
[ForeignKey("SubjectId")]
public Subject Subject { get; set; }
#endregion
[JsonIgnore]
[ForeignKey("SubjectId")]
public Subject Subject { get; set; }
#endregion
public Guid SeqId { get; set; }
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid VisitTaskId { get; set; }
public int Code { get; set; } = 0;
public Guid SeqId { get; set; }
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid VisitTaskId { get; set; }
public int Code { get; set; } = 0;
public string StudyCode { get; set; } = string.Empty;
public string StudyCode { get; set; } = string.Empty;
public string StudyInstanceUid { get; set; } = string.Empty;
public DateTime? StudyTime { get; set; }
public string Modalities { get; set; } = string.Empty;
public string StudyInstanceUid { get; set; } = string.Empty;
public DateTime? StudyTime { get; set; }
public string Modalities { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public int SeriesCount { get; set; } = 0;
public int InstanceCount { get; set; } = 0;
public string InstitutionName { get; set; } = string.Empty;
public string PatientId { get; set; } = string.Empty;
public string PatientName { get; set; } = string.Empty;
public string PatientAge { get; set; } = string.Empty;
public string PatientSex { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public int SeriesCount { get; set; } = 0;
public int InstanceCount { get; set; } = 0;
public string InstitutionName { get; set; } = string.Empty;
public string PatientId { get; set; } = string.Empty;
public string PatientName { get; set; } = string.Empty;
public string PatientAge { get; set; } = string.Empty;
public string PatientSex { get; set; } = string.Empty;
public string StudyId { get; set; } = string.Empty;
public string AccessionNumber { get; set; } = string.Empty;
public string PatientBirthDate { get; set; } = string.Empty;
public string AcquisitionTime { get; set; } = string.Empty;
public string AcquisitionNumber { get; set; } = string.Empty;
public string TriggerTime { get; set; } = string.Empty;
public string StudyId { get; set; } = string.Empty;
public string AccessionNumber { get; set; } = string.Empty;
public string PatientBirthDate { get; set; } = string.Empty;
public string AcquisitionTime { get; set; } = string.Empty;
public string AcquisitionNumber { get; set; } = string.Empty;
public string TriggerTime { get; set; } = string.Empty;
public string BodyPartExamined { get; set; } = string.Empty;
public string BodyPartExamined { get; set; } = string.Empty;
public string BodyPartForEdit { get; set; } = string.Empty;
public string BodyPartForEdit { get; set; } = string.Empty;
public string ModalityForEdit { get; set; } = string.Empty;
}
public string ModalityForEdit { get; set; } = string.Empty;
}

View File

@ -1,25 +1,21 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TrialDicomAE")]
public class TrialDicomAE : BaseFullAuditEntity
{
///<summary>
///DicomAE
///</summary>
[Table("TrialDicomAE")]
public class TrialDicomAE : BaseFullAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
public Guid TrialId { get; set; }
public string CalledAE { get; set; } = string.Empty;
#endregion
public Guid TrialId { get; set; }
public string CalledAE { get; set; } = string.Empty;
public string IP { get; set; } = string.Empty;
public int Port { get; set; }
public string Modality { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public DateTime? LatestTestTime { get; set; }
public string IP { get; set; } = string.Empty;
public int Port { get; set; }
public string Modality { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public DateTime? LatestTestTime { get; set; }
public bool? IsTestOK { get; set; }
}
public bool? IsTestOK { get; set; }
}

View File

@ -1,44 +1,42 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TrialImageDownload")]
public class TrialImageDownload : BaseFullAuditEntity
{
[Table("TrialImageDownload")]
public class TrialImageDownload : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
#endregion
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public string SubjectCode { get; set; }
public string SubjectCode { get; set; }
public bool IsSuccess { get; set; }
public bool IsSuccess { get; set; }
public DateTime DownloadStartTime { get; set; }
public DateTime? DownloadEndTime { get; set; }
public DateTime DownloadStartTime { get; set; }
public DateTime? DownloadEndTime { get; set; }
public string VisitName { get; set; }
public string VisitName { get; set; }
public ImageType ImageType { get; set; }
public ImageType ImageType { get; set; }
public int NoneDicomStudyCount { get; set; }
public int NoneDicomStudyCount { get; set; }
public int DicomStudyCount { get; set; }
public int DicomStudyCount { get; set; }
public int ImageCount { get; set; }
public long ImageSize { get; set; }
public int ImageCount { get; set; }
public long ImageSize { get; set; }
public string IP { get; set; }
public string IP { get; set; }
}
public enum ImageType
{
Dicom = 1,
NoneDicom = 2,
DicomAndNoneDicom = 3
};
}
public enum ImageType
{
Dicom = 1,
NoneDicom = 2,
DicomAndNoneDicom = 3
};

View File

@ -16,7 +16,7 @@ public class CRO : BaseFullAuditEntity
[StringLength(1000)]
public string CRONameCN { get; set; } = null!;
[Comment(" 是否是项目级别")]
[Comment("是否是项目级别")]
public bool IsTrialLevel { get; set; }
public Guid? TrialId { get; set; }

View File

@ -1,30 +1,26 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("Hospital")]
public class Hospital : BaseFullAuditEntity
{
[Table("Hospital")]
public class Hospital : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("SiteId")]
public Site Site { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("SiteId")]
public Site Site { get; set; }
[JsonIgnore]
public List<Doctor> DoctorList { get; set; }
#endregion
public string HospitalName { get; set; } = string.Empty;
public string UniversityAffiliated { get; set; } = string.Empty;
public string Country { get; set; } = string.Empty;
public string Province { get; set; } = string.Empty;
public string City { get; set; } = string.Empty;
[JsonIgnore]
public List<Doctor> DoctorList { get; set; }
#endregion
public string HospitalName { get; set; } = string.Empty;
public string UniversityAffiliated { get; set; } = string.Empty;
public string Country { get; set; } = string.Empty;
public string Province { get; set; } = string.Empty;
public string City { get; set; } = string.Empty;
public string HospitalNameCN { get; set; } = string.Empty;
public string UniversityAffiliatedCN { get; set; } = string.Empty;
public string CountryCN { get; set; } = string.Empty;
public string ProvinceCN { get; set; } = string.Empty;
public string CityCN { get; set; } = string.Empty;
/// <summary>
/// 中心Id
/// </summary>
public Guid? SiteId { get; set; } = Guid.Empty;
}
public string HospitalNameCN { get; set; } = string.Empty;
public string UniversityAffiliatedCN { get; set; } = string.Empty;
public string CountryCN { get; set; } = string.Empty;
public string ProvinceCN { get; set; } = string.Empty;
public string CityCN { get; set; } = string.Empty;
[Comment("中心Id")]
public Guid? SiteId { get; set; } = Guid.Empty;
}

View File

@ -1,37 +1,35 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("Site")]
public partial class Site : BaseFullAuditEntity
{
[Table("Site")]
public partial class Site : BaseFullAuditEntity
{
#region µ¼º½ÊôÐÔ
[JsonIgnore]
[ForeignKey("HospitalId")]
public Hospital Hospital { get; set; }
[JsonIgnore]
public List<TrialSite> TrialSiteList { get; set; }
#endregion
#region µ¼º½ÊôÐÔ
[JsonIgnore]
[ForeignKey("HospitalId")]
public Hospital Hospital { get; set; }
[JsonIgnore]
public List<TrialSite> TrialSiteList { get; set; }
#endregion
public string SiteName { get; set; } = string.Empty;
public string SiteNameCN { get; set; } = string.Empty;
public string AliasName { get; set; } = string.Empty;
public string SiteCode { get; set; } = string.Empty;
public string SiteName { get; set; } = string.Empty;
public string SiteNameCN { get; set; } = string.Empty;
public string AliasName { get; set; } = string.Empty;
public string SiteCode { get; set; } = string.Empty;
public int Code { get; set; }
public int Code { get; set; }
public string City { get; set; } = string.Empty;
public string Country { get; set; } = string.Empty;
public Guid? HospitalId { get; set; }
public int State { get; set; }
public string City { get; set; } = string.Empty;
public string Country { get; set; } = string.Empty;
public Guid? HospitalId { get; set; }
public int State { get; set; }
public string Province { get; set; } = string.Empty;
public string Province { get; set; } = string.Empty;
public string UniqueCode { get; set; } = string.Empty;
public string UniqueCode { get; set; } = string.Empty;
public string Address { get; set; } = string.Empty;
public string Address { get; set; } = string.Empty;
public string DirectorName { get; set; } = string.Empty;
public string DirectorPhone { get; set; } = string.Empty;
public string ContactName { get; set; } = string.Empty;
public string ContactPhone { get; set; } = string.Empty;
}
public string DirectorName { get; set; } = string.Empty;
public string DirectorPhone { get; set; } = string.Empty;
public string ContactName { get; set; } = string.Empty;
public string ContactPhone { get; set; } = string.Empty;
}

View File

@ -1,17 +1,15 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("Sponsor")]
public partial class Sponsor : BaseFullAuditEntity
{
[Table("Sponsor")]
public partial class Sponsor : BaseFullAuditEntity
{
#region µ¼º½ÊôÐÔ
#region µ¼º½ÊôÐÔ
#endregion
public string SponsorName { get; set; } = String.Empty;
public string SponsorNameCN { get; set; } = String.Empty;
#endregion
public string SponsorName { get; set; } = String.Empty;
public string SponsorNameCN { get; set; } = String.Empty;
public string SponsorCode { get; set; } = String.Empty;
public string SponsorCode { get; set; } = String.Empty;
public bool IsTrialLevel { get; set; }
public Guid? TrialId { get; set; }
}
public bool IsTrialLevel { get; set; }
public Guid? TrialId { get; set; }
}

View File

@ -1,52 +1,50 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("Menu")]
public class Menu : BaseFullAuditEntity
{
[Table("Menu")]
public class Menu : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<UserTypeMenu> UserTypeMenuList { get; set; }
#endregion
//上级菜单
public Guid? ParentId { get; set; } = Guid.Empty;
#region 导航属性
[JsonIgnore]
public List<UserTypeMenu> UserTypeMenuList { get; set; }
#endregion
//上级菜单
public Guid? ParentId { get; set; } = Guid.Empty;
// 类型M目录 C菜单 F按钮 L链接
public string MenuType { get; set; } = string.Empty;
// 类型M目录 C菜单 F按钮 L链接
public string MenuType { get; set; } = string.Empty;
public string MenuIcon { get; set; } = string.Empty;
public string MenuIcon { get; set; } = string.Empty;
public string MenuName { get; set; } = string.Empty;
public string MenuName { get; set; } = string.Empty;
//路由地址
public string Path { get; set; } = string.Empty;
//路由地址
public string Path { get; set; } = string.Empty;
//组件路径
public string Component { get; set; } = string.Empty;
//组件路径
public string Component { get; set; } = string.Empty;
public int ShowOrder { get; set; }
public int ShowOrder { get; set; }
//启用 禁用
public bool IsEnable { get; set; } = true;
//启用 禁用
public bool IsEnable { get; set; } = true;
public bool IsCache { get; set; } = false;
public bool IsCache { get; set; } = false;
public bool IsDisplay { get; set; }
public bool IsDisplay { get; set; }
public bool IsInTabDisplay { get; set; }
public bool IsInTabDisplay { get; set; }
public bool IsExternalLink { get; set; }
public bool IsExternalLink { get; set; }
//权限点
public string PermissionStr { get; set; } = string.Empty;
//权限点
public string PermissionStr { get; set; } = string.Empty;
//Api 接口地址
public string ApiPath { get; set; } = string.Empty;
//Api 接口地址
public string ApiPath { get; set; } = string.Empty;
public string Note { get; set; } = string.Empty;
public string Note { get; set; } = string.Empty;
public string Meta { get; set; } = string.Empty;
public string Meta { get; set; } = string.Empty;
public string Redirect { get; set; } = string.Empty;
public string LanguageMark { get; set; } = string.Empty;
}
public string Redirect { get; set; } = string.Empty;
public string LanguageMark { get; set; } = string.Empty;
}

View File

@ -1,46 +1,42 @@
using IRaCIS.Core.Domain.Share.Management;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SystemNotice")]
public class SystemNotice : BaseFullAuditEntity
{
///<summary>
///SystemNotice
///</summary>
[Table("SystemNotice")]
public class SystemNotice : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public List<SystemNoticeUserType> NoticeUserTypeList { get; set; } = new List<SystemNoticeUserType>();
[JsonIgnore]
public List<SystemNoticeUserRead> NoticeUserReadList { get; set; } = new List<SystemNoticeUserRead>();
#region 导航属性
[JsonIgnore]
public List<SystemNoticeUserType> NoticeUserTypeList { get; set; } = new List<SystemNoticeUserType>();
[JsonIgnore]
public List<SystemNoticeUserRead> NoticeUserReadList { get; set; } = new List<SystemNoticeUserRead>();
#endregion
public string NoticeContent { get; set; } = string.Empty;
#endregion
public string NoticeContent { get; set; } = string.Empty;
public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; }
public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; }
public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; }
public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; }
public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; }
public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; }
public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; }
public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; }
public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; }
public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; }
public DateTime? StartDate { get; set; }
public DateTime? StartDate { get; set; }
public DateTime? EndDate { get; set; }
public DateTime? EndDate { get; set; }
public string FileName { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public string Path { get; set; } = string.Empty;
public string Path { get; set; } = string.Empty;
public Guid? PublishedUserId { get; set; }
public Guid? PublishedUserId { get; set; }
public User PublishedUser { get; set; }
public User PublishedUser { get; set; }
public DateTime? PublishedTime { get; set; }
}
public DateTime? PublishedTime { get; set; }
}

View File

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

View File

@ -1,21 +1,17 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SystemNoticeUserType")]
public class SystemNoticeUserType : BaseAddAuditEntity
{
///<summary>
///SystemNoticeUserType
///</summary>
[Table("SystemNoticeUserType")]
public class SystemNoticeUserType : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
#region 导航属性
[JsonIgnore]
[ForeignKey("UserTypeId")]
public UserType NoticeUserType { get; set; }
#endregion
public Guid SystemNoticeId { get; set; }
public Guid UserTypeId { get; set; }
}
[ForeignKey("UserTypeId")]
public UserType NoticeUserType { get; set; }
#endregion
public Guid SystemNoticeId { get; set; }
public Guid UserTypeId { get; set; }
}

View File

@ -1,17 +1,15 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("Role")]
public partial class Role : BaseFullAuditEntity
{
[Table("Role")]
public partial class Role : BaseFullAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
public string RoleName { get; set; } = string.Empty;
#endregion
public string RoleName { get; set; } = string.Empty;
public string RoleDescription { get; set; } = string.Empty;
public string RoleDescription { get; set; } = string.Empty;
public int Status { get; set; }
public int PrivilegeLevel { get; set; } //权限级别
public int Status { get; set; }
public int PrivilegeLevel { get; set; } //权限级别
}
}

View File

@ -26,7 +26,7 @@ public class User : BaseFullAuditEntity
#endregion
[Comment(" 自动切换下一个任务")]
[Comment("自动切换下一个任务")]
public bool AutoCutNextTask { get; set; }
public int Code { get; set; }
@ -34,7 +34,7 @@ public class User : BaseFullAuditEntity
[StringLength(400)]
public string DepartmentName { get; set; } = null!;
[Comment(" 医生生成账号后,会有值")]
[Comment("医生生成账号后,会有值")]
public Guid? DoctorId { get; set; }
public string EMail { get; set; } = null!;
@ -44,15 +44,15 @@ public class User : BaseFullAuditEntity
public string FirstName { get; set; } = null!;
[Comment(" 首次登录需要修改密码")]
[Comment("首次登录需要修改密码")]
public bool IsFirstAdd { get; set; } = true;
public bool IsTestUser { get; set; }
[Comment(" 内部用户 外部用户")]
[Comment("内部用户 外部用户")]
public bool IsZhiZhun { get; set; }
[Comment(" 上一次修改密码的时间")]
[Comment("上一次修改密码的时间")]
public DateTime? LastChangePassWordTime { get; set; }
public string LastLoginIP { get; set; } = null!;

View File

@ -1,37 +1,33 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("UserFeedBack")]
public class UserFeedBack : BaseFullAuditEntity
{
///<summary>
///UserFeedBack
///</summary>
[Table("UserFeedBack")]
public class UserFeedBack : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
public TrialSite TrialSite { get; set; }
[JsonIgnore]
public VisitTask VisitTask { get; set; }
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
public TrialSite TrialSite { get; set; }
[JsonIgnore]
public VisitTask VisitTask { get; set; }
[NotMapped]
public List<string> FeedBackScreenshotList => JsonConvert.DeserializeObject<List<string>>(ScreenshotListStr);
#endregion
public Guid? VisitTaskId { get; set; }
[NotMapped]
public List<string> FeedBackScreenshotList => JsonConvert.DeserializeObject<List<string>>(ScreenshotListStr);
#endregion
public Guid? VisitTaskId { get; set; }
public Guid? SubjectId { get; set; }
public Guid? SubjectVisitId { get; set; }
public int QuestionType { get; set; }
public Guid? SubjectId { get; set; }
public Guid? SubjectVisitId { get; set; }
public int QuestionType { get; set; }
public string QuestionDescription { get; set; } = string.Empty;
public int State { get; set; }
public Guid? TrialSiteId { get; set; }
public Guid? TrialId { get; set; }
public string QuestionDescription { get; set; } = string.Empty;
public int State { get; set; }
public Guid? TrialSiteId { get; set; }
public Guid? TrialId { get; set; }
public string ScreenshotListStr { get; set; } = string.Empty;
}
public string ScreenshotListStr { get; set; } = string.Empty;
}

View File

@ -1,76 +1,64 @@
namespace IRaCIS.Core.Domain.Models
using System.ComponentModel;
namespace IRaCIS.Core.Domain.Models;
[Table("UserLog")]
public class UserLog : BaseAddAuditEntity
{
///<summary>
///UserLog
///</summary>
[Table("UserLog")]
public class UserLog : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public User LoginUser { get; set; }
#region 导航属性
[JsonIgnore]
public User LoginUser { get; set; }
[JsonIgnore]
public User OptUser { get; set; }
#endregion
public string IP { get; set; } = string.Empty;
public string LoginFaildName { get; set; } = string.Empty;
public UserOptType OptType { get; set; }
public string LoginPassword { get; set; } = string.Empty;
public Guid? LoginUserId { get; set; }
[JsonIgnore]
public User OptUser { get; set; }
#endregion
public string IP { get; set; } = string.Empty;
public string LoginFaildName { get; set; } = string.Empty;
public UserOptType OptType { get; set; }
public string LoginPassword { get; set; } = string.Empty;
public Guid? LoginUserId { get; set; }
public Guid? OptUserId { get; set; }
public string IPRegion { get; set; } = string.Empty;
}
/// <summary>
/// 登录或者登出 锁定类型
/// </summary>
public enum UserOptType
{
/// <summary>
/// 用户登录
/// </summary>
Login = 1,
/// <summary>
/// 用户登出
/// </summary>
LoginOut = 2,
/// <summary>
///账号或者密码错误
/// </summary>
AccountOrPasswordError = 3,
/// <summary>
/// 账号锁定
/// </summary>
AccountLocked = 4,
//账号启用
AccountEnable = 5,
//登录锁定账户
LoginLockedAccount = 6,
//修改密码
LoginModifyPassword = 7,
UnloginModifyPasswoed = 8,
//admin 重置密码
ResetPassword = 9,
DeleteUser = 10,
UpdateUser = 11,
MFALogin = 12,
MFALoginFail = 13,
}
public Guid? OptUserId { get; set; }
public string IPRegion { get; set; } = string.Empty;
}
[Description("登录或者登出 锁定类型")]
public enum UserOptType
{
[Description("用户登录")]
Login = 1,
[Description("用户登出")]
LoginOut = 2,
[Description("账号或者密码错误")]
AccountOrPasswordError = 3,
[Description("账号锁定")]
AccountLocked = 4,
//账号启用
AccountEnable = 5,
//登录锁定账户
LoginLockedAccount = 6,
//修改密码
LoginModifyPassword = 7,
UnloginModifyPasswoed = 8,
//admin 重置密码
ResetPassword = 9,
DeleteUser = 10,
UpdateUser = 11,
MFALogin = 12,
MFALoginFail = 13,
}

View File

@ -1,23 +1,15 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("UserPassWordLog")]
public class UserPassWordLog : BaseAddAuditEntity
{
///<summary>
///UserPassWordLog
///</summary>
[Table("UserPassWordLog")]
public class UserPassWordLog : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
#endregion
/// <summary>
/// 用户Id
/// </summary>
public Guid UserId { get; set; }
[Comment("用户Id")]
public Guid UserId { get; set; }
/// <summary>
/// 密码
/// </summary>
public string PassWord { get; set; } = string.Empty;
}
[Comment("密码")]
public string PassWord { get; set; } = string.Empty;
}

View File

@ -1,32 +1,30 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class UserType : Entity
{
public class UserType : Entity
{
#region 导航属性
[JsonIgnore]
public List<UserTypeMenu> UserTypeMenuList { get; set; }
[JsonIgnore]
public List<UserTypeGroup> UserTypeGroupList { get; set; }
#region 导航属性
[JsonIgnore]
public List<UserTypeMenu> UserTypeMenuList { get; set; }
[JsonIgnore]
public List<UserTypeGroup> UserTypeGroupList { get; set; }
[JsonIgnore]
public List<SystemDocNeedConfirmedUserType> SystemDocNeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
public List<SystemDocNeedConfirmedUserType> SystemDocNeedConfirmedUserTypeList { get; set; }
[JsonIgnore]
public List<User> UserList { get; set; }
#endregion
public UserTypeEnum UserTypeEnum { get; set; }
[JsonIgnore]
public List<User> UserList { get; set; }
#endregion
public UserTypeEnum UserTypeEnum { get; set; }
public string UserTypeName { get; set; } = string.Empty;
public string UserTypeName { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;
public int Order { get; set; }
public int Order { get; set; }
public string UserTypeShortName { get; set; } = string.Empty;
public string UserTypeShortName { get; set; } = string.Empty;
public bool IsEnable { get; set; } = true;
public string PermissionStr { get; set; } = string.Empty;
}
public bool IsEnable { get; set; } = true;
public string PermissionStr { get; set; } = string.Empty;
}

View File

@ -1,22 +1,18 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("UserTypeGroup")]
public class UserTypeGroup : Entity
{
///<summary>
///UserTypeGroup
///</summary>
[Table("UserTypeGroup")]
public class UserTypeGroup : Entity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("DictionaryId")]
public Dictionary Group { get; set; }
[JsonIgnore]
[ForeignKey("UserTypeId")]
public UserType UserType { get; set; }
#endregion
public Guid UserTypeId { get; set; }
public Guid DictionaryId { get; set; }
}
#region 导航属性
[JsonIgnore]
[ForeignKey("DictionaryId")]
public Dictionary Group { get; set; }
[JsonIgnore]
[ForeignKey("UserTypeId")]
public UserType UserType { get; set; }
#endregion
public Guid UserTypeId { get; set; }
public Guid DictionaryId { get; set; }
}

View File

@ -1,18 +1,16 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("UserTypeMenu")]
public partial class UserTypeMenu : Entity
{
[Table("UserTypeMenu")]
public partial class UserTypeMenu : Entity
{
#region µ¼º½ÊôÐÔ
#region µ¼º½ÊôÐÔ
[JsonIgnore]
[ForeignKey("UserTypeId")]
public UserType UserType { get; set; }
[JsonIgnore]
public Menu Menu { get; set; }
#endregion
[JsonIgnore]
[ForeignKey("UserTypeId")]
public UserType UserType { get; set; }
[JsonIgnore]
public Menu Menu { get; set; }
#endregion
public Guid UserTypeId { get; set; }
public Guid MenuId { get; set; }
}
public Guid UserTypeId { get; set; }
public Guid MenuId { get; set; }
}

View File

@ -11,10 +11,10 @@ public class CheckChallengeDialog : BaseAddAuditEntity
public SubjectVisit SubjectVisit { get; set; }
#endregion
[Comment(" CRC是否需要回复 前端使用")]
[Comment("CRC是否需要回复 前端使用")]
public bool? IsCRCNeedReply { get; set; }
[Comment(" 核查的检查信息Json")]
[Comment("核查的检查信息Json")]
[MaxLength]
public string ParamInfo { get; set; } = null!;
@ -23,7 +23,7 @@ public class CheckChallengeDialog : BaseAddAuditEntity
[MaxLength]
public string TalkContent { get; set; } = null!;
[Comment(" 核查过程中的操作用户类型")]
[Comment("核查过程中的操作用户类型")]
public UserTypeEnum UserTypeEnum { get; set; }
}

View File

@ -1,25 +1,21 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("PreviousHistory")]
public class PreviousHistory : BaseAddAuditEntity
{
///<summary>
///PreviousHistory
///</summary>
[Table("PreviousHistory")]
public class PreviousHistory : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
#endregion
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
public int? IsPD { get; set; }
public Guid SubjectVisitId { get; set; }
public bool IsSubjectLevel { get; set; }
public string Path { get; set; } = String.Empty;
public string FileName { get; set; } = String.Empty;
public string Position { get; set; } = String.Empty;
public Guid ClinicalDataTrialSetId { get; set; }
}
#region 导航属性
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
#endregion
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
public int? IsPD { get; set; }
public Guid SubjectVisitId { get; set; }
public bool IsSubjectLevel { get; set; }
public string Path { get; set; } = String.Empty;
public string FileName { get; set; } = String.Empty;
public string Position { get; set; } = String.Empty;
public Guid ClinicalDataTrialSetId { get; set; }
}

View File

@ -1,33 +1,27 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("PreviousOther")]
public class PreviousOther : BaseAddAuditEntity
{
///<summary>
///PreviousOther
///</summary>
[Table("PreviousOther")]
public class PreviousOther : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
#endregion
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
#endregion
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
public bool IsPD { get; set; }
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
public bool IsPD { get; set; }
public Guid SubjectVisitId { get; set; }
public bool IsSubjectLevel { get; set; }
public string Path { get; set; } = String.Empty;
public string FileName { get; set; } = String.Empty;
public string TreatmentType { get; set; } = String.Empty;
public Guid SubjectVisitId { get; set; }
public bool IsSubjectLevel { get; set; }
public string Path { get; set; } = String.Empty;
public string FileName { get; set; } = String.Empty;
public string TreatmentType { get; set; } = String.Empty;
/// <summary>
/// 临床数据类型Id
/// </summary>
[Required]
public Guid ClinicalDataTrialSetId { get; set; }
}
[Comment("临床数据类型Id")]
[Required]
public Guid ClinicalDataTrialSetId { get; set; }
}

View File

@ -1,42 +1,32 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("PreviousPDF")]
public class PreviousPDF : BaseAddAuditEntity
{
///<summary>
///PreviousPDF
///</summary>
[Table("PreviousPDF")]
public class PreviousPDF : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
#region 导航属性
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
#endregion
public Guid SubjectVisitId { get; set; }
#endregion
public Guid SubjectVisitId { get; set; }
public string Path { get; set; } = string.Empty;
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public bool? IsVisist { get; set; }
public string FileName { get; set; } = string.Empty;
public bool? IsVisist { get; set; }
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel? ClinicalLevel { get; set; }
[Comment("临床级别")]
public ClinicalLevel? ClinicalLevel { get; set; }
/// <summary>
/// 数据类型
/// </summary>
public ClinicalDataType? DataType { get; set; }
[Comment("数据类型")]
public ClinicalDataType? DataType { get; set; }
/// <summary>
/// 上传方式
/// </summary>
public ClinicalUploadType? UploadType { get; set; }
[Comment("上传方式")]
public ClinicalUploadType? UploadType { get; set; }
public Guid? TrialId { get; set; }
public Guid? TrialId { get; set; }
public Guid? SubjectId { get; set; }
public Guid? SubjectId { get; set; }
}
}

View File

@ -1,31 +1,25 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("PreviousSurgery")]
public class PreviousSurgery : BaseAddAuditEntity
{
///<summary>
///PreviousSurgery
///</summary>
[Table("PreviousSurgery")]
public class PreviousSurgery : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
public DateTime? OperationTime { get; set; }
#endregion
public DateTime? OperationTime { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid SubjectVisitId { get; set; }
public bool IsSubjectLevel { get; set; }
public bool IsSubjectLevel { get; set; }
public string Path { get; set; } = String.Empty;
public string Path { get; set; } = String.Empty;
public string FileName { get; set; } = String.Empty;
public string FileName { get; set; } = String.Empty;
public string OperationName { get; set; } = String.Empty;
public string OperationName { get; set; } = String.Empty;
/// <summary>
/// 临床数据类型Id
/// </summary>
[Required]
public Guid ClinicalDataTrialSetId { get; set; }
}
[Comment("临床数据类型Id")]
[Required]
public Guid ClinicalDataTrialSetId { get; set; }
}

View File

@ -1,18 +1,14 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("一致性核查文件")]
[Table("InspectionFile")]
public class InspectionFile : BaseAddAuditEntity
{
///<summary>
/// 一致性核查文件
///</summary>
[Table("InspectionFile")]
public class InspectionFile : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
#endregion
#endregion
public string FileName { get; set; } = string.Empty;
public string RelativePath { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public string RelativePath { get; set; } = string.Empty;
public Guid TrialId { get; set; }
}
public Guid TrialId { get; set; }
}

View File

@ -1,57 +1,55 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class QCChallenge : BaseAddAuditEntity
{
public class QCChallenge : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("LatestReplyUserId")]
public User LatestReplyUser { get; set; }
[JsonIgnore]
//导航属性
[ForeignKey("SubjectVisitId")]
public SubjectVisit SubjectVisit { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("LatestReplyUserId")]
public User LatestReplyUser { get; set; }
[JsonIgnore]
//导航属性
[ForeignKey("SubjectVisitId")]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
public List<QCChallengeDialog> DialogList { get; set; } = new List<QCChallengeDialog>();
[JsonIgnore]
public List<QCChallengeDialog> DialogList { get; set; } = new List<QCChallengeDialog>();
#endregion
public Guid TrialId { get; set; }
public Guid SubjectVisitId { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid SubjectVisitId { get; set; }
public DateTime? DeadlineTime { get; set; }
public DateTime? DeadlineTime { get; set; }
public string Note { get; set; } = string.Empty;
public string Note { get; set; } = string.Empty;
public QCChanllengeReuploadEnum ReuploadEnum { get; set; }
public DateTime? ReUploadedTime { get; set; }
public QCChanllengeReuploadEnum ReuploadEnum { get; set; }
public DateTime? ReUploadedTime { get; set; }
public string ReUploader { get; set; } = string.Empty;
public string ReUploader { get; set; } = string.Empty;
public Guid? ReUploadUserId { get; set; }
public Guid? ReUploadUserId { get; set; }
public TrialQCProcess QCProcessEnum { get; set; }
public TrialQCProcess QCProcessEnum { get; set; }
public CurrentQC CurrentQCEnum { get; set; }
public CurrentQC CurrentQCEnum { get; set; }
public DateTime? LatestMsgTime { get; set; }
public Guid? LatestReplyUserId { get; set; }
public string ChallengeCode { get; set; } = string.Empty;
public DateTime? LatestMsgTime { get; set; }
public Guid? LatestReplyUserId { get; set; }
public string ChallengeCode { get; set; } = string.Empty;
public int Code { get; set; }
public bool IsClosed { get; set; }
public int Code { get; set; }
public bool IsClosed { get; set; }
public DateTime? ClosedTime { get; set; }
public DateTime? ClosedTime { get; set; }
public string ClosedUser { get; set; } = string.Empty;
public QCChallengeCloseEnum CloseResonEnum { get; set; }
public string ClosedUser { get; set; } = string.Empty;
public QCChallengeCloseEnum CloseResonEnum { get; set; }
public string Content { get; set; } = string.Empty;
public string Content { get; set; } = string.Empty;
public string ActionContent { get; set; } = string.Empty;
public string ActionContent { get; set; } = string.Empty;
public UserTypeEnum UserTypeEnum { get; set; }
public string ChallengeType { get; set; } = string.Empty;
}
public UserTypeEnum UserTypeEnum { get; set; }
public string ChallengeType { get; set; } = string.Empty;
}

View File

@ -1,20 +1,18 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
public class QCChallengeDialog : BaseAddAuditEntity
{
public class QCChallengeDialog : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
public QCChallenge QCChallenge { get; set; }
#endregion
#region 导航属性
[JsonIgnore]
public QCChallenge QCChallenge { get; set; }
#endregion
public string TalkContent { get; set; } = string.Empty;
public string TalkContent { get; set; } = string.Empty;
public Guid QCChallengeId { get; set; }
public Guid QCChallengeId { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid SubjectVisitId { get; set; }
public UserTypeEnum UserTypeEnum { get; set; }
}
public UserTypeEnum UserTypeEnum { get; set; }
}

View File

@ -1,33 +1,29 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("QCQuestion")]
public class QCQuestion : BaseFullAuditEntity
{
///<summary>
///QCQuestionConfigure
///</summary>
[Table("QCQuestion")]
public class QCQuestion : BaseFullAuditEntity
{
#region 导航属性
#region 导航属性
[JsonIgnore]
[ForeignKey("ParentId")]
public QCQuestion ParentQuestion { get; set; }
#endregion
[JsonIgnore]
[ForeignKey("ParentId")]
public QCQuestion ParentQuestion { get; set; }
#endregion
public string QuestionName { get; set; } = string.Empty;
/// <summary> 语言类型 </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; }
public string QuestionName { get; set; } = string.Empty;
/// <summary> 语言类型 </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; }
public bool IsEnable { get; set; }
public bool IsEnable { get; set; }
/// <summary> 下拉框、文本、单选、多选 </summary>
public string Type { get; set; } = string.Empty;
/// <summary> 下拉框、文本、单选、多选 </summary>
public string Type { get; set; } = string.Empty;
public string TypeValue { get; set; } = string.Empty;
public string TypeValue { get; set; } = string.Empty;
public string ParentTriggerValue { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public int ShowOrder { get; set; }
}
public string ParentTriggerValue { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public int ShowOrder { get; set; }
}

View File

@ -1,38 +1,34 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TrialQCQuestion")]
public class TrialQCQuestion : BaseFullAuditEntity
{
///<summary>
///TrialQCQuestionConfigure
///</summary>
[Table("TrialQCQuestion")]
public class TrialQCQuestion : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("ParentId")]
public TrialQCQuestion ParentQCQuestion { get; set; }
#region 导航属性
[JsonIgnore]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("ParentId")]
public TrialQCQuestion ParentQCQuestion { get; set; }
[JsonIgnore]
public List<TrialQCQuestionAnswer> TrialQCQuestionAnswerList { get; set; }
[JsonIgnore]
public List<TrialQCQuestionAnswer> TrialQCQuestionAnswerList { get; set; }
#endregion
public Guid TrialId { get; set; }
public string QuestionName { get; set; } = string.Empty;
/// <summary> 语言类型 </summary>
#endregion
public Guid TrialId { get; set; }
public string QuestionName { get; set; } = string.Empty;
/// <summary> 语言类型 </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; }
public bool IsEnable { get; set; }
public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
public bool IsRequired { get; set; }
public bool IsEnable { get; set; }
/// <summary> 下拉框、文本、单选、多选 </summary>
public string Type { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public string TypeValue { get; set; } = string.Empty;
public string ParentTriggerValue { get; set; } = string.Empty;
public int ShowOrder { get; set; }
/// <summary> 下拉框、文本、单选、多选 </summary>
public string Type { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public string TypeValue { get; set; } = string.Empty;
public string ParentTriggerValue { get; set; } = string.Empty;
public int ShowOrder { get; set; }
public bool? IsConfirm { get; set; }
}
public bool? IsConfirm { get; set; }
}

View File

@ -1,26 +1,22 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("TrialQCQuestionAnswer")]
public class TrialQCQuestionAnswer : BaseFullAuditEntity
{
///<summary>
///TrialQCQuestionRecord
///</summary>
[Table("TrialQCQuestionAnswer")]
public class TrialQCQuestionAnswer : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
public TrialQCQuestion TrialQCQuestionConfigure { get; set; }
#endregion
public Guid TrialId { get; set; }
#region 导航属性
[JsonIgnore]
public TrialQCQuestion TrialQCQuestionConfigure { get; set; }
#endregion
public Guid TrialId { get; set; }
public string Answer { get; set; } = string.Empty;
public string Answer { get; set; } = string.Empty;
public TrialQCProcess QCProcessEnum { get; set; }
public TrialQCProcess QCProcessEnum { get; set; }
// 1代表第一个人QC数据 2 代表第二个人QC数据
public CurrentQC CurrentQCEnum { get; set; }
// 1代表第一个人QC数据 2 代表第二个人QC数据
public CurrentQC CurrentQCEnum { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid TrialQCQuestionConfigureId { get; set; }
}
public Guid SubjectVisitId { get; set; }
public Guid TrialQCQuestionConfigureId { get; set; }
}

View File

@ -1,51 +1,39 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SubjectAdditionalEvaluationResult")]
public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity
{
///<summary>
///SubjectAdditionalEvaluationResult
///</summary>
[Table("SubjectAdditionalEvaluationResult")]
public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialReadingQuestionId")]
public ReadingQuestionTrial TrialReadingQuestion { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialReadingQuestionId")]
public ReadingQuestionTrial TrialReadingQuestion { get; set; }
#endregion
public Guid TrialReadingQuestionId { get; set; }
#endregion
public Guid TrialReadingQuestionId { get; set; }
public Guid SubjectId { get; set; }
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid? VisitTaskId { get; set; }
public Guid? VisitTaskId { get; set; }
public string Answer { get; set; } = string.Empty;
public string Answer { get; set; } = string.Empty;
/// <summary>
/// 附加评估答案翻译字典
/// </summary>
[Comment("附加评估答案翻译字典")]
public string TranslateDictionaryCode { get; set; } = string.Empty;
public string TranslateDictionaryCode { get; set; } = string.Empty;
/// <summary>
/// 是否是最终结果
/// </summary>
[Comment("是否是最终结果")]
public bool IsFinalResult { get; set; }
public bool IsFinalResult { get; set; }
/// <summary>
/// 最终结果
/// </summary>
[Comment("最终结果")]
public string FinalAnswer { get; set; } = string.Empty;
public string FinalAnswer { get; set; } = string.Empty;
/// <summary>
/// 最终结果翻字典
/// </summary>
[Comment("最终结果翻字典")]
public string FinalTranslateDictionaryCode { get; set; } = string.Empty;
}
public string FinalTranslateDictionaryCode { get; set; } = string.Empty;
}

View File

@ -1,29 +1,23 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SubjectCriteriaEvaluation")]
public class SubjectCriteriaEvaluation : BaseFullAuditEntity
{
///<summary>
///SubjectCriteriaEvaluation
///</summary>
[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<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilterList { get; set; }
#endregion
public Guid SubjectId { get; set; }
[JsonIgnore]
public List<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilterList { get; set; }
#endregion
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
/// <summary>
/// 是否参与评估
/// </summary>
public bool IsJoinEvaluation { get; set; }
}
[Comment("是否参与评估")]
public bool IsJoinEvaluation { get; set; }
}

View File

@ -1,66 +1,54 @@
namespace IRaCIS.Core.Domain.Models
using System.ComponentModel;
namespace IRaCIS.Core.Domain.Models;
[Table("SubjectCriteriaEvaluationVisitFilter")]
public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity
{
///<summary>
///SubjectCriteriaEvaluationVisitFilter
///</summary>
[Table("SubjectCriteriaEvaluationVisitFilter")]
public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[JsonIgnore]
public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[JsonIgnore]
public SubjectCriteriaEvaluation SubjectCriteriaEvaluation { get; set; }
[JsonIgnore]
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
#endregion
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectVisitId { get; set; }
public SubjectVisit SubjectVisit { get; set; }
#endregion
public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectVisitId { get; set; }
/// <summary>
/// 影像筛选状态
/// </summary>
public ImageFilterState ImageFilterState { get; set; }
[Comment("影像筛选状态")]
public ImageFilterState ImageFilterState { get; set; }
/// <summary>
/// 影像判断结果
/// </summary>
public ImageDeterminationResultState ImageDeterminationResultState { get; set; }
[Comment("影像判断结果")]
public ImageDeterminationResultState ImageDeterminationResultState { get; set; }
/// <summary>
/// 是否已生成任务
/// </summary>
public bool IsGeneratedTask { get; set; }
}
/// <summary>
/// 影像确认结果
/// </summary>
public enum ImageDeterminationResultState
{
//待定
None = 0,
//通过
Passed = 1,
}
/// <summary>
/// 影像筛选状态
/// </summary>
public enum ImageFilterState
{
//默认值 待筛选
None = 0,
Filtering = 1,
//筛选已完成
Finished = 2
}
[Comment("是否已生成任务")]
public bool IsGeneratedTask { get; set; }
}
[Description("影像确认结果")]
public enum ImageDeterminationResultState
{
//待定
None = 0,
//通过
Passed = 1,
}
[Description("影像筛选状态")]
public enum ImageFilterState
{
//默认值 待筛选
None = 0,
Filtering = 1,
//筛选已完成
Finished = 2
}

View File

@ -1,35 +1,31 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Table("SubjectCriteriaEvaluationVisitStudyFilter")]
public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity
{
///<summary>
///SubjectCriteriaEvaluationVisitStudyFilter
///</summary>
[Table("SubjectCriteriaEvaluationVisitStudyFilter")]
public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
#region 导航属性
[JsonIgnore]
[ForeignKey("TrialReadingCriterionId")]
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
public SubjectVisit SubjectVisit { get; set; }
[ForeignKey("SeriesId")]
[JsonIgnore]
public DicomSeries Series { get; set; }
[ForeignKey("StudyId")]
[JsonIgnore]
public DicomStudy Study { get; set; }
#endregion
public Guid TrialReadingCriterionId { get; set; }
[ForeignKey("SeriesId")]
[JsonIgnore]
public DicomSeries Series { get; set; }
[ForeignKey("StudyId")]
[JsonIgnore]
public DicomStudy Study { get; set; }
#endregion
public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid StudyId { get; set; }
public Guid SubjectVisitId { get; set; }
public Guid StudyId { get; set; }
public Guid SeriesId { get; set; }
public bool IsConfirmed { get; set; }
public bool IsReading { get; set; }
}
public Guid SeriesId { get; set; }
public bool IsConfirmed { get; set; }
public bool IsReading { get; set; }
}

View File

@ -18,7 +18,7 @@ public class ClinicalDataSystemSet : BaseAddAuditEntity
[StringLength(400)]
public string ClinicalDataSetEnName { get; set; } = null!;
[Comment(" 枚举(字典里面取的)")]
[Comment("枚举(字典里面取的)")]
public int ClinicalDataSetEnum { get; set; }
public string ClinicalDataSetName { get; set; } = null!;

View File

@ -1,83 +1,65 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目的临床数据")]
[Table("ReadingClinicalData")]
public class ReadingClinicalData : BaseAddAuditEntity
{
///<summary>
/// 项目的临床数据
///</summary>
[Table("ReadingClinicalData")]
public class ReadingClinicalData : BaseAddAuditEntity
{
#region 导航属性
#region 导航属性
[JsonIgnore]
[ForeignKey("ClinicalDataTrialSetId")]
[JsonIgnore]
[ForeignKey("ClinicalDataTrialSetId")]
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
[JsonIgnore]
[ForeignKey("StudyId")]
public DicomStudy DicomStudy { get; set; }
[JsonIgnore]
[ForeignKey("StudyId")]
public DicomStudy DicomStudy { get; set; }
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("ReadingId")]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
[ForeignKey("ReadingId")]
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
[ForeignKey("SubjectId")]
public Subject Subject { get; set; }
[JsonIgnore]
[ForeignKey("SubjectId")]
public Subject Subject { get; set; }
[JsonIgnore]
[ForeignKey("ReadingId")]
[JsonIgnore]
[ForeignKey("ReadingId")]
public ReadModule ReadModule { get; set; }
public ReadModule ReadModule { get; set; }
/// <summary>
/// PDF文件
/// </summary>
[JsonIgnore]
public List<ReadingClinicalDataPDF> ReadingClinicalDataPDFList { get; set; }
#endregion
[Comment("PDF文件")]
[JsonIgnore]
public List<ReadingClinicalDataPDF> ReadingClinicalDataPDFList { get; set; }
#endregion
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
/// <summary>
/// 访视Id 或者模块Id
/// </summary>
public Guid ReadingId { get; set; }
[Comment("访视Id 或者模块Id")]
public Guid ReadingId { get; set; }
public Guid? StudyId { get; set; }
public Guid SubjectId { get; set; }
public Guid? StudyId { get; set; }
public Guid SubjectId { get; set; }
/// <summary>
/// 临床数据类型Id
/// </summary>
public Guid ClinicalDataTrialSetId { get; set; }
[Comment("临床数据类型Id")]
public Guid ClinicalDataTrialSetId { get; set; }
/// <summary>
/// 是否为访视
/// </summary>xiu
public bool IsVisit { get; set; }
/// <summary>
/// 是否签名
/// </summary>
public bool IsSign { get; set; }
[Comment("是否为访视")]
public bool IsVisit { get; set; }
[Comment("是否签名")]
public bool IsSign { get; set; }
/// <summary>
/// 是否盲化
/// </summary>
public bool? IsBlind { get; set; }
[Comment("是否盲化")]
public bool? IsBlind { get; set; }
/// <summary>
/// 是否完整
/// </summary>
public bool? IsComplete { get; set; }
public int FileCount { get; set; }
//临床数据状态
public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
}
[Comment("是否完整")]
public bool? IsComplete { get; set; }
public int FileCount { get; set; }
//临床数据状态
public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
}

View File

@ -1,26 +1,20 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("项目的临床数据")]
[Table("ReadingClinicalDataPDF")]
public class ReadingClinicalDataPDF : BaseAddAuditEntity
{
///<summary>
/// 项目的临床数据
///</summary>
[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
/// <summary>
/// 阅片临床数据ID
/// </summary>
public Guid ReadingClinicalDataId { get; set; }
[Comment("阅片临床数据ID")]
public Guid ReadingClinicalDataId { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public int Size { get; set; } = 0;
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public int Size { get; set; } = 0;
public string Type { get; set; } = string.Empty;
}
public string Type { get; set; } = string.Empty;
}

View File

@ -1,91 +1,69 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("一致性分析临床数据")]
[Table("ReadingConsistentClinicalData")]
public class ReadingConsistentClinicalData : BaseAddAuditEntity
{
///<summary>
/// 一致性分析临床数据
///</summary>
[Table("ReadingConsistentClinicalData")]
public class ReadingConsistentClinicalData : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("ClinicalDataTrialSetId")]
#region 导航属性
[JsonIgnore]
[ForeignKey("ClinicalDataTrialSetId")]
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
[JsonIgnore]
[ForeignKey("StudyId")]
public DicomStudy DicomStudy { get; set; }
[JsonIgnore]
[ForeignKey("StudyId")]
public DicomStudy DicomStudy { get; set; }
[JsonIgnore]
[ForeignKey("TrialId")]
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("ReadingId")]
[JsonIgnore]
[ForeignKey("ReadingId")]
public SubjectVisit SubjectVisit { get; set; }
public SubjectVisit SubjectVisit { get; set; }
[JsonIgnore]
[ForeignKey("SubjectId")]
[JsonIgnore]
[ForeignKey("SubjectId")]
public Subject Subject { get; set; }
public Subject Subject { get; set; }
[JsonIgnore]
[ForeignKey("ReadingId")]
[JsonIgnore]
[ForeignKey("ReadingId")]
public ReadModule ReadModule { get; set; }
public ReadModule ReadModule { get; set; }
/// <summary>
/// PDF文件
/// </summary>
[JsonIgnore]
public List<ReadingConsistentClinicalDataPDF> ReadingClinicalDataPDFList { get; set; }
#endregion
/// <summary>
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
[Comment("PDF文件")]
[JsonIgnore]
public List<ReadingConsistentClinicalDataPDF> ReadingClinicalDataPDFList { get; set; }
#endregion
[Comment("项目ID")]
public Guid TrialId { get; set; }
/// <summary>
/// 访视Id 或者模块Id
/// </summary>
public Guid ReadingId { get; set; }
[Comment("访视Id 或者模块Id")]
public Guid ReadingId { get; set; }
public Guid? StudyId { get; set; }
public Guid? StudyId { get; set; }
/// <summary>
/// 受试者ID
/// </summary>
public Guid SubjectId { get; set; }
[Comment("受试者ID")]
public Guid SubjectId { get; set; }
/// <summary>
/// 临床数据类型Id
/// </summary>
public Guid ClinicalDataTrialSetId { get; set; }
[Comment("临床数据类型Id")]
public Guid ClinicalDataTrialSetId { get; set; }
/// <summary>
/// 是否为访视
/// </summary>xiu
public bool IsVisit { get; set; }
/// <summary>
/// 是否签名
/// </summary>
public bool IsSign { get; set; }
[Comment("是否为访视")]
public bool IsVisit { get; set; }
[Comment("是否签名")]
public bool IsSign { get; set; }
/// <summary>
/// 是否盲化
/// </summary>
public bool? IsBlind { get; set; } = false;
[Comment("是否盲化")]
public bool? IsBlind { get; set; } = false;
/// <summary>
/// 是否完整
/// </summary>
public bool? IsComplete { get; set; } = true;
public int FileCount { get; set; }
//临床数据状态
public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
}
[Comment("是否完整")]
public bool? IsComplete { get; set; } = true;
public int FileCount { get; set; }
//临床数据状态
public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
}

View File

@ -1,30 +1,22 @@
namespace IRaCIS.Core.Domain.Models
namespace IRaCIS.Core.Domain.Models;
[Comment("一致性分析临床数据")]
[Table("ReadingConsistentClinicalDataPDF")]
public class ReadingConsistentClinicalDataPDF : BaseAddAuditEntity
{
///<summary>
/// 一致性分析临床数据
///</summary>
[Table("ReadingConsistentClinicalDataPDF")]
public class ReadingConsistentClinicalDataPDF : BaseAddAuditEntity
{
#region 导航属性
[JsonIgnore]
[ForeignKey("ReadingConsistentClinicalDataId")]
public ReadingConsistentClinicalData ReadingConsistentClinicalData { get; set; }
#endregion
#region 导航属性
[JsonIgnore]
[ForeignKey("ReadingConsistentClinicalDataId")]
public ReadingConsistentClinicalData ReadingConsistentClinicalData { get; set; }
#endregion
/// <summary>
/// 阅片临床数据ID
/// </summary>
public Guid ReadingConsistentClinicalDataId { get; set; }
[Comment("阅片临床数据ID")]
public Guid ReadingConsistentClinicalDataId { get; set; }
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public string Path { get; set; } = string.Empty;
public string FileName { get; set; } = string.Empty;
public int Size { get; set; } = 0;
public int Size { get; set; } = 0;
/// <summary>
/// 文件类型
/// </summary>
public string Type { get; set; } = string.Empty;
}
[Comment("文件类型")]
public string Type { get; set; } = string.Empty;
}

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