同步数据模型和数据库对应关系2

IRaCIS.Core.Domain/Allocation/SubjectUser.cs

@@ -9,11 +9,12 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
 using System.ComponentModel;
+using Microsoft.EntityFrameworkCore;
 
 namespace IRaCIS.Core.Domain.Models
 {
 
-    [Description("受试者某标准阅片用户中间关系表")]
+    [Comment("受试者 - 项目标准阅片医生配置表")]
     [Table("SubjectUser")]
     public class SubjectUser : BaseFullAuditEntity
     {
@@ -39,25 +40,23 @@ namespace IRaCIS.Core.Domain.Models
         public Subject Subject { get; set; }
         #endregion
 
+        public Arm ArmEnum { get; set; }
+
+        public DateTime? AssignTime { get; set; }
+
+        public Guid DoctorUserId { get; set; }
+
+        public bool IsConfirmed { get; set; }
+
+        [Comment("该属性有值 说明该医生被替换了 分配的时候 要过滤掉")]
+        public Guid? ReplacedSubjectUserId { get; set; }
+
+        public Guid SubjectId { get; set; }
+
         public Guid TrialId { get; set; }
 
         public Guid TrialReadingCriterionId { get; set; }
 
-        public DateTime? AssignTime { get; set; }
-
-        public Guid SubjectId { get; set; }
-
-
-        public Guid DoctorUserId { get; set; }
-
-
-        public Arm ArmEnum { get; set; }
-
-        public bool IsConfirmed { get; set; } = true;
-
-        //该属性有值 说明该医生被替换了 分配的时候 要过滤掉
-        public Guid? ReplacedSubjectUserId { get; set; }
-
 
 
     }

IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs

@@ -8,12 +8,11 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
 
 namespace IRaCIS.Core.Domain.Models
 {
-    ///<summary>
+    [Comment("项目阅片 - 分配规则")]
-    ///TaskAllocationRule
-    ///</summary>
     [Table("TaskAllocationRule")]
     public class TaskAllocationRule : BaseFullAuditEntity
     {
@@ -31,24 +30,23 @@ namespace IRaCIS.Core.Domain.Models
         #endregion
 
         public Guid TrialId { get; set; }
+        public Guid DoctorUserId { get; set; }
+
+        [Comment(" 入组表Id   可以去掉 TrialId  DoctorUserId")]
+        public Guid EnrollId { get; set; }
+
+        public bool IsEnable { get; set; }
+
+        public bool IsJudgeDoctor { get; set; }
+
+        public string Note { get; set; } = null!;
+
+        [Comment(" 计划比率")]
+        public int PlanReadingRatio { get; set; }
 
         public int PlanSubjectCount { get; set; }
 
 
-        public bool IsEnable { get; set; }
-
-        public string Note { get; set; } = string.Empty;
-
-        public Guid DoctorUserId { get; set; }
-
-        public Guid EnrollId { get; set; }
-
-        //是否是裁判医生  裁判医生单独加入
-        public bool IsJudgeDoctor { get; set; }
-
-        public int PlanReadingRatio { get; set; }
-
-
 
 
 

IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs

@@ -7,12 +7,11 @@ using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	///<summary>
+[Comment("项目阅片 - 一致性分析生成任务配置")]
-	///TaskConsistentRule
-	///</summary>
 [Table("TaskConsistentRule")]
 public class TaskConsistentRule : BaseFullAuditEntity
 {
@@ -57,4 +56,4 @@ namespace IRaCIS.Core.Domain.Models
 
 }
 
-}	 
+

IRaCIS.Core.Domain/Allocation/TaskInfluence.cs

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-    ///<summary>
+
-    ///TaskInfluence
+[Comment("项目阅片 - 退回重阅影响")]
-    ///</summary>
 [Table("TaskInfluence")]
 public class TaskInfluence : BaseAddAuditEntity
 {
@@ -28,7 +27,7 @@ namespace IRaCIS.Core.Domain.Models
 
     public Guid InfluenceTaskId { get; set; }
 
-        //对影响任务进行的操作
+    [Comment(" 对影响任务进行的操作")]
     public ReReadingOrBackOptType OptType { get; set; }
 
 
@@ -49,5 +48,3 @@ namespace IRaCIS.Core.Domain.Models
     Return = 2,
 
 }
-
-}

IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs

@@ -10,6 +10,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
+using Microsoft.EntityFrameworkCore;
 
 namespace IRaCIS.Core.Domain.Models
 {
@@ -19,9 +20,7 @@ namespace IRaCIS.Core.Domain.Models
 
         public string ImagePath { get; set; } = string.Empty;
     }
-    ///<summary>
+    [Comment("项目阅片 - 医学审核")]
-    ///TaskMedicalReview
-    ///</summary>
     [Table("TaskMedicalReview")]
     public class TaskMedicalReview : BaseFullAuditEntity
     {

IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs

@@ -8,18 +8,18 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
 
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
+    [Comment("项目阅片 - 一致性分析规则")]
-	 ///TaskTaskMedicalReviewRule
-	 ///</summary>
     [Table("TaskMedicalReviewRule")]
     public class TaskMedicalReviewRule :BaseFullAuditEntity
 	 {
 
         #region 导航属性
-
+        [JsonIgnore]
+        public User DoctorUser { get; set; }
         #endregion
 
         public Guid DoctorUserId { get; set; }
@@ -38,8 +38,7 @@ namespace IRaCIS.Core.Domain.Models
 
 		public int PlanTumorCount { get; set; }
 
-		[JsonIgnore]
+
-		public User DoctorUser { get; set; }
 
 
 

IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
+    [Comment("项目 - 虚拟中心编号更新记录")]
-	 ///TrialVirtualSiteCodeUpdate
-	 ///</summary>
     [Table("TrialVirtualSiteCodeUpdate")]
     public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
     {
@@ -22,7 +21,7 @@ namespace IRaCIS.Core.Domain.Models
 
         public Guid TrialId { get; set; }
 
-
+        [StringLength(250)]
         public string VirturalSiteCode { get; set; } = string.Empty;
 
 

IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs

@@ -8,12 +8,11 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-    ///<summary>
+[Comment("项目阅片  - 阅片任务重阅表")]
-    ///重阅申请流程记录表
-    ///</summary>
 [Table("VisitTaskReReading")]
 public class VisitTaskReReading : BaseFullAuditEntity
 {
@@ -37,43 +36,39 @@ namespace IRaCIS.Core.Domain.Models
     #endregion
 
     public Guid TrialId { get; set; }
-
+    [Comment(" 重阅原始任务Id")]
-        //重阅原始任务Id  重阅会产生新的任务 
     public Guid OriginalReReadingTaskId { get; set; }
 
-
+    [Comment(" 重阅确认人")]
-        //产生重阅的根任务Id
-        public Guid RootReReadingTaskId { get; set; }
-
-        //重阅申请 产生的新任务Id
-        public Guid? NewReReadingTaskId { get; set; }
-
-        public Guid RequestReReadingUserId { get; set; }
-      
-
-        public DateTime RequestReReadingTime { get; set; }
-      
-
-        //申请回退类型
-        public RequestReReadingType RequestReReadingType { get; set; }
-
-
-        public string RequestReReadingReason { get; set; } = string.Empty;
-
-        public string RequestReReadingRejectReason { get; set; } = string.Empty;
-
-        public RequestReReadingResult RequestReReadingResultEnum { get; set; }
-
     public Guid? RequestReReadingConfirmUserId { get; set; }
 
 
-        public bool IsCopyOrigenalForms { get; set; }
+    [Comment(" 请求重阅人")]
+    public Guid RequestReReadingUserId { get; set; }
 
-        //仅仅包括全局和访视
+    public Guid RootReReadingTaskId { get; set; }
+    [Comment("仅仅包括全局和访视")]
     public bool IsCopyFollowForms { get; set; }
 
+    [Comment(" 是否复制之前任务表单数据")]
+    public bool IsCopyOrigenalForms { get; set; }
+
+    public Guid? NewReReadingTaskId { get; set; }
+
+
+
+    [StringLength(512)]
+    public string RequestReReadingReason { get; set; } = null!;
+
+    public string RequestReReadingRejectReason { get; set; } = null!;
+
+    public RequestReReadingResult RequestReReadingResultEnum { get; set; }
+
+    public DateTime? RequestReReadingTime { get; set; }
+
+    public RequestReReadingType RequestReReadingType { get; set; }
+
+
 
 
-    }
-
 }

IRaCIS.Core.Domain/Common/Internationalization.cs

@@ -41,7 +41,7 @@ public class Internationalization : BaseFullAuditEntity
 
     public int ShowOrder { get; set; }
 
-    [Comment(" 0 1  2 预翻译 已确认  废除")]
+    //[Comment(" 0 1  2 预翻译 已确认  废除")]
     public int State { get; set; }
 
     [StringLength(2000)]

IRaCIS.Core.Domain/Common/SystemBasicData.cs

@@ -25,24 +25,28 @@ namespace IRaCIS.Core.Domain.Models
         #endregion
 
 
-        public string Name { get; set; }=string.Empty;
+        public BasicDataTypeEnum BasicDataTypeEnum { get; set; }
 
-		public string Value { get; set; } = string.Empty;
+        [StringLength(512)]
+        public string Code { get; set; } = null!;
 
-		public string Description { get; set; } = string.Empty;
+        [StringLength(512)]
-
+        public string Description { get; set; } = null!;
-		public int ShowOrder { get; set; }
-
-		public string Code { get; set; } = string.Empty;
-
-        public Guid? ParentId { get; set; }
-
-
-		 public string ValueCN { get; set; } = string.Empty;
 
         public bool IsEnable { get; set; }
 
-		public BasicDataTypeEnum  BasicDataTypeEnum { get; set; }
+        [StringLength(400)]
+        public string Name { get; set; } = null!;
+
+        public Guid? ParentId { get; set; }
+
+        public int ShowOrder { get; set; }
+
+        [StringLength(512)]
+        public string Value { get; set; } = null!;
+
+        [StringLength(512)]
+        public string ValueCN { get; set; } = null!;
 
 
     }

IRaCIS.Core.Domain/Common/VerificationCode.cs

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

IRaCIS.Core.Domain/Dcotor/TrialExperience.cs

@@ -1,3 +1,4 @@
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -5,6 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace IRaCIS.Core.Domain.Models
 {
+    [Comment("医生 - 项目临床经历")]
     [Table("TrialExperience")]
     public partial class TrialExperience : BaseFullAuditEntity
     {
@@ -12,6 +14,8 @@ namespace IRaCIS.Core.Domain.Models
 
         [JsonIgnore]
         public List<TrialExperienceCriteria> ExperienceCriteriaList { get; set; }
+        [JsonIgnore]
+        public Dictionary Phase { get; set; }
         #endregion
 
 
@@ -19,7 +23,7 @@ namespace IRaCIS.Core.Domain.Models
 
         public Guid? PhaseId { get; set; }
 
-        public Dictionary Phase { get; set; }
+
 
         [StringLength(512)]
         public string EvaluationContent { get; set; } = string.Empty;

IRaCIS.Core.Domain/Dcotor/Vacation.cs

@@ -1,8 +1,10 @@
-using System;
+using Microsoft.EntityFrameworkCore;
+using System;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace IRaCIS.Core.Domain.Models
 {
+    [Comment("医生 - 假期安排")]
     [Table("Vacation")]
     public class Vacation : BaseFullAuditEntity
     {

IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs

@@ -3,14 +3,13 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-01-14 15:04:22 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-    ///<summary>
+[Comment("后台 - 系统文档签署记录")]
-    ///SystemDocConfirmedUser
-    ///</summary>
 [Table("SystemDocConfirmedUser")]
 public class SystemDocConfirmedUser : BaseAddDeleteAuditEntity
 
@@ -26,18 +25,16 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-        public Guid SystemDocumentId { get; set; }
-
     public DateTime? ConfirmTime { get; set; }
 
-
     public Guid ConfirmUserId { get; set; }
 
     public DateTime? SignFirstViewTime { get; set; }
 
-        public string SignText { get; set; } = string.Empty;
+    [StringLength(1024)]
+    public string SignText { get; set; } = null!;
+
+    public Guid SystemDocumentId { get; set; }
 
 
 }
-
-}

IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs

@@ -3,14 +3,13 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-01-14 15:04:23 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	 ///<summary>
+[Comment("后台 - 系统文档需要签署用户类型")]
-	 ///SystemDocNeedConfirmedUserType
-	 ///</summary>
 [Table("SystemDocNeedConfirmedUserType")]
 public class SystemDocNeedConfirmedUserType : Entity
 {
@@ -30,4 +29,4 @@ namespace IRaCIS.Core.Domain.Models
 
 }
 
-}	 
+

IRaCIS.Core.Domain/Document/SystemDocument.cs

@@ -28,15 +28,15 @@ namespace IRaCIS.Core.Domain.Models
 
         public Guid FileTypeId { get; set; }
 
+        [StringLength(2000)]
+        public string Name { get; set; } = null!;
 
-		public string Name { get; set; } = string.Empty;
+        [StringLength(2000)]
+        public string Path { get; set; } = null!;
 
         public int SignViewMinimumMinutes { get; set; }
 
 
-		public string Path { get; set; } = string.Empty;
-
-
 
     }
 

IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs

@@ -3,14 +3,13 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-01-05 18:02:45 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
+    [Comment("项目 - 项目文档签署记录")]
-	 ///TrialDocUserTypeConfirmUser
-	 ///</summary>
     [Table("TrialDocConfirmedUser")]
     public class TrialDocConfirmedUser : BaseAddDeleteAuditEntity
     {
@@ -37,7 +36,7 @@ namespace IRaCIS.Core.Domain.Models
 
 		public DateTime? SignFirstViewTime { get; set; }
 
-
+        [StringLength(512)]
         public string SignText { get; set; } = string.Empty;
 
 

IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs

@@ -3,15 +3,14 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-01-05 09:11:50 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	 ///<summary>
+[Comment("项目 - 项目文档需要签署的用户类型")]
-	 ///TrialDocumentUserConfirm
-	 ///</summary>
 [Table("TrialDocNeedConfirmedUserType")]
 public class TrialDocNeedConfirmedUserType : Entity
 {
@@ -33,4 +32,4 @@ namespace IRaCIS.Core.Domain.Models
 
 }
 
-}	 
+

IRaCIS.Core.Domain/Document/TrialDocument.cs

@@ -3,15 +3,14 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-01-05 09:11:50 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	 ///<summary>
+[Comment("项目 - 项目文档")]
-	 ///TrialDocument
-	 ///</summary>
 [Table("TrialDocument")]
 public class TrialDocument : BaseFullDeleteAuditEntity
 {
@@ -38,6 +37,7 @@ namespace IRaCIS.Core.Domain.Models
 
     public Guid TrialId { get; set; }
 
+    [StringLength(1000)]
     public string Description { get; set; } = string.Empty;
 
     public int SignViewMinimumMinutes { get; set; }
@@ -46,4 +46,4 @@ namespace IRaCIS.Core.Domain.Models
 
 }
 
-}	 
+

IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs

@@ -9,12 +9,11 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-    ///<summary>
+[Comment("项目 - 项目发送邮件配置")]
-    ///TrialEmailNoticeConfig
-    ///</summary>
 [Table("TrialEmailNoticeConfig")]
 public class TrialEmailNoticeConfig : BaseFullDeleteAuditEntity
 {
@@ -40,80 +39,68 @@ namespace IRaCIS.Core.Domain.Models
     #endregion
 
     public Guid TrialId { get; set; }
+    public string AttachCNPath { get; set; } = null!;
 
+    public string AttachName { get; set; } = null!;
 
-        public string SMTPServerAddress { get; set; } = string.Empty;
+    public string AttachNameCN { get; set; } = null!;
 
-        public int SMTPServerPort { get; set; }
+    public string AttachPath { get; set; } = null!;
 
-        public string AuthorizationCode { get; set; } = string.Empty;
+    public string AuthorizationCode { get; set; } = null!;
 
-
-        public string FromName { get; set; } = string.Empty;
-
-
-        public string FromEmail { get; set; } = string.Empty;
-
-
-
-        /// <summary> 业务模块 /// </summary>
-        public int BusinessModuleEnum { get; set; }
-
-        /// <summary> 业务层级 /// </summary>
     public int BusinessLevelEnum { get; set; }
 
-
+    public int BusinessModuleEnum { get; set; }
-        /// <summary> 邮件加急类型 /// </summary>
-        public int EmailUrgentEnum { get; set; }
-
-        /// <summary> 定时周期 /// </summary>
-        public string EmailCron { get; set; } = string.Empty;
-
-        /// <summary> 邮件主题 /// </summary>
-        public string EmailTopic { get; set; } = string.Empty;
-
-        public string EmailTopicCN { get; set; } = string.Empty;
-
-        /// <summary> 附件 /// </summary>
-        public string AttachPath { get; set; } = string.Empty;
-
-        public string AttachCNPath { get; set; } = string.Empty;
-
-        public string Description { get; set; } = string.Empty;
-
-
-        public string AttachName { get; set; } = string.Empty;
-        public string AttachNameCN { get; set; } = string.Empty;
-
-
-        public string EmailHtmlContent { get; set; } = string.Empty;
-        public string EmailHtmlContentCN { get; set; } = string.Empty;
-
-
-        public Guid? SysEmailNoticeConfigId { get; set; }
-
-
-        [Required]
-        public string Code { get; set; } = string.Empty;
-
-        [Required]
-        public bool IsReturnRequired { get; set; }
-        [Required]
-        public bool IsAutoSend { get; set; }
-
-        public bool IsEnable { get; set; }
-
 
     public EmailBusinessScenario BusinessScenarioEnum { get; set; }
 
+    public string Code { get; set; } = null!;
+
     public CriterionType? CriterionTypeEnum { get; set; }
 
+    public string Description { get; set; } = null!;
+
+    public string EmailCron { get; set; } = null!;
+
+    [MaxLength]
+    public string? EmailHtmlContent { get; set; }
+
+    [MaxLength]
+    public string? EmailHtmlContentCN { get; set; }
+
+    public string EmailTopic { get; set; } = null!;
+
+    public string EmailTopicCN { get; set; } = null!;
+
+    public int EmailTypeEnum { get; set; }
+
+    public int EmailUrgentEnum { get; set; }
+
+    public string FromEmail { get; set; } = null!;
+
+    public string FromName { get; set; } = null!;
+
+    public bool IsAutoSend { get; set; }
+
+    public bool IsDistinguishCriteria { get; set; }
+
+    public bool IsEnable { get; set; }
+
+    public bool IsReturnRequired { get; set; }
+
+    public string SMTPServerAddress { get; set; } = null!;
+
+    public int SMTPServerPort { get; set; }
+
+    public Guid? SysEmailNoticeConfigId { get; set; }
 
     public Guid? TrialReadingCriterionId { get; set; }
 
-
 }
 
+[Comment("项目 - 项目邮件用户黑名单")]
+[Table("TrialEmailBlackUser")]
 public class TrialEmailBlackUser : Entity
 {
     [JsonIgnore]
@@ -128,5 +115,3 @@ namespace IRaCIS.Core.Domain.Models
 
     public Guid UserId { get; set; }
 }
-
-}

IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs

@@ -7,21 +7,17 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
+    [Comment("项目 - 项目邮件收发配置用户类型")]
-	 ///TrialEmailNoticeUser
-	 ///</summary>
     [Table("TrialEmailNoticeUser")]
     public class TrialEmailNoticeUser : Entity
 	 {
         #region 导航属性
-
-		#endregion
-
         [JsonIgnore]
         public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; }
-
+        #endregion
 
         public UserTypeEnum UserType { get; set; }
 	

IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs

@@ -1,29 +1,35 @@
+using Microsoft.EntityFrameworkCore;
 using System;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
-    [Table("TrialPaymentPrice")]
-    public partial class TrialPaymentPrice : BaseFullAuditEntity
-    {
-        public Guid TrialId { get; set; }
 
+[Comment("医生计费 - 项目支付配置")]
+[Table("TrialPaymentPrice")]
+public class TrialPaymentPrice : BaseFullAuditEntity
+{
+    [JsonIgnore]
     public Trial Trial { get; set; }
 
-        [Column(TypeName = "decimal(18,2)")]
+    public Guid TrialId { get; set; }
-        public decimal TrialAdditional { get; set; } = 0;
 
-        public string SowName { get; set; } = string.Empty;
-        public string SowPath { get; set; } = string.Empty;
 
-        [Column(TypeName = "decimal(18,2)")]
-        public decimal AdjustmentMultiple { get; set; } = 1;
 
-        /// <summary>
-        /// ÊÇ·ñÓРΪÐÂÏîÄ¿
-        /// </summary>
-        public bool? IsNewTrial { get; set; } = false;
 
 
+    [DecimalPrecision(18, 2)]
+    public decimal AdjustmentMultiple { get; set; }
+
+    [Comment(" 是否为新项目")]
+    public bool? IsNewTrial { get; set; }
+
+    public string SowName { get; set; } = null!;
+
+    [StringLength(500)]
+    public string SowPath { get; set; } = null!;
+
+    [DecimalPrecision(18, 2)]
+    public decimal TrialAdditional { get; set; }
+
 }
-}

IRaCIS.Core.Domain/Financial/TrialRevenuesPrice.cs

@@ -1,42 +1,45 @@
-using System;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
+[Comment("医生计费 - 项目工作量收入单价")]
 [Table("TrialRevenuesPrice")]
 public class TrialRevenuesPrice : BaseFullAuditEntity
 {
     public Guid TrialId { get; set; }
 
-        [Column(TypeName = "decimal(18,2)")]
+    [DecimalPrecision(18, 2)]
-        public decimal Timepoint { get; set; }
-
-        [Column(TypeName = "decimal(18,2)")]
-        public decimal TimepointIn24H { get; set; }
-
-        [Column(TypeName = "decimal(18,2)")]
-        public decimal TimepointIn48H { get; set; }
-
-        [Column(TypeName = "decimal(18,2)")]
     public decimal Adjudication { get; set; }
 
-        [Column(TypeName = "decimal(18,2)")]
+    [DecimalPrecision(18, 2)]
     public decimal AdjudicationIn24H { get; set; }
 
-        [Column(TypeName = "decimal(18,2)")]
+    [DecimalPrecision(18, 2)]
     public decimal AdjudicationIn48H { get; set; }
 
-        [Column(TypeName = "decimal(18,2)")]
+    [DecimalPrecision(18, 2)]
-        public decimal Global { get; set; }
-
-        [Column(TypeName = "decimal(18,2)")]
-        public decimal Training { get; set; }
-
-        [Column(TypeName = "decimal(18,2)")]
     public decimal Downtime { get; set; }
 
-        [Column(TypeName = "decimal(18,2)")]
+    [DecimalPrecision(18, 2)]
+    public decimal Global { get; set; }
+
+    [DecimalPrecision(18, 2)]
     public decimal RefresherTraining { get; set; }
 
-    }
+    [DecimalPrecision(18, 2)]
+    public decimal Timepoint { get; set; }
+
+    [DecimalPrecision(18, 2)]
+    public decimal TimepointIn24H { get; set; }
+
+    [DecimalPrecision(18, 2)]
+    public decimal TimepointIn48H { get; set; }
+
+    [DecimalPrecision(18, 2)]
+    public decimal Training { get; set; }
+
+
 }

IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs

@@ -1,33 +1,41 @@
-using System;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
+[Comment("医生计费 - 项目收入价格验证")]
+[Table("TrialRevenuesPriceVerification")]
 public class TrialRevenuesPriceVerification : Entity
 {
     public Guid TrialId { get; set; }
 
+    public bool Adjudication { get; set; }
+
+    public bool AdjudicationIn24H { get; set; }
+
+    public bool AdjudicationIn48H { get; set; }
+
+    public bool Downtime { get; set; }
+
+    public bool Global { get; set; }
+
+    public bool RefresherTraining { get; set; }
+
     public Guid ReviewerId { get; set; }
 
-        public string YearMonth { get; set; } = string.Empty;
+    [Comment(" false代表没有价格")]
+    public bool Timepoint { get; set; }
 
-        public bool Training { get; set; } = false;
+    public bool TimepointIn24H { get; set; }
 
-        public bool Downtime { get; set; } = false;
+    public bool TimepointIn48H { get; set; }
 
-        public bool Global { get; set; } = false;
+    public bool Training { get; set; }
 
-        public bool Timepoint { get; set; } = false;
+    public DateTime? WorkLoadDate { get; set; }
 
-        public bool TimepointIn24H { get; set; } = false;
+    [StringLength(400)]
-
+    public string YearMonth { get; set; } = null!;
-        public bool TimepointIn48H { get; set; } = false;
-
-        public bool Adjudication { get; set; } = false;
-
-        public bool AdjudicationIn24H { get; set; } = false;
-
-        public bool AdjudicationIn48H { get; set; } = false;
-        public bool RefresherTraining { get; set; } = false;
-        public DateTime WorkLoadDate { get; set; }
-    }
 }

IRaCIS.Core.Domain/Financial/VolumeReward.cs

@@ -1,15 +1,17 @@
+using Microsoft.EntityFrameworkCore;
 using System;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
+[Comment("医生计费 - 奖励")]
 [Table("VolumeReward")]
 public partial class VolumeReward : BaseFullAuditEntity
 {
-        [Column(TypeName = "decimal(18,2)")]
+    [DecimalPrecision(18, 2)]
     public decimal Price { get; set; }
     public int Min { get; set; }
     public int Max { get; set; }
 
 }
-}

IRaCIS.Core.Domain/Image/SystemAnonymization.cs

@@ -3,45 +3,38 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-03-03 15:26:35 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	 ///<summary>
+[Comment("系统 - 匿名化配置（需要同步）")]
-	 ///SystemAnonymization
-	 ///</summary>
 [Table("SystemAnonymization")]
 public class SystemAnonymization : BaseFullAuditEntity
 {
     #region 导航属性
 
     #endregion
-        public string Group { get; set; } = String.Empty;
+    public string Element { get; set; } = null!;
-
-		public string Element { get; set; } = String.Empty;
-
-
-		public string TagDescription { get; set; } = String.Empty;
-
-
-		public string TagDescriptionCN { get; set; } = string.Empty;
-
-
-        public string ReplaceValue { get; set; } = String.Empty;
-
-
-		public string ValueRepresentation { get; set; } = String.Empty;
 
+    public string Group { get; set; } = null!;
 
     public bool IsAdd { get; set; }
 
     public bool IsEnable { get; set; }
 
-
     public bool IsFixed { get; set; }
 
+    public string ReplaceValue { get; set; } = null!;
+
+    public string TagDescription { get; set; } = null!;
+
+    public string TagDescriptionCN { get; set; } = null!;
+
+    public string ValueRepresentation { get; set; } = null!;
+
 
 }
 
-}	 
+

IRaCIS.Core.Domain/Image/TrialDicomAE.cs

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-    ///<summary>
+
-    ///DicomAE
+[Comment("项目 - 项目DicomAE")]
-    ///</summary>
 [Table("TrialDicomAE")]
 public class TrialDicomAE : BaseFullAuditEntity
 {
@@ -40,5 +39,3 @@ namespace IRaCIS.Core.Domain.Models
     public bool? IsTestOK { get; set; }
 
 }
-
-}

IRaCIS.Core.Domain/Image/TrialImageDownload.cs

@@ -1,6 +1,8 @@
 using IRaCIS.Core.Domain.Models;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Text;
@@ -8,6 +10,7 @@ using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Domain.Models
 {
+    [Comment("项目 - 影像下载监控")]
     [Table("TrialImageDownload")]
     public class TrialImageDownload : BaseFullAuditEntity
     {
@@ -26,6 +29,7 @@ namespace IRaCIS.Core.Domain.Models
         public DateTime DownloadStartTime { get; set; }
         public DateTime? DownloadEndTime { get; set; }
 
+        [StringLength(400)]
         public string VisitName { get; set; }
 
         public ImageType ImageType { get; set; }

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

@@ -9,12 +9,11 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using IRaCIS.Core.Domain.Share.Management;
+using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-    ///<summary>
+[Comment("后台 - 系统通知")]
-    ///SystemNotice
-    ///</summary>
 [Table("SystemNotice")]
 public class SystemNotice : BaseFullAuditEntity
 {
@@ -27,7 +26,7 @@ namespace IRaCIS.Core.Domain.Models
     #endregion
 
 
-
+    [MaxLength]
     public string NoticeContent { get; set; } = string.Empty;
 
     public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; }
@@ -55,5 +54,3 @@ namespace IRaCIS.Core.Domain.Models
     public DateTime? PublishedTime { get; set; }
 
 }
-
-}

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

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-    ///<summary>
+
-    ///SystemNoticeUserRead
+[Comment("后台 - 系统通知用户读取记录")]
-    ///</summary>
 [Table("SystemNoticeUserRead")]
 public class SystemNoticeUserRead : BaseAddAuditEntity
 {
@@ -24,5 +23,3 @@ namespace IRaCIS.Core.Domain.Models
 
 
 }
-
-}

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

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
+    [Comment("后台 - 系统通知用户类型配置")]
-	 ///SystemNoticeUserType
-	 ///</summary>
     [Table("SystemNoticeUserType")]
     public class SystemNoticeUserType : BaseAddAuditEntity
     {

IRaCIS.Core.Domain/Management/UserFeedBack.cs

@@ -8,11 +8,10 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-    ///<summary>
+
-    ///UserFeedBack
+[Comment("后台 - 用户反馈")]
-    ///</summary>
 [Table("UserFeedBack")]
 public class UserFeedBack : BaseFullAuditEntity
 {
@@ -45,12 +44,9 @@ namespace IRaCIS.Core.Domain.Models
 
     public int QuestionType { get; set; }
 
+    [MaxLength]
     public string QuestionDescription { get; set; } = string.Empty;
 
-
-
-
-
     public int State { get; set; }
 
 
@@ -58,7 +54,7 @@ namespace IRaCIS.Core.Domain.Models
 
 
     public Guid? TrialId { get; set; }
-
+    [MaxLength]
     public string ScreenshotListStr { get; set; } = string.Empty;
 
 
@@ -68,4 +64,4 @@ namespace IRaCIS.Core.Domain.Models
 
 
 }
- }
+

IRaCIS.Core.Domain/Management/UserLog.cs

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-    ///<summary>
+
-    ///UserLog
+[Comment("后台 - 用户账户操作日志")]
-    ///</summary>
 [Table("UserLog")]
 public class UserLog : BaseAddAuditEntity
 {
@@ -22,9 +21,11 @@ namespace IRaCIS.Core.Domain.Models
     [JsonIgnore]
     public User OptUser { get; set; }
     #endregion
+
+    [StringLength(400)]
     public string IP { get; set; } = string.Empty;
 
-
+    [StringLength(400)]
     public string LoginFaildName { get; set; }=string.Empty;
 
 
@@ -92,5 +93,3 @@ namespace IRaCIS.Core.Domain.Models
 
     MFALoginFail=13,
 }
-
-}

IRaCIS.Core.Domain/Management/UserPassWordLog.cs

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-	 ///<summary>
+
-	 ///UserPassWordLog
+[Comment("后台 - 用户修改密码")]
-	 ///</summary>
 [Table("UserPassWordLog")]
 public class UserPassWordLog : BaseAddAuditEntity
 {
@@ -19,14 +18,9 @@ namespace IRaCIS.Core.Domain.Models
 
     #endregion
 
-        /// <summary>
+
-        /// 用户Id
-        /// </summary>
     public Guid UserId { get; set; }
 
-		/// <summary>
-        /// 密码
-        /// </summary>
     public string PassWord { get; set; } = string.Empty;
 
 
@@ -34,4 +28,4 @@ namespace IRaCIS.Core.Domain.Models
 }
 
 
-}	 
+

IRaCIS.Core.Domain/Management/UserType.cs

@@ -1,9 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using IRaCIS.Core.Domain.Share;
+using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
+
+[Comment("后台 - 用户类型 （需要同步）")]
+[Table("UserType")]
 public class UserType : Entity
 {
 
@@ -20,24 +25,30 @@ namespace IRaCIS.Core.Domain.Models
     [JsonIgnore]
     public List<User> UserList { get; set; }
     #endregion
-        public UserTypeEnum UserTypeEnum { get; set; }
 
-        public string UserTypeName { get; set; } = string.Empty;
+    public string Description { get; set; } = null!;
 
-        public string Description { get; set; } = string.Empty;
+    public bool IsEnable { get; set; }
 
+    [Comment(" 是否是内部用户类型")]
+    public bool IsInternal { get; set; }
+
+    [Comment(" 用于前端界面下拉框展示排序")]
     public int Order { get; set; }
 
-        public string UserTypeShortName { get; set; } = string.Empty;
+    public string PermissionStr { get; set; } = null!;
 
-        public bool IsEnable { get; set; } = true;
+    [Comment(" 此数据固定，不能更改，和代码耦合")]
+    public UserTypeEnum UserTypeEnum { get; set; }
 
+    [Comment(" 名称、描述可以更改")]
+    public string UserTypeName { get; set; } = null!;
 
-        public string PermissionStr { get; set; } = string.Empty;
+    [Comment(" 用户类型名称简写")]
+    public string UserTypeShortName { get; set; } = null!;
 
 
 
 
 
-    }
 }

IRaCIS.Core.Domain/Management/UserTypeGroup.cs

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-	 ///<summary>
+
-	 ///UserTypeGroup
+[Comment("后台 - 用户类型组（需要同步）")]
-	 ///</summary>
 [Table("UserTypeGroup")]
 public class UserTypeGroup : Entity
 {
@@ -31,8 +30,6 @@ namespace IRaCIS.Core.Domain.Models
 
     public Guid DictionaryId { get; set; }
 
-		
-
 }
 
-}	 
+

IRaCIS.Core.Domain/Management/UserTypeMenu.cs

@@ -2,8 +2,8 @@ using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using IRaCIS.Core.Domain.Share;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
 [Table("UserTypeMenu")]
 public partial class UserTypeMenu : Entity
 {
@@ -19,8 +19,4 @@ namespace IRaCIS.Core.Domain.Models
     public Guid UserTypeId { get; set; }
     public Guid MenuId { get; set; }
 
-       
-      
-
-    }
 }

IRaCIS.Core.Domain/QC/TrialQCQuestion.cs

@@ -3,15 +3,14 @@
 //	   生成时间 2021-11-11 11:19:10 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	 ///<summary>
+[Comment("项目 - 质控问题")]
-	 ///TrialQCQuestionConfigure
-	 ///</summary>
 [Table("TrialQCQuestion")]
 public class TrialQCQuestion : BaseFullAuditEntity
 {
@@ -30,19 +29,15 @@ namespace IRaCIS.Core.Domain.Models
 
     public Guid TrialId { get; set; }
 
-
+    [StringLength(500)]
     public string QuestionName { get; set; } = string.Empty;
-        /// <summary> 语言类型 </summary>
 
     public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
 
-
     public bool IsRequired { get; set; }
 
-
     public bool IsEnable { get; set; }
-
+    [Comment(" 下拉框、文本、单选、多选")]
-        /// <summary> 下拉框、文本、单选、多选 </summary>
     public string Type { get; set; } = string.Empty;
 
 
@@ -66,4 +61,4 @@ namespace IRaCIS.Core.Domain.Models
 }
 
 
-}	 
+

IRaCIS.Core.Domain/QC/TrialQCQuestionAnswer.cs

@@ -4,14 +4,13 @@
 //	   生成时间 2021-11-11 17:01:49 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	 ///<summary>
+[Comment("项目 - 质控问题表单答案")]
-	 ///TrialQCQuestionRecord
-	 ///</summary>
 [Table("TrialQCQuestionAnswer")]
 public class TrialQCQuestionAnswer : BaseFullAuditEntity
 {
@@ -27,7 +26,7 @@ namespace IRaCIS.Core.Domain.Models
 
     public TrialQCProcess QCProcessEnum { get; set; }
 
-		// 1代表第一个人QC数据  2 代表第二个人QC数据
+    [Comment("1代表第一个人QC数据  2 代表第二个人QC数据")]
     public CurrentQC CurrentQCEnum { get; set; }
 
     public Guid SubjectVisitId { get; set; }
@@ -40,4 +39,4 @@ namespace IRaCIS.Core.Domain.Models
 }
 
 
-}	 
+

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

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-	 ///<summary>
+
-	 ///SubjectAdditionalEvaluationResult
+[Comment("受试者 - 附加评估标准结果")]
-	 ///</summary>
 [Table("SubjectAdditionalEvaluationResult")]
 public class SubjectAdditionalEvaluationResult : BaseFullAuditEntity
 	 {
@@ -23,41 +22,29 @@ namespace IRaCIS.Core.Domain.Models
     #endregion
 
 
+    [Comment(" 附加评估答案")]
+    public string Answer { get; set; } = null!;
 
-        public Guid TrialReadingQuestionId { get; set; }
+    [Comment(" 最终结果")]
+    public string FinalAnswer { get; set; } = null!;
+
+    [Comment(" 最终结果翻字典")]
+    public string FinalTranslateDictionaryCode { get; set; } = null!;
+
+    [Comment(" 是否是最终结果")]
+    public bool IsFinalResult { get; set; }
 
     public Guid SubjectId { get; set; }
 
+    [Comment(" 附加评估答案翻译字典")]
+    public string TranslateDictionaryCode { get; set; } = null!;
+
     public Guid TrialReadingCriterionId { get; set; }
 
+    public Guid TrialReadingQuestionId { get; set; }
+
     public Guid? VisitTaskId { get; set; }
 
-		public string Answer { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 附加评估答案翻译字典
-        /// </summary>
-
-        public string TranslateDictionaryCode { get; set; }=string.Empty;
-	
-		/// <summary>
-        /// 是否是最终结果
-        /// </summary>
-
-		public bool IsFinalResult { get; set; }
-	
-		/// <summary>
-        /// 最终结果
-        /// </summary>
-
-		public string FinalAnswer { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 最终结果翻字典
-        /// </summary>
-
-        public string FinalTranslateDictionaryCode { get; set; } = string.Empty;
-
 }
 
-}	 
+	 

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

@@ -8,12 +8,11 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
 
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
+    [Comment("受试者 - 参与附加评估标准配置")]
-	 ///SubjectCriteriaEvaluation
-	 ///</summary>
     [Table("SubjectCriteriaEvaluation")]
     public class SubjectCriteriaEvaluation : BaseFullAuditEntity
     {
@@ -29,16 +28,13 @@ namespace IRaCIS.Core.Domain.Models
         public List<SubjectCriteriaEvaluationVisitFilter> SubjectCriteriaEvaluationVisitFilterList { get; set; }
         #endregion
 
+        [Comment(" 是否参与评估")]
+        public bool IsJoinEvaluation { get; set; }
 
         public Guid SubjectId { get; set; }
 
         public Guid TrialReadingCriterionId { get; set; }
 
-		/// <summary>
-        /// 是否参与评估
-        /// </summary>
-		public bool IsJoinEvaluation { get; set; }
-	
 
     }
 

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

@@ -8,12 +8,11 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-    ///<summary>
+[Comment("受试者 - 附加评估标准影像筛选")]
-    ///SubjectCriteriaEvaluationVisitFilter
-    ///</summary>
 [Table("SubjectCriteriaEvaluationVisitFilter")]
 public class SubjectCriteriaEvaluationVisitFilter : BaseFullAuditEntity
 {
@@ -32,29 +31,20 @@ namespace IRaCIS.Core.Domain.Models
     #endregion
 
 
+    [Comment(" 影像判断结果")]
+    public ImageDeterminationResultState ImageDeterminationResultState { get; set; }
+
+    [Comment(" 影像筛选状态")]
+    public ImageFilterState ImageFilterState { get; set; }
+
+    [Comment(" 是否已生成任务")]
+    public bool IsGeneratedTask { get; set; }
+
     public Guid SubjectId { get; set; }
 
-
-        public Guid TrialReadingCriterionId { get; set; }
-
-
-
     public Guid SubjectVisitId { get; set; }
 
-        /// <summary>
+    public Guid TrialReadingCriterionId { get; set; }
-        /// 影像筛选状态
-        /// </summary>
-        public ImageFilterState ImageFilterState { get; set; }
-
-        /// <summary>
-        /// 影像判断结果
-        /// </summary>
-        public ImageDeterminationResultState ImageDeterminationResultState { get; set; }
-
-        /// <summary>
-        /// 是否已生成任务
-        /// </summary>
-        public bool IsGeneratedTask { get; set; }
 
 }
 
@@ -84,5 +74,3 @@ namespace IRaCIS.Core.Domain.Models
     //筛选已完成
     Finished = 2
 }
-
-}

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

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
 namespace IRaCIS.Core.Domain.Models
 {
-    ///<summary>
+    [Comment("受试者 - 附加评估标准影像筛选检查")]
-    ///SubjectCriteriaEvaluationVisitStudyFilter
-    ///</summary>
     [Table("SubjectCriteriaEvaluationVisitStudyFilter")]
     public class SubjectCriteriaEvaluationVisitStudyFilter : BaseFullAuditEntity
     {
@@ -34,20 +33,19 @@ namespace IRaCIS.Core.Domain.Models
         #endregion
 
 
-        public Guid TrialReadingCriterionId { get; set; }
+        [Comment(" 是否确认")]
-
-        public Guid SubjectVisitId { get; set; }
-
-
-        public Guid StudyId { get; set; }
-
-        public Guid SeriesId { get; set; }
-
-
         public bool IsConfirmed { get; set; }
 
         public bool IsReading { get; set; }
 
+        public Guid SeriesId { get; set; }
+
+        public Guid StudyId { get; set; }
+
+        public Guid SubjectVisitId { get; set; }
+
+        public Guid TrialReadingCriterionId { get; set; }
+
 
 
     }

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

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
+    [Comment("项目标准 - 临床数据配置")]
-	 ///TrialClinicalDataSetCriterion
-	 ///</summary>
     [Table("TrialClinicalDataSetCriterion")]
     public class TrialClinicalDataSetCriterion : BaseFullAuditEntity
     {

IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalQuestion.cs

@@ -9,12 +9,11 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using IRaCIS.Core.Domain.Models;
 using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-    ///<summary>
+[Comment("系统临床数据问题  (需要同步)")]
-    ///系统临床数据问题
-    ///</summary>
 [Table("SystemClinicalQuestion")]
 public class SystemClinicalQuestion : BaseAddAuditEntity
 {
@@ -46,6 +45,7 @@ namespace IRaCIS.Core.Domain.Models
         }
     }
     #endregion
+
     /// <summary>
     /// 项目临床数据Id
     /// </summary>
@@ -165,6 +165,3 @@ namespace IRaCIS.Core.Domain.Models
 
 
 }
-
-
-}

IRaCIS.Core.Domain/Reading/ClinicalQuestion/SystemClinicalTableQuestion.cs

@@ -9,12 +9,11 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	 ///<summary>
+[Comment("系统临床表格问题 (需要同步)")]
-	 /// 系统临床表格问题
-	 ///</summary>
 [Table("SystemClinicalTableQuestion")]
 public class SystemClinicalTableQuestion : BaseAddAuditEntity
 {
@@ -37,90 +36,62 @@ namespace IRaCIS.Core.Domain.Models
 
     }
     #endregion
-        /// <summary>
+
-        /// 系统临床数据Id
+    [Comment(" 系统临床数据Id")]
-        /// </summary>
     public Guid SystemClinicalId { get; set; }
 
-		/// <summary>
+    [Comment(" 临床数据选项类型(无，自定义)")]
-		/// 问题名称
+    public int ClinicalOptionTypeEnum { get; set; }
-		/// </summary>
-		public string QuestionName { get; set; } = string.Empty;
 
-		/// <summary>
+    [Comment(" 问题标识")]
-        /// 问题英文名称
-        /// </summary>
-		public string QuestionEnName { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 临床问题类型(分组，单选。)
-        /// </summary>
-        public string ClinicalTableQuestionType { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 问题标识
-        /// </summary>
     public ClinicalTableQuestionMark? ClinicalTableQuestionMarkEnum { get; set; }
 
-		/// <summary>
+    [Comment(" 临床问题类型(分组，单选。)")]
-        /// 最大长度
+    public string ClinicalTableQuestionType { get; set; } = null!;
-        /// </summary>
-		public int? MaxAnswerLength { get; set; }
 
-		/// <summary>
+    [Comment(" 字典Code")]
-        /// 临床数据选项类型(无，自定义)
+    [StringLength(400)]
-        /// </summary>
+    public string DictionaryCode { get; set; } = null!;
-		public ClinicalOptionType ClinicalOptionTypeEnum { get; set; }
 
-		/// <summary>
-        /// 自定义选项
-        /// </summary>
-		public string TypeValue { get; set; } = string.Empty;
-
-        /// <summary>
-        /// 字典Code
-        /// </summary>
-        public string DictionaryCode { get; set; } = string.Empty;
-	
-		/// <summary>
-        /// 排序
-        /// </summary>
-		public int ShowOrder { get; set; }
-
-		/// <summary>
-		/// 是否必填
-		/// </summary>
-		public IsRequired IsRequired { get; set; }
-
-
-		/// <summary>
-        /// 外层问题Id
-        /// </summary>
-		public Guid QuestionId { get; set; }
-
-        /// <summary>
-        /// 小数点位数
-        /// </summary>
     public int? DigitPlaces { get; set; }
 
-        /// <summary>
+    [Comment(" 是否必填")]
-        /// 单位
+    public int IsRequired { get; set; }
-        /// </summary>
-        public string Unit { get; set; } = string.Empty;
 
-        /// <summary>
+    [Comment(" 最大长度")]
-        /// 关联ID
+    public int? MaxAnswerLength { get; set; }
-        /// </summary>
+
+    [Comment(" 问题英文名称")]
+    [StringLength(400)]
+    public string QuestionEnName { get; set; } = null!;
+
+    [Comment(" 外层问题Id")]
+    public Guid QuestionId { get; set; }
+
+    [Comment(" 问题名称")]
+    [StringLength(400)]
+    public string QuestionName { get; set; } = null!;
+
+    [Comment(" 关联ID")]
     public Guid? RelevanceId { get; set; }
 
-        /// <summary>
+    [Comment(" 关联Value")]
-        /// 关联Value
+    [StringLength(1000)]
-        /// </summary>
+    public string RelevanceValue { get; set; } = null!;
-        public string RelevanceValue { get; set; } = string.Empty;
+
+    [Comment(" 排序")]
+    public int ShowOrder { get; set; }
+
+
+    [Comment(" 自定义选项")]
+    [StringLength(1000)]
+    public string TypeValue { get; set; } = null!;
+
+    public string Unit { get; set; } = null!;
 
 
 
 }
 
 
-}	 
+

IRaCIS.Core.Domain/Reading/ClinicalQuestion/TrialClinicalQuestion.cs

@@ -9,12 +9,11 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using IRaCIS.Core.Domain.Models;
 using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-    ///<summary>
+[Comment("项目 - 项目临床数据问题")]
-    ///项目临床数据问题
-    ///</summary>
 [Table("TrialClinicalQuestion")]
 public class TrialClinicalQuestion : BaseAddAuditEntity
 {
@@ -39,7 +38,12 @@ namespace IRaCIS.Core.Domain.Models
         }
     }
 
-
+    /// <summary>
+    /// 分组
+    /// </summary>
+    [JsonIgnore]
+    [ForeignKey("GroupId")]
+    public TrialClinicalQuestion GroupQuestin { get; set; }
 
     [JsonIgnore]
     [ForeignKey("TrialClinicalId")]
@@ -153,12 +157,7 @@ namespace IRaCIS.Core.Domain.Models
     /// </summary>
     public ClinicalCalculateMark? CustomCalculateMark { get; set; }
 
-        /// <summary>
+
-        /// 分组
-        /// </summary>
-        [JsonIgnore]
-        [ForeignKey("GroupId")]
-        public TrialClinicalQuestion GroupQuestin { get; set; }
 
     /// <summary>
     /// 自定义计算问题
@@ -175,7 +174,4 @@ namespace IRaCIS.Core.Domain.Models
     public string Unit { get; set; } = string.Empty;
 
 
-	}
-
-
 }

IRaCIS.Core.Domain/Reading/ReadingCriterion/SystemCriterionDictionaryCode.cs

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-	 ///<summary>
+
-	 ///SystemCriterionDictionaryCode
+[Comment("系统标准 - 字典配置 （需要同步）")]
-	 ///</summary>
 [Table("SystemCriterionDictionaryCode")]
 public class SystemCriterionDictionaryCode : BaseAddAuditEntity
 {
@@ -28,4 +27,4 @@ namespace IRaCIS.Core.Domain.Models
 }
 
 
-}	 
+

IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionAdditionalAssessmentType.cs

@@ -8,12 +8,11 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using IRaCIS.Core.Domain.Share.Reading;
+using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	///<summary>
+[Comment("项目 - 项目标准附加评估配置")]
-	///TrialCriterionAdditionalAssessmentType
-	///</summary>
 [Table("TrialCriterionAdditionalAssessmentType")]
 public class TrialCriterionAdditionalAssessmentType : BaseFullAuditEntity
 {
@@ -37,4 +36,4 @@ namespace IRaCIS.Core.Domain.Models
 
 }
 
-}	 
+

IRaCIS.Core.Domain/Reading/ReadingCriterion/TrialCriterionDictionaryCode.cs

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
+    [Comment("项目 - 项目标准使用字典")]
-	 ///TrialCriterionDictionaryCode
-	 ///</summary>
     [Table("TrialCriterionDictionaryCode")]
     public class TrialCriterionDictionaryCode : BaseAddAuditEntity
     {

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs

@@ -11,8 +11,8 @@ using Microsoft.EntityFrameworkCore;
 
 namespace IRaCIS.Core.Domain.Models;
 
-[Comment("项目标准 - 标准配置")]
+[Comment("项目标准问题")]
-[Table("ReadingQuestionCriterionTrial")]
+[Table("ReadingQuestionTrial")]
 public class ReadingQuestionTrial : BaseAddAuditEntity
 {
     #region 导航属性

IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadingPeriodSet.cs

@@ -7,8 +7,8 @@ using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
 [Comment("项目 - 阅片期配置")]
 [Table("ReadingPeriodSet")]
 public class ReadingPeriodSet : BaseFullDeleteAuditEntity
@@ -32,7 +32,6 @@ namespace IRaCIS.Core.Domain.Models
 
     [Comment("生效时间")]
     public DateTime? EffectOfTime { get; set; }
-        [Comment("")]
     public DateTime? ExpirationDate { get; set; }
     [Comment("截止访视")]
     [DecimalPrecision(18, 0)]
@@ -59,6 +58,4 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-    }
-
 }

IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
+    [Comment("用户配置 - WL模板")]
-	 ///UserWLTemplate
-	 ///</summary>
     [Table("UserWLTemplate")]
     public class UserWLTemplate : BaseAddAuditEntity
     {
@@ -21,23 +20,15 @@ namespace IRaCIS.Core.Domain.Models
 
         public string TemplateName { get; set; } = string.Empty;
 
-
         public Guid UserId { get; set; }
 
-
-	
-
         public int WW { get; set; }
 
-
         public int WL { get; set; }
 
-
         public int ShowOrder { get; set; } = 0;
 
-		/// <summary>
+
-		/// 是否为默认
-		/// </summary>
         public bool IsPitchOn { get; set; } = true;
 
     }

IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_IRECIST1Point1.cs

@@ -7,34 +7,26 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-	///<summary>
+
-	///IRECIST1Point1肿瘤评估(系统标准)
+[Comment("系统标准 - 疗效评估对照表 (需要同步)")]
-	///</summary>
 [Table("TumorAssessment_IRECIST1Point1")]
 public class TumorAssessment_IRECIST1Point1 : Entity
 {
 
-		/// <summary>
+    [Comment("靶病灶")]
-        /// 靶病灶
-        /// </summary>
     public TargetAssessment TargetLesion { get; set; }
 
-		/// <summary>
+    [Comment("非靶病灶")] 
-        /// 非靶病灶
-        /// </summary>
     public NoTargetAssessment NonTargetLesions { get; set; }
 
-		/// <summary>
+    [Comment("新病灶")]     
-        /// 新病灶
-        /// </summary>
     public NewLesionAssessment NewLesion { get; set; }
 
-		/// <summary>
+
-        /// 整体疗效
+    [Comment("整体疗效")] 
-        /// </summary>
     public OverallAssessment OverallEfficacy { get; set; }
 }
 
-}	 
+

IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1.cs

@@ -7,6 +7,7 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
 namespace IRaCIS.Core.Domain.Models
 {
     ///<summary>
@@ -16,24 +17,16 @@ namespace IRaCIS.Core.Domain.Models
     public class TumorAssessment_RECIST1Point1 : Entity
     {
 
-		/// <summary>
+        [Comment("靶病灶")]
-        /// 靶病灶
-        /// </summary>
         public TargetAssessment TargetLesion { get; set; }
 
-		/// <summary>
+        [Comment("非靶病灶")]
-        /// 非靶病灶
-        /// </summary>
         public NoTargetAssessment NonTargetLesions { get; set; }
 
-		/// <summary>
+        [Comment("新病灶")]
-        /// 新病灶
-        /// </summary>
         public NewLesionAssessment NewLesion { get; set; }
 
-		/// <summary>
+        [Comment("整体疗效")]
-        /// 整体疗效
-        /// </summary>
         public OverallAssessment OverallEfficacy { get; set; }
     }
 

IRaCIS.Core.Domain/Reading/TumorAssessment/TumorAssessment_RECIST1Point1BM.cs

@@ -7,6 +7,7 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
 namespace IRaCIS.Core.Domain.Models
 {
 	///<summary>
@@ -16,24 +17,16 @@ namespace IRaCIS.Core.Domain.Models
 	 public class TumorAssessment_RECIST1Point1BM : Entity
 	 {
 
-		/// <summary>
+        [Comment("靶病灶")]
-        /// 靶病灶
-        /// </summary>
         public TargetAssessment TargetLesion { get; set; }
 
-		/// <summary>
+        [Comment("非靶病灶")]
-        /// 非靶病灶
-        /// </summary>
         public NoTargetAssessment NonTargetLesions { get; set; }
 
-		/// <summary>
+        [Comment("新病灶")]     
-        /// 新病灶
-        /// </summary>
 		public NewLesionAssessment NewLesion { get; set; }
 
-		/// <summary>
+        [Comment("整体疗效")]
-        /// 整体疗效
-        /// </summary>
         public OverallAssessment OverallEfficacy { get; set; }
 	}
 

IRaCIS.Core.Domain/SiteSurvey/TrialSiteEquipmentSurvey.cs

@@ -4,14 +4,13 @@
 //	   生成时间 2021-12-23 13:16:57 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-    ///<summary>
+[Comment("项目 - 项目中心调研设备表")]
-    ///TrialSiteEquipmentSurvey
-    ///</summary>
 [Table("TrialSiteEquipmentSurvey")]
 public class TrialSiteEquipmentSurvey : BaseFullAuditEntity
 {
@@ -41,6 +40,4 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-    }
-
 }

IRaCIS.Core.Domain/SiteSurvey/TrialSiteSurvey.cs

@@ -4,15 +4,15 @@
 //	   生成时间 2021-12-23 13:16:57 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	 ///<summary>
+
-	 ///TrialSiteSurvey
+[Comment("项目 - 项目中心调研表")]
-	 ///</summary>
 [Table("TrialSiteSurvey")]
 public class TrialSiteSurvey : BaseFullDeleteAuditEntity
 {
@@ -77,4 +77,4 @@ namespace IRaCIS.Core.Domain.Models
 
 }
 
-}	 
+

IRaCIS.Core.Domain/SiteSurvey/TrialSiteUserSurvey.cs

@@ -4,14 +4,13 @@
 //	   生成时间 2021-12-23 13:16:57 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-    ///<summary>
+[Comment("项目 - 项目中心调研用户表")]
-    ///TrialSiteUserSurvey
-    ///</summary>
 [Table("TrialSiteUserSurvey")]
 public class TrialSiteUserSurvey : BaseFullAuditEntity
 {
@@ -62,6 +61,4 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-    }
-
 }

IRaCIS.Core.Domain/Trial/TrialBodyPart.cs

@@ -8,11 +8,10 @@ using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Collections.Generic;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-	 ///<summary>
+
-	 ///TrialBodyPart
+[Comment("项目 - 项目部位配置")]
-	 ///</summary>
 [Table("TrialBodyPart")]
 public class TrialBodyPart : BaseAddAuditEntity
 {
@@ -23,20 +22,17 @@ namespace IRaCIS.Core.Domain.Models
 
     #endregion
 
-        public string Code { get; set; } = string.Empty;
+    public string Code { get; set; } = null!;
-
-
-        public string Name { get; set; } = string.Empty;
-
-
-        public string NameCN { get; set; } = string.Empty;
-
-
-
-        public Guid TrialId { get; set; }
-
 
     public bool IsHandAdd { get; set; }
 
+    [StringLength(500)]
+    public string Name { get; set; } = null!;
+
+    [StringLength(500)]
+    public string NameCN { get; set; } = null!;
+
+    public Guid TrialId { get; set; }
+
 }
-}	 
+

IRaCIS.Core.Domain/Trial/TrialDictionary.cs

@@ -1,9 +1,11 @@
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
+[Comment("项目 - 项目字典关系表")]
 [Table("TrialDictionary")]
 public partial class TrialDictionary : Entity
 {
@@ -14,11 +16,10 @@ namespace IRaCIS.Core.Domain.Models
     public virtual Dictionary Dictionary { get; set; }
     #endregion
 
-
+    [StringLength(400)]
     public string KeyName { get; set; } = string.Empty;
 
     public Guid TrialId { get; set; }
 
     public Guid DictionaryId { get; set; }
 }
-}

IRaCIS.Core.Domain/Trial/TrialSign.cs

@@ -4,14 +4,13 @@
 //	   生成时间 2022-02-16 16:23:57 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	 ///<summary>
+[Comment("项目 - 项目操作签名表")]
-	 ///TrialSign
-	 ///</summary>
 [Table("TrialSign")]
 public class TrialSign : BaseAddAuditEntity
 {
@@ -20,15 +19,13 @@ namespace IRaCIS.Core.Domain.Models
     #endregion
     public Guid? TrialId { get; set; }
 
-
     public Guid? SubjectVisitId { get; set; }
 
-
-		//关联基础数据
     public Guid? SignCodeId { get; set; }
 
     public string SignCode { get; set; } = string.Empty;
 
+    [StringLength(1024)]
     public string SignText { get; set; } = string.Empty;
 
     public bool IsCompleted { get; set; }
@@ -36,4 +33,4 @@ namespace IRaCIS.Core.Domain.Models
 }
 
 
-}	 
+

IRaCIS.Core.Domain/Trial/TrialStateChange.cs

@@ -3,13 +3,12 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-02-25 14:21:48 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
+    [Comment("项目 - 项目状态变更记录表")]
-	 ///TrialStateChange
-	 ///</summary>
     [Table("TrialStateChange")]
     public class TrialStateChange : BaseAddAuditEntity
     {

IRaCIS.Core.Domain/Trial/TrialStatusDetail.cs

@@ -1,3 +1,4 @@
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -5,6 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace IRaCIS.Core.Domain.Models
 {
+    [Comment("ÏîÄ¿ - Èë×éÁ÷³Ì¼Ç¼")]
     [Table("TrialStatus")]
     public partial class TrialStatusDetail : BaseAddAuditEntity
     {
@@ -19,7 +21,7 @@ namespace IRaCIS.Core.Domain.Models
 
         public Guid TrialId { get; set; }
         public int TrialStatus { get; set; }
-
+        [StringLength(400)]
         public string Memo { get; set; } = string.Empty;
 
         public int OptUserType { get; set; }

IRaCIS.Core.Domain/TrialSiteUser/TrialExternalUser.cs

@@ -4,14 +4,13 @@
 //	   生成时间 2022-03-04 13:33:37 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	 ///<summary>
+[Comment("项目 - 项目外部人员")]
-	 ///TrialExternalUser
-	 ///</summary>
 [Table("TrialExternalUser")]
 public class TrialExternalUser : BaseFullAuditEntity
 {
@@ -21,15 +20,12 @@ namespace IRaCIS.Core.Domain.Models
     #endregion
 
 
-
     public Guid TrialId { get; set; }
 
     public Guid UserTypeId { get; set; }
 
     public string Phone { get; set; } = String.Empty;
 
-		/// <summary>
-
     public string Email { get; set; } = String.Empty;
 
 
@@ -40,31 +36,24 @@ namespace IRaCIS.Core.Domain.Models
 
     public string OrganizationName { get; set; } = String.Empty;
 
-
     public bool IsSystemUser { get; set; }
 
 
     public Guid SystemUserId { get; set; }
 
-
-
     public bool IsJoin { get; set; }
 
-
-
-
     public DateTime? ExpireTime { get; set; }
 
     public DateTime? ConfirmTime { get; set; }
 
+    [StringLength(512)]
     public string RejectReason { get; set; } = String.Empty;
 
-        /// <summary>
+
-        /// 邀请状态
+    [Comment(" 邀请状态")]
-        /// </summary>
-        [Required]
     public TrialExternalUserStateEnum InviteState { get; set; } = TrialExternalUserStateEnum.WaitSent;
 
 }
 
-}	 
+

IRaCIS.Core.Domain/TrialSiteUser/TrialSite.cs

@@ -1,9 +1,12 @@
-using System;
+using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
+[Comment("项目 - 项目中心表")]
+[Table("TrialSite")]
 public class TrialSite : BaseFullDeleteAuditEntity
 {
     #region 导航属性
@@ -49,5 +52,4 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-    }
 }

IRaCIS.Core.Domain/TrialSiteUser/TrialSiteDicomAE.cs

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-	 ///<summary>
+
-	 ///TrialSiteDicomAE
+[Comment("项目 - 项目中心DicomAE表")]
-	 ///</summary>
 [Table("TrialSiteDicomAE")]
 public class TrialSiteDicomAE : BaseFullDeleteAuditEntity
 {
@@ -31,16 +30,16 @@ namespace IRaCIS.Core.Domain.Models
     public string CallingAE { get; set; } = string.Empty;
 
 
-        public string IP { get; set; } = string.Empty;
+    [StringLength(500)]
+    public string Description { get; set; } = null!;
 
+    public string IP { get; set; } = null!;
 
-        public string Port { get; set; } = string.Empty;
+    [StringLength(500)]
-
+    public string Port { get; set; } = null!;
-
-        public string Description { get; set; } = string.Empty;
 
 
 
 }
 
-}	 
+

IRaCIS.Core.Domain/TrialSiteUser/TrialSiteUser.cs

@@ -4,15 +4,14 @@
 //	   生成时间 2021-11-23 15:40:27 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	///<summary>
+[Comment("项目 - 项目中心用户关系表")]
-	///UserTrialSite
-	///</summary>
 [Table("TrialSiteUser")]
 public class TrialSiteUser : BaseFullDeleteAuditEntity
 {
@@ -42,4 +41,4 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-}	 
+

IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs

@@ -2,12 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using IRaCIS.Core.Domain.Share;
+using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-    /// <summary>
+[Comment("项目 - 项目参与人员中间表")]
-    /// 运维人员与项目关联关系表 - 实体
-    /// </summary>
 [Table("TrialUser")]
 public partial class TrialUser : BaseFullDeleteAuditEntity
 {
@@ -29,5 +28,4 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-    }
 }

IRaCIS.Core.Domain/Visit/SubjectCanceDoctor.cs

@@ -7,11 +7,10 @@ using System;
 using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+using Microsoft.EntityFrameworkCore;
-{
+namespace IRaCIS.Core.Domain.Models;
-	 ///<summary>
+
-	 ///SubjectCanceDoctor
+[Comment("受试者 - 阅片标准取消分配医生记录")]
-	 ///</summary>
 [Table("SubjectCanceDoctor")]
 public class SubjectCanceDoctor : BaseAddAuditEntity
 {
@@ -20,15 +19,13 @@ namespace IRaCIS.Core.Domain.Models
     public Subject Subject { get; set; }
     #endregion
 
-
+    [StringLength(512)]
+    public string Note { get; set; } = null!;
 
     public Guid SubjectId { get; set; }
 
-		public string Note { get; set; } = string.Empty;
-
     public Guid? TrialReadingCriterionId { get; set; }
 
-
 }
 
-}	 
+

IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStat.cs

@@ -3,15 +3,14 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2021-12-23 15:37:48 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-	 ///<summary>
+[Comment("项目配置 - 访视计划调整不一致数量记录表")]
-	 ///VisitPlanInfluenceStudystat
-	 ///</summary>
 [Table("VisitPlanInfluenceStat")]
 public class VisitPlanInfluenceStat : BaseAddAuditEntity
 {
@@ -29,4 +28,4 @@ namespace IRaCIS.Core.Domain.Models
 
 }
 
-}	 
+

IRaCIS.Core.Domain/Visit/VisitPlanInfluenceStudy.cs

@@ -3,13 +3,12 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2021-12-20 16:42:26 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
-    ///<summary>
+[Comment("项目配置 - 访视计划调整影像检查")]
-    ///VisitPlanInfluenceSubjectVisit
-    ///</summary>
 [Table("VisitPlanInfluenceStudy")]
 public class VisitPlanInfluenceStudy : BaseAddAuditEntity
 {
@@ -43,5 +42,3 @@ namespace IRaCIS.Core.Domain.Models
     public Guid VisitPlanInfluenceStatId { get; set; }
 
 }
-
-}

IRaCIS.Core.Domain/Visit/VisitStage.cs

@@ -1,8 +1,11 @@
-using System;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace IRaCIS.Core.Domain.Models
+namespace IRaCIS.Core.Domain.Models;
-{
+
+[Comment("项目配置 - 访视记录")]
 [Table("VisitStage")]
 public class VisitStage : BaseFullDeleteAuditEntity
 {
@@ -15,7 +18,7 @@ namespace IRaCIS.Core.Domain.Models
 
     public string BlindName { get; set; } = string.Empty;
 
-        [Column(TypeName = "decimal(18,1)")]
+    [DecimalPrecision(18, 1)]
     public decimal VisitNum { get; set; }
     public string VisitName { get; set; } = string.Empty;
     public int VisitDay { get; set; }
@@ -34,5 +37,4 @@ namespace IRaCIS.Core.Domain.Models
 
 
 
-    }
 }