整理数据库实体备注

IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs

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

IRaCIS.Core.Domain/Allocation/SubjectUser.cs

@@ -1,13 +1,12 @@
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
 
-    [Description("受试者某标准阅片用户中间关系表")]
+[Description("受试者某标准阅片用户中间关系表")]
-    [Table("SubjectUser")]
+[Table("SubjectUser")]
-    public class SubjectUser : BaseFullAuditEntity
+public class SubjectUser : BaseFullAuditEntity
-    {
+{
 
     #region 导航属性
     [JsonIgnore]
@@ -42,6 +41,5 @@ namespace IRaCIS.Core.Domain.Models
 
     //该属性有值 说明该医生被替换了 分配的时候 要过滤掉
     public Guid? ReplacedSubjectUserId { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("TaskAllocationRule")]
+public class TaskAllocationRule : BaseFullAuditEntity
 {
-    ///<summary>
-    ///TaskAllocationRule
-    ///</summary>
-    [Table("TaskAllocationRule")]
-    public class TaskAllocationRule : BaseFullAuditEntity
-    {
     #region 导航属性
 
     [ForeignKey("DoctorUserId")]
@@ -34,6 +31,5 @@ namespace IRaCIS.Core.Domain.Models
     public bool IsJudgeDoctor { get; set; }
 
     public int PlanReadingRatio { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("TaskConsistentRule")]
+public class TaskConsistentRule : BaseFullAuditEntity
 {
-    ///<summary>
-    ///TaskConsistentRule
-    ///</summary>
-    [Table("TaskConsistentRule")]
-    public class TaskConsistentRule : BaseFullAuditEntity
-    {
 
     #region 导航属性
     [JsonIgnore]
@@ -38,6 +35,5 @@ namespace IRaCIS.Core.Domain.Models
 
     public string Note { get; set; } = string.Empty;
     public Guid TrialReadingCriterionId { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/Allocation/TaskInfluence.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("TaskInfluence")]
+public class TaskInfluence : BaseAddAuditEntity
 {
-    ///<summary>
-    ///TaskInfluence
-    ///</summary>
-    [Table("TaskInfluence")]
-    public class TaskInfluence : BaseAddAuditEntity
-    {
 
     #region 导航属性
     [JsonIgnore]
@@ -21,9 +18,9 @@ namespace IRaCIS.Core.Domain.Models
 
     //对影响任务进行的操作
     public ReReadingOrBackOptType OptType { get; set; }
-    }
+}
-    public enum ReReadingOrBackOptType
+public enum ReReadingOrBackOptType
-    {
+{
     //取消分配
     CancelAssign = 0,
 
@@ -34,6 +31,5 @@ namespace IRaCIS.Core.Domain.Models
 
     Return = 2,
 
-    }
-
 }
+

IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs

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

IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("TaskMedicalReviewRule")]
+public class TaskMedicalReviewRule : BaseFullAuditEntity
 {
-    ///<summary>
-    ///TaskTaskMedicalReviewRule
-    ///</summary>
-    [Table("TaskMedicalReviewRule")]
-    public class TaskMedicalReviewRule : BaseFullAuditEntity
-    {
 
     #region 导航属性
 
@@ -29,6 +26,5 @@ namespace IRaCIS.Core.Domain.Models
 
     [JsonIgnore]
     public User DoctorUser { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs

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

IRaCIS.Core.Domain/Allocation/VisitTask.cs

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

IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs

@@ -1,13 +1,10 @@
 using IRaCIS.Core.Domain.Share;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Comment("重阅申请流程记录表")]
+[Table("VisitTaskReReading")]
+public class VisitTaskReReading : BaseFullAuditEntity
 {
-    ///<summary>
-    ///重阅申请流程记录表
-    ///</summary>
-    [Table("VisitTaskReReading")]
-    public class VisitTaskReReading : BaseFullAuditEntity
-    {
     #region 导航属性
 
     [JsonIgnore]
@@ -52,6 +49,5 @@ namespace IRaCIS.Core.Domain.Models
 
     //仅仅包括全局和访视
     public bool IsCopyFollowForms { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/BaseModel/DomainEvent.cs

@@ -1,18 +1,16 @@
-namespace IRaCIS.Core.Domain.BaseModel
+using System.ComponentModel;
+
+namespace IRaCIS.Core.Domain.BaseModel;
+[Description("领域实体事件基类")]
+public abstract class DomainEvent
 {
-    /// <summary>
-    /// 领域实体事件基类
-    /// </summary>
-    public abstract class DomainEvent
-    {
 
-    }
+}
 
-    public class FailedDomainEvent
+public class FailedDomainEvent
-    {
+{
     public Guid Id { get; set; }
     public string EventType { get; set; } = string.Empty;
     public string EventData { get; set; } = string.Empty;
     public DateTime FailedAt { get; set; }
-    }
 }

IRaCIS.Core.Domain/BaseModel/Entity.cs

@@ -1,22 +1,21 @@
 using IRaCIS.Core.Domain.BaseModel;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+public interface IAggregateRoot;
+public interface IEntity<TKey>
 {
-    public interface IAggregateRoot;
-    public interface IEntity<TKey>
-    {
     abstract TKey Id { get; set; }
 
-    }
+}
 
-    //针对dicom 
+//针对dicom 
-    public interface IEntitySeqId
+public interface IEntitySeqId
-    {
+{
     public Guid SeqId { get; set; }
-    }
+}
 
-    public abstract class Entity : IEntity<Guid>
+public abstract class Entity : IEntity<Guid>
-    {
+{
     [Key]
     [Required]
     [DatabaseGenerated(DatabaseGeneratedOption.None)]
@@ -43,11 +42,11 @@ namespace IRaCIS.Core.Domain.Models
         _domainEvents.Clear();
     }
     #endregion
-    }
+}
-    #region 减少实体属性，增加基类
+#region 减少实体属性，增加基类
 
-    public abstract class BaseAddAuditEntity : Entity, IAuditAdd
+public abstract class BaseAddAuditEntity : Entity, IAuditAdd
-    {
+{
 
     public Guid CreateUserId { get; set; }
     public DateTime CreateTime { get; set; }
@@ -55,53 +54,52 @@ namespace IRaCIS.Core.Domain.Models
     [ForeignKey("CreateUserId")]
     [JsonIgnore]
     public virtual User CreateUser { get; set; }
-    }
-
-    public abstract class BaseAddDeleteAuditEntity : Entity, IAuditAdd, ISoftDelete
-    {
-
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
-        public Guid? DeleteUserId { get; set; }
-        public bool IsDeleted { get; set; }
-        public DateTime? DeletedTime { get; set; }
-
-        [ForeignKey("CreateUserId")]
-        [JsonIgnore]
-        public User CreateUser { get; set; }
-    }
-
-    public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd
-    {
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
-
-        [ForeignKey("CreateUserId")]
-        [JsonIgnore]
-        public User CreateUser { get; set; }
-    }
-    public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
-    {
-        public Guid? DeleteUserId { get; set; }
-        public bool IsDeleted { get; set; }
-        public DateTime? DeletedTime { get; set; }
-        public Guid CreateUserId { get; set; }
-        public DateTime CreateTime { get; set; }
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
-
-        [ForeignKey("CreateUserId")]
-        [JsonIgnore]
-        public User CreateUser { get; set; }
-    }
-
-    public abstract class BaseAuditUpdateEntity : Entity, IAuditUpdate
-    {
-        public Guid UpdateUserId { get; set; }
-        public DateTime UpdateTime { get; set; }
-    }
-    #endregion
-
 }
+
+public abstract class BaseAddDeleteAuditEntity : Entity, IAuditAdd, ISoftDelete
+{
+
+    public Guid CreateUserId { get; set; }
+    public DateTime CreateTime { get; set; }
+    public Guid? DeleteUserId { get; set; }
+    public bool IsDeleted { get; set; }
+    public DateTime? DeletedTime { get; set; }
+
+    [ForeignKey("CreateUserId")]
+    [JsonIgnore]
+    public User CreateUser { get; set; }
+}
+
+public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd
+{
+    public Guid CreateUserId { get; set; }
+    public DateTime CreateTime { get; set; }
+    public Guid UpdateUserId { get; set; }
+    public DateTime UpdateTime { get; set; }
+
+    [ForeignKey("CreateUserId")]
+    [JsonIgnore]
+    public User CreateUser { get; set; }
+}
+public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
+{
+    public Guid? DeleteUserId { get; set; }
+    public bool IsDeleted { get; set; }
+    public DateTime? DeletedTime { get; set; }
+    public Guid CreateUserId { get; set; }
+    public DateTime CreateTime { get; set; }
+    public Guid UpdateUserId { get; set; }
+    public DateTime UpdateTime { get; set; }
+
+    [ForeignKey("CreateUserId")]
+    [JsonIgnore]
+    public User CreateUser { get; set; }
+}
+
+public abstract class BaseAuditUpdateEntity : Entity, IAuditUpdate
+{
+    public Guid UpdateUserId { get; set; }
+    public DateTime UpdateTime { get; set; }
+}
+#endregion
+

IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs

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

IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs

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

IRaCIS.Core.Domain/BaseModel/ISoftDelete.cs

@@ -1,15 +1,13 @@
-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 bool IsDeleted { get; set; }
 
     public DateTime? DeletedTime { get; set; }
-    }
+}
-
+
-    public interface ISoftDelete : ISoftDelete<Guid>
+public interface ISoftDelete : ISoftDelete<Guid>
-    {
+{
-
+
-    }
 }

IRaCIS.Core.Domain/Common/CommonDocument.cs

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

IRaCIS.Core.Domain/Common/Dictionary.cs

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

IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs

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

IRaCIS.Core.Domain/Common/FrontAuditConfig.cs

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

IRaCIS.Core.Domain/Common/Internationalization.cs

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

IRaCIS.Core.Domain/Common/PublishLog.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("PublishLog")]
+public class PublishLog : BaseFullAuditEntity
 {
-    ///<summary>
-    ///PublishLog
-    ///</summary>
-    [Table("PublishLog")]
-    public class PublishLog : BaseFullAuditEntity
-    {
     public string Version { get; set; } = string.Empty;
 
     public DateTime? PublishTime { get; set; }
@@ -17,6 +14,5 @@ namespace IRaCIS.Core.Domain.Models
 
     public bool IsCurrentVersion { get; set; }
 
-    }
-
 }
+

IRaCIS.Core.Domain/Common/SystemBasicData.cs

@@ -1,12 +1,9 @@
 using IRaCIS.Core.Domain.Share;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("SystemBasicData")]
+public class SystemBasicData : BaseFullAuditEntity
 {
-    ///<summary>
-    ///SystemBasicData
-    ///</summary>
-    [Table("SystemBasicData")]
-    public class SystemBasicData : BaseFullAuditEntity
-    {
 
     #region 导航属性
     [JsonIgnore]
@@ -30,6 +27,5 @@ namespace IRaCIS.Core.Domain.Models
     public bool IsEnable { get; set; }
 
     public BasicDataTypeEnum BasicDataTypeEnum { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/Common/VerificationCode.cs

@@ -1,10 +1,9 @@
 using IRaCIS.Core.Domain.Share;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("VerificationCode")]
+public class VerificationCode : BaseAddAuditEntity
 {
-    [Table("VerificationCode")]
-    public class VerificationCode : BaseAddAuditEntity
-    {
 
     public Guid UserId { get; set; } = Guid.Empty;
 
@@ -23,5 +22,4 @@ namespace IRaCIS.Core.Domain.Models
     //过期时间
     public DateTime ExpirationTime { get; set; }
 
-    }
 }

IRaCIS.Core.Domain/Dcotor/Attachment.cs

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

IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs

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

IRaCIS.Core.Domain/Dcotor/Postgraduate.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("Postgraduate")]
+public partial class Postgraduate : BaseFullAuditEntity
 {
-    [Table("Postgraduate")]
-    public partial class Postgraduate : BaseFullAuditEntity
-    {
     #region 导航属性
 
     #endregion
@@ -54,5 +53,4 @@ namespace IRaCIS.Core.Domain.Models
 
     [StringLength(100)]
     public string CityCN { get; set; } = string.Empty;
-    }
 }

IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("ResearchPublication")]
+public partial class ResearchPublication : BaseFullAuditEntity
 {
-    [Table("ResearchPublication")]
-    public partial class ResearchPublication : BaseFullAuditEntity
-    {
     #region 导航属性
 
     #endregion
@@ -16,5 +15,4 @@ namespace IRaCIS.Core.Domain.Models
     public string GrantsCN { get; set; } = string.Empty;
     public string PublicationsCN { get; set; } = string.Empty;
     public string AwardsHonorsCN { get; set; } = string.Empty;
-    }
 }

IRaCIS.Core.Domain/Dcotor/TrialExperience.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("TrialExperience")]
+public partial class TrialExperience : BaseFullAuditEntity
 {
-    [Table("TrialExperience")]
-    public partial class TrialExperience : BaseFullAuditEntity
-    {
     #region 导航属性
 
     [JsonIgnore]
@@ -21,5 +20,4 @@ namespace IRaCIS.Core.Domain.Models
     public DateTime? StartTime { get; set; }
 
     public DateTime? EndTime { get; set; }
-    }
 }

IRaCIS.Core.Domain/Dcotor/TrialExperienceCriteria.cs

@@ -1,7 +1,6 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+public class TrialExperienceCriteria : Entity
 {
-    public class TrialExperienceCriteria : Entity
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("EvaluationCriteriaId")]
@@ -10,5 +9,4 @@
     public Guid DoctorId { get; set; }
     public Guid TrialExperienceId { get; set; }
     public Guid EvaluationCriteriaId { get; set; }
-    }
 }

IRaCIS.Core.Domain/Dcotor/Vacation.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("Vacation")]
+public class Vacation : BaseFullAuditEntity
 {
-    [Table("Vacation")]
-    public class Vacation : BaseFullAuditEntity
-    {
     #region 导航属性
 
     #endregion
@@ -11,5 +10,4 @@
     public DateTime EndDate { get; set; }
     public int Status { get; set; } = 1;
 
-    }
 }

IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs

@@ -1,12 +1,9 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
-    ///<summary>
-    ///SystemDocConfirmedUser
-    ///</summary>
-    [Table("SystemDocConfirmedUser")]
-    public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity
 
-    {
+[Table("SystemDocConfirmedUser")]
+public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity
+
+{
     #region 导航属性
     [JsonIgnore]
     public SystemDocument SystemDocument { get; set; }
@@ -23,6 +20,5 @@ namespace IRaCIS.Core.Domain.Models
     public DateTime? SignFirstViewTime { get; set; }
 
     public string SignText { get; set; } = string.Empty;
-    }
-
 }
+

IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("SystemDocNeedConfirmedUserType")]
+public class SystemDocNeedConfirmedUserType : Entity
 {
-    ///<summary>
-    ///SystemDocNeedConfirmedUserType
-    ///</summary>
-    [Table("SystemDocNeedConfirmedUserType")]
-    public class SystemDocNeedConfirmedUserType : Entity
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("NeedConfirmUserTypeId")]
@@ -18,6 +15,5 @@ namespace IRaCIS.Core.Domain.Models
 
     public Guid NeedConfirmUserTypeId { get; set; }
 
-    }
-
 }
+

IRaCIS.Core.Domain/Document/SystemDocument.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("SystemDocument")]
+public class SystemDocument : BaseFullDeleteAuditEntity
 {
-    ///<summary>
-    ///SystemDocument
-    ///</summary>
-    [Table("SystemDocument")]
-    public class SystemDocument : BaseFullDeleteAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public List<SystemDocConfirmedUser> SystemDocConfirmedUserList { get; set; }
@@ -20,6 +17,5 @@ namespace IRaCIS.Core.Domain.Models
 
     public int SignViewMinimumMinutes { get; set; }
     public string Path { get; set; } = string.Empty;
-    }
-
 }
+

IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs

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

IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("TrialDocNeedConfirmedUserType")]
+public class TrialDocNeedConfirmedUserType : Entity
 {
-    ///<summary>
-    ///TrialDocumentUserConfirm
-    ///</summary>
-    [Table("TrialDocNeedConfirmedUserType")]
-    public class TrialDocNeedConfirmedUserType : Entity
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("NeedConfirmUserTypeId")]
@@ -18,6 +15,5 @@ namespace IRaCIS.Core.Domain.Models
     public Guid TrialDocumentId { get; set; }
 
     public Guid NeedConfirmUserTypeId { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/Document/TrialDocument.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("TrialDocument")]
+public class TrialDocument : BaseFullDeleteAuditEntity
 {
-    ///<summary>
-    ///TrialDocument
-    ///</summary>
-    [Table("TrialDocument")]
-    public class TrialDocument : BaseFullDeleteAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public List<TrialDocConfirmedUser> TrialDocConfirmedUserList { get; set; }
@@ -30,6 +27,5 @@ namespace IRaCIS.Core.Domain.Models
     public string Description { get; set; } = string.Empty;
 
     public int SignViewMinimumMinutes { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs

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

IRaCIS.Core.Domain/Financial/CalculateTask.cs

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

IRaCIS.Core.Domain/Financial/ExchangeRate.cs

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

IRaCIS.Core.Domain/Financial/Payment.cs

@@ -1,9 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
 
-    [Table("Payment")]
+[Table("Payment")]
-    public partial class Payment : BaseFullAuditEntity
+public partial class Payment : BaseFullAuditEntity
-    {
+{
     public Guid DoctorId { get; set; }
     public string YearMonth { get; set; } = string.Empty;
     public bool IsLock { get; set; }
@@ -29,5 +28,4 @@ namespace IRaCIS.Core.Domain.Models
 
     [StringLength(500)]
     public string Note { get; set; } = string.Empty;
-    }
 }

IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("PaymentAdjustment")]
+public partial class PaymentAdjustment : BaseFullAuditEntity
 {
-    [Table("PaymentAdjustment")]
-    public partial class PaymentAdjustment : BaseFullAuditEntity
-    {
     public Guid ReviewerId { get; set; }
 
     public DateTime YearMonthDate { get; set; }
@@ -20,5 +19,4 @@ namespace IRaCIS.Core.Domain.Models
     public bool IsLock { get; set; } = false;
     public string Note { get; set; } = string.Empty;
 
-    }
 }

IRaCIS.Core.Domain/Financial/PaymentDetail.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("PaymentDetail")]
+public partial class PaymentDetail : BaseFullAuditEntity
 {
-    [Table("PaymentDetail")]
-    public partial class PaymentDetail : BaseFullAuditEntity
-    {
     public Guid PaymentId { get; set; }
     public Guid DoctorId { get; set; }
     public string YearMonth { get; set; } = string.Empty;
@@ -36,5 +35,4 @@ namespace IRaCIS.Core.Domain.Models
     public int ShowTypeOrder { get; set; }
     public int ShowCodeOrder { get; set; }
 
-    }
 }

IRaCIS.Core.Domain/Financial/RankPrice.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("RankPrice")]
+public partial class RankPrice : BaseFullAuditEntity
 {
-    [Table("RankPrice")]
-    public partial class RankPrice : BaseFullAuditEntity
-    {
     [StringLength(200)]
     public string RankName { get; set; } = string.Empty;
 
@@ -36,5 +35,4 @@ namespace IRaCIS.Core.Domain.Models
     [DecimalPrecision(18, 2)]
     public decimal RefresherTraining { get; set; }
     public int ShowOrder { get; set; }
-    }
 }

IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs

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

IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("TrialRevenuesPrice")]
+public class TrialRevenuesPrice : BaseFullAuditEntity
 {
-    [Table("TrialRevenuesPrice")]
-    public class TrialRevenuesPrice : BaseFullAuditEntity
-    {
     public Guid TrialId { get; set; }
 
     [DecimalPrecision(18, 2)]
@@ -35,5 +34,4 @@
     [DecimalPrecision(18, 2)]
     public decimal RefresherTraining { get; set; }
 
-    }
 }

IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs

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

IRaCIS.Core.Domain/Financial/VolumeReward.cs

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

IRaCIS.Core.Domain/GlobalUsings.cs

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

IRaCIS.Core.Domain/Image/DicomStudy.cs

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

IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs

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

IRaCIS.Core.Domain/Image/ImageShare.cs

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

IRaCIS.Core.Domain/Image/NoneDicomStudy.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("NoneDicomStudy")]
+public class NoneDicomStudy : BaseFullAuditEntity
 {
-    ///<summary>
-    ///NoneDicomStudy
-    ///</summary>
-    [Table("NoneDicomStudy")]
-    public class NoneDicomStudy : BaseFullAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public List<NoneDicomStudyFile> NoneDicomFileList { get; set; }
@@ -41,6 +38,5 @@ namespace IRaCIS.Core.Domain.Models
 
     public string VideoUrl { get; set; } = string.Empty;
 
-    }
-
 }
+

IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs

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

IRaCIS.Core.Domain/Image/SCPImageUpload.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("SCPImageUpload")]
+public class SCPImageUpload : BaseAddAuditEntity
 {
-    ///<summary>
-    ///SCPImageUpload
-    ///</summary>
-    [Table("SCPImageUpload")]
-    public class SCPImageUpload : BaseAddAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public Trial Trial { get; set; }
@@ -23,5 +20,4 @@ namespace IRaCIS.Core.Domain.Models
     public int StudyCount { get; set; }
     public Guid TrialId { get; set; }
     public Guid TrialSiteId { get; set; }
-    }
 }

IRaCIS.Core.Domain/Image/SCPInstance.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("SCPInstance")]
+public class SCPInstance : BaseFullAuditEntity, IEntitySeqId
 {
-    [Table("SCPInstance")]
-    public class SCPInstance : BaseFullAuditEntity, IEntitySeqId
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("SeriesId")]
@@ -37,5 +36,4 @@
     public string Path { get; set; } = string.Empty;
 
     public long? FileSize { get; set; }
-    }
 }

IRaCIS.Core.Domain/Image/SCPPatient.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("SCPPatient")]
+public class SCPPatient : BaseFullAuditEntity
 {
-    [Table("SCPPatient")]
-    public class SCPPatient : BaseFullAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public List<SCPStudy> SCPStudyList { get; set; }
@@ -27,5 +26,4 @@
     public Guid? SubjectId { get; set; }
     public Guid TrialId { get; set; }
     public Guid TrialSiteId { get; set; }
-    }
 }

IRaCIS.Core.Domain/Image/SCPSeries.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("SCPSeries")]
+public class SCPSeries : BaseFullDeleteAuditEntity, IEntitySeqId
 {
-    [Table("SCPSeries")]
-    public class SCPSeries : BaseFullDeleteAuditEntity, IEntitySeqId
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("StudyId")]
@@ -37,5 +36,4 @@
 
     public string ImageResizePath { get; set; } = string.Empty;
 
-    }
 }

IRaCIS.Core.Domain/Image/SCPStudy.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("SCPStudy")]
+public class SCPStudy : BaseFullDeleteAuditEntity, IEntitySeqId
 {
-    [Table("SCPStudy")]
-    public class SCPStudy : BaseFullDeleteAuditEntity, IEntitySeqId
-    {
 
     #region 导航属性
     [JsonIgnore]
@@ -63,5 +62,4 @@
     public Guid TrialSiteId { get; set; }
 
     public Guid? SubjectVisitId { get; set; }
-    }
 }

IRaCIS.Core.Domain/Image/SystemAnonymization.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("SystemAnonymization")]
+public class SystemAnonymization : BaseFullAuditEntity
 {
-    ///<summary>
-    ///SystemAnonymization
-    ///</summary>
-    [Table("SystemAnonymization")]
-    public class SystemAnonymization : BaseFullAuditEntity
-    {
     #region 导航属性
 
     #endregion
@@ -20,6 +17,5 @@ namespace IRaCIS.Core.Domain.Models
 
     public bool IsEnable { get; set; }
     public bool IsFixed { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/Image/TaskInstance.cs

@@ -1,7 +1,6 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+public class TaskInstance : BaseFullAuditEntity, IEntitySeqId
 {
-    public class TaskInstance : BaseFullAuditEntity, IEntitySeqId
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("SeriesId")]
@@ -43,5 +42,4 @@
 
     public long? FileSize { get; set; }
 
-    }
 }

IRaCIS.Core.Domain/Image/TaskSeries.cs

@@ -1,7 +1,6 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId
 {
-    public class TaskSeries : BaseFullDeleteAuditEntity, IEntitySeqId
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("StudyId")]
@@ -38,5 +37,4 @@
 
     public string ImageResizePath { get; set; } = string.Empty;
 
-    }
 }

IRaCIS.Core.Domain/Image/TaskStudy.cs

@@ -1,7 +1,6 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId
 {
-    public class TaskStudy : BaseFullDeleteAuditEntity, IEntitySeqId
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("VisitTaskId")]
@@ -54,5 +53,4 @@
     public string BodyPartForEdit { get; set; } = string.Empty;
 
     public string ModalityForEdit { get; set; } = string.Empty;
-    }
 }

IRaCIS.Core.Domain/Image/TrialDicomAE.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("TrialDicomAE")]
+public class TrialDicomAE : BaseFullAuditEntity
 {
-    ///<summary>
-    ///DicomAE
-    ///</summary>
-    [Table("TrialDicomAE")]
-    public class TrialDicomAE : BaseFullAuditEntity
-    {
     #region 导航属性
 
     #endregion
@@ -20,6 +17,5 @@ namespace IRaCIS.Core.Domain.Models
 
     public bool? IsTestOK { get; set; }
 
-    }
-
 }
+

IRaCIS.Core.Domain/Image/TrialImageDownload.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("TrialImageDownload")]
+public class TrialImageDownload : BaseFullAuditEntity
 {
-    [Table("TrialImageDownload")]
-    public class TrialImageDownload : BaseFullAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public Trial Trial { get; set; }
@@ -31,14 +30,13 @@
 
     public string IP { get; set; }
 
-    }
+}
 
-    public enum ImageType
+public enum ImageType
-    {
+{
     Dicom = 1,
 
     NoneDicom = 2,
 
     DicomAndNoneDicom = 3
-    };
+};
-}

IRaCIS.Core.Domain/Institution/CRO.cs

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

IRaCIS.Core.Domain/Institution/Hospital.cs

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

IRaCIS.Core.Domain/Institution/Site.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("Site")]
+public partial class Site : BaseFullAuditEntity
 {
-    [Table("Site")]
-    public partial class Site : BaseFullAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("HospitalId")]
@@ -33,5 +32,4 @@ namespace IRaCIS.Core.Domain.Models
     public string DirectorPhone { get; set; } = string.Empty;
     public string ContactName { get; set; } = string.Empty;
     public string ContactPhone { get; set; } = string.Empty;
-    }
 }

IRaCIS.Core.Domain/Institution/Sponsor.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("Sponsor")]
+public partial class Sponsor : BaseFullAuditEntity
 {
-    [Table("Sponsor")]
-    public partial class Sponsor : BaseFullAuditEntity
-    {
     #region 导航属性
 
     #endregion
@@ -13,5 +12,4 @@ namespace IRaCIS.Core.Domain.Models
 
     public bool IsTrialLevel { get; set; }
     public Guid? TrialId { get; set; }
-    }
 }

IRaCIS.Core.Domain/Management/Menu.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("Menu")]
+public class Menu : BaseFullAuditEntity
 {
-    [Table("Menu")]
-    public class Menu : BaseFullAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public List<UserTypeMenu> UserTypeMenuList { get; set; }
@@ -48,5 +47,4 @@
 
     public string Redirect { get; set; } = string.Empty;
     public string LanguageMark { get; set; } = string.Empty;
-    }
 }

IRaCIS.Core.Domain/Management/Notice/SystemNotice.cs

@@ -1,13 +1,10 @@
 using IRaCIS.Core.Domain.Share.Management;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("SystemNotice")]
+public class SystemNotice : BaseFullAuditEntity
 {
-    ///<summary>
-    ///SystemNotice
-    ///</summary>
-    [Table("SystemNotice")]
-    public class SystemNotice : BaseFullAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public List<SystemNoticeUserType> NoticeUserTypeList { get; set; } = new List<SystemNoticeUserType>();
@@ -41,6 +38,5 @@ namespace IRaCIS.Core.Domain.Models
 
     public DateTime? PublishedTime { get; set; }
 
-    }
-
 }
+

IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserRead.cs

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

IRaCIS.Core.Domain/Management/Notice/SystemNoticeUserType.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("SystemNoticeUserType")]
+public class SystemNoticeUserType : BaseAddAuditEntity
 {
-    ///<summary>
-    ///SystemNoticeUserType
-    ///</summary>
-    [Table("SystemNoticeUserType")]
-    public class SystemNoticeUserType : BaseAddAuditEntity
-    {
 
     #region 导航属性
     [JsonIgnore]
@@ -16,6 +13,5 @@ namespace IRaCIS.Core.Domain.Models
 
     public Guid SystemNoticeId { get; set; }
     public Guid UserTypeId { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/Management/Role.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("Role")]
+public partial class Role : BaseFullAuditEntity
 {
-    [Table("Role")]
-    public partial class Role : BaseFullAuditEntity
-    {
     #region 导航属性
 
     #endregion
@@ -13,5 +12,4 @@ namespace IRaCIS.Core.Domain.Models
     public int Status { get; set; }
     public int PrivilegeLevel { get; set; } //权限级别
 
-    }
 }

IRaCIS.Core.Domain/Management/User.cs

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

IRaCIS.Core.Domain/Management/UserFeedBack.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("UserFeedBack")]
+public class UserFeedBack : BaseFullAuditEntity
 {
-    ///<summary>
-    ///UserFeedBack
-    ///</summary>
-    [Table("UserFeedBack")]
-    public class UserFeedBack : BaseFullAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public Trial Trial { get; set; }
@@ -33,5 +30,4 @@ namespace IRaCIS.Core.Domain.Models
     public Guid? TrialId { get; set; }
 
     public string ScreenshotListStr { get; set; } = string.Empty;
-    }
 }

IRaCIS.Core.Domain/Management/UserLog.cs

@@ -1,11 +1,10 @@
-namespace IRaCIS.Core.Domain.Models
+using System.ComponentModel;
+
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("UserLog")]
+public class UserLog : BaseAddAuditEntity
 {
-    ///<summary>
-    ///UserLog
-    ///</summary>
-    [Table("UserLog")]
-    public class UserLog : BaseAddAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public User LoginUser { get; set; }
@@ -22,32 +21,22 @@ namespace IRaCIS.Core.Domain.Models
     public Guid? OptUserId { get; set; }
     public string IPRegion { get; set; } = string.Empty;
 
-    }
+}
 
-    /// <summary>
+[Description("登录或者登出 锁定类型")]
-    /// 登录或者登出 锁定类型
+public enum UserOptType
-    /// </summary>
+{
-    public enum UserOptType
-    {
 
-        /// <summary>
+    [Description("用户登录")]
-        /// 用户登录
-        /// </summary>
     Login = 1,
 
-        /// <summary>
+    [Description("用户登出")]
-        /// 用户登出
-        /// </summary>
     LoginOut = 2,
 
-        /// <summary>
+    [Description("账号或者密码错误")]
-        ///账号或者密码错误
-        /// </summary>
     AccountOrPasswordError = 3,
 
-        /// <summary>
+    [Description("账号锁定")]
-        /// 账号锁定
-        /// </summary>
     AccountLocked = 4,
 
     //账号启用
@@ -71,6 +60,5 @@ namespace IRaCIS.Core.Domain.Models
     MFALogin = 12,
 
     MFALoginFail = 13,
-    }
-
 }
+

IRaCIS.Core.Domain/Management/UserPassWordLog.cs

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

IRaCIS.Core.Domain/Management/UserType.cs

@@ -1,9 +1,8 @@
 using IRaCIS.Core.Domain.Share;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+public class UserType : Entity
 {
-    public class UserType : Entity
-    {
     #region 导航属性
     [JsonIgnore]
     public List<UserTypeMenu> UserTypeMenuList { get; set; }
@@ -28,5 +27,4 @@ namespace IRaCIS.Core.Domain.Models
 
     public bool IsEnable { get; set; } = true;
     public string PermissionStr { get; set; } = string.Empty;
-    }
 }

IRaCIS.Core.Domain/Management/UserTypeGroup.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("UserTypeGroup")]
+public class UserTypeGroup : Entity
 {
-    ///<summary>
-    ///UserTypeGroup
-    ///</summary>
-    [Table("UserTypeGroup")]
-    public class UserTypeGroup : Entity
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("DictionaryId")]
@@ -17,6 +14,5 @@ namespace IRaCIS.Core.Domain.Models
     #endregion
     public Guid UserTypeId { get; set; }
     public Guid DictionaryId { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/Management/UserTypeMenu.cs

@@ -1,8 +1,7 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Table("UserTypeMenu")]
+public partial class UserTypeMenu : Entity
 {
-    [Table("UserTypeMenu")]
-    public partial class UserTypeMenu : Entity
-    {
     #region 导航属性
 
     [JsonIgnore]
@@ -14,5 +13,4 @@ namespace IRaCIS.Core.Domain.Models
 
     public Guid UserTypeId { get; set; }
     public Guid MenuId { get; set; }
-    }
 }

IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs

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

IRaCIS.Core.Domain/QC/ClinicalData/PreviousHistory.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("PreviousHistory")]
+public class PreviousHistory : BaseAddAuditEntity
 {
-    ///<summary>
-    ///PreviousHistory
-    ///</summary>
-    [Table("PreviousHistory")]
-    public class PreviousHistory : BaseAddAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public SubjectVisit SubjectVisit { get; set; }
@@ -20,6 +17,5 @@ namespace IRaCIS.Core.Domain.Models
     public string FileName { get; set; } = String.Empty;
     public string Position { get; set; } = String.Empty;
     public Guid ClinicalDataTrialSetId { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/QC/ClinicalData/PreviousOther.cs

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

IRaCIS.Core.Domain/QC/ClinicalData/PreviousPDF.cs

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

IRaCIS.Core.Domain/QC/ClinicalData/PreviousSurgery.cs

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

IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs

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

IRaCIS.Core.Domain/QC/QCChallenge.cs

@@ -1,9 +1,8 @@
 using IRaCIS.Core.Domain.Share;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+public class QCChallenge : BaseAddAuditEntity
 {
-    public class QCChallenge : BaseAddAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("LatestReplyUserId")]
@@ -53,5 +52,4 @@ namespace IRaCIS.Core.Domain.Models
 
     public UserTypeEnum UserTypeEnum { get; set; }
     public string ChallengeType { get; set; } = string.Empty;
-    }
 }

IRaCIS.Core.Domain/QC/QCChallengeDialog.cs

@@ -1,9 +1,8 @@
 using IRaCIS.Core.Domain.Share;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+public class QCChallengeDialog : BaseAddAuditEntity
 {
-    public class QCChallengeDialog : BaseAddAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public QCChallenge QCChallenge { get; set; }
@@ -16,5 +15,4 @@ namespace IRaCIS.Core.Domain.Models
     public Guid SubjectVisitId { get; set; }
 
     public UserTypeEnum UserTypeEnum { get; set; }
-    }
 }

IRaCIS.Core.Domain/QC/QCQuestion.cs

@@ -1,12 +1,9 @@
 using IRaCIS.Core.Domain.Share;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("QCQuestion")]
+public class QCQuestion : BaseFullAuditEntity
 {
-    ///<summary>
-    ///QCQuestionConfigure
-    ///</summary>
-    [Table("QCQuestion")]
-    public class QCQuestion : BaseFullAuditEntity
-    {
     #region 导航属性
 
     [JsonIgnore]
@@ -29,5 +26,4 @@ namespace IRaCIS.Core.Domain.Models
     public string ParentTriggerValue { get; set; } = string.Empty;
     public Guid? ParentId { get; set; }
     public int ShowOrder { get; set; }
-    }
 }

IRaCIS.Core.Domain/QC/TrialQCQuestion.cs

@@ -1,12 +1,9 @@
 using IRaCIS.Core.Domain.Share;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("TrialQCQuestion")]
+public class TrialQCQuestion : BaseFullAuditEntity
 {
-    ///<summary>
-    ///TrialQCQuestionConfigure
-    ///</summary>
-    [Table("TrialQCQuestion")]
-    public class TrialQCQuestion : BaseFullAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public Trial Trial { get; set; }
@@ -34,5 +31,4 @@ namespace IRaCIS.Core.Domain.Models
     public int ShowOrder { get; set; }
 
     public bool? IsConfirm { get; set; }
-    }
 }

IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs

@@ -1,12 +1,9 @@
 using IRaCIS.Core.Domain.Share;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("TrialQCQuestionAnswer")]
+public class TrialQCQuestionAnswer : BaseFullAuditEntity
 {
-    ///<summary>
-    ///TrialQCQuestionRecord
-    ///</summary>
-    [Table("TrialQCQuestionAnswer")]
-    public class TrialQCQuestionAnswer : BaseFullAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     public TrialQCQuestion TrialQCQuestionConfigure { get; set; }
@@ -22,5 +19,4 @@ namespace IRaCIS.Core.Domain.Models
 
     public Guid SubjectVisitId { get; set; }
     public Guid TrialQCQuestionConfigureId { get; set; }
-    }
 }

IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectAdditionalEvaluationResult.cs

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

IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluation.cs

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

IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitFilter.cs

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

IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs

@@ -1,11 +1,8 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+
+[Table("SubjectCriteriaEvaluationVisitStudyFilter")]
+public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity
 {
-    ///<summary>
-    ///SubjectCriteriaEvaluationVisitStudyFilter
-    ///</summary>
-    [Table("SubjectCriteriaEvaluationVisitStudyFilter")]
-    public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("TrialReadingCriterionId")]
@@ -30,6 +27,5 @@ namespace IRaCIS.Core.Domain.Models
     public bool IsConfirmed { get; set; }
 
     public bool IsReading { get; set; }
-    }
-
 }
+

IRaCIS.Core.Domain/Reading/ClinicalData/ClinicalDataSystemSet.cs

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

IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs

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

IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs

@@ -1,20 +1,15 @@
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
+[Comment("项目的临床数据")]
+[Table("ReadingClinicalDataPDF")]
+public class ReadingClinicalDataPDF : BaseAddAuditEntity
 {
-    ///<summary>
-    /// 项目的临床数据
-    ///</summary>
-    [Table("ReadingClinicalDataPDF")]
-    public class ReadingClinicalDataPDF : BaseAddAuditEntity
-    {
     #region 导航属性
     [JsonIgnore]
     [ForeignKey("ReadingClinicalDataId")]
     public ReadingClinicalData ReadingClinicalData { get; set; }
     #endregion
 
-        /// <summary>
+    [Comment("阅片临床数据ID")]
-        /// 阅片临床数据ID
-        /// </summary>
     public Guid ReadingClinicalDataId { get; set; }
 
     public string Path { get; set; } = string.Empty;
@@ -22,5 +17,4 @@ namespace IRaCIS.Core.Domain.Models
     public int Size { get; set; } = 0;
 
     public string Type { get; set; } = string.Empty;
-    }
 }

IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalData.cs

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

IRaCIS.Core.Domain/Reading/ClinicalData/ReadingConsistentClinicalDataPDF.cs

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