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

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

IRC_NewDev
hang 2024-09-20 18:20:37 +08:00
parent d3e3ed79ba
commit 40c8a51a31
174 changed files with 5006 additions and 6652 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
View File

@ -207,11 +207,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<User, TrialExternalUser>().ReverseMap(); 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) CreateMap<TrialExternalUser, TrialInfoWithPreparationInfo>().IncludeMembers(t => t.Trial)

4
IRaCIS.Core.Domain/Allocation/SubjectUser.cs
View File

@ -1,8 +1,7 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using System.ComponentModel; using System.ComponentModel;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Description("受试者某标准阅片用户中间关系表")] [Description("受试者某标准阅片用户中间关系表")]
[Table("SubjectUser")] [Table("SubjectUser")]
@ -44,4 +43,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid? ReplacedSubjectUserId { get; set; } public Guid? ReplacedSubjectUserId { get; set; }
} }
}

8
IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs
View File

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///TaskAllocationRule
///</summary>
[Table("TaskAllocationRule")] [Table("TaskAllocationRule")]
public class TaskAllocationRule : BaseFullAuditEntity public class TaskAllocationRule : BaseFullAuditEntity
{ {
@ -36,4 +33,3 @@ namespace IRaCIS.Core.Domain.Models
public int PlanReadingRatio { get; set; } public int PlanReadingRatio { get; set; }
} }
}

8
IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs
View File

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///TaskConsistentRule
///</summary>
[Table("TaskConsistentRule")] [Table("TaskConsistentRule")]
public class TaskConsistentRule : BaseFullAuditEntity public class TaskConsistentRule : BaseFullAuditEntity
{ {
@ -40,4 +37,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialReadingCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///TaskInfluence
///</summary>
[Table("TaskInfluence")] [Table("TaskInfluence")]
public class TaskInfluence : BaseAddAuditEntity public class TaskInfluence : BaseAddAuditEntity
{ {
@ -36,4 +33,3 @@ namespace IRaCIS.Core.Domain.Models
} }
}

84
IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs
View File

@ -1,17 +1,14 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using System.Linq; 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; public string ImagePath { get; set; } = string.Empty;
} }
///<summary>
///TaskMedicalReview
///</summary>
[Table("TaskMedicalReview")] [Table("TaskMedicalReview")]
public class TaskMedicalReview : BaseFullAuditEntity public class TaskMedicalReview : BaseFullAuditEntity
{ {
@ -32,9 +29,7 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore] [JsonIgnore]
public Trial Trial { get; set; } public Trial Trial { get; set; }
/// <summary> [Comment("文件")]
/// 文件
/// </summary>
[NotMapped] [NotMapped]
public List<OSSImageInfo> FileList public List<OSSImageInfo> FileList
{ {
@ -60,93 +55,57 @@ namespace IRaCIS.Core.Domain.Models
#endregion #endregion
public Guid? LatestReplyUserId { get; set; } public Guid? LatestReplyUserId { get; set; }
/// <summary> [Comment("分配时间")]
/// 分配时间
/// </summary>
public DateTime? AllocateTime { get; set; } public DateTime? AllocateTime { get; set; }
/// <summary> [Comment("审核状态")]
/// 审核状态
/// </summary>
[Required] [Required]
public MedicalReviewAuditState AuditState { get; set; } public MedicalReviewAuditState AuditState { get; set; }
/// <summary> [Comment("审核通过时间")]
/// 审核通过时间
/// </summary>
public DateTime? AuditSignTime { get; set; } public DateTime? AuditSignTime { get; set; }
/// <summary> [Comment("阅片人是否认同")]
/// 阅片人是否认同
/// </summary>
public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; }
public Guid? MedicalManagerUserId { get; set; } public Guid? MedicalManagerUserId { get; set; }
public Guid VisitTaskId { get; set; } public Guid VisitTaskId { get; set; }
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
/// <summary> [Comment("是否有问题")]
/// 是否有问题
/// </summary>
public bool IsHaveQuestion { get; set; } = false; public bool IsHaveQuestion { get; set; } = false;
/// <summary> [Comment("质询问题")]
/// 质询问题
/// </summary>
public string Questioning { get; set; } = string.Empty; public string Questioning { get; set; } = string.Empty;
/// <summary> [Comment("图片路径")]
/// 图片路径
/// </summary>
public string ImagePath { get; set; } = string.Empty; public string ImagePath { get; set; } = string.Empty;
/// <summary> [Comment("审核建议")]
/// 审核建议
/// </summary>
public AuditAdvice AuditAdviceEnum { get; set; } public AuditAdvice AuditAdviceEnum { get; set; }
/// <summary> [Comment("是否关闭对话")]
/// 是否关闭对话
/// </summary>
public bool IsClosedDialog { get; set; } public bool IsClosedDialog { get; set; }
/// <summary> [Comment("保存问题的时间")]
/// 保存问题的时间
/// </summary>
public DateTime? SaveQuestionTime { get; set; } public DateTime? SaveQuestionTime { get; set; }
/// <summary> [Comment("不同意重阅原因")]
/// 不同意重阅原因
/// </summary>
public string DisagreeReason { get; set; } = string.Empty; public string DisagreeReason { get; set; } = string.Empty;
/// <summary> [Comment("是否申请重阅")]
/// 是否申请重阅
/// </summary>
public bool IsApplyHeavyReading { get; set; } = false; public bool IsApplyHeavyReading { get; set; } = false;
/// <summary> [Comment("保存结论时间")]
/// 保存结论时间
/// </summary>
public DateTime? SaveConclusionTime { get; set; } public DateTime? SaveConclusionTime { get; set; }
/// <summary> [Comment("文件名称")]
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty; public string FileName { get; set; } = string.Empty;
/// <summary> [Comment("是否发送消息")]
/// 是否发送消息
/// </summary>
public bool IsSendMessage { get; set; } = false; public bool IsSendMessage { get; set; } = false;
/// <summary> [Comment("医学审核对话关闭原因")]
/// 医学审核对话关闭原因
/// </summary>
public MedicalDialogClose MedicalDialogCloseEnum { get; set; } public MedicalDialogClose MedicalDialogCloseEnum { get; set; }
/// <summary> [Comment("对话关闭原因")]
/// 对话关闭原因
/// </summary>
public string DialogCloseReason { get; set; } = string.Empty; public string DialogCloseReason { get; set; } = string.Empty;
/// <summary> [Comment("无效的 为True无效")]
/// 无效的 为True无效
/// </summary>
public bool IsInvalid { get; set; } public bool IsInvalid { get; set; }
public bool IsAutoGenerate { get; set; } public bool IsAutoGenerate { get; set; }
@ -154,4 +113,3 @@ namespace IRaCIS.Core.Domain.Models
// | 分割 // | 分割
public string PDRelationTaskIdListStr { get; set; } = string.Empty; public string PDRelationTaskIdListStr { get; set; } = string.Empty;
} }
}

8
IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs
View File

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///TaskTaskMedicalReviewRule
///</summary>
[Table("TaskMedicalReviewRule")] [Table("TaskMedicalReviewRule")]
public class TaskMedicalReviewRule : BaseFullAuditEntity public class TaskMedicalReviewRule : BaseFullAuditEntity
{ {
@ -31,4 +28,3 @@ namespace IRaCIS.Core.Domain.Models
public User DoctorUser { get; set; } public User DoctorUser { get; set; }
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///TrialVirtualSiteCodeUpdate
///</summary>
[Table("TrialVirtualSiteCodeUpdate")] [Table("TrialVirtualSiteCodeUpdate")]
public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
{ {
@ -14,4 +11,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public string VirturalSiteCode { get; set; } = string.Empty; public string VirturalSiteCode { get; set; } = string.Empty;
} }
}

136
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -2,11 +2,8 @@ using EntityFrameworkCore.Projectables;
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using System.Linq; using System.Linq;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///VisitTask
///</summary>
[Table("VisitTask")] [Table("VisitTask")]
public class VisitTask : BaseFullAuditEntity public class VisitTask : BaseFullAuditEntity
{ {
@ -53,9 +50,7 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore] [JsonIgnore]
//对于全局任务而言 才可以用的 关联的访视阅片结果 //对于全局任务而言 才可以用的 关联的访视阅片结果
public List<ReadingGlobalTaskInfo> GlobalVisitResultList { get; set; } = new List<ReadingGlobalTaskInfo>(); public List<ReadingGlobalTaskInfo> GlobalVisitResultList { get; set; } = new List<ReadingGlobalTaskInfo>();
/// <summary> [Comment("裁判结果图片地址")]
/// 裁判结果图片地址
/// </summary>
[NotMapped] [NotMapped]
public List<string> JudgeResultImagePathList public List<string> JudgeResultImagePathList
{ {
@ -80,9 +75,7 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore] [JsonIgnore]
public List<UserFeedBack> UserFeedBackList { get; set; } public List<UserFeedBack> UserFeedBackList { get; set; }
/// <summary> [Comment("关联的访视任务ID (当前任务是访视任务的话会有自己)集合")]
/// 关联的访视任务ID (当前任务是访视任务的话会有自己)集合
/// </summary>
[NotMapped] [NotMapped]
public List<Guid> RelatedVisitTaskIdList public List<Guid> RelatedVisitTaskIdList
{ {
@ -102,9 +95,7 @@ namespace IRaCIS.Core.Domain.Models
} }
} }
/// <summary> [Comment("报告任务关系 包含冻结")]
/// 报告任务关系 包含冻结
/// </summary>
[NotMapped] [NotMapped]
public List<Guid> ReportRelatedTaskIdList public List<Guid> ReportRelatedTaskIdList
{ {
@ -124,9 +115,7 @@ namespace IRaCIS.Core.Domain.Models
} }
} }
/// <summary> [Comment("既往任务Id 不包括自己集合")]
/// 既往任务Id 不包括自己集合
/// </summary>
[NotMapped] [NotMapped]
public List<Guid> PastResultTaskIdList public List<Guid> PastResultTaskIdList
{ {
@ -157,9 +146,7 @@ namespace IRaCIS.Core.Domain.Models
public ReadingCategory ReadingCategory { get; set; } public ReadingCategory ReadingCategory { get; set; }
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
/// <summary> [Comment("分配时间")]
/// 分配时间
/// </summary>
public DateTime? AllocateTime { get; set; } public DateTime? AllocateTime { get; set; }
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
@ -169,35 +156,23 @@ namespace IRaCIS.Core.Domain.Models
public bool IsUrgent { get; set; } public bool IsUrgent { get; set; }
/// <summary> [Comment("加急类型")]
/// 加急类型
/// </summary>
public TaskUrgentType? TaskUrgentType { get; set; } public TaskUrgentType? TaskUrgentType { get; set; }
/// <summary> [Comment("任务加急类型")]
/// 任务加急类型
/// </summary>
public string TaskUrgentRemake { get; set; } = string.Empty; public string TaskUrgentRemake { get; set; } = string.Empty;
/// <summary> [Comment("是否和编辑加急状态")]
/// 是否和编辑加急状态
/// </summary>
public bool IsCanEditUrgentState { get; set; } = true; public bool IsCanEditUrgentState { get; set; } = true;
/// <summary> [Comment("0 代表 单重阅片 产生的任务 否则就是双重 任务 1 任务 2")]
/// 0 代表 单重阅片 产生的任务 否则就是双重 任务 1 任务 2
/// </summary>
[Required] [Required]
public Arm ArmEnum { get; set; } public Arm ArmEnum { get; set; }
/// <summary> [Comment("分配状态")]
/// 分配状态
/// </summary>
public TaskAllocationState TaskAllocationState { get; set; } public TaskAllocationState TaskAllocationState { get; set; }
public TaskState TaskState { get; set; } public TaskState TaskState { get; set; }
/// <summary> [Comment("重阅状态")]
/// 重阅状态
/// </summary>
public ReReadingApplyState ReReadingApplyState { get; set; } public ReReadingApplyState ReReadingApplyState { get; set; }
public Guid? DoctorUserId { get; set; } public Guid? DoctorUserId { get; set; }
@ -212,47 +187,31 @@ namespace IRaCIS.Core.Domain.Models
public DateTime? SignTime { get; set; } public DateTime? SignTime { get; set; }
public DateTime? SuggesteFinishedTime { get; set; } public DateTime? SuggesteFinishedTime { get; set; }
/// <summary> [Comment("是否是重阅产生的，方便过滤数据")]
/// 是否是重阅产生的，方便过滤数据
/// </summary>
public bool IsReReadingCreate { get; set; } public bool IsReReadingCreate { get; set; }
/// <summary> [Comment("PM 对该任务进行了回退 影响的任务不设置")]
/// PM 对该任务进行了回退 影响的任务不设置
/// </summary>
public bool IsPMSetBack { get; set; } public bool IsPMSetBack { get; set; }
/// <summary> 裁判结果的任务ID </summary> /// <summary> 裁判结果的任务ID </summary>
public Guid? JudgeResultTaskId { get; set; } public Guid? JudgeResultTaskId { get; set; }
//随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定 //随访任务号 取访视的号 计划外是 访视+0.1 裁判任务在访视任务上+0.002 全局任务在截止访视号上+0.03 肿瘤待定
public decimal VisitTaskNum { get; set; } public decimal VisitTaskNum { get; set; }
/// <summary> [Comment("首次阅片时间")]
/// 首次阅片时间
/// </summary>
public DateTime? FirstReadingTime { get; set; } public DateTime? FirstReadingTime { get; set; }
/// <summary> [Comment("全局是否有更新")]
/// 全局是否有更新
/// </summary>
public bool? IsGlobalHaveUpdate { get; set; } public bool? IsGlobalHaveUpdate { get; set; }
/// <summary> [Comment("IR是否阅读临床数据")]
/// IR是否阅读临床数据
/// </summary>
public bool IsReadClinicalData { get; set; } = false; public bool IsReadClinicalData { get; set; } = false;
/// <summary> [Comment("关联的访视任务ID (当前任务是访视任务的话会有自己)")]
/// 关联的访视任务ID (当前任务是访视任务的话会有自己)
/// </summary>
public string RelatedVisitTaskIds { get; set; } = "[]"; public string RelatedVisitTaskIds { get; set; } = "[]";
/// <summary> [Comment("报告任务关系 包含冻结")]
/// 报告任务关系 包含冻结
/// </summary>
public string ReportRelatedTaskIds { get; set; } = "[]"; public string ReportRelatedTaskIds { get; set; } = "[]";
/// <summary> [Comment("既往任务Id 不包括自己")]
/// 既往任务Id 不包括自己
/// </summary>
public string PastResultTaskIds { get; set; } = "[]"; public string PastResultTaskIds { get; set; } = "[]";
#region 裁判任务特有 #region 裁判任务特有
@ -261,40 +220,26 @@ namespace IRaCIS.Core.Domain.Models
//对于裁判任务而言，触发裁判的列表 //对于裁判任务而言，触发裁判的列表
public List<VisitTask> JudgeVisitList { get; set; } public List<VisitTask> JudgeVisitList { get; set; }
/// <summary> [Comment("裁判结果的备注")]
/// 裁判结果的备注
/// </summary>
public string JudgeResultRemark { get; set; } = string.Empty; public string JudgeResultRemark { get; set; } = string.Empty;
/// <summary> [Comment("裁判结果的图片路径")]
/// 裁判结果的图片路径
/// </summary>
public string JudgeResultImagePath { get; set; } = string.Empty; public string JudgeResultImagePath { get; set; } = string.Empty;
#endregion #endregion
#region 一致性分析的任务特有数据 #region 一致性分析的任务特有数据
/// <summary> [Comment("阅片结果是否和原数据有差异")]
/// 阅片结果是否和原数据有差异
/// </summary>
public bool? IsAnalysisDiffToOriginalData { get; set; } public bool? IsAnalysisDiffToOriginalData { get; set; }
/// <summary> [Comment("组件一致性和原Arm1是否有差异")]
/// 组件一致性和原Arm1是否有差异
/// </summary>
public bool? IsGroupDiffArm1 { get; set; } public bool? IsGroupDiffArm1 { get; set; }
/// <summary> [Comment("组件一致性和原Arm2是否有差异")]
/// 组件一致性和原Arm2是否有差异
/// </summary>
public bool? IsGroupDiffArm2 { get; set; } public bool? IsGroupDiffArm2 { get; set; }
/// <summary> [Comment("是否是一致性分析产生")]
/// 是否是一致性分析产生
/// </summary>
public bool IsAnalysisCreate { get; set; } public bool IsAnalysisCreate { get; set; }
/// <summary> [Comment("转换之前的任务Id(转化的任务才有该值)")]
/// 转换之前的任务Id(转化的任务才有该值)
/// </summary>
public Guid? BeforeConvertedTaskId { get; set; } public Guid? BeforeConvertedTaskId { get; set; }
[Projectable] [Projectable]
[JsonIgnore] [JsonIgnore]
@ -305,18 +250,12 @@ namespace IRaCIS.Core.Domain.Models
&& t.IsSelfAnalysis == IsSelfAnalysis && t.IsSelfAnalysis == IsSelfAnalysis
&& t.ArmEnum == ArmEnum && t.ArmEnum == ArmEnum
).Any(); ).Any();
/// <summary> [Comment("是否修改了整体肿瘤评估")]
/// 是否修改了整体肿瘤评估
/// </summary>
public bool IsChangeTumorEvaluate { get; set; } = false; public bool IsChangeTumorEvaluate { get; set; } = false;
/// <summary> [Comment("重阅重置任务的 标注是转化之前的 还是转化之后的")]
/// 重阅重置任务的 标注是转化之前的 还是转化之后的
/// </summary>
public bool IsHistoryConvertedTask { get; set; } = false; public bool IsHistoryConvertedTask { get; set; } = false;
/// <summary> [Comment("是否是自身一致性")]
/// 是否是自身一致性
/// </summary>
public bool? IsSelfAnalysis { get; set; } public bool? IsSelfAnalysis { get; set; }
public string BlindSubjectCode { get; set; } = string.Empty; public string BlindSubjectCode { get; set; } = string.Empty;
@ -325,9 +264,7 @@ namespace IRaCIS.Core.Domain.Models
//一致性分析规则Id 用于最后统计 //一致性分析规则Id 用于最后统计
//public Guid? TaskConsistentRuleId { get; set; } //public Guid? TaskConsistentRuleId { get; set; }
/// <summary> [Comment("针对产生的一致性任务而言，这个字段存储的是原始任务")]
/// 针对产生的一致性任务而言，这个字段存储的是原始任务
/// </summary>
public Guid? ConsistentAnalysisOriginalTaskId { get; set; } public Guid? ConsistentAnalysisOriginalTaskId { get; set; }
#endregion #endregion
@ -335,15 +272,10 @@ namespace IRaCIS.Core.Domain.Models
public bool IsNeedClinicalDataSign { get; set; } public bool IsNeedClinicalDataSign { get; set; }
/// <summary> [Comment("临床数据是否签名")]
/// 临床数据是否签名
/// </summary>
public bool IsClinicalDataSign { get; set; } public bool IsClinicalDataSign { get; set; }
/// <summary> [Comment("前序任务需要签名 但是未签名")]
/// 前序任务需要签名 但是未签名
/// </summary>
public bool IsFrontTaskNeedSignButNotSign { get; set; } public bool IsFrontTaskNeedSignButNotSign { get; set; }
public int ImageStudyState { get; set; } public int ImageStudyState { get; set; }
} }
}

8
IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs
View File

@ -1,10 +1,7 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{ [Comment("重阅申请流程记录表")]
///<summary>
///重阅申请流程记录表
///</summary>
[Table("VisitTaskReReading")] [Table("VisitTaskReReading")]
public class VisitTaskReReading : BaseFullAuditEntity public class VisitTaskReReading : BaseFullAuditEntity
{ {
@ -54,4 +51,3 @@ namespace IRaCIS.Core.Domain.Models
public bool IsCopyFollowForms { get; set; } public bool IsCopyFollowForms { get; set; }
} }
}

10
IRaCIS.Core.Domain/BaseModel/DomainEvent.cs
View File

@ -1,8 +1,7 @@
namespace IRaCIS.Core.Domain.BaseModel using System.ComponentModel;
{
/// <summary> namespace IRaCIS.Core.Domain.BaseModel;
/// 领域实体事件基类 [Description("领域实体事件基类")]
/// </summary>
public abstract class DomainEvent public abstract class DomainEvent
{ {
@ -15,4 +14,3 @@
public string EventData { get; set; } = string.Empty; public string EventData { get; set; } = string.Empty;
public DateTime FailedAt { get; set; } public DateTime FailedAt { get; set; }
} }
}

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

@ -1,7 +1,6 @@
using IRaCIS.Core.Domain.BaseModel; using IRaCIS.Core.Domain.BaseModel;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
public interface IAggregateRoot; public interface IAggregateRoot;
public interface IEntity<TKey> public interface IEntity<TKey>
{ {
@ -104,4 +103,3 @@ namespace IRaCIS.Core.Domain.Models
} }
#endregion #endregion
}

4
IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs
View File

@ -1,5 +1,4 @@
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; }
@ -16,4 +15,3 @@
{ {
public string CreateUser { get; set; } public string CreateUser { get; set; }
} }
}

4
IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs
View File

@ -1,5 +1,4 @@
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 TKey UpdateUserId { get; set; }
@ -10,4 +9,3 @@
{ {
} }
}

4
IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
public interface ISoftDelete<TKey> where TKey : struct public interface ISoftDelete<TKey> where TKey : struct
{ {
public TKey? DeleteUserId { get; set; } public TKey? DeleteUserId { get; set; }
@ -12,4 +11,3 @@
{ {
} }
}

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

@ -50,7 +50,7 @@ public class FrontAuditConfig : BaseFullAuditEntity
[Comment("枚举字典Type")] [Comment("枚举字典Type")]
public string DictionaryType { get; set; } = null!; public string DictionaryType { get; set; } = null!;
[Comment(" 后端翻译的类型 对应前端界面 &quot;&quot; Dictionary Date")] [Comment("后端翻译的类型 对应前端界面 Dictionary Date")]
public string EnumType { get; set; } = null!; public string EnumType { get; set; } = null!;
[StringLength(1000)] [StringLength(1000)]

12
IRaCIS.Core.Domain/Common/Internationalization.cs
View File

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///Internationalization
///</summary>
[Table("Internationalization")] [Table("Internationalization")]
public class Internationalization : BaseFullAuditEntity public class Internationalization : BaseFullAuditEntity
{ {
@ -13,9 +10,7 @@ namespace IRaCIS.Core.Domain.Models
#endregion #endregion
public int ShowOrder { get; set; } public int ShowOrder { get; set; }
/// <summary> [Comment("0 1 2 预翻译 已确认 废除")]
/// 0 1 2 预翻译 已确认 废除
/// </summary>
public int State { get; set; } public int State { get; set; }
public string Description { get; set; } = string.Empty; public string Description { get; set; } = string.Empty;
@ -33,4 +28,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid? PublishLogId { get; set; } public Guid? PublishLogId { get; set; }
} }
}

8
IRaCIS.Core.Domain/Common/PublishLog.cs
View File

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///PublishLog
///</summary>
[Table("PublishLog")] [Table("PublishLog")]
public class PublishLog : BaseFullAuditEntity public class PublishLog : BaseFullAuditEntity
{ {
@ -19,4 +16,3 @@ namespace IRaCIS.Core.Domain.Models
} }
}

8
IRaCIS.Core.Domain/Common/SystemBasicData.cs
View File

@ -1,9 +1,6 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///SystemBasicData
///</summary>
[Table("SystemBasicData")] [Table("SystemBasicData")]
public class SystemBasicData : BaseFullAuditEntity public class SystemBasicData : BaseFullAuditEntity
{ {
@ -32,4 +29,3 @@ namespace IRaCIS.Core.Domain.Models
public BasicDataTypeEnum BasicDataTypeEnum { get; set; } public BasicDataTypeEnum BasicDataTypeEnum { get; set; }
} }
}

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

@ -1,7 +1,6 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("VerificationCode")] [Table("VerificationCode")]
public class VerificationCode : BaseAddAuditEntity public class VerificationCode : BaseAddAuditEntity
{ {
@ -24,4 +23,3 @@ namespace IRaCIS.Core.Domain.Models
public DateTime ExpirationTime { get; set; } public DateTime ExpirationTime { get; set; }
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///EnrollReadingCriterion
///</summary>
[Table("EnrollReadingCriterion")] [Table("EnrollReadingCriterion")]
public class EnrollReadingCriterion : BaseAddAuditEntity public class EnrollReadingCriterion : BaseAddAuditEntity
{ {
@ -18,4 +15,3 @@ namespace IRaCIS.Core.Domain.Models
public bool IsJoinAnalysis { get; set; } public bool IsJoinAnalysis { get; set; }
} }
}

4
IRaCIS.Core.Domain/Dcotor/Postgraduate.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("Postgraduate")] [Table("Postgraduate")]
public partial class Postgraduate : BaseFullAuditEntity public partial class Postgraduate : BaseFullAuditEntity
{ {
@ -55,4 +54,3 @@ namespace IRaCIS.Core.Domain.Models
[StringLength(100)] [StringLength(100)]
public string CityCN { get; set; } = string.Empty; public string CityCN { get; set; } = string.Empty;
} }
}

4
IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("ResearchPublication")] [Table("ResearchPublication")]
public partial class ResearchPublication : BaseFullAuditEntity public partial class ResearchPublication : BaseFullAuditEntity
{ {
@ -17,4 +16,3 @@ namespace IRaCIS.Core.Domain.Models
public string PublicationsCN { get; set; } = string.Empty; public string PublicationsCN { get; set; } = string.Empty;
public string AwardsHonorsCN { get; set; } = string.Empty; public string AwardsHonorsCN { get; set; } = string.Empty;
} }
}

4
IRaCIS.Core.Domain/Dcotor/TrialExperience.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("TrialExperience")] [Table("TrialExperience")]
public partial class TrialExperience : BaseFullAuditEntity public partial class TrialExperience : BaseFullAuditEntity
{ {
@ -22,4 +21,3 @@ namespace IRaCIS.Core.Domain.Models
public DateTime? EndTime { get; set; } public DateTime? EndTime { get; set; }
} }
}

4
IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
public class TrialExperienceCriteria : Entity public class TrialExperienceCriteria : Entity
{ {
#region 导航属性 #region 导航属性
@ -11,4 +10,3 @@
public Guid TrialExperienceId { get; set; } public Guid TrialExperienceId { get; set; }
public Guid EvaluationCriteriaId { get; set; } public Guid EvaluationCriteriaId { get; set; }
} }
}

4
IRaCIS.Core.Domain/Dcotor/Vacation.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("Vacation")] [Table("Vacation")]
public class Vacation : BaseFullAuditEntity public class Vacation : BaseFullAuditEntity
{ {
@ -12,4 +11,3 @@
public int Status { get; set; } = 1; public int Status { get; set; } = 1;
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///SystemDocConfirmedUser
///</summary>
[Table("SystemDocConfirmedUser")] [Table("SystemDocConfirmedUser")]
public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity
@ -25,4 +22,3 @@ namespace IRaCIS.Core.Domain.Models
public string SignText { get; set; } = string.Empty; public string SignText { get; set; } = string.Empty;
} }
}

8
IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs
View File

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///SystemDocNeedConfirmedUserType
///</summary>
[Table("SystemDocNeedConfirmedUserType")] [Table("SystemDocNeedConfirmedUserType")]
public class SystemDocNeedConfirmedUserType : Entity public class SystemDocNeedConfirmedUserType : Entity
{ {
@ -20,4 +17,3 @@ namespace IRaCIS.Core.Domain.Models
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///SystemDocument
///</summary>
[Table("SystemDocument")] [Table("SystemDocument")]
public class SystemDocument : BaseFullDeleteAuditEntity public class SystemDocument : BaseFullDeleteAuditEntity
{ {
@ -22,4 +19,3 @@ namespace IRaCIS.Core.Domain.Models
public string Path { get; set; } = string.Empty; public string Path { get; set; } = string.Empty;
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///TrialDocUserTypeConfirmUser
///</summary>
[Table("TrialDocConfirmedUser")] [Table("TrialDocConfirmedUser")]
public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity
{ {
@ -20,4 +17,3 @@ namespace IRaCIS.Core.Domain.Models
public DateTime? SignFirstViewTime { get; set; } public DateTime? SignFirstViewTime { get; set; }
public string SignText { get; set; } = string.Empty; public string SignText { get; set; } = string.Empty;
} }
}

8
IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs
View File

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///TrialDocumentUserConfirm
///</summary>
[Table("TrialDocNeedConfirmedUserType")] [Table("TrialDocNeedConfirmedUserType")]
public class TrialDocNeedConfirmedUserType : Entity public class TrialDocNeedConfirmedUserType : Entity
{ {
@ -20,4 +17,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid NeedConfirmUserTypeId { get; set; } public Guid NeedConfirmUserTypeId { get; set; }
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///TrialDocument
///</summary>
[Table("TrialDocument")] [Table("TrialDocument")]
public class TrialDocument : BaseFullDeleteAuditEntity public class TrialDocument : BaseFullDeleteAuditEntity
{ {
@ -32,4 +29,3 @@ namespace IRaCIS.Core.Domain.Models
public int SignViewMinimumMinutes { get; set; } public int SignViewMinimumMinutes { get; set; }
} }
}

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

@ -1,9 +1,6 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///TrialEmailNoticeUser
///</summary>
[Table("TrialEmailNoticeUser")] [Table("TrialEmailNoticeUser")]
public class TrialEmailNoticeUser : Entity public class TrialEmailNoticeUser : Entity
{ {
@ -18,4 +15,3 @@ namespace IRaCIS.Core.Domain.Models
public EmailUserType EmailUserType { get; set; } public EmailUserType EmailUserType { get; set; }
} }
}

4
IRaCIS.Core.Domain/Financial/CalculateTask.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("CalculateTask")] [Table("CalculateTask")]
public class CalculateTask : Entity public class CalculateTask : Entity
{ {
@ -9,4 +8,3 @@
public string YearMonth { get; set; } = string.Empty; public string YearMonth { get; set; } = string.Empty;
public bool IsLock { get; set; } public bool IsLock { get; set; }
} }
}

4
IRaCIS.Core.Domain/Financial/ExchangeRate.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("ExchangeRate")] [Table("ExchangeRate")]
public class ExchangeRate : BaseFullAuditEntity public class ExchangeRate : BaseFullAuditEntity
{ {
@ -9,4 +8,3 @@
public decimal Rate { get; set; } public decimal Rate { get; set; }
} }
}

4
IRaCIS.Core.Domain/Financial/Payment.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("Payment")] [Table("Payment")]
public partial class Payment : BaseFullAuditEntity public partial class Payment : BaseFullAuditEntity
@ -30,4 +29,3 @@ namespace IRaCIS.Core.Domain.Models
[StringLength(500)] [StringLength(500)]
public string Note { get; set; } = string.Empty; public string Note { get; set; } = string.Empty;
} }
}

4
IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("PaymentAdjustment")] [Table("PaymentAdjustment")]
public partial class PaymentAdjustment : BaseFullAuditEntity public partial class PaymentAdjustment : BaseFullAuditEntity
{ {
@ -21,4 +20,3 @@ namespace IRaCIS.Core.Domain.Models
public string Note { get; set; } = string.Empty; public string Note { get; set; } = string.Empty;
} }
}

4
IRaCIS.Core.Domain/Financial/PaymentDetail.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("PaymentDetail")] [Table("PaymentDetail")]
public partial class PaymentDetail : BaseFullAuditEntity public partial class PaymentDetail : BaseFullAuditEntity
{ {
@ -37,4 +36,3 @@ namespace IRaCIS.Core.Domain.Models
public int ShowCodeOrder { get; set; } public int ShowCodeOrder { get; set; }
} }
}

4
IRaCIS.Core.Domain/Financial/RankPrice.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("RankPrice")] [Table("RankPrice")]
public partial class RankPrice : BaseFullAuditEntity public partial class RankPrice : BaseFullAuditEntity
{ {
@ -37,4 +36,3 @@ namespace IRaCIS.Core.Domain.Models
public decimal RefresherTraining { get; set; } public decimal RefresherTraining { get; set; }
public int ShowOrder { get; set; } public int ShowOrder { get; set; }
} }
}

8
IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("TrialPaymentPrice")] [Table("TrialPaymentPrice")]
public partial class TrialPaymentPrice : BaseFullAuditEntity public partial class TrialPaymentPrice : BaseFullAuditEntity
{ {
@ -16,9 +15,6 @@ namespace IRaCIS.Core.Domain.Models
[DecimalPrecision(18, 2)] [DecimalPrecision(18, 2)]
public decimal AdjustmentMultiple { get; set; } = 1; public decimal AdjustmentMultiple { get; set; } = 1;
/// <summary> [Comment("是否有 为新项目")]
/// 是否有 为新项目
/// </summary>
public bool? IsNewTrial { get; set; } = false; public bool? IsNewTrial { get; set; } = false;
} }
}

4
IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("TrialRevenuesPrice")] [Table("TrialRevenuesPrice")]
public class TrialRevenuesPrice : BaseFullAuditEntity public class TrialRevenuesPrice : BaseFullAuditEntity
{ {
@ -36,4 +35,3 @@
public decimal RefresherTraining { get; set; } public decimal RefresherTraining { get; set; }
} }
}

4
IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs
View File

@ -1,5 +1,4 @@
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; }
@ -28,4 +27,3 @@
public bool RefresherTraining { get; set; } = false; public bool RefresherTraining { get; set; } = false;
public DateTime WorkLoadDate { get; set; } public DateTime WorkLoadDate { get; set; }
} }
}

4
IRaCIS.Core.Domain/Financial/VolumeReward.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("VolumeReward")] [Table("VolumeReward")]
public partial class VolumeReward : BaseFullAuditEntity public partial class VolumeReward : BaseFullAuditEntity
{ {
@ -9,4 +8,3 @@ namespace IRaCIS.Core.Domain.Models
public int Max { get; set; } public int Max { get; set; }
} }
}

2
IRaCIS.Core.Domain/GlobalUsings.cs
View File

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

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
public class ImageShare : Entity public class ImageShare : Entity
{ {
#region 导航属性 #region 导航属性
@ -14,4 +13,3 @@
public string Password { get; set; } = string.Empty; public string Password { get; set; } = string.Empty;
} }
}

8
IRaCIS.Core.Domain/Image/NoneDicomStudy.cs
View File

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///NoneDicomStudy
///</summary>
[Table("NoneDicomStudy")] [Table("NoneDicomStudy")]
public class NoneDicomStudy : BaseFullAuditEntity public class NoneDicomStudy : BaseFullAuditEntity
{ {
@ -43,4 +40,3 @@ namespace IRaCIS.Core.Domain.Models
} }
}

8
IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("NoneDicomStudyFile")] [Table("NoneDicomStudyFile")]
public class NoneDicomStudyFile : BaseAddAuditEntity public class NoneDicomStudyFile : BaseAddAuditEntity
@ -25,11 +24,8 @@ namespace IRaCIS.Core.Domain.Models
#region 跟任务绑定 同时区分检查 #region 跟任务绑定 同时区分检查
public Guid? VisitTaskId { get; set; } public Guid? VisitTaskId { get; set; }
/// <summary> [Comment("为了不影响原始检查，跟任务绑定的 NoneDicomStudyId 为guid空 这个字段记录跟原始检查绑")]
/// 为了不影响原始检查，跟任务绑定的 NoneDicomStudyId 为guid空 这个字段记录跟原始检查绑
/// </summary>
public Guid? OriginNoneDicomStudyId { get; set; } public Guid? OriginNoneDicomStudyId { get; set; }
#endregion #endregion
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///SCPImageUpload
///</summary>
[Table("SCPImageUpload")] [Table("SCPImageUpload")]
public class SCPImageUpload : BaseAddAuditEntity public class SCPImageUpload : BaseAddAuditEntity
{ {
@ -24,4 +21,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; } public Guid TrialSiteId { get; set; }
} }
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("SCPInstance")] [Table("SCPInstance")]
public class SCPInstance : BaseFullAuditEntity, IEntitySeqId public class SCPInstance : BaseFullAuditEntity, IEntitySeqId
{ {
@ -38,4 +37,3 @@
public long? FileSize { get; set; } public long? FileSize { get; set; }
} }
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("SCPPatient")] [Table("SCPPatient")]
public class SCPPatient : BaseFullAuditEntity public class SCPPatient : BaseFullAuditEntity
{ {
@ -28,4 +27,3 @@
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public Guid TrialSiteId { get; set; } public Guid TrialSiteId { get; set; }
} }
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("SCPSeries")] [Table("SCPSeries")]
public class SCPSeries : BaseFullDeleteAuditEntity, IEntitySeqId public class SCPSeries : BaseFullDeleteAuditEntity, IEntitySeqId
{ {
@ -38,4 +37,3 @@
public string ImageResizePath { get; set; } = string.Empty; public string ImageResizePath { get; set; } = string.Empty;
} }
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("SCPStudy")] [Table("SCPStudy")]
public class SCPStudy : BaseFullDeleteAuditEntity, IEntitySeqId public class SCPStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{ {
@ -64,4 +63,3 @@
public Guid? SubjectVisitId { get; set; } public Guid? SubjectVisitId { get; set; }
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///SystemAnonymization
///</summary>
[Table("SystemAnonymization")] [Table("SystemAnonymization")]
public class SystemAnonymization : BaseFullAuditEntity public class SystemAnonymization : BaseFullAuditEntity
{ {
@ -22,4 +19,3 @@ namespace IRaCIS.Core.Domain.Models
public bool IsFixed { get; set; } public bool IsFixed { get; set; }
} }
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
public class TaskInstance : BaseFullAuditEntity, IEntitySeqId public class TaskInstance : BaseFullAuditEntity, IEntitySeqId
{ {
#region 导航属性 #region 导航属性
@ -44,4 +43,3 @@
public long? FileSize { get; set; } public long? FileSize { get; set; }
} }
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId
{ {
#region 导航属性 #region 导航属性
@ -39,4 +38,3 @@
public string ImageResizePath { get; set; } = string.Empty; public string ImageResizePath { get; set; } = string.Empty;
} }
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId
{ {
#region 导航属性 #region 导航属性
@ -55,4 +54,3 @@
public string ModalityForEdit { get; set; } = string.Empty; public string ModalityForEdit { get; set; } = string.Empty;
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///DicomAE
///</summary>
[Table("TrialDicomAE")] [Table("TrialDicomAE")]
public class TrialDicomAE : BaseFullAuditEntity public class TrialDicomAE : BaseFullAuditEntity
{ {
@ -22,4 +19,3 @@ namespace IRaCIS.Core.Domain.Models
} }
}

4
IRaCIS.Core.Domain/Image/TrialImageDownload.cs
View File

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("TrialImageDownload")] [Table("TrialImageDownload")]
public class TrialImageDownload : BaseFullAuditEntity public class TrialImageDownload : BaseFullAuditEntity
{ {
@ -41,4 +40,3 @@
DicomAndNoneDicom = 3 DicomAndNoneDicom = 3
}; };
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("Hospital")] [Table("Hospital")]
public class Hospital : BaseFullAuditEntity public class Hospital : BaseFullAuditEntity
{ {
@ -22,9 +21,6 @@
public string CountryCN { get; set; } = string.Empty; public string CountryCN { get; set; } = string.Empty;
public string ProvinceCN { get; set; } = string.Empty; public string ProvinceCN { get; set; } = string.Empty;
public string CityCN { get; set; } = string.Empty; public string CityCN { get; set; } = string.Empty;
/// <summary> [Comment("中心Id")]
/// 中心Id
/// </summary>
public Guid? SiteId { get; set; } = Guid.Empty; public Guid? SiteId { get; set; } = Guid.Empty;
} }
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("Site")] [Table("Site")]
public partial class Site : BaseFullAuditEntity public partial class Site : BaseFullAuditEntity
{ {
@ -34,4 +33,3 @@ namespace IRaCIS.Core.Domain.Models
public string ContactName { get; set; } = string.Empty; public string ContactName { get; set; } = string.Empty;
public string ContactPhone { get; set; } = string.Empty; public string ContactPhone { get; set; } = string.Empty;
} }
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("Sponsor")] [Table("Sponsor")]
public partial class Sponsor : BaseFullAuditEntity public partial class Sponsor : BaseFullAuditEntity
{ {
@ -14,4 +13,3 @@ namespace IRaCIS.Core.Domain.Models
public bool IsTrialLevel { get; set; } public bool IsTrialLevel { get; set; }
public Guid? TrialId { get; set; } public Guid? TrialId { get; set; }
} }
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("Menu")] [Table("Menu")]
public class Menu : BaseFullAuditEntity public class Menu : BaseFullAuditEntity
{ {
@ -49,4 +48,3 @@
public string Redirect { get; set; } = string.Empty; public string Redirect { get; set; } = string.Empty;
public string LanguageMark { get; set; } = string.Empty; public string LanguageMark { get; set; } = string.Empty;
} }
}

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

@ -1,10 +1,7 @@
using IRaCIS.Core.Domain.Share.Management; using IRaCIS.Core.Domain.Share.Management;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///SystemNotice
///</summary>
[Table("SystemNotice")] [Table("SystemNotice")]
public class SystemNotice : BaseFullAuditEntity public class SystemNotice : BaseFullAuditEntity
{ {
@ -43,4 +40,3 @@ namespace IRaCIS.Core.Domain.Models
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///SystemNoticeUserRead
///</summary>
[Table("SystemNoticeUserRead")] [Table("SystemNoticeUserRead")]
public class SystemNoticeUserRead : BaseAddAuditEntity public class SystemNoticeUserRead : BaseAddAuditEntity
{ {
@ -14,4 +11,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid SystemNoticeId { get; set; } public Guid SystemNoticeId { get; set; }
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///SystemNoticeUserType
///</summary>
[Table("SystemNoticeUserType")] [Table("SystemNoticeUserType")]
public class SystemNoticeUserType : BaseAddAuditEntity public class SystemNoticeUserType : BaseAddAuditEntity
{ {
@ -18,4 +15,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid UserTypeId { get; set; } public Guid UserTypeId { get; set; }
} }
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("Role")] [Table("Role")]
public partial class Role : BaseFullAuditEntity public partial class Role : BaseFullAuditEntity
{ {
@ -14,4 +13,3 @@ namespace IRaCIS.Core.Domain.Models
public int PrivilegeLevel { get; set; } //权限级别 public int PrivilegeLevel { get; set; } //权限级别
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///UserFeedBack
///</summary>
[Table("UserFeedBack")] [Table("UserFeedBack")]
public class UserFeedBack : BaseFullAuditEntity public class UserFeedBack : BaseFullAuditEntity
{ {
@ -34,4 +31,3 @@ namespace IRaCIS.Core.Domain.Models
public string ScreenshotListStr { get; set; } = string.Empty; public string ScreenshotListStr { get; set; } = string.Empty;
} }
}

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

@ -1,8 +1,7 @@
namespace IRaCIS.Core.Domain.Models using System.ComponentModel;
{
///<summary> namespace IRaCIS.Core.Domain.Models;
///UserLog
///</summary>
[Table("UserLog")] [Table("UserLog")]
public class UserLog : BaseAddAuditEntity public class UserLog : BaseAddAuditEntity
{ {
@ -24,30 +23,20 @@ namespace IRaCIS.Core.Domain.Models
} }
/// <summary> [Description("登录或者登出 锁定类型")]
/// 登录或者登出 锁定类型
/// </summary>
public enum UserOptType public enum UserOptType
{ {
/// <summary> [Description("用户登录")]
/// 用户登录
/// </summary>
Login = 1, Login = 1,
/// <summary> [Description("用户登出")]
/// 用户登出
/// </summary>
LoginOut = 2, LoginOut = 2,
/// <summary> [Description("账号或者密码错误")]
///账号或者密码错误
/// </summary>
AccountOrPasswordError = 3, AccountOrPasswordError = 3,
/// <summary> [Description("账号锁定")]
/// 账号锁定
/// </summary>
AccountLocked = 4, AccountLocked = 4,
//账号启用 //账号启用
@ -73,4 +62,3 @@ namespace IRaCIS.Core.Domain.Models
MFALoginFail = 13, MFALoginFail = 13,
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///UserPassWordLog
///</summary>
[Table("UserPassWordLog")] [Table("UserPassWordLog")]
public class UserPassWordLog : BaseAddAuditEntity public class UserPassWordLog : BaseAddAuditEntity
{ {
@ -10,14 +7,9 @@ namespace IRaCIS.Core.Domain.Models
#endregion #endregion
/// <summary> [Comment("用户Id")]
/// 用户Id
/// </summary>
public Guid UserId { get; set; } public Guid UserId { get; set; }
/// <summary> [Comment("密码")]
/// 密码
/// </summary>
public string PassWord { get; set; } = string.Empty; public string PassWord { get; set; } = string.Empty;
} }
}

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

@ -1,7 +1,6 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
public class UserType : Entity public class UserType : Entity
{ {
#region 导航属性 #region 导航属性
@ -29,4 +28,3 @@ namespace IRaCIS.Core.Domain.Models
public bool IsEnable { get; set; } = true; public bool IsEnable { get; set; } = true;
public string PermissionStr { get; set; } = string.Empty; public string PermissionStr { get; set; } = string.Empty;
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///UserTypeGroup
///</summary>
[Table("UserTypeGroup")] [Table("UserTypeGroup")]
public class UserTypeGroup : Entity public class UserTypeGroup : Entity
{ {
@ -19,4 +16,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid DictionaryId { get; set; } public Guid DictionaryId { get; set; }
} }
}

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

@ -1,5 +1,4 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
[Table("UserTypeMenu")] [Table("UserTypeMenu")]
public partial class UserTypeMenu : Entity public partial class UserTypeMenu : Entity
{ {
@ -15,4 +14,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid UserTypeId { get; set; } public Guid UserTypeId { get; set; }
public Guid MenuId { get; set; } public Guid MenuId { get; set; }
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///PreviousHistory
///</summary>
[Table("PreviousHistory")] [Table("PreviousHistory")]
public class PreviousHistory : BaseAddAuditEntity public class PreviousHistory : BaseAddAuditEntity
{ {
@ -22,4 +19,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid ClinicalDataTrialSetId { get; set; } public Guid ClinicalDataTrialSetId { get; set; }
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///PreviousOther
///</summary>
[Table("PreviousOther")] [Table("PreviousOther")]
public class PreviousOther : BaseAddAuditEntity public class PreviousOther : BaseAddAuditEntity
{ {
@ -22,12 +19,9 @@ namespace IRaCIS.Core.Domain.Models
public string FileName { get; set; } = String.Empty; public string FileName { get; set; } = String.Empty;
public string TreatmentType { get; set; } = String.Empty; public string TreatmentType { get; set; } = String.Empty;
/// <summary> [Comment("临床数据类型Id")]
/// 临床数据类型Id
/// </summary>
[Required] [Required]
public Guid ClinicalDataTrialSetId { get; set; } public Guid ClinicalDataTrialSetId { get; set; }
} }
}

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

@ -1,9 +1,6 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///PreviousPDF
///</summary>
[Table("PreviousPDF")] [Table("PreviousPDF")]
public class PreviousPDF : BaseAddAuditEntity public class PreviousPDF : BaseAddAuditEntity
{ {
@ -19,19 +16,13 @@ namespace IRaCIS.Core.Domain.Models
public string FileName { get; set; } = string.Empty; public string FileName { get; set; } = string.Empty;
public bool? IsVisist { get; set; } public bool? IsVisist { get; set; }
/// <summary> [Comment("临床级别")]
/// 临床级别
/// </summary>
public ClinicalLevel? ClinicalLevel { get; set; } public ClinicalLevel? ClinicalLevel { get; set; }
/// <summary> [Comment("数据类型")]
/// 数据类型
/// </summary>
public ClinicalDataType? DataType { get; set; } public ClinicalDataType? DataType { get; set; }
/// <summary> [Comment("上传方式")]
/// 上传方式
/// </summary>
public ClinicalUploadType? UploadType { get; set; } public ClinicalUploadType? UploadType { get; set; }
public Guid? TrialId { get; set; } public Guid? TrialId { get; set; }
@ -39,4 +30,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid? SubjectId { get; set; } public Guid? SubjectId { get; set; }
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///PreviousSurgery
///</summary>
[Table("PreviousSurgery")] [Table("PreviousSurgery")]
public class PreviousSurgery : BaseAddAuditEntity public class PreviousSurgery : BaseAddAuditEntity
{ {
@ -22,10 +19,7 @@ namespace IRaCIS.Core.Domain.Models
public string OperationName { get; set; } = String.Empty; public string OperationName { get; set; } = String.Empty;
/// <summary> [Comment("临床数据类型Id")]
/// 临床数据类型Id
/// </summary>
[Required] [Required]
public Guid ClinicalDataTrialSetId { get; set; } public Guid ClinicalDataTrialSetId { get; set; }
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{ [Comment("一致性核查文件")]
///<summary>
/// 一致性核查文件
///</summary>
[Table("InspectionFile")] [Table("InspectionFile")]
public class InspectionFile : BaseAddAuditEntity public class InspectionFile : BaseAddAuditEntity
{ {
@ -15,4 +12,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
} }
}

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

@ -1,7 +1,6 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
public class QCChallenge : BaseAddAuditEntity public class QCChallenge : BaseAddAuditEntity
{ {
#region 导航属性 #region 导航属性
@ -54,4 +53,3 @@ namespace IRaCIS.Core.Domain.Models
public UserTypeEnum UserTypeEnum { get; set; } public UserTypeEnum UserTypeEnum { get; set; }
public string ChallengeType { get; set; } = string.Empty; public string ChallengeType { get; set; } = string.Empty;
} }
}

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

@ -1,7 +1,6 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
public class QCChallengeDialog : BaseAddAuditEntity public class QCChallengeDialog : BaseAddAuditEntity
{ {
#region 导航属性 #region 导航属性
@ -17,4 +16,3 @@ namespace IRaCIS.Core.Domain.Models
public UserTypeEnum UserTypeEnum { get; set; } public UserTypeEnum UserTypeEnum { get; set; }
} }
}

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

@ -1,9 +1,6 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///QCQuestionConfigure
///</summary>
[Table("QCQuestion")] [Table("QCQuestion")]
public class QCQuestion : BaseFullAuditEntity public class QCQuestion : BaseFullAuditEntity
{ {
@ -30,4 +27,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid? ParentId { get; set; } public Guid? ParentId { get; set; }
public int ShowOrder { get; set; } public int ShowOrder { get; set; }
} }
}

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

@ -1,9 +1,6 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///TrialQCQuestionConfigure
///</summary>
[Table("TrialQCQuestion")] [Table("TrialQCQuestion")]
public class TrialQCQuestion : BaseFullAuditEntity public class TrialQCQuestion : BaseFullAuditEntity
{ {
@ -35,4 +32,3 @@ namespace IRaCIS.Core.Domain.Models
public bool? IsConfirm { get; set; } public bool? IsConfirm { get; set; }
} }
}

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

@ -1,9 +1,6 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///TrialQCQuestionRecord
///</summary>
[Table("TrialQCQuestionAnswer")] [Table("TrialQCQuestionAnswer")]
public class TrialQCQuestionAnswer : BaseFullAuditEntity public class TrialQCQuestionAnswer : BaseFullAuditEntity
{ {
@ -23,4 +20,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid SubjectVisitId { get; set; } public Guid SubjectVisitId { get; set; }
public Guid TrialQCQuestionConfigureId { get; set; } public Guid TrialQCQuestionConfigureId { get; set; }
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///SubjectAdditionalEvaluationResult
///</summary>
[Table("SubjectAdditionalEvaluationResult")] [Table("SubjectAdditionalEvaluationResult")]
public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity
{ {
@ -22,30 +19,21 @@ namespace IRaCIS.Core.Domain.Models
public string Answer { get; set; } = string.Empty; public string Answer { get; set; } = string.Empty;
/// <summary> [Comment("附加评估答案翻译字典")]
/// 附加评估答案翻译字典
/// </summary>
public string TranslateDictionaryCode { get; set; } = string.Empty; public string TranslateDictionaryCode { get; set; } = string.Empty;
/// <summary> [Comment("是否是最终结果")]
/// 是否是最终结果
/// </summary>
public bool IsFinalResult { get; set; } public bool IsFinalResult { get; set; }
/// <summary> [Comment("最终结果")]
/// 最终结果
/// </summary>
public string FinalAnswer { get; set; } = string.Empty; public string FinalAnswer { get; set; } = string.Empty;
/// <summary> [Comment("最终结果翻字典")]
/// 最终结果翻字典
/// </summary>
public string FinalTranslateDictionaryCode { get; set; } = string.Empty; public string FinalTranslateDictionaryCode { get; set; } = string.Empty;
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///SubjectCriteriaEvaluation
///</summary>
[Table("SubjectCriteriaEvaluation")] [Table("SubjectCriteriaEvaluation")]
public class SubjectCriteriaEvaluation : BaseFullAuditEntity public class SubjectCriteriaEvaluation : BaseFullAuditEntity
{ {
@ -21,9 +18,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialReadingCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }
/// <summary> [Comment("是否参与评估")]
/// 是否参与评估
/// </summary>
public bool IsJoinEvaluation { get; set; } public bool IsJoinEvaluation { get; set; }
} }
}

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

@ -1,8 +1,7 @@
namespace IRaCIS.Core.Domain.Models using System.ComponentModel;
{
///<summary> namespace IRaCIS.Core.Domain.Models;
///SubjectCriteriaEvaluationVisitFilter
///</summary>
[Table("SubjectCriteriaEvaluationVisitFilter")] [Table("SubjectCriteriaEvaluationVisitFilter")]
public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity
{ {
@ -21,26 +20,18 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialReadingCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }
public Guid SubjectVisitId { get; set; } public Guid SubjectVisitId { get; set; }
/// <summary> [Comment("影像筛选状态")]
/// 影像筛选状态
/// </summary>
public ImageFilterState ImageFilterState { get; set; } public ImageFilterState ImageFilterState { get; set; }
/// <summary> [Comment("影像判断结果")]
/// 影像判断结果
/// </summary>
public ImageDeterminationResultState ImageDeterminationResultState { get; set; } public ImageDeterminationResultState ImageDeterminationResultState { get; set; }
/// <summary> [Comment("是否已生成任务")]
/// 是否已生成任务
/// </summary>
public bool IsGeneratedTask { get; set; } public bool IsGeneratedTask { get; set; }
} }
/// <summary> [Description("影像确认结果")]
/// 影像确认结果
/// </summary>
public enum ImageDeterminationResultState public enum ImageDeterminationResultState
{ {
//待定 //待定
@ -49,9 +40,7 @@ namespace IRaCIS.Core.Domain.Models
Passed = 1, Passed = 1,
} }
/// <summary> [Description("影像筛选状态")]
/// 影像筛选状态
/// </summary>
public enum ImageFilterState public enum ImageFilterState
{ {
//默认值 待筛选 //默认值 待筛选
@ -63,4 +52,3 @@ namespace IRaCIS.Core.Domain.Models
Finished = 2 Finished = 2
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///SubjectCriteriaEvaluationVisitStudyFilter
///</summary>
[Table("SubjectCriteriaEvaluationVisitStudyFilter")] [Table("SubjectCriteriaEvaluationVisitStudyFilter")]
public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity
{ {
@ -32,4 +29,3 @@ namespace IRaCIS.Core.Domain.Models
public bool IsReading { get; set; } public bool IsReading { get; set; }
} }
}

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

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

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{ [Comment("项目的临床数据")]
///<summary>
/// 项目的临床数据
///</summary>
[Table("ReadingClinicalDataPDF")] [Table("ReadingClinicalDataPDF")]
public class ReadingClinicalDataPDF : BaseAddAuditEntity public class ReadingClinicalDataPDF : BaseAddAuditEntity
{ {
@ -12,9 +9,7 @@ namespace IRaCIS.Core.Domain.Models
public ReadingClinicalData ReadingClinicalData { get; set; } public ReadingClinicalData ReadingClinicalData { get; set; }
#endregion #endregion
/// <summary> [Comment("阅片临床数据ID")]
/// 阅片临床数据ID
/// </summary>
public Guid ReadingClinicalDataId { get; set; } public Guid ReadingClinicalDataId { get; set; }
public string Path { get; set; } = string.Empty; public string Path { get; set; } = string.Empty;
@ -23,4 +18,3 @@ namespace IRaCIS.Core.Domain.Models
public string Type { get; set; } = string.Empty; public string Type { get; set; } = string.Empty;
} }
}

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

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

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

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

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///TrialClinicalDataSetCriterion
///</summary>
[Table("TrialClinicalDataSetCriterion")] [Table("TrialClinicalDataSetCriterion")]
public class TrialClinicalDataSetCriterion : BaseFullAuditEntity public class TrialClinicalDataSetCriterion : BaseFullAuditEntity
{ {
@ -21,4 +18,3 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialReadingCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }
} }
}

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

@ -1,17 +1,12 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{ [Comment("系统临床数据问题")]
///<summary>
///系统临床数据问题
///</summary>
[Table("SystemClinicalQuestion")] [Table("SystemClinicalQuestion")]
public class SystemClinicalQuestion : BaseAddAuditEntity public class SystemClinicalQuestion : BaseAddAuditEntity
{ {
#region 导航属性 #region 导航属性
/// <summary> [Comment("分组")]
/// 分组
/// </summary>
[JsonIgnore] [JsonIgnore]
[ForeignKey("GroupId")] [ForeignKey("GroupId")]
public SystemClinicalQuestion GroupQuestin { get; set; } public SystemClinicalQuestion GroupQuestin { get; set; }
@ -36,118 +31,71 @@ namespace IRaCIS.Core.Domain.Models
} }
} }
#endregion #endregion
/// <summary> [Comment("项目临床数据Id")]
/// 项目临床数据Id
/// </summary>
public Guid SystemClinicalId { get; set; } public Guid SystemClinicalId { get; set; }
/// <summary> [Comment("问题名称")]
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> [Comment("问题英文名称")]
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty; public string QuestionEnName { get; set; } = string.Empty;
/// <summary> [Comment("临床问题类型(分组，单选。)")]
/// 临床问题类型(分组，单选。)
/// </summary>
public string ClinicalQuestionType { get; set; } = string.Empty; public string ClinicalQuestionType { get; set; } = string.Empty;
/// <summary> [Comment("问题标识")]
/// 问题标识
/// </summary>
public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; } public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; }
/// <summary> [Comment("最大长度")]
/// 最大长度
/// </summary>
public int? MaxAnswerLength { get; set; } public int? MaxAnswerLength { get; set; }
/// <summary> [Comment("最大行数")]
/// 最大行数
/// </summary>
public int? MaxQuestionCount { get; set; } public int? MaxQuestionCount { get; set; }
/// <summary> [Comment("临床数据选项类型(无，自定义)")]
/// 临床数据选项类型(无，自定义)
/// </summary>
public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } public ClinicalOptionType ClinicalOptionTypeEnum { get; set; }
/// <summary> [Comment("分组Id")]
/// 分组Id
/// </summary>
public Guid? GroupId { get; set; } public Guid? GroupId { get; set; }
/// <summary> [Comment("自定义选项")]
/// 自定义选项
/// </summary>
public string TypeValue { get; set; } = string.Empty; public string TypeValue { get; set; } = string.Empty;
/// <summary> [Comment("字典Code")]
/// 字典Code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty; public string DictionaryCode { get; set; } = string.Empty;
/// <summary> [Comment("排序")]
/// 排序
/// </summary>
public int ShowOrder { get; set; } = 0; public int ShowOrder { get; set; } = 0;
/// <summary> [Comment("是否必填")]
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; } public IsRequired IsRequired { get; set; }
/// <summary> [Comment("关联Value")]
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty; public string RelevanceValue { get; set; } = string.Empty;
/// <summary> [Comment("关联ID")]
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; } public Guid? RelevanceId { get; set; }
/// <summary> [Comment("父问题Id")]
/// 父问题Id
/// </summary>
public Guid? ParentId { get; set; } public Guid? ParentId { get; set; }
/// <summary> [Comment("父问题触发值")]
/// 父问题触发值
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty; public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary> [Comment("显示类型")]
/// 显示类型
/// </summary>
public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show; public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show;
/// <summary> [Comment("是否是检查日期")]
/// 是否是检查日期
/// </summary>
public bool IsCheckDate { get; set; } public bool IsCheckDate { get; set; }
/// <summary> [Comment("小数点位数")]
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; } public int? DigitPlaces { get; set; }
/// <summary> [Comment("单位")]
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty; public string Unit { get; set; } = string.Empty;
/// <summary> [Comment("自定义计算标记")]
/// 自定义计算标记
/// </summary>
public ClinicalCalculateMark? CustomCalculateMark { get; set; } public ClinicalCalculateMark? CustomCalculateMark { get; set; }
/// <summary> [Comment("自定义计算问题")]
/// 自定义计算问题
/// </summary>
public string CalculateQuestions { get; set; } = "[]"; public string CalculateQuestions { get; set; } = "[]";
} }
}

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

@ -1,11 +1,8 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using System.Linq; using System.Linq;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{ [Comment("系统临床表格问题")]
///<summary>
/// 系统临床表格问题
///</summary>
[Table("SystemClinicalTableQuestion")] [Table("SystemClinicalTableQuestion")]
public class SystemClinicalTableQuestion : BaseAddAuditEntity public class SystemClinicalTableQuestion : BaseAddAuditEntity
{ {
@ -28,83 +25,50 @@ namespace IRaCIS.Core.Domain.Models
} }
#endregion #endregion
/// <summary> [Comment("系统临床数据Id")]
/// 系统临床数据Id
/// </summary>
public Guid SystemClinicalId { get; set; } public Guid SystemClinicalId { get; set; }
/// <summary> [Comment("问题名称")]
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> [Comment("问题英文名称")]
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty; public string QuestionEnName { get; set; } = string.Empty;
/// <summary> [Comment("临床问题类型(分组，单选。)")]
/// 临床问题类型(分组，单选。)
/// </summary>
public string ClinicalTableQuestionType { get; set; } = string.Empty; public string ClinicalTableQuestionType { get; set; } = string.Empty;
/// <summary> [Comment("问题标识")]
/// 问题标识
/// </summary>
public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; } public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; }
/// <summary> [Comment("最大长度")]
/// 最大长度
/// </summary>
public int? MaxAnswerLength { get; set; } public int? MaxAnswerLength { get; set; }
/// <summary> [Comment("临床数据选项类型(无，自定义)")]
/// 临床数据选项类型(无，自定义)
/// </summary>
public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } public ClinicalOptionType ClinicalOptionTypeEnum { get; set; }
/// <summary> [Comment("自定义选项")]
/// 自定义选项
/// </summary>
public string TypeValue { get; set; } = string.Empty; public string TypeValue { get; set; } = string.Empty;
/// <summary> [Comment("字典Code")]
/// 字典Code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty; public string DictionaryCode { get; set; } = string.Empty;
/// <summary> [Comment("排序")]
/// 排序
/// </summary>
public int ShowOrder { get; set; } public int ShowOrder { get; set; }
/// <summary> [Comment("是否必填")]
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; } public IsRequired IsRequired { get; set; }
/// <summary> [Comment("外层问题Id")]
/// 外层问题Id
/// </summary>
public Guid QuestionId { get; set; } public Guid QuestionId { get; set; }
/// <summary> [Comment("小数点位数")]
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; } public int? DigitPlaces { get; set; }
/// <summary> [Comment("单位")]
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty; public string Unit { get; set; } = string.Empty;
/// <summary> [Comment("关联ID")]
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; } public Guid? RelevanceId { get; set; }
/// <summary> [Comment("关联Value")]
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty; public string RelevanceValue { get; set; } = string.Empty;
} }
}

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

@ -1,10 +1,7 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{ [Comment("项目临床数据问题")]
///<summary>
///项目临床数据问题
///</summary>
[Table("TrialClinicalQuestion")] [Table("TrialClinicalQuestion")]
public class TrialClinicalQuestion : BaseAddAuditEntity public class TrialClinicalQuestion : BaseAddAuditEntity
{ {
@ -33,129 +30,78 @@ namespace IRaCIS.Core.Domain.Models
public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; } public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
#endregion #endregion
/// <summary> [Comment("项目临床数据Id")]
/// 项目临床数据Id
/// </summary>
public Guid TrialClinicalId { get; set; } public Guid TrialClinicalId { get; set; }
/// <summary> [Comment("问题名称")]
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> [Comment("问题英文名称")]
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty; public string QuestionEnName { get; set; } = string.Empty;
/// <summary> [Comment("临床问题类型(分组，单选。)")]
/// 临床问题类型(分组，单选。)
/// </summary>
public string ClinicalQuestionType { get; set; } = string.Empty; public string ClinicalQuestionType { get; set; } = string.Empty;
/// <summary> [Comment("问题标识")]
/// 问题标识
/// </summary>
public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; } public ClinicalQuestionMark? ClinicalQuestionMarkEnum { get; set; }
/// <summary> [Comment("最大长度")]
/// 最大长度
/// </summary>
public int? MaxAnswerLength { get; set; } public int? MaxAnswerLength { get; set; }
/// <summary> [Comment("最大行数")]
/// 最大行数
/// </summary>
public int? MaxQuestionCount { get; set; } public int? MaxQuestionCount { get; set; }
/// <summary> [Comment("临床数据选项类型(无，自定义)")]
/// 临床数据选项类型(无，自定义)
/// </summary>
public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } public ClinicalOptionType ClinicalOptionTypeEnum { get; set; }
/// <summary> [Comment("分组Id")]
/// 分组Id
/// </summary>
public Guid? GroupId { get; set; } public Guid? GroupId { get; set; }
/// <summary> [Comment("自定义选项")]
/// 自定义选项
/// </summary>
public string TypeValue { get; set; } = string.Empty; public string TypeValue { get; set; } = string.Empty;
/// <summary> [Comment("字典Code")]
/// 字典Code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty; public string DictionaryCode { get; set; } = string.Empty;
/// <summary> [Comment("排序")]
/// 排序
/// </summary>
public int ShowOrder { get; set; } = 0; public int ShowOrder { get; set; } = 0;
/// <summary> [Comment("是否必填")]
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; } public IsRequired IsRequired { get; set; }
/// <summary> [Comment("关联Value")]
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty; public string RelevanceValue { get; set; } = string.Empty;
/// <summary> [Comment("关联ID")]
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; } public Guid? RelevanceId { get; set; }
/// <summary> [Comment("系统临床问题Id")]
/// 系统临床问题Id
/// </summary>
public Guid? SystemClinicalQuestionId { get; set; } public Guid? SystemClinicalQuestionId { get; set; }
/// <summary> [Comment("父问题Id")]
/// 父问题Id
/// </summary>
public Guid? ParentId { get; set; } public Guid? ParentId { get; set; }
/// <summary> [Comment("父问题触发值")]
/// 父问题触发值
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty; public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary> [Comment("显示类型")]
/// 显示类型
/// </summary>
public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show; public ClinicalQuestionShow ClinicalQuestionShowEnum { get; set; } = ClinicalQuestionShow.Show;
/// <summary> [Comment("是否是检查日期")]
/// 是否是检查日期
/// </summary>
public bool IsCheckDate { get; set; } public bool IsCheckDate { get; set; }
/// <summary> [Comment("自定义计算标记")]
/// 自定义计算标记
/// </summary>
public ClinicalCalculateMark? CustomCalculateMark { get; set; } public ClinicalCalculateMark? CustomCalculateMark { get; set; }
/// <summary> [Comment("分组")]
/// 分组
/// </summary>
[JsonIgnore] [JsonIgnore]
[ForeignKey("GroupId")] [ForeignKey("GroupId")]
public TrialClinicalQuestion GroupQuestin { get; set; } public TrialClinicalQuestion GroupQuestin { get; set; }
/// <summary> [Comment("自定义计算问题")]
/// 自定义计算问题
/// </summary>
public string CalculateQuestions { get; set; } = "[]"; public string CalculateQuestions { get; set; } = "[]";
/// <summary> [Comment("小数点位数")]
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; } public int? DigitPlaces { get; set; }
/// <summary> [Comment("单位")]
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty; public string Unit { get; set; } = string.Empty;
} }
}

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

@ -1,11 +1,8 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using System.Linq; using System.Linq;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{ [Comment("项目临床表格问题")]
///<summary>
/// 项目临床表格问题
///</summary>
[Table("TrialClinicalTableQuestion")] [Table("TrialClinicalTableQuestion")]
public class TrialClinicalTableQuestion : BaseAddAuditEntity public class TrialClinicalTableQuestion : BaseAddAuditEntity
{ {
@ -29,99 +26,60 @@ namespace IRaCIS.Core.Domain.Models
} }
#endregion #endregion
/// <summary> [Comment("项目临床数据Id")]
/// 项目临床数据Id
/// </summary>
public Guid TrialClinicalId { get; set; } public Guid TrialClinicalId { get; set; }
/// <summary> [Comment("问题名称")]
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> [Comment("问题英文名称")]
/// 问题英文名称
/// </summary>
public string QuestionEnName { get; set; } = string.Empty; public string QuestionEnName { get; set; } = string.Empty;
/// <summary> [Comment("临床问题类型(分组，单选。)")]
/// 临床问题类型(分组，单选。)
/// </summary>
public string ClinicalTableQuestionType { get; set; } = string.Empty; public string ClinicalTableQuestionType { get; set; } = string.Empty;
/// <summary> [Comment("问题标识")]
/// 问题标识
/// </summary>
public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; } public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; }
/// <summary> [Comment("最大长度")]
/// 最大长度
/// </summary>
public int? MaxAnswerLength { get; set; } public int? MaxAnswerLength { get; set; }
/// <summary> [Comment("临床数据选项类型(无，自定义)")]
/// 临床数据选项类型(无，自定义)
/// </summary>
public ClinicalOptionType ClinicalOptionTypeEnum { get; set; } public ClinicalOptionType ClinicalOptionTypeEnum { get; set; }
/// <summary> [Comment("自定义选项")]
/// 自定义选项
/// </summary>
public string TypeValue { get; set; } = string.Empty; public string TypeValue { get; set; } = string.Empty;
/// <summary> [Comment("字典Code")]
/// 字典Code
/// </summary>
public string DictionaryCode { get; set; } = string.Empty; public string DictionaryCode { get; set; } = string.Empty;
/// <summary> [Comment("排序")]
/// 排序
/// </summary>
public int ShowOrder { get; set; } public int ShowOrder { get; set; }
/// <summary> [Comment("是否必填")]
/// 是否必填
/// </summary>
public IsRequired IsRequired { get; set; } public IsRequired IsRequired { get; set; }
/// <summary> [Comment("外层问题Id")]
/// 外层问题Id
/// </summary>
public Guid QuestionId { get; set; } public Guid QuestionId { get; set; }
/// <summary> [Comment("系统表格问题Id")]
/// 系统表格问题Id
/// </summary>
public Guid? SystemTableQuestionId { get; set; } public Guid? SystemTableQuestionId { get; set; }
/// <summary> [Comment("自定义计算标记")]
/// 自定义计算标记
/// </summary>
public ClinicalCalculateMark? ClinicalCalculateMarkEnum { get; set; } public ClinicalCalculateMark? ClinicalCalculateMarkEnum { get; set; }
/// <summary> [Comment("自定义计算问题")]
/// 自定义计算问题
/// </summary>
public string CalculateQuestions { get; set; } = "[]"; public string CalculateQuestions { get; set; } = "[]";
/// <summary> [Comment("小数点位数")]
/// 小数点位数
/// </summary>
public int? DigitPlaces { get; set; } public int? DigitPlaces { get; set; }
/// <summary> [Comment("单位")]
/// 单位
/// </summary>
public string Unit { get; set; } = string.Empty; public string Unit { get; set; } = string.Empty;
/// <summary> [Comment("关联ID")]
/// 关联ID
/// </summary>
public Guid? RelevanceId { get; set; } public Guid? RelevanceId { get; set; }
/// <summary> [Comment("关联Value")]
/// 关联Value
/// </summary>
public string RelevanceValue { get; set; } = string.Empty; public string RelevanceValue { get; set; } = string.Empty;
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{
///<summary>
///ReadModuleCriterionFrom
///</summary>
[Table("ReadModuleCriterionFrom")] [Table("ReadModuleCriterionFrom")]
public class ReadModuleCriterionFrom : BaseAddAuditEntity public class ReadModuleCriterionFrom : BaseAddAuditEntity
{ {
@ -18,9 +15,6 @@ namespace IRaCIS.Core.Domain.Models
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
/// <summary> [Comment("表单Id")]
/// 表单Id
/// </summary>
public Guid ClinicalFormId { get; set; } public Guid ClinicalFormId { get; set; }
} }
}

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

@ -1,10 +1,7 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{ [Comment("阅片医学审核对话")]
///<summary>
///阅片医学审核对话
///</summary>
[Table("ReadingMedicalReviewDialog")] [Table("ReadingMedicalReviewDialog")]
public class ReadingMedicalReviewDialog : BaseAddAuditEntity public class ReadingMedicalReviewDialog : BaseAddAuditEntity
{ {
@ -12,9 +9,7 @@ namespace IRaCIS.Core.Domain.Models
[JsonIgnore] [JsonIgnore]
[ForeignKey("TaskMedicalReviewId")] [ForeignKey("TaskMedicalReviewId")]
public TaskMedicalReview TaskMedicalReview { get; set; } public TaskMedicalReview TaskMedicalReview { get; set; }
/// <summary> [Comment("文件")]
/// 文件
/// </summary>
[NotMapped] [NotMapped]
public List<OSSImageInfo> FileList public List<OSSImageInfo> FileList
{ {
@ -35,71 +30,42 @@ namespace IRaCIS.Core.Domain.Models
} }
#endregion #endregion
/// <summary> [Comment("医学审核Id")]
/// 医学审核Id
/// </summary>
public Guid TaskMedicalReviewId { get; set; } public Guid TaskMedicalReviewId { get; set; }
/// <summary> [Comment("任务Id")]
/// 任务Id
/// </summary>
public Guid VisitTaskId { get; set; } public Guid VisitTaskId { get; set; }
/// <summary> [Comment("对话内容")]
/// 对话内容
/// </summary>
public string Content { get; set; } = string.Empty; public string Content { get; set; } = string.Empty;
/// <summary> [Comment("用户角色")]
/// 用户角色
/// </summary>
public string UserTypeShortName { get; set; } = string.Empty; public string UserTypeShortName { get; set; } = string.Empty;
/// <summary> [Comment("医学审核对话关闭原因")]
/// 医学审核对话关闭原因
/// </summary>
public MedicalDialogClose? MedicalDialogCloseEnum { get; set; } public MedicalDialogClose? MedicalDialogCloseEnum { get; set; }
/// <summary> [Comment("用户角色枚举")]
/// 用户角色枚举
/// </summary>
public int UserTypeEnumInt { get; set; } public int UserTypeEnumInt { get; set; }
/// <summary> [Comment("阅片人是否认同")]
/// 阅片人是否认同
/// </summary>
public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } = MedicalReviewDoctorUserIdea.defalut; public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; } = MedicalReviewDoctorUserIdea.defalut;
/// <summary> [Comment("是否有问题")]
/// 是否有问题
/// </summary>
public bool IsHaveQuestion { get; set; } = false; public bool IsHaveQuestion { get; set; } = false;
/// <summary> [Comment("质询问题")]
/// 质询问题
/// </summary>
public string Questioning { get; set; } = string.Empty; public string Questioning { get; set; } = string.Empty;
/// <summary> [Comment("审核建议")]
/// 审核建议
/// </summary>
public AuditAdvice AuditAdviceEnum { get; set; } = AuditAdvice.None; public AuditAdvice AuditAdviceEnum { get; set; } = AuditAdvice.None;
/// <summary> [Comment("不同意重阅原因")]
/// 不同意重阅原因
/// </summary>
public string DisagreeReason { get; set; } = string.Empty; public string DisagreeReason { get; set; } = string.Empty;
/// <summary> [Comment("是否申请重阅")]
/// 是否申请重阅
/// </summary>
public bool? IsApplyHeavyReading { get; set; } public bool? IsApplyHeavyReading { get; set; }
/// <summary> [Comment("图片路径")]
/// 图片路径
/// </summary>
public string ImagePath { get; set; } = string.Empty; public string ImagePath { get; set; } = string.Empty;
/// <summary> [Comment("文件名称")]
/// 文件名称
/// </summary>
public string FileName { get; set; } = string.Empty; public string FileName { get; set; } = string.Empty;
} }
}

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

@ -1,8 +1,5 @@
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{ [Comment("阅片医学问题答案")]
///<summary>
/// 阅片医学问题答案
///</summary>
[Table("ReadingMedicineQuestionAnswer")] [Table("ReadingMedicineQuestionAnswer")]
public class ReadingMedicineQuestionAnswer : BaseFullAuditEntity public class ReadingMedicineQuestionAnswer : BaseFullAuditEntity
{ {
@ -12,18 +9,13 @@ namespace IRaCIS.Core.Domain.Models
public TaskMedicalReview TaskMedicalReview { get; set; } public TaskMedicalReview TaskMedicalReview { get; set; }
#endregion #endregion
/// <summary> [Comment("医学审核问题Id")]
/// 医学审核问题Id
/// </summary>
public Guid ReadingMedicineQuestionId { get; set; } public Guid ReadingMedicineQuestionId { get; set; }
/// <summary> [Comment("医学审核Id")]
/// 医学审核Id
/// </summary>
public Guid TaskMedicalReviewId { get; set; } public Guid TaskMedicalReviewId { 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;
} }
}

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

@ -1,10 +1,7 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{ [Comment("阅片医学审核系统问题")]
///<summary>
/// 阅片医学审核系统问题
///</summary>
[Table("ReadingMedicineSystemQuestion")] [Table("ReadingMedicineSystemQuestion")]
public class ReadingMedicineSystemQuestion : BaseFullAuditEntity public class ReadingMedicineSystemQuestion : BaseFullAuditEntity
{ {
@ -19,54 +16,33 @@ namespace IRaCIS.Core.Domain.Models
// [NotMapped] // [NotMapped]
// public List<int> CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList( // public List<int> CriterionEnumList => CriterionEnumStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Where(t => !string.IsNullOrEmpty(t)).Select(t=> Convert.ToInt32(t.Trim()) ).ToList(
#endregion #endregion
/// <summary> [Comment("类型")]
/// 类型
/// </summary>
public string Type { get; set; } = string.Empty; public string Type { get; set; } = string.Empty;
/// <summary> [Comment("父问题触发")]
/// 父问题触发
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty; public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary> [Comment("问题名称")]
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> [Comment("语言类型")]
/// 语言类型
/// </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary> [Comment("是否是必须")]
/// 是否是必须
/// </summary>
public bool IsRequired { get; set; } public bool IsRequired { get; set; }
/// <summary> [Comment("排序")]
/// 排序
/// </summary>
public int ShowOrder { get; set; } public int ShowOrder { get; set; }
/// <summary> [Comment("父问题ID")]
/// 父问题ID
/// </summary>
public Guid? ParentId { get; set; } public Guid? ParentId { get; set; }
/// <summary> [Comment("类型值")]
/// 类型值
/// </summary>
public string TypeValue { get; set; } = string.Empty; public string TypeValue { get; set; } = string.Empty;
/// <summary> [Comment("是否启用")]
/// 是否启用
/// </summary>
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary> [Comment("任务类型")]
/// 任务类型
/// </summary>
public ReadingCategory ReadingCategory { get; set; } public ReadingCategory ReadingCategory { get; set; }
public CriterionType? CriterionTypeEnum { get; set; } public CriterionType? CriterionTypeEnum { get; set; }
public bool IsGeneral { get; set; } public bool IsGeneral { get; set; }
} }
}

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

@ -1,9 +1,6 @@
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models;
{ [Comment("阅片医学审核项目问题")]
///<summary>
///阅片医学审核项目问题
///</summary>
[Table("ReadingMedicineTrialQuestion")] [Table("ReadingMedicineTrialQuestion")]
public class ReadingMedicineTrialQuestion : BaseFullAuditEntity public class ReadingMedicineTrialQuestion : BaseFullAuditEntity
{ {
@ -14,69 +11,42 @@ namespace IRaCIS.Core.Domain.Models
public ReadingMedicineTrialQuestion ParentQuestion { get; set; } public ReadingMedicineTrialQuestion ParentQuestion { get; set; }
#endregion #endregion
/// <summary> [Comment("类型")]
/// 类型
/// </summary>
public string Type { get; set; } = string.Empty; public string Type { get; set; } = string.Empty;
/// <summary> [Comment("父问题触发值")]
/// 父问题触发值
/// </summary>
public string ParentTriggerValue { get; set; } = string.Empty; public string ParentTriggerValue { get; set; } = string.Empty;
/// <summary> [Comment("问题名称")]
/// 问题名称
/// </summary>
public string QuestionName { get; set; } = string.Empty; public string QuestionName { get; set; } = string.Empty;
/// <summary> [Comment("语言类型")]
/// 语言类型
/// </summary>
public LanguageType LanguageType { get; set; } = LanguageType.Chinese; public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
/// <summary> [Comment("类型值")]
/// 类型值
/// </summary>
public string TypeValue { get; set; } = string.Empty; public string TypeValue { get; set; } = string.Empty;
/// <summary> [Comment("项目ID")]
/// 项目ID
/// </summary>
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
/// <summary> [Comment("是否启用")]
/// 是否启用
/// </summary>
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary> [Comment("是否必须")]
/// 是否必须
/// </summary>
public bool IsRequired { get; set; } public bool IsRequired { get; set; }
/// <summary> [Comment("排序")]
/// 排序
/// </summary>
public int ShowOrder { get; set; } public int ShowOrder { get; set; }
/// <summary> [Comment("父问题")]
/// 父问题
/// </summary>
public Guid? ParentId { get; set; } public Guid? ParentId { get; set; }
/// <summary> [Comment("是否确认")]
/// 是否确认
/// </summary>
public bool IsConfirm { get; set; } public bool IsConfirm { get; set; }
/// <summary> [Comment("任务类型")]
/// 任务类型
/// </summary>
public ReadingCategory ReadingCategory { get; set; } public ReadingCategory ReadingCategory { get; set; }
/// <summary> [Comment("项目标准")]
/// 项目标准
/// </summary>
public Guid TrialReadingCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }
public Guid? SystemQuestionId { get; set; } public Guid? SystemQuestionId { get; set; }
} }
}

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