GlobalUsings 清理实体层

IRaCIS.Core.Application/TestService.cs

@@ -293,6 +293,9 @@ namespace IRaCIS.Application.Services
 
 
             Console.WriteLine(AesEncryption.Encrypt(MD5Helper.Md5("123456"), key));
+
+            Console.WriteLine();
+
             Console.WriteLine(AesEncryption.Encrypt("cyldev", key));
 
             Console.WriteLine($"原始文本: {plainText}");

IRaCIS.Core.Domain/Allocation/SubjectUser.cs

@@ -3,60 +3,59 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-06-10 11:59:27 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Collections.Generic;
 using System.ComponentModel;
-using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models;
+namespace IRaCIS.Core.Domain.Models
-
-
-[Comment("受试者 - 项目标准阅片医生配置表")]
-[Table("SubjectUser")]
-public class SubjectUser : BaseFullAuditEntity
 {
 
-    #region 导航属性
+    [Description("受试者某标准阅片用户中间关系表")]
-    [JsonIgnore]
+    [Table("SubjectUser")]
-    public Trial Trial { get; set; }
+    public class SubjectUser : BaseFullAuditEntity
+    {
 
-    [JsonIgnore]
+        #region 导航属性
-    //Parent
+        [JsonIgnore]
-    [ForeignKey("ReplacedSubjectUserId")]
+        public Trial Trial { get; set; }
-    public SubjectUser ReplacedSubjectUser { get; set; }
 
-    //ChildList
+        [JsonIgnore]
-    [JsonIgnore]
+        //Parent
-    public List<SubjectUser> EarlierSubjectUserList { get; set; }
+        [ForeignKey("ReplacedSubjectUserId")]
+        public SubjectUser ReplacedSubjectUser { get; set; }
+
+        //ChildList
+        [JsonIgnore]
+        public List<SubjectUser> EarlierSubjectUserList { get; set; }
 
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public User DoctorUser { get; set; }
+        public User DoctorUser { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public Subject Subject { get; set; }
+        public Subject Subject { get; set; }
-    #endregion
+        #endregion
 
-    public Arm ArmEnum { get; set; }
+        public Guid TrialId { get; set; }
 
-    public DateTime? AssignTime { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }
 
-    public Guid DoctorUserId { get; set; }
+        public DateTime? AssignTime { get; set; }
 
-    public bool IsConfirmed { get; set; }
+        public Guid SubjectId { get; set; }
-
-    [Comment("该属性有值 说明该医生被替换了 分配的时候 要过滤掉")]
-    public Guid? ReplacedSubjectUserId { get; set; }
-
-    public Guid SubjectId { get; set; }
-
-    public Guid TrialId { get; set; }
-
-    public Guid TrialReadingCriterionId { 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

@@ -1,53 +1,50 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-06-07 13:13:13 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-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;
-
-[Comment("项目阅片 - 分配规则")]
-[Table("TaskAllocationRule")]
-public class TaskAllocationRule : BaseFullAuditEntity
 {
-    #region 导航属性
+    ///<summary>
+    ///TaskAllocationRule
+    ///</summary>
+    [Table("TaskAllocationRule")]
+    public class TaskAllocationRule : BaseFullAuditEntity
+    {
+        #region 导航属性
 
-    [ForeignKey("DoctorUserId")]
+        [ForeignKey("DoctorUserId")]
-    [JsonIgnore]
+        [JsonIgnore]
-    public User DoctorUser { get; set; }
+        public User DoctorUser { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public Enroll Enroll { get; set; }
+        public Enroll Enroll { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public Trial Trial { get; set; }
+        public Trial Trial { get; set; }
-    #endregion
+        #endregion
 
-    public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
-    public Guid DoctorUserId { get; set; }
 
-    [Comment(" 入组表Id   可以去掉 TrialId  DoctorUserId")]
+        public int PlanSubjectCount { get; set; }
-    public Guid EnrollId { get; set; }
 
-    public bool IsEnable { get; set; }
 
-    public bool IsJudgeDoctor { get; set; }
+        public bool IsEnable { get; set; }
 
-    public string Note { get; set; } = null!;
+        public string Note { get; set; } = string.Empty;
 
-    [Comment(" 计划比率")]
+        public Guid DoctorUserId { get; set; }
-    public int PlanReadingRatio { get; set; }
 
-    public int PlanSubjectCount { get; set; }
+        public Guid EnrollId { get; set; }
+
+        //是否是裁判医生  裁判医生单独加入
+        public bool IsJudgeDoctor { get; set; }
+
+        public int PlanReadingRatio { get; set; }
 
 
 
 
 
+    }
+
 }

IRaCIS.Core.Domain/Allocation/TaskConsistentRule.cs

@@ -1,59 +1,54 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-07-01 15:32:56 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("项目阅片 - 一致性分析生成任务配置")]
-[Table("TaskConsistentRule")]
-public class TaskConsistentRule : BaseFullAuditEntity
 {
+    ///<summary>
+    ///TaskConsistentRule
+    ///</summary>
+    [Table("TaskConsistentRule")]
+    public class TaskConsistentRule : BaseFullAuditEntity
+    {
 
-    #region 导航属性
+        #region 导航属性
-    [JsonIgnore]
+        [JsonIgnore]
-    public Trial Trial { get; set; }
+        public Trial Trial { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    [ForeignKey("TrialReadingCriterionId")]
+        [ForeignKey("TrialReadingCriterionId")]
-    public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
+        public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
-    #endregion
+        #endregion
 
-    public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
-    public int PlanSubjectCount { get; set; }
+        public int PlanSubjectCount { get; set; }
 
-    public int PlanVisitCount { get; set; }
+        public int PlanVisitCount { get; set; }
 
-    public int IntervalWeeks { get; set; }
+        public int IntervalWeeks { get; set; }
 
-    public bool IsHaveReadingPeriod { get; set; }
+        public bool IsHaveReadingPeriod { get; set; }
 
-    public bool IsGenerateGlobalTask { get; set; }
+        public bool IsGenerateGlobalTask { get; set; }
 
-    public int BlindSubjectNumberOfPlaces { get; set; }
+        public int BlindSubjectNumberOfPlaces { get; set; }
 
-    public string BlindTrialSiteCode { get; set; } = string.Empty;
+        public string BlindTrialSiteCode { get; set; } = string.Empty;
 
-    public bool IsSelfAnalysis { get; set; }
+        public bool IsSelfAnalysis { get; set; }
 
-    public bool IsEnable { get; set; }
+        public bool IsEnable { get; set; }
 
-    public string Note { get; set; } = string.Empty;
+        public string Note { get; set; } = string.Empty;
 
 
-    public Guid TrialReadingCriterionId { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }
 
 
 
 
 
+    }
+
 }
-
-

IRaCIS.Core.Domain/Allocation/TaskInfluence.cs

@@ -1,50 +1,48 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-07-21 13:44:02 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("项目阅片 - 退回重阅影响")]
-[Table("TaskInfluence")]
-public class TaskInfluence : BaseAddAuditEntity
 {
+    ///<summary>
+    ///TaskInfluence
+    ///</summary>
+    [Table("TaskInfluence")]
+    public class TaskInfluence : BaseAddAuditEntity
+    {
 
-    #region 导航属性
+        #region 导航属性
-    [JsonIgnore]
+        [JsonIgnore]
-    public VisitTask OriginalTask { get; set; }
+        public VisitTask OriginalTask { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public VisitTask InfluenceTask { get; set; }
+        public VisitTask InfluenceTask { get; set; }
-    #endregion
+        #endregion
 
-    public Guid OriginalTaskId { get; set; }
+        public Guid OriginalTaskId { get; set; }
 
-    public Guid InfluenceTaskId { get; set; }
+        public Guid InfluenceTaskId { get; set; }
 
-    [Comment(" 对影响任务进行的操作")]
+        //对影响任务进行的操作
-    public ReReadingOrBackOptType OptType { get; set; }
+        public ReReadingOrBackOptType OptType { get; set; }
 
 
-
+
-}
+    }
-
+
-
+
-public enum ReReadingOrBackOptType
+    public enum ReReadingOrBackOptType
-{
+    {
-    //取消分配
+        //取消分配
-    CancelAssign = 0,
+        CancelAssign = 0,
-
+
-    //失效
+        //失效
-    Abandon = 1,
+        Abandon = 1,
-
+
-    //重阅重置
+        //重阅重置
-
+
-    Return = 2,
+        Return = 2,
+
+    }
 
 }

IRaCIS.Core.Domain/Allocation/TaskMedicalReview.cs

@@ -3,190 +3,190 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-06-29 10:56:50 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Collections.Generic;
 using System.Linq;
-using Newtonsoft.Json;
-using Microsoft.EntityFrameworkCore;
 
-namespace IRaCIS.Core.Domain.Models;
+namespace IRaCIS.Core.Domain.Models
-
-public class OSSImageInfo
 {
-    public string FileName { get; set; } = string.Empty;
+    public class OSSImageInfo
-
-    public string ImagePath { get; set; } = string.Empty;
-}
-[Comment("项目阅片 - 医学审核")]
-[Table("TaskMedicalReview")]
-public class TaskMedicalReview : BaseFullAuditEntity
-{
-    #region 导航属性
-
-    [JsonIgnore]
-    public User LatestReplyUser { get; set; }
-
-    [JsonIgnore]
-    public User MedicalManagerUser { get; set; }
-
-    [JsonIgnore]
-    [ForeignKey("VisitTaskId")]
-    public VisitTask VisitTask { get; set; }
-
-    [JsonIgnore]
-    public List<ReadingMedicalReviewDialog> ReadingMedicalReviewDialogList { get; set; }
-
-    [JsonIgnore]
-    public Trial Trial { get; set; }
-
-
-
-
-    /// <summary>
-    /// 文件
-    /// </summary>
-    [NotMapped]
-    public List<OSSImageInfo> FileList
     {
-        get
+        public string FileName { get; set; } = string.Empty;
+
+        public string ImagePath { get; set; } = string.Empty;
+    }
+    ///<summary>
+    ///TaskMedicalReview
+    ///</summary>
+    [Table("TaskMedicalReview")]
+    public class TaskMedicalReview : BaseFullAuditEntity
+    {
+        #region 导航属性
+
+        [JsonIgnore]
+        public User LatestReplyUser { get; set; }
+
+        [JsonIgnore]
+        public User MedicalManagerUser { get; set; }
+
+        [JsonIgnore]
+        [ForeignKey("VisitTaskId")]
+        public VisitTask VisitTask { get; set; }
+
+        [JsonIgnore]
+        public List<ReadingMedicalReviewDialog> ReadingMedicalReviewDialogList { get; set; }
+
+        [JsonIgnore]
+        public Trial Trial { get; set; }
+
+
+
+
+        /// <summary>
+        /// 文件
+        /// </summary>
+        [NotMapped]
+        public List<OSSImageInfo> FileList
         {
-
+            get
-
-            try
-            {
-                var result = JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
-                return result == null ? new List<OSSImageInfo>() : result;
-            }
-            catch (Exception)
             {
 
-                return new List<OSSImageInfo>();
-            }
 
+                try
+                {
+                    var result = JsonConvert.DeserializeObject<List<OSSImageInfo>>(this.ImagePath);
+                    return result == null ? new List<OSSImageInfo>() : result;
+                }
+                catch (Exception)
+                {
+
+                    return new List<OSSImageInfo>();
+                }
+
+            }
         }
+
+        [NotMapped]
+        public List<Guid> PDRelationTaskIdList => PDRelationTaskIdListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Select(t => Guid.Parse(t)).ToList();
+
+        #endregion
+
+        public Guid? LatestReplyUserId { get; set; }
+
+
+        /// <summary>
+        /// 分配时间
+        /// </summary>
+        public DateTime? AllocateTime { get; set; }
+
+        /// <summary>
+        /// 审核状态
+        /// </summary>
+        [Required]
+        public MedicalReviewAuditState AuditState { get; set; }
+
+        /// <summary>
+        /// 审核通过时间
+        /// </summary>
+        public DateTime? AuditSignTime { get; set; }
+
+        /// <summary>
+        /// 阅片人是否认同
+        /// </summary>
+        public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; }
+
+        public Guid? MedicalManagerUserId { get; set; }
+
+
+
+        public Guid VisitTaskId { get; set; }
+
+
+        public Guid TrialId { get; set; }
+
+        /// <summary>
+        /// 是否有问题
+        /// </summary>
+        public bool IsHaveQuestion { get; set; } = false;
+
+        /// <summary>
+        /// 质询问题
+        /// </summary>
+        public string Questioning { get; set; } = string.Empty;
+
+
+        /// <summary>
+        /// 图片路径
+        /// </summary>
+        public string ImagePath { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 审核建议
+        /// </summary>
+        public AuditAdvice AuditAdviceEnum { get; set; }
+
+        /// <summary>
+        /// 是否关闭对话
+        /// </summary>
+        public bool IsClosedDialog { get; set; }
+
+        /// <summary>
+        /// 保存问题的时间
+        /// </summary>
+        public DateTime? SaveQuestionTime { get; set; }
+
+
+        /// <summary>
+        /// 不同意重阅原因
+        /// </summary>
+        public string DisagreeReason { get; set; } = string.Empty;
+
+
+        /// <summary>
+        /// 是否申请重阅
+        /// </summary>
+        public bool IsApplyHeavyReading { get; set; } = false;
+
+
+        /// <summary>
+        /// 保存结论时间
+        /// </summary>
+        public DateTime? SaveConclusionTime { get; set; }
+
+
+        /// <summary>
+        /// 文件名称
+        /// </summary>
+        public string FileName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 是否发送消息
+        /// </summary>
+        public bool IsSendMessage { get; set; } = false;
+
+
+        /// <summary>
+        /// 医学审核对话关闭原因
+        /// </summary>
+        public MedicalDialogClose MedicalDialogCloseEnum { get; set; }
+
+        /// <summary>
+        /// 对话关闭原因
+        /// </summary>
+        public string DialogCloseReason { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 无效的 为True无效
+        /// </summary>
+        public bool IsInvalid { get; set; }
+
+        public bool IsAutoGenerate { get; set; }
+
+        //  | 分割
+        public string PDRelationTaskIdListStr { get; set; } = string.Empty;
+
+
     }
 
-    [NotMapped]
-    public List<Guid> PDRelationTaskIdList => PDRelationTaskIdListStr.Split('|', StringSplitOptions.RemoveEmptyEntries).Select(t => Guid.Parse(t)).ToList();
-
-    #endregion
-
-    public Guid? LatestReplyUserId { get; set; }
-
-
-    /// <summary>
-    /// 分配时间
-    /// </summary>
-    public DateTime? AllocateTime { get; set; }
-
-    /// <summary>
-    /// 审核状态
-    /// </summary>
-    [Required]
-    public MedicalReviewAuditState AuditState { get; set; }
-
-    /// <summary>
-    /// 审核通过时间
-    /// </summary>
-    public DateTime? AuditSignTime { get; set; }
-
-    /// <summary>
-    /// 阅片人是否认同
-    /// </summary>
-    public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; }
-
-    public Guid? MedicalManagerUserId { get; set; }
-
-
-
-    public Guid VisitTaskId { get; set; }
-
-
-    public Guid TrialId { get; set; }
-
-    /// <summary>
-    /// 是否有问题
-    /// </summary>
-    public bool IsHaveQuestion { get; set; } = false;
-
-    /// <summary>
-    /// 质询问题
-    /// </summary>
-    public string Questioning { get; set; } = string.Empty;
-
-
-    /// <summary>
-    /// 图片路径
-    /// </summary>
-    public string ImagePath { get; set; } = string.Empty;
-
-    /// <summary>
-    /// 审核建议
-    /// </summary>
-    public AuditAdvice AuditAdviceEnum { get; set; }
-
-    /// <summary>
-    /// 是否关闭对话
-    /// </summary>
-    public bool IsClosedDialog { get; set; }
-
-    /// <summary>
-    /// 保存问题的时间
-    /// </summary>
-    public DateTime? SaveQuestionTime { get; set; }
-
-
-    /// <summary>
-    /// 不同意重阅原因
-    /// </summary>
-    public string DisagreeReason { get; set; } = string.Empty;
-
-
-    /// <summary>
-    /// 是否申请重阅
-    /// </summary>
-    public bool IsApplyHeavyReading { get; set; } = false;
-
-
-    /// <summary>
-    /// 保存结论时间
-    /// </summary>
-    public DateTime? SaveConclusionTime { get; set; }
-
-
-    /// <summary>
-    /// 文件名称
-    /// </summary>
-    public string FileName { get; set; } = string.Empty;
-
-    /// <summary>
-    /// 是否发送消息
-    /// </summary>
-    public bool IsSendMessage { get; set; } = false;
-
-
-    /// <summary>
-    /// 医学审核对话关闭原因
-    /// </summary>
-    public MedicalDialogClose MedicalDialogCloseEnum { get; set; }
-
-    /// <summary>
-    /// 对话关闭原因
-    /// </summary>
-    public string DialogCloseReason { get; set; } = string.Empty;
-
-    /// <summary>
-    /// 无效的 为True无效
-    /// </summary>
-    public bool IsInvalid { get; set; }
-
-    public bool IsAutoGenerate { get; set; }
-
-    //  | 分割
-    public string PDRelationTaskIdListStr { get; set; } = string.Empty;
 
 
 }

IRaCIS.Core.Domain/Allocation/TaskMedicalReviewRule.cs

@@ -1,49 +1,43 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-06-29 13:32:34 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-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;
-
-[Comment("项目阅片 - 一致性分析规则")]
-[Table("TaskMedicalReviewRule")]
-public class TaskMedicalReviewRule : BaseFullAuditEntity
 {
+    ///<summary>
+    ///TaskTaskMedicalReviewRule
+    ///</summary>
+    [Table("TaskMedicalReviewRule")]
+    public class TaskMedicalReviewRule : BaseFullAuditEntity
+    {
 
-    #region 导航属性
+        #region 导航属性
-    [JsonIgnore]
-    public User DoctorUser { get; set; }
-    #endregion
 
-    public Guid DoctorUserId { get; set; }
+        #endregion
 
-    public bool IsEnable { get; set; }
+        public Guid DoctorUserId { get; set; }
 
-    public string Note { get; set; } = string.Empty;
+        public bool IsEnable { get; set; }
 
-    public Guid TrialId { get; set; }
+        public string Note { get; set; } = string.Empty;
 
-    public int PlanVisitCount { get; set; }
+        public Guid TrialId { get; set; }
 
-    public int PlanJudgeCount { get; set; }
+        public int PlanVisitCount { get; set; }
 
-    public int PlanGlobalCount { get; set; }
+        public int PlanJudgeCount { get; set; }
-
-    public int PlanTumorCount { get; set; }
 
+        public int PlanGlobalCount { get; set; }
+
+        public int PlanTumorCount { get; set; }
+
+        [JsonIgnore]
+        public User DoctorUser { get; set; }
 
 
 
 
 
+    }
 
 }
-
-

IRaCIS.Core.Domain/Allocation/TrialVirtualSiteCodeUpdate.cs

@@ -1,29 +1,28 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2024-02-29 15:48:36 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("项目 - 虚拟中心编号更新记录")]
-[Table("TrialVirtualSiteCodeUpdate")]
-public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
 {
+    ///<summary>
+    ///TrialVirtualSiteCodeUpdate
+    ///</summary>
+    [Table("TrialVirtualSiteCodeUpdate")]
+    public class TrialVirtualSiteCodeUpdate : BaseAddAuditEntity
+    {
 
-    #region 导航属性
+        #region 导航属性
 
-    #endregion
+        #endregion
 
-    public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
-    [StringLength(250)]
-    public string VirturalSiteCode { get; set; } = string.Empty;
 
+        public string VirturalSiteCode { get; set; } = string.Empty;
+
+
+
+    }
 
 
 }

IRaCIS.Core.Domain/Allocation/VisitTask.cs

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

IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs

@@ -3,72 +3,73 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-06-07 14:09:29 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
 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
-
-[Comment("项目阅片  - 阅片任务重阅表")]
-[Table("VisitTaskReReading")]
-public class VisitTaskReReading : BaseFullAuditEntity
 {
-    #region 导航属性
+    ///<summary>
+    ///重阅申请流程记录表
+    ///</summary>
+    [Table("VisitTaskReReading")]
+    public class VisitTaskReReading : BaseFullAuditEntity
+    {
+        #region 导航属性
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public User RequestReReadingUser { get; set; }
+        public User RequestReReadingUser { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public VisitTask NewReReadingTask { get; set; }
+        public VisitTask NewReReadingTask { get; set; }
-    [JsonIgnore]
+        [JsonIgnore]
-    public VisitTask RootReReadingTask { get; set; }
+        public VisitTask RootReReadingTask { get; set; }
-    [JsonIgnore]
+        [JsonIgnore]
-    public VisitTask OriginalReReadingTask { get; set; }
+        public VisitTask OriginalReReadingTask { get; set; }
-    [JsonIgnore]
+        [JsonIgnore]
-    public User RequestReReadingConfirmUser { get; set; }
+        public User RequestReReadingConfirmUser { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public Trial Trial { get; set; }
+        public Trial Trial { get; set; }
 
-    #endregion
+        #endregion
 
-    public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
-    [Comment(" 重阅原始任务Id")]
-    public Guid OriginalReReadingTaskId { get; set; }
 
-    [Comment(" 重阅确认人")]
+        //重阅原始任务Id  重阅会产生新的任务 
-    public Guid? RequestReReadingConfirmUserId { get; set; }
+        public Guid OriginalReReadingTaskId { get; set; }
 
 
-    [Comment(" 请求重阅人")]
+        //产生重阅的根任务Id
-    public Guid RequestReReadingUserId { get; set; }
+        public Guid RootReReadingTaskId { get; set; }
 
-    public Guid RootReReadingTaskId { get; set; }
+        //重阅申请 产生的新任务Id
-    [Comment("仅仅包括全局和访视")]
+        public Guid? NewReReadingTaskId { get; set; }
-    public bool IsCopyFollowForms { get; set; }
 
-    [Comment(" 是否复制之前任务表单数据")]
+        public Guid RequestReReadingUserId { get; set; }
-    public bool IsCopyOrigenalForms { get; set; }
 
-    public Guid? NewReReadingTaskId { get; set; }
+
-
+        public DateTime RequestReReadingTime { get; set; }
-
+
-
+
-    [StringLength(512)]
+        //申请回退类型
-    public string RequestReReadingReason { get; set; } = null!;
+        public RequestReReadingType RequestReReadingType { get; set; }
-
+
-    public string RequestReReadingRejectReason { get; set; } = null!;
+
-
+        public string RequestReReadingReason { get; set; } = string.Empty;
-    public RequestReReadingResult RequestReReadingResultEnum { get; set; }
+
-
+        public string RequestReReadingRejectReason { get; set; } = string.Empty;
-    public DateTime? RequestReReadingTime { get; set; }
+
-
+        public RequestReReadingResult RequestReReadingResultEnum { get; set; }
-    public RequestReReadingType RequestReReadingType { get; set; }
+
+        public Guid? RequestReReadingConfirmUserId { get; set; }
+
+
+        public bool IsCopyOrigenalForms { get; set; }
+
+        //仅仅包括全局和访视
+        public bool IsCopyFollowForms { get; set; }
 
 
 
+    }
 
 }

IRaCIS.Core.Domain/BaseModel/DomainEvent.cs

@@ -1,23 +1,18 @@
-using System;
+namespace IRaCIS.Core.Domain.BaseModel
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IRaCIS.Core.Domain.BaseModel;
-
-/// <summary>
-/// 领域实体事件基类
-/// </summary>
-public abstract class DomainEvent
 {
+    /// <summary>
+    /// 领域实体事件基类
+    /// </summary>
+    public abstract class DomainEvent
+    {
 
-}
+    }
 
-public class FailedDomainEvent
+    public class FailedDomainEvent
-{
+    {
-    public Guid Id { get; set; }
+        public Guid Id { get; set; }
-    public string EventType { get; set; } = string.Empty;
+        public string EventType { get; set; } = string.Empty;
-    public string EventData { get; set; } = string.Empty;
+        public string EventData { get; set; } = string.Empty;
-    public DateTime FailedAt { get; set; }
+        public DateTime FailedAt { get; set; }
+    }
 }

IRaCIS.Core.Domain/BaseModel/Entity.cs

@@ -1,126 +1,123 @@
 using IRaCIS.Core.Domain.BaseModel;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Security.Cryptography;
 
-namespace IRaCIS.Core.Domain.Models;
+namespace IRaCIS.Core.Domain.Models
-
-
-
-public interface IAggregateRoot;
-public interface IEntity<TKey>
 {
-    abstract TKey Id { get; set; }
-
-}
-
-//针对dicom 
-public interface IEntitySeqId
-{
-    public Guid SeqId { get; set; }
-}
-
-public abstract class Entity : IEntity<Guid>
-{
-    [Key]
-    [Required]
-    [DatabaseGenerated(DatabaseGeneratedOption.None)]
-    public Guid Id { get; set; }
 
 
-    #region 领域事件 仅仅允许通过提供的方法进行操作
+    public interface IAggregateRoot;
-    [JsonIgnore]
+    public interface IEntity<TKey>
-    private readonly List<DomainEvent> _domainEvents = [];
-
-    [JsonIgnore]
-    [NotMapped]
-    public IReadOnlyCollection<DomainEvent> DomainEvents => _domainEvents.AsReadOnly();
-
-
-    public void AddDomainEvent(DomainEvent domainEvent)
     {
-        _domainEvents.Add(domainEvent);
+        abstract TKey Id { get; set; }
+
     }
 
-    public void RemoveDomainEvent(DomainEvent domainEvent)
+    //针对dicom 
+    public interface IEntitySeqId
     {
-        _domainEvents.Remove(domainEvent);
+        public Guid SeqId { get; set; }
     }
 
-    public void ClearDomainEvents()
+    public abstract class Entity : IEntity<Guid>
     {
-        _domainEvents.Clear();
+        [Key]
+        [Required]
+        [DatabaseGenerated(DatabaseGeneratedOption.None)]
+        public Guid Id { get; set; }
+
+
+        #region 领域事件 仅仅允许通过提供的方法进行操作
+        [JsonIgnore]
+        private readonly List<DomainEvent> _domainEvents = [];
+
+        [JsonIgnore]
+        [NotMapped]
+        public IReadOnlyCollection<DomainEvent> DomainEvents => _domainEvents.AsReadOnly();
+
+
+        public void AddDomainEvent(DomainEvent domainEvent)
+        {
+            _domainEvents.Add(domainEvent);
+        }
+
+        public void RemoveDomainEvent(DomainEvent domainEvent)
+        {
+            _domainEvents.Remove(domainEvent);
+        }
+
+        public void ClearDomainEvents()
+        {
+            _domainEvents.Clear();
+        }
+        #endregion
+
+
     }
+
+
+
+
+    #region 减少实体属性，增加基类
+
+    public abstract class BaseAddAuditEntity : Entity, IAuditAdd
+    {
+
+        public Guid CreateUserId { get; set; }
+        public DateTime CreateTime { get; set; }
+
+        [ForeignKey("CreateUserId")]
+        [JsonIgnore]
+        public virtual User CreateUser { get; set; }
+    }
+
+    public abstract class BaseAddDeleteAuditEntity : Entity, IAuditAdd, ISoftDelete
+    {
+
+        public Guid CreateUserId { get; set; }
+        public DateTime CreateTime { get; set; }
+        public Guid? DeleteUserId { get; set; }
+        public bool IsDeleted { get; set; }
+        public DateTime? DeletedTime { get; set; }
+
+        [ForeignKey("CreateUserId")]
+        [JsonIgnore]
+        public User CreateUser { get; set; }
+    }
+
+    public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd
+    {
+        public Guid CreateUserId { get; set; }
+        public DateTime CreateTime { get; set; }
+        public Guid UpdateUserId { get; set; }
+        public DateTime UpdateTime { get; set; }
+
+        [ForeignKey("CreateUserId")]
+        [JsonIgnore]
+        public User CreateUser { get; set; }
+    }
+
+
+    public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
+    {
+        public Guid? DeleteUserId { get; set; }
+        public bool IsDeleted { get; set; }
+        public DateTime? DeletedTime { get; set; }
+        public Guid CreateUserId { get; set; }
+        public DateTime CreateTime { get; set; }
+        public Guid UpdateUserId { get; set; }
+        public DateTime UpdateTime { get; set; }
+
+        [ForeignKey("CreateUserId")]
+        [JsonIgnore]
+        public User CreateUser { get; set; }
+    }
+
+    public abstract class BaseAuditUpdateEntity : Entity, IAuditUpdate
+    {
+        public Guid UpdateUserId { get; set; }
+        public DateTime UpdateTime { get; set; }
+    }
+
+
     #endregion
 
-
 }
-
-
-
-
-#region 减少实体属性，增加基类
-
-public abstract class BaseAddAuditEntity : Entity, IAuditAdd
-{
-
-    public Guid CreateUserId { get; set; }
-    public DateTime CreateTime { get; set; }
-
-    [ForeignKey("CreateUserId")]
-    [JsonIgnore]
-    public virtual User CreateUser { get; set; }
-}
-
-public abstract class BaseAddDeleteAuditEntity : Entity, IAuditAdd, ISoftDelete
-{
-
-    public Guid CreateUserId { get; set; }
-    public DateTime CreateTime { get; set; }
-    public Guid? DeleteUserId { get; set; }
-    public bool IsDeleted { get; set; }
-    public DateTime? DeletedTime { get; set; }
-
-    [ForeignKey("CreateUserId")]
-    [JsonIgnore]
-    public User CreateUser { get; set; }
-}
-
-public abstract class BaseFullAuditEntity : Entity, IAuditUpdate, IAuditAdd
-{
-    public Guid CreateUserId { get; set; }
-    public DateTime CreateTime { get; set; }
-    public Guid UpdateUserId { get; set; }
-    public DateTime UpdateTime { get; set; }
-
-    [ForeignKey("CreateUserId")]
-    [JsonIgnore]
-    public User CreateUser { get; set; }
-}
-
-
-public abstract class BaseFullDeleteAuditEntity : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
-{
-    public Guid? DeleteUserId { get; set; }
-    public bool IsDeleted { get; set; }
-    public DateTime? DeletedTime { get; set; }
-    public Guid CreateUserId { get; set; }
-    public DateTime CreateTime { get; set; }
-    public Guid UpdateUserId { get; set; }
-    public DateTime UpdateTime { get; set; }
-
-    [ForeignKey("CreateUserId")]
-    [JsonIgnore]
-    public User CreateUser { get; set; }
-}
-
-public abstract class BaseAuditUpdateEntity : Entity, IAuditUpdate
-{
-    public Guid UpdateUserId { get; set; }
-    public DateTime UpdateTime { get; set; }
-}
-
-
-#endregion

IRaCIS.Core.Domain/BaseModel/IAuditAdd.cs

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

IRaCIS.Core.Domain/BaseModel/IAuditUpdate.cs

@@ -1,14 +1,18 @@
-using System;
+namespace IRaCIS.Core.Domain.Models
-
-namespace IRaCIS.Core.Domain.Models;
-
-public interface IAuditUpdate<TKey> where TKey : struct
 {
-    public TKey UpdateUserId { get; set; }
+    public interface IAuditUpdate<TKey> where TKey : struct
-    public DateTime UpdateTime { get; set; }
+    {
-}
+        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,16 +1,17 @@
-using System;
+namespace IRaCIS.Core.Domain.Models
-
-namespace IRaCIS.Core.Domain.Models;
-
-public interface ISoftDelete<TKey> where TKey : struct
 {
-    public TKey? DeleteUserId { get; set; }
+    public interface ISoftDelete<TKey> where TKey : struct
-    public bool IsDeleted { get; set; }
+    {
+        public TKey? DeleteUserId { get; set; }
+        public bool IsDeleted { get; set; }
 
-    public DateTime? DeletedTime { get; set; }
+        public DateTime? DeletedTime { get; set; }
-}
+    }
+
+    public interface ISoftDelete : ISoftDelete<Guid>
+    {
+
+    }
 
-public interface ISoftDelete : ISoftDelete<Guid>
-{
 
 }

IRaCIS.Core.Domain/Common/CommonDocument.cs

@@ -3,17 +3,13 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-03-31 13:18:42 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
 namespace IRaCIS.Core.Domain.Models;
 
 
 [Comment("数据上传 | 数据导出 | 邮件附件 文件记录表 （需要同步）")]
 [Table("CommonDocument")]
-public  class CommonDocument : BaseFullDeleteAuditEntity
+public class CommonDocument : BaseFullDeleteAuditEntity
 {
     [Comment(" 业务场景")]
     public EmailBusinessScenario BusinessScenarioEnum { get; set; }

IRaCIS.Core.Domain/Common/Dictionary.cs

@@ -1,9 +1,5 @@
 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;
 

IRaCIS.Core.Domain/Common/EmailNoticeConfig.cs

@@ -4,12 +4,6 @@
 //	   生成时间 2022-02-15 11:55:43 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 
 namespace IRaCIS.Core.Domain.Models;
 
@@ -104,11 +98,11 @@ public class EmailNoticeUserType : Entity
 
 public enum SysEmailLevel
 {
-    not_sys=0,
+    not_sys = 0,
 
     //系统 不配置角色
-    sys_not_role=1,
+    sys_not_role = 1,
 
     //系统需要配置角色的
-    sys_Config_role=2
+    sys_Config_role = 2
 }

IRaCIS.Core.Domain/Common/ExploreRecommend.cs

@@ -1,13 +1,7 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2024-07-02 09:26:43 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
-using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
 namespace IRaCIS.Core.Domain.Models;
 
 [Comment("后台 - 浏览器推荐 （需要同步）")]

IRaCIS.Core.Domain/Common/FrontAuditConfig.cs

@@ -1,15 +1,7 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-03-28 16:43:12 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
-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;
 
 [Comment("稽查 - 配置表 （需要同步）")]
@@ -177,7 +169,7 @@ public class TableConfig
 
 
     public bool IsNeedTransalate { get; set; }
-    public string  TranslateDictionaryName { get; set; } = String.Empty;
+    public string TranslateDictionaryName { get; set; } = String.Empty;
 
 
     public bool IsDynamicTranslate { get; set; }

IRaCIS.Core.Domain/Common/Internationalization.cs

@@ -1,55 +1,48 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2023-06-01 13:37:10 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("后台 - 国际化配置表 （需要同步）")]
-[Table("Internationalization")]
-public class Internationalization : BaseFullAuditEntity
 {
-    #region 导航属性
+    ///<summary>
-    [JsonIgnore]
+    ///Internationalization
-    public PublishLog PublishLog { get; set; }
+    ///</summary>
+    [Table("Internationalization")]
+    public class Internationalization : BaseFullAuditEntity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        public PublishLog PublishLog { get; set; }
 
-    #endregion
+        #endregion
+        public int ShowOrder { get; set; }
 
-    [StringLength(400)]
+        /// <summary>
-    public string Code { get; set; } = null!;
+        /// 0 1  2 预翻译 已确认  废除
+        /// </summary>
+        public int State { get; set; }
 
-    [StringLength(400)]
-    public string Description { get; set; } = null!;
 
-    [Comment(" 前端类型")]
+        public string Description { get; set; } = string.Empty;
-    [StringLength(1000)]
-    public string FrontType { get; set; } = null!;
 
-    [Comment(" 前端还是后端")]
+        public string Code { get; set; } = string.Empty;
-    public int InternationalizationType { get; set; }
 
-    [Comment(" 模块")]
+        public string Value { get; set; } = string.Empty;
-    public string Module { get; set; } = null!;
 
-    [Comment(" 版本")]
+        public string ValueCN { get; set; } = string.Empty;
-    public Guid? PublishLogId { get; set; }
 
-    public int ShowOrder { get; set; }
+        public int InternationalizationType { get; set; }
 
-    //[Comment(" 0 1  2 预翻译 已确认  废除")]
+        public string FrontType { get; set; } = string.Empty;
-    public int State { get; set; }
 
-    [StringLength(2000)]
-    public string Value { get; set; } = null!;
 
-    [StringLength(2000)]
+        public string Module { get; set; } = string.Empty;
-    public string ValueCN { get; set; } = null!;
+        //关联版本历史记录表Id
+        public Guid? PublishLogId { get; set; }
+
+
+
+
+    }
 
 }
-
-

IRaCIS.Core.Domain/Common/PublishLog.cs

@@ -1,33 +1,28 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2023-06-27 15:46:59 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("后台 - 系统发布日志 （需要同步）")]
-[Table("PublishLog")]
-public class PublishLog : BaseFullAuditEntity
 {
-    public bool IsCurrentVersion { get; set; }
+    ///<summary>
-
+    ///PublishLog
-    public DateTime? PublishTime { get; set; }
+    ///</summary>
-
+    [Table("PublishLog")]
-    [Comment("0 开发中 1已发布")]
+    public class PublishLog : BaseFullAuditEntity
-    public int State { get; set; }
+    {
 
 
-    [MaxLength]
+        public string Version { get; set; } = string.Empty;
-    public string? UpdateContent { get; set; }
 
-    public string Version { get; set; } = null!;
+        public DateTime? PublishTime { get; set; }
 
+        public string UpdateContent { get; set; } = string.Empty;
+
+        //0 开发中 ，已发布
+        public int State { get; set; }
+
+        public bool IsCurrentVersion { get; set; }
+
+    }
 
 }
-
-

IRaCIS.Core.Domain/Common/SystemBasicData.cs

@@ -4,48 +4,43 @@
 //	   生成时间 2022-02-15 15:45:52 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("系统 - 签名模板场景配置  (需要同步)")]
-[Table("SystemBasicData")]
-public class SystemBasicData : BaseFullAuditEntity
 {
+    ///<summary>
+    ///SystemBasicData
+    ///</summary>
+    [Table("SystemBasicData")]
+    public class SystemBasicData : BaseFullAuditEntity
+    {
 
-    #region 导航属性
+        #region 导航属性
-    [JsonIgnore]
+        [JsonIgnore]
-    [ForeignKey("ParentId")]
+        [ForeignKey("ParentId")]
-    public SystemBasicData Parent { get; set; }
+        public SystemBasicData Parent { get; set; }
 
-    #endregion
+        #endregion
 
 
-    public BasicDataTypeEnum BasicDataTypeEnum { get; set; }
+        public string Name { get; set; } = string.Empty;
 
-    [StringLength(512)]
+        public string Value { get; set; } = string.Empty;
-    public string Code { get; set; } = null!;
 
-    [StringLength(512)]
+        public string Description { get; set; } = string.Empty;
-    public string Description { get; set; } = null!;
 
-    public bool IsEnable { get; set; }
+        public int ShowOrder { get; set; }
 
-    [StringLength(400)]
+        public string Code { get; set; } = string.Empty;
-    public string Name { get; set; } = null!;
 
-    public Guid? ParentId { get; set; }
+        public Guid? ParentId { get; set; }
 
-    public int ShowOrder { get; set; }
 
-    [StringLength(512)]
+        public string ValueCN { get; set; } = string.Empty;
-    public string Value { get; set; } = null!;
 
-    [StringLength(512)]
+        public bool IsEnable { get; set; }
-    public string ValueCN { get; set; } = null!;
 
+        public BasicDataTypeEnum BasicDataTypeEnum { get; set; }
+
+
+    }
 
 }

IRaCIS.Core.Domain/Common/VerificationCode.cs

@@ -1,26 +1,27 @@
 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
 {
+    [Table("VerificationCode")]
+    public class VerificationCode : BaseAddAuditEntity
+    {
 
-    public Guid UserId { get; set; } = Guid.Empty;
+        public Guid UserId { get; set; } = Guid.Empty;
 
-    public string Code { get; set; } = string.Empty;
+        //验证码
+        public string Code { get; set; } = string.Empty;
 
-    [Comment("邮箱|手机")]
+        //什么类型的验证码   邮箱|手机
-    public VerifyType CodeType { get; set; }
 
-    public bool HasSend { get; set; }
+        public VerifyType CodeType { get; set; }
 
-    public string EmailOrPhone { get; set; } = string.Empty;
+        public bool HasSend { get; set; }
 
-    public DateTime ExpirationTime { get; set; }
+        //发送的邮箱或者手机
+        public string EmailOrPhone { get; set; } = string.Empty;
 
+        //过期时间
+        public DateTime ExpirationTime { get; set; }
+
+    }
 }

IRaCIS.Core.Domain/Dcotor/Attachment.cs

@@ -1,8 +1,3 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
 namespace IRaCIS.Core.Domain.Models;
 
 //public enum AttachmentType
@@ -17,7 +12,7 @@ namespace IRaCIS.Core.Domain.Models;
 //}
 [Comment("医生 - 简历|证书 文档表")]
 [Table("Attachment")]
-public  class Attachment : BaseAddAuditEntity
+public class Attachment : BaseAddAuditEntity
 {
 
     [JsonIgnore]

IRaCIS.Core.Domain/Dcotor/Doctor.cs

@@ -1,15 +1,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;
 
 [Comment("医生 - 基础信息表")]
 [Table("Doctor")]
-public  class Doctor : BaseFullAuditEntity
+public class Doctor : BaseFullAuditEntity
 {
     #region 导航属性
 

IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs

@@ -3,11 +3,7 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2023-01-09 14:34: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;
 
 [Comment("医生 - 项目标准签名文档")]

IRaCIS.Core.Domain/Dcotor/DoctorDictionary.cs

@@ -1,14 +1,9 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
 namespace IRaCIS.Core.Domain.Models;
 
 
 [Comment("医生 - 医生字典关联表")]
 [Table("DoctorDictionary")]
-public  class DoctorDictionary : Entity
+public class DoctorDictionary : Entity
 {
     #region 导航属性
     [JsonIgnore]

IRaCIS.Core.Domain/Dcotor/DoctorWorkload.cs

@@ -1,13 +1,8 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
 namespace IRaCIS.Core.Domain.Models;
 
 [Comment("医生计费 - 工作量记录表")]
 [Table("DoctorWorkload")]
-public partial class Workload :BaseFullAuditEntity
+public partial class Workload : BaseFullAuditEntity
 {
     #region 导航属性
 

IRaCIS.Core.Domain/Dcotor/Education.cs

@@ -1,13 +1,8 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
 namespace IRaCIS.Core.Domain.Models;
 
 [Comment("医生 - 教育信息")]
 [Table("Education")]
-public  class Education : BaseFullAuditEntity
+public class Education : BaseFullAuditEntity
 {
     #region 导航属性
 

IRaCIS.Core.Domain/Dcotor/EnrollReadingCriterion.cs

@@ -1,36 +1,32 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2024-02-29 15:51:46 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("医生 - 项目阅片标准参与一致性分析配置表")]
-[Table("EnrollReadingCriterion")]
-public class EnrollReadingCriterion : BaseAddAuditEntity
 {
-    #region 导航属性
+    ///<summary>
+    ///EnrollReadingCriterion
+    ///</summary>
+    [Table("EnrollReadingCriterion")]
+    public class EnrollReadingCriterion : BaseAddAuditEntity
+    {
+        #region 导航属性
 
-    [JsonIgnore]
+        [JsonIgnore]
-    [ForeignKey("EnrollId")]
+        [ForeignKey("EnrollId")]
-    public Enroll Enroll { get; set; }
+        public Enroll Enroll { get; set; }
-    #endregion
+        #endregion
 
 
-    public Guid EnrollId { get; set; }
+        public Guid EnrollId { get; set; }
 
-    public Guid TrialReadingCriterionId { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }
 
-    public bool IsJoinAnalysis { get; set; }
+        public bool IsJoinAnalysis { get; set; }
 
 
 
+    }
+
+
 }
-
-
-

IRaCIS.Core.Domain/Dcotor/Postgraduate.cs

@@ -1,63 +1,58 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("医生 - 继续教育经历")]
-[Table("Postgraduate")]
-public  class Postgraduate : BaseFullAuditEntity
 {
-    #region 导航属性
+    [Table("Postgraduate")]
+    public partial class Postgraduate : BaseFullAuditEntity
+    {
+        #region µ¼º½ÊôÐÔ
 
-    #endregion
+        #endregion
 
-    public DateOnly? BeginDate { get; set; }
+        public Guid DoctorId { get; set; }
 
-    [StringLength(400)]
+        [Column(TypeName = "date")]
-    public string City { get; set; } = null!;
+        public DateTime? BeginDate { get; set; }
 
-    [StringLength(400)]
+        [Column(TypeName = "date")]
-    public string CityCN { get; set; } = null!;
+        public DateTime? EndDate { get; set; }
 
-    [StringLength(400)]
+        [StringLength(50)]
-    public string Country { get; set; } = null!;
+        public string Training { get; set; } = string.Empty;
 
-    [StringLength(400)]
+        [StringLength(100)]
-    public string CountryCN { get; set; } = null!;
+        public string Major { get; set; } = string.Empty;
 
-    public Guid DoctorId { get; set; }
+        [StringLength(100)]
+        public string Hospital { get; set; } = string.Empty;
 
-    public DateOnly? EndDate { get; set; }
+        [StringLength(100)]
+        public string School { get; set; } = string.Empty;
+        [StringLength(100)]
+        public string Country { get; set; } = string.Empty;
 
-    [StringLength(400)]
+        [StringLength(100)]
-    public string Hospital { get; set; } = null!;
+        public string Province { get; set; } = string.Empty;
 
-    [StringLength(400)]
+        [StringLength(100)]
-    public string HospitalCN { get; set; } = null!;
+        public string City { get; set; } = string.Empty;
 
-    [StringLength(400)]
+        [StringLength(50)]
-    public string Major { get; set; } = null!;
+        public string TrainingCN { get; set; } = string.Empty;
 
-    [StringLength(400)]
+        [StringLength(100)]
-    public string MajorCN { get; set; } = null!;
+        public string MajorCN { get; set; } = string.Empty;
 
-    [StringLength(400)]
+        [StringLength(100)]
-    public string Province { get; set; } = null!;
+        public string HospitalCN { get; set; } = string.Empty;
 
-    [StringLength(400)]
+        [StringLength(100)]
-    public string ProvinceCN { get; set; } = null!;
+        public string SchoolCN { get; set; } = string.Empty;
+        [StringLength(100)]
+        public string CountryCN { get; set; } = string.Empty;
 
-    [StringLength(400)]
+        [StringLength(100)]
-    public string School { get; set; } = null!;
+        public string ProvinceCN { get; set; } = string.Empty;
 
-    [StringLength(400)]
+        [StringLength(100)]
-    public string SchoolCN { get; set; } = null!;
+        public string CityCN { get; set; } = string.Empty;
-
+    }
-    [StringLength(400)]
-    public string Training { get; set; } = null!;
-
-    [StringLength(400)]
-    public string TrainingCN { get; set; } = null!;
 }

IRaCIS.Core.Domain/Dcotor/ResearchPublication.cs

@@ -1,40 +1,20 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("医生 - 科研学术记录")]
-[Table("ResearchPublication")]
-public partial class ResearchPublication : BaseFullAuditEntity
 {
-    #region 导航属性
+    [Table("ResearchPublication")]
+    public partial class ResearchPublication : BaseFullAuditEntity
+    {
+        #region µ¼º½ÊôÐÔ
 
-    #endregion
+        #endregion
-    [MaxLength]
+        public Guid DoctorId { get; set; }
-    public string? AwardsHonors { get; set; }
+        public string Research { get; set; } = string.Empty;
+        public string Grants { get; set; } = string.Empty;
+        public string Publications { get; set; } = string.Empty;
+        public string AwardsHonors { get; set; } = string.Empty;
 
-    [MaxLength]
+        public string ResearchCN { get; set; } = string.Empty;
-    public string? AwardsHonorsCN { get; set; }
+        public string GrantsCN { get; set; } = string.Empty;
-
+        public string PublicationsCN { get; set; } = string.Empty;
-    public Guid DoctorId { get; set; }
+        public string AwardsHonorsCN { get; set; } = string.Empty;
-
+    }
-    [MaxLength]
-    public string? Grants { get; set; }
-
-    [MaxLength]
-    public string? GrantsCN { get; set; }
-
-    [MaxLength]
-    public string? Publications { get; set; }
-
-    [MaxLength]
-    public string? PublicationsCN { get; set; }
-
-    [MaxLength]
-    public string? Research { get; set; }
-
-    [MaxLength]
-    public string? ResearchCN { get; set; }
 }

IRaCIS.Core.Domain/Dcotor/TrialExperience.cs

@@ -1,12 +1,5 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
 namespace IRaCIS.Core.Domain.Models
 {
-    [Comment("医生 - 项目临床经历")]
     [Table("TrialExperience")]
     public partial class TrialExperience : BaseFullAuditEntity
     {
@@ -14,8 +7,6 @@ namespace IRaCIS.Core.Domain.Models
 
         [JsonIgnore]
         public List<TrialExperienceCriteria> ExperienceCriteriaList { get; set; }
-        [JsonIgnore]
-        public Dictionary Phase { get; set; }
         #endregion
 
 
@@ -23,7 +14,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/TrialExperienceCriteria.cs

@@ -1,9 +1,6 @@
-using System;
+namespace IRaCIS.Core.Domain.Models
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models
 {
-    public class TrialExperienceCriteria:Entity
+    public class TrialExperienceCriteria : Entity
     {
         #region 导航属性
         [JsonIgnore]

IRaCIS.Core.Domain/Dcotor/Vacation.cs

@@ -1,19 +1,15 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("医生 - 假期安排")]
-[Table("Vacation")]
-public class Vacation : BaseFullAuditEntity
 {
-    #region 导航属性
+    [Table("Vacation")]
+    public class Vacation : BaseFullAuditEntity
+    {
+        #region 导航属性
 
-    #endregion
+        #endregion
-    public Guid DoctorId { get; set; }
+        public Guid DoctorId { get; set; }
-    public DateTime StartDate { get; set; }
+        public DateTime StartDate { get; set; }
-    public DateTime EndDate { get; set; }
+        public DateTime EndDate { get; set; }
-    public int Status { get; set; } = 1;
+        public int Status { get; set; } = 1;
 
+    }
 }

IRaCIS.Core.Domain/Document/SystemDocConfirmedUser.cs

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

IRaCIS.Core.Domain/Document/SystemDocNeedConfirmedUserType.cs

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

IRaCIS.Core.Domain/Document/SystemDocument.cs

@@ -1,20 +1,15 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-01-05 09:11:49 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models
 {
-	 ///<summary>
+    ///<summary>
-	 ///SystemDocument
+    ///SystemDocument
-	 ///</summary>
+    ///</summary>
-	 [Table("SystemDocument")]	
+    [Table("SystemDocument")]
-	 public class SystemDocument : BaseFullDeleteAuditEntity
+    public class SystemDocument : BaseFullDeleteAuditEntity
-	 {
+    {
         #region 导航属性
         [JsonIgnore]
         public List<SystemDocConfirmedUser> SystemDocConfirmedUserList { get; set; }
@@ -28,16 +23,16 @@ namespace IRaCIS.Core.Domain.Models
 
         public Guid FileTypeId { get; set; }
 
-        [StringLength(2000)]
-        public string Name { get; set; } = null!;
 
-        [StringLength(2000)]
+        public string Name { get; set; } = string.Empty;
-        public string Path { get; set; } = null!;
 
         public int SignViewMinimumMinutes { get; set; }
 
 
+        public string Path { get; set; } = string.Empty;
+
+
 
     }
 
-}	 
+}

IRaCIS.Core.Domain/Document/TrialDocConfirmedUser.cs

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

IRaCIS.Core.Domain/Document/TrialDocNeedConfirmedUserType.cs

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

IRaCIS.Core.Domain/Document/TrialDocument.cs

@@ -1,49 +1,44 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-01-05 09:11:50 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("项目 - 项目文档")]
-[Table("TrialDocument")]
-public class TrialDocument : BaseFullDeleteAuditEntity
 {
-    #region 导航属性
+    ///<summary>
-    [JsonIgnore]
+    ///TrialDocument
-    public List<TrialDocConfirmedUser> TrialDocConfirmedUserList { get; set; }
+    ///</summary>
-    [JsonIgnore]
+    [Table("TrialDocument")]
-    public List<TrialDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
+    public class TrialDocument : BaseFullDeleteAuditEntity
-    [JsonIgnore]
+    {
-    public Trial Trial { get; set; }
+        #region 导航属性
+        [JsonIgnore]
+        public List<TrialDocConfirmedUser> TrialDocConfirmedUserList { get; set; }
+        [JsonIgnore]
+        public List<TrialDocNeedConfirmedUserType> NeedConfirmedUserTypeList { get; set; }
+        [JsonIgnore]
+        public Trial Trial { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    [ForeignKey("FileTypeId")]
+        [ForeignKey("FileTypeId")]
-    public Dictionary FileType { get; set; }
+        public Dictionary FileType { get; set; }
-    #endregion
+        #endregion
-    //需要确认的项目用户 通过TrialId 关联 用中间表过滤
+        //需要确认的项目用户 通过TrialId 关联 用中间表过滤
 
 
-    public Guid FileTypeId { get; set; }
+        public Guid FileTypeId { get; set; }
 
-    public string Name { get; set; } = string.Empty;
+        public string Name { get; set; } = string.Empty;
 
-    public string Path { get; set; } = string.Empty;
+        public string Path { get; set; } = string.Empty;
 
-    public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
-    [StringLength(1000)]
+        public string Description { get; set; } = string.Empty;
-    public string Description { get; set; } = string.Empty;
 
-    public int SignViewMinimumMinutes { get; set; }
+        public int SignViewMinimumMinutes { get; set; }
 
 
 
+    }
+
 }
-
-

IRaCIS.Core.Domain/Document/TrialEmailNoticeConfig.cs

@@ -3,13 +3,7 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-10-20 11:51:58 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.EntityFrameworkCore;
 
 namespace IRaCIS.Core.Domain.Models;
 

IRaCIS.Core.Domain/Document/TrialEmailNoticeUser.cs

@@ -3,29 +3,30 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-10-21 16:06:20 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
+namespace IRaCIS.Core.Domain.Models
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("项目 - 项目邮件收发配置用户类型")]
-[Table("TrialEmailNoticeUser")]
-public class TrialEmailNoticeUser : Entity
 {
-    #region 导航属性
+    ///<summary>
-    [JsonIgnore]
+    ///TrialEmailNoticeUser
-    public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; }
+    ///</summary>
-    #endregion
+    [Table("TrialEmailNoticeUser")]
+    public class TrialEmailNoticeUser : Entity
+    {
+        #region 导航属性
 
-    public UserTypeEnum UserType { get; set; }
+        #endregion
+
+        [JsonIgnore]
+        public TrialEmailNoticeConfig TrialEmailNoticeConfig { get; set; }
 
 
-    public Guid TrialEmailNoticeConfigId { get; set; }
+        public UserTypeEnum UserType { get; set; }
 
 
-    public EmailUserType EmailUserType { get; set; }
+        public Guid TrialEmailNoticeConfigId { get; set; }
+
+
+        public EmailUserType EmailUserType { get; set; }
+    }
+
 }
-
-

IRaCIS.Core.Domain/Financial/CalculateTask.cs

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

IRaCIS.Core.Domain/Financial/ExchangeRate.cs

@@ -1,16 +1,12 @@
-using System;
+namespace IRaCIS.Core.Domain.Models
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Table("ExchangeRate")]
-public class ExchangeRate : BaseFullAuditEntity
 {
-    [StringLength(400)]
+    [Table("ExchangeRate")]
-    public string YearMonth { get; set; } = string.Empty;
+    public class ExchangeRate : BaseFullAuditEntity
+    {
+        public string YearMonth { get; set; } = string.Empty;
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal Rate { get; set; }
+        public decimal Rate { get; set; }
 
+    }
 }

IRaCIS.Core.Domain/Financial/Payment.cs

@@ -1,54 +1,37 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-
-[Comment("医生计费 - 每月支付记录表")]
-[Table("Payment")]
-public class Payment : BaseFullAuditEntity
 {
-    [DecimalPrecision(18, 4)]
-    public decimal ActuallyPaidCNY { get; set; }
 
-    [DecimalPrecision(18, 4)]
+    [Table("Payment")]
-    public decimal AdjustmentCNY { get; set; }
+    public partial class Payment : BaseFullAuditEntity
+    {
+        public Guid DoctorId { get; set; }
+        public string YearMonth { get; set; } = string.Empty;
+        public bool IsLock { get; set; }
+        public DateTime YearMonthDate { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal AdjustmentUSD { get; set; }
+        public decimal PaymentUSD { get; set; }
 
-    [DecimalPrecision(18, 4)]
+        [Column(TypeName = "decimal(18,4)")]
-    public decimal BankTransferCNY { get; set; }
+        public decimal PaymentCNY { get; set; }
 
-    public DateTime CalculateTime { get; set; } = DateTime.Now;
+        [Column(TypeName = "decimal(18,2)")]
+        public decimal ExchangeRate { get; set; }
 
-    [StringLength(400)]
-    public string CalculateUser { get; set; } = null!;
 
-    public Guid DoctorId { get; set; }
+        [Column(TypeName = "decimal(18,4)")]
+        public decimal AdjustmentCNY { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal ExchangeRate { get; set; }
+        public decimal AdjustmentUSD { get; set; }
+        public DateTime CalculateTime { get; set; } = DateTime.Now;
 
-    public bool IsLock { get; set; }
+        [StringLength(100)]
+        public string CalculateUser { get; set; } = string.Empty;
 
-    [StringLength(1000)]
+        [StringLength(500)]
-    public string Note { get; set; } = null!;
+        public string Note { get; set; } = string.Empty;
 
-    [DecimalPrecision(18, 4)]
-    public decimal PaymentCNY { get; set; }
-
-    [DecimalPrecision(18, 2)]
-    public decimal PaymentUSD { get; set; }
-
-    [DecimalPrecision(18, 4)]
-    public decimal TaxCNY { get; set; }
-
-    [StringLength(400)]
-    public string YearMonth { get; set; } = null!;
-
-    public DateTime YearMonthDate { get; set; }
 
+    }
 }

IRaCIS.Core.Domain/Financial/PaymentAdjustment.cs

@@ -1,35 +1,26 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("医生计费 - 项目每月调整记录表")]
-[Table("PaymentAdjustment")]
-public partial class PaymentAdjustment : BaseFullAuditEntity
 {
-    [DecimalPrecision(18, 4)]
+    [Table("PaymentAdjustment")]
-    public decimal AdjustmentCNY { get; set; }
+    public partial class PaymentAdjustment : BaseFullAuditEntity
+    {
+        public Guid ReviewerId { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        public DateTime YearMonthDate { get; set; }
-    public decimal AdjustmentUSD { get; set; }
+        public string YearMonth { get; set; } = string.Empty;
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal ExchangeRate { get; set; }
+        public decimal AdjustmentUSD { get; set; }
 
-    public bool IsLock { get; set; }
+        [Column(TypeName = "decimal(18,4)")]
+        public decimal AdjustmentCNY { get; set; }
 
-    [StringLength(1000)]
-    public string Note { get; set; } = null!;
 
-    public Guid ReviewerId { get; set; }
+        public Guid TrialId { get; set; } = Guid.Empty;
 
-    public Guid TrialId { get; set; }
+        [Column(TypeName = "decimal(18,2)")]
-
+        public decimal ExchangeRate { get; set; }
-    [StringLength(400)]
+        public bool IsLock { get; set; } = false;
-    public string YearMonth { get; set; } = null!;
+        public string Note { get; set; } = string.Empty;
-
-    public DateTime YearMonthDate { get; set; }
 
+    }
 }

IRaCIS.Core.Domain/Financial/PaymentDetail.cs

@@ -1,51 +1,40 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("医生计费 - 每月支付详情表")]
-[Table("PaymentDetail")]
-public  class PaymentDetail : BaseFullAuditEntity
 {
-    [DecimalPrecision(18, 2)]
+    [Table("PaymentDetail")]
-    public decimal BasePrice { get; set; }
+    public partial class PaymentDetail : BaseFullAuditEntity
+    {
+        public Guid PaymentId { get; set; }
+        public Guid DoctorId { get; set; }
+        public string YearMonth { get; set; } = string.Empty;
+        public Guid TrialId { get; set; }
 
-    public int Count { get; set; }
+        [StringLength(50)]
+        public string TrialCode { get; set; } = string.Empty;
 
-    public Guid DoctorId { get; set; }
+        [StringLength(50)]
+        public string PaymentType { get; set; } = string.Empty;
+        public int Count { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal ExchangeRate { get; set; }
+        public decimal BasePrice { get; set; }
 
-    [DecimalPrecision(18, 4)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal PaymentCNY { get; set; }
+        public decimal PersonalAdditional { get; set; }
 
-    public Guid PaymentId { get; set; }
+        [Column(TypeName = "decimal(18,2)")]
+        public decimal TrialAdditional { get; set; }
 
-    [StringLength(400)]
+        [Column(TypeName = "decimal(18,2)")]
-    public string PaymentType { get; set; } = null!;
+        public decimal ExchangeRate { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal PaymentUSD { get; set; }
+        public decimal PaymentUSD { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,4)")]
-    public decimal PersonalAdditional { get; set; }
+        public decimal PaymentCNY { get; set; }
 
-    public int ShowCodeOrder { get; set; }
+        public int ShowTypeOrder { get; set; }
-
+        public int ShowCodeOrder { get; set; }
-    public int ShowTypeOrder { get; set; }
-
-    [DecimalPrecision(18, 2)]
-    public decimal TrialAdditional { get; set; }
-
-    [StringLength(400)]
-    public string TrialCode { get; set; } = null!;
-
-    public Guid TrialId { get; set; }
-
-    [StringLength(400)]
-    public string YearMonth { get; set; } = null!;
 
+    }
 }

IRaCIS.Core.Domain/Financial/RankPrice.cs

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

IRaCIS.Core.Domain/Financial/ReviewerPayInformation.cs

@@ -1,8 +1,3 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
 namespace IRaCIS.Core.Domain.Models;
 
 [Comment("医生计费 - 支付信息表")]

IRaCIS.Core.Domain/Financial/TrialPaymentPrice.cs

@@ -1,35 +1,26 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("医生计费 - 项目支付配置")]
-[Table("TrialPaymentPrice")]
-public class TrialPaymentPrice : BaseFullAuditEntity
 {
-    [JsonIgnore]
+    [Table("TrialPaymentPrice")]
-    public Trial Trial { get; set; }
+    public partial class TrialPaymentPrice : BaseFullAuditEntity
+    {
+        public Guid TrialId { get; set; }
 
-    public Guid TrialId { get; set; }
+        public Trial Trial { get; set; }
+
+        [Column(TypeName = "decimal(18,2)")]
+        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,45 +1,39 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("医生计费 - 项目工作量收入单价")]
-[Table("TrialRevenuesPrice")]
-public class TrialRevenuesPrice : BaseFullAuditEntity
 {
-    public Guid TrialId { get; set; }
+    [Table("TrialRevenuesPrice")]
+    public class TrialRevenuesPrice : BaseFullAuditEntity
+    {
+        public Guid TrialId { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal Adjudication { get; set; }
+        public decimal Timepoint { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal AdjudicationIn24H { get; set; }
+        public decimal TimepointIn24H { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal AdjudicationIn48H { get; set; }
+        public decimal TimepointIn48H { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal Downtime { get; set; }
+        public decimal Adjudication { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal Global { get; set; }
+        public decimal AdjudicationIn24H { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal RefresherTraining { get; set; }
+        public decimal AdjudicationIn48H { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal Timepoint { get; set; }
+        public decimal Global { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal TimepointIn24H { get; set; }
+        public decimal Training { get; set; }
 
-    [DecimalPrecision(18, 2)]
+        [Column(TypeName = "decimal(18,2)")]
-    public decimal TimepointIn48H { get; set; }
+        public decimal Downtime { get; set; }
-
-    [DecimalPrecision(18, 2)]
-    public decimal Training { get; set; }
 
+        [Column(TypeName = "decimal(18,2)")]
+        public decimal RefresherTraining { get; set; }
 
+    }
 }

IRaCIS.Core.Domain/Financial/TrialRevenuesPriceVerification.cs

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

IRaCIS.Core.Domain/Financial/VolumeReward.cs

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

IRaCIS.Core.Domain/GlobalUsings.cs

@@ -0,0 +1,7 @@
+global using Microsoft.EntityFrameworkCore;
+global using System;
+global using System.Collections.Generic;
+global using System.ComponentModel.DataAnnotations;
+global using System.ComponentModel.DataAnnotations.Schema;
+
+

IRaCIS.Core.Domain/Image/DicomInstance.cs

@@ -1,13 +1,8 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models;
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
 
 [Comment("归档 -  Instance表")]
 [Table("DicomInstance")]
-public  class DicomInstance : BaseFullAuditEntity, IEntitySeqId
+public class DicomInstance : BaseFullAuditEntity, IEntitySeqId
 {
     #region 导航属性
     [JsonIgnore]

IRaCIS.Core.Domain/Image/DicomSeries.cs

@@ -1,10 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
 
 [Comment("归档 - 序列表")]
 public partial class DicomSeries : BaseFullDeleteAuditEntity, IEntitySeqId

IRaCIS.Core.Domain/Image/DicomStudy.cs

@@ -1,10 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
 
 [Table("DicomStudy")]
 public class DicomStudy : BaseFullDeleteAuditEntity, IEntitySeqId

IRaCIS.Core.Domain/Image/DicomStudyMonitor.cs

@@ -1,12 +1,7 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-01-25 13:26:03 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 namespace IRaCIS.Core.Domain.Models;
 
 [Comment("项目 - 影像上传监控")]

IRaCIS.Core.Domain/Image/ImageShare.cs

@@ -1,24 +1,17 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("影像 - 影像分享记录表")]
-[Table("ImageShare")]
-public class ImageShare: Entity
 {
-    #region 导航属性
+    public class ImageShare : Entity
+    {
+        #region 导航属性
 
-    #endregion
+        #endregion
-    public DateTime ExpireTime { get; set; }
+        public Guid TrialId { get; set; }
+        public Guid SubjectId { get; set; }
+        public Guid StudyId { get; set; }
 
-    public string Password { get; set; } = null!;
+        public DateTime ExpireTime { get; set; }
 
-    public Guid StudyId { get; set; }
+        public string Password { get; set; } = string.Empty;
-
-    public Guid SubjectId { get; set; }
-
-    public Guid TrialId { get; set; }
 
+    }
 }

IRaCIS.Core.Domain/Image/NoneDicomStudy.cs

@@ -1,62 +1,66 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2021-12-06 10:49:39 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("影像 - 非dicom检查")]
-[Table("NoneDicomStudy")]
-public class NoneDicomStudy : BaseFullAuditEntity
 {
-    #region 导航属性
+    ///<summary>
-    [JsonIgnore]
+    ///NoneDicomStudy
-    public List<NoneDicomStudyFile> NoneDicomFileList { get; set; }
+    ///</summary>
+    [Table("NoneDicomStudy")]
+    public class NoneDicomStudy : BaseFullAuditEntity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        public List<NoneDicomStudyFile> NoneDicomFileList { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<NoneDicomStudyFile> TaskNoneDicomFileList { get; set; }
+        public List<NoneDicomStudyFile> TaskNoneDicomFileList { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public SubjectVisit SubjectVisit { get; set; }
+        public SubjectVisit SubjectVisit { get; set; }
-    [JsonIgnore]
+        [JsonIgnore]
-    public Subject Subject { get; set; }
+        public Subject Subject { get; set; }
 
-    #endregion
+        #endregion
 
 
-    public string BodyPart { get; set; } = null!;
 
-    public int Code { get; set; }
+        public string StudyCode { get; set; } = string.Empty;
 
-    public string Description { get; set; } = null!;
+        public int FileCount { get; set; }
 
-    public int FileCount { get; set; }
+        public int Code { get; set; }
 
-    public DateTime ImageDate { get; set; }
+        public Guid TrialId { get; set; }
 
-    public string Modality { get; set; } = null!;
 
-    public string StudyCode { get; set; } = null!;
+        public Guid SubjectId { get; set; }
 
-    public Guid SubjectId { get; set; }
 
-    public Guid SubjectVisitId { get; set; }
+        public Guid SubjectVisitId { get; set; }
 
-    public Guid TrialId { get; set; }
 
-    public DateTime? UploadVideoTime { get; set; }
 
-    public string VideoName { get; set; } = null!;
+        public string BodyPart { get; set; } = string.Empty;
 
-    public string VideoObjectName { get; set; } = null!;
 
-    public string VideoUrl { get; set; } = null!;
+        public string Modality { get; set; } = string.Empty;
+
+        public DateTime ImageDate { get; set; }
+
+
+        public string Description { get; set; } = string.Empty;
+
+
+        public string VideoName { get; set; } = string.Empty;
+
+        public string VideoObjectName { get; set; } = string.Empty;
+
+        public DateTime? UploadVideoTime { get; set; }
+
+        public string VideoUrl { get; set; } = string.Empty;
+
+    }
 
 }
-
-

IRaCIS.Core.Domain/Image/NoneDicomStudyFile.cs

@@ -1,50 +1,53 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2021-12-06 10:49:39 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models;
-
-
-[Comment("影像 - 非dicom检查关联文件表")]
-[Table("NoneDicomStudyFile")]
-public class NoneDicomStudyFile : BaseAddAuditEntity
 {
-    #region 导航属性
+
-    [ForeignKey("NoneDicomStudyId")]
+    [Table("NoneDicomStudyFile")]
-    [JsonIgnore]
+    public class NoneDicomStudyFile : BaseAddAuditEntity
-    public NoneDicomStudy NoneDicomStudy { get; set; }
+    {
+        #region 导航属性
+        [ForeignKey("NoneDicomStudyId")]
+        [JsonIgnore]
+        public NoneDicomStudy NoneDicomStudy { get; set; }
 
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public VisitTask VisitTask { get; set; }
+        public VisitTask VisitTask { get; set; }
 
-    [ForeignKey("OriginNoneDicomStudyId")]
+        [ForeignKey("OriginNoneDicomStudyId")]
-    [JsonIgnore]
+        [JsonIgnore]
-    public NoneDicomStudy OriginNoneDicomStudy { get; set; }
+        public NoneDicomStudy OriginNoneDicomStudy { get; set; }
-    #endregion
+        #endregion
 
 
-    public string FileName { get; set; } = null!;
+        public Guid NoneDicomStudyId { get; set; }
 
-    public long? FileSize { get; set; }
 
-    public string FileType { get; set; } = null!;
+        public string Path { get; set; } = string.Empty;
 
-    public Guid NoneDicomStudyId { get; set; }
 
-    [Comment("为了不影响原始检查，跟任务绑定的  NoneDicomStudyId 为guid空  这个字段记录跟原始检查绑")]
+        public string FileName { get; set; } = string.Empty;
-    public Guid? OriginNoneDicomStudyId { get; set; }
 
-    [StringLength(512)]
+        public string FileType { get; set; } = string.Empty;
-    public string Path { get; set; } = null!;
 
-    [Comment("任务Id,配合OriginNoneDicomStudyId 一起使用")]
+        public long? FileSize { get; set; }
-    public Guid? VisitTaskId { get; set; }
 
 
+        #region 跟任务绑定 同时区分检查
+
+        public Guid? VisitTaskId { get; set; }
+
+
+        /// <summary>
+        /// 为了不影响原始检查，跟任务绑定的  NoneDicomStudyId 为guid空  这个字段记录跟原始检查绑
+        /// </summary>
+        public Guid? OriginNoneDicomStudyId { get; set; }
+        #endregion
+
+
+    }
+
 }

IRaCIS.Core.Domain/Image/SCPImageUpload.cs

@@ -1,49 +1,60 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2024-05-24 14:31:45 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-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;
-
-[Comment("项目中心 - 影像推送记录")]
-[Table("SCPImageUpload")]
-public class SCPImageUpload : BaseAddAuditEntity
 {
-    #region 导航属性
+    ///<summary>
-    [JsonIgnore]
+    ///SCPImageUpload
-    public Trial Trial { get; set; }
+    ///</summary>
+    [Table("SCPImageUpload")]
+    public class SCPImageUpload : BaseAddAuditEntity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        public Trial Trial { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public TrialSite TrialSite { get; set; }
+        public TrialSite TrialSite { get; set; }
-    #endregion
+        #endregion
 
 
-    public string CalledAE { get; set; } = null!;
+        public string CallingAE { get; set; } = string.Empty;
 
-    public string CallingAE { get; set; } = null!;
 
-    public string CallingAEIP { get; set; } = null!;
+        public string CalledAE { get; set; } = string.Empty;
 
-    public DateTime EndTime { get; set; }
 
-    public int FileCount { get; set; }
 
-    public long FileSize { get; set; }
+        public string CallingAEIP { get; set; } = string.Empty;
 
-    public DateTime StartTime { get; set; }
 
-    public int StudyCount { get; set; }
 
-    public Guid TrialId { get; set; }
+        public DateTime StartTime { get; set; }
 
-    public Guid TrialSiteId { get; set; }
 
+        public DateTime EndTime { get; set; }
+
+
+
+        public int FileCount { get; set; }
+
+
+
+        public long FileSize { get; set; }
+
+
+        public int StudyCount { get; set; }
+
+
+
+
+        public Guid TrialId { get; set; }
+        public Guid TrialSiteId { get; set; }
+
+
+
+    }
 
 
 }

IRaCIS.Core.Domain/Image/SCPInstance.cs

@@ -1,76 +1,49 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Table("SCPInstance")]
-public class SCPInstance : BaseFullAuditEntity, IEntitySeqId
 {
-    #region 导航属性
+    [Table("SCPInstance")]
-    [JsonIgnore]
+    public class SCPInstance : BaseFullAuditEntity, IEntitySeqId
-    [ForeignKey("SeriesId")]
+    {
-    public SCPSeries SCPSeries { get; set; }
+        #region 导航属性
+        [JsonIgnore]
+        [ForeignKey("SeriesId")]
+        public SCPSeries SCPSeries { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    [ForeignKey("StudyId")]
+        [ForeignKey("StudyId")]
-    public SCPStudy SCPStudy { get; set; }
+        public SCPStudy SCPStudy { get; set; }
-    #endregion
+        #endregion
-
-    public bool Anonymize { get; set; }
-
-    public bool CPIStatus { get; set; }
-
-    public long? FileSize { get; set; }
-
-    [StringLength(500)]
-    public string FrameOfReferenceUID { get; set; } = null!;
-
-    public int ImageColumns { get; set; }
-
-    public int ImageRows { get; set; }
-
-    [StringLength(400)]
-    public string ImagerPixelSpacing { get; set; } = null!;
-
-    public int InstanceNumber { get; set; }
-
-    public DateTime? InstanceTime { get; set; }
-
-    public int NumberOfFrames { get; set; }
-
-
-    [MaxLength]
-    [Unicode(false)]
-    public string Path { get; set; } = null!;
-
-    [StringLength(400)]
-    public string PixelSpacing { get; set; } = null!;
-
-    public Guid SeqId { get; set; }
-
-    public Guid SeriesId { get; set; }
-
-    public string SeriesInstanceUid { get; set; } = null!;
-
-    public int SliceLocation { get; set; }
-
-    [StringLength(400)]
-    public string SliceThickness { get; set; } = null!;
-
-    public string SopInstanceUid { get; set; } = null!;
-
-    public Guid StudyId { get; set; }
-
-    public string StudyInstanceUid { get; set; } = null!;
-
-    [StringLength(400)]
-    public string WindowCenter { get; set; } = null!;
-
-    [StringLength(400)]
-    public string WindowWidth { get; set; } = null!;
 
 
 
+        public Guid SeqId { get; set; }
+        public Guid StudyId { get; set; }
+        public Guid SeriesId { get; set; }
+        public string StudyInstanceUid { get; set; } = string.Empty;
+        public string SeriesInstanceUid { get; set; } = string.Empty;
+        public string SopInstanceUid { get; set; } = string.Empty;
+        public int InstanceNumber { get; set; }
+        public DateTime? InstanceTime { get; set; }
+        public bool CPIStatus { get; set; }
+        public int ImageRows { get; set; }
+        public int ImageColumns { get; set; }
+        public int SliceLocation { get; set; }
+
+
+        public string SliceThickness { get; set; } = string.Empty;
+        public int NumberOfFrames { get; set; }
+        public string PixelSpacing { get; set; } = string.Empty;
+
+        public string ImagerPixelSpacing { get; set; } = string.Empty;
+        public string FrameOfReferenceUID { get; set; } = string.Empty;
+        public string WindowCenter { get; set; } = string.Empty;
+        public string WindowWidth { get; set; } = string.Empty;
+
+        public bool Anonymize { get; set; }
+        public string Path { get; set; } = string.Empty;
+
+        public long? FileSize { get; set; }
+
+
+
+    }
 }

IRaCIS.Core.Domain/Image/SCPPatient.cs

@@ -1,48 +1,39 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("项目中心 - 推送检查患者")]
-[Table("SCPPatient")]
-public class SCPPatient : BaseFullAuditEntity
 {
-    #region 导航属性
+    [Table("SCPPatient")]
-    [JsonIgnore]
+    public class SCPPatient : BaseFullAuditEntity
-    public List<SCPStudy> SCPStudyList { get; set; }
+    {
-    [JsonIgnore]
+        #region 导航属性
-    public Subject Subject { get; set; }
+        [JsonIgnore]
-    [JsonIgnore]
+        public List<SCPStudy> SCPStudyList { get; set; }
-    public Trial Trial { get; set; }
+        [JsonIgnore]
-    [JsonIgnore]
+        public Subject Subject { get; set; }
-    public TrialSite TrialSite { get; set; }
+        [JsonIgnore]
-    #endregion
+        public Trial Trial { get; set; }
+        [JsonIgnore]
+        public TrialSite TrialSite { get; set; }
+        #endregion
 
-    public DateTime? EarliestStudyTime { get; set; }
 
-    public DateTime LatestPushTime { get; set; }
+        public string PatientIdStr { get; set; } = string.Empty;
+        public string PatientName { get; set; } = string.Empty;
+        public string PatientAge { get; set; } = string.Empty;
+        public string PatientSex { get; set; } = string.Empty;
+        public string PatientBirthDate { get; set; } = string.Empty;
 
-    public DateTime? LatestStudyTime { get; set; }
+        public DateTime? EarliestStudyTime { get; set; }
 
-    public string PatientAge { get; set; } = null!;
+        public DateTime? LatestStudyTime { get; set; }
 
-    public string PatientBirthDate { get; set; } = null!;
+        public DateTime LatestPushTime { get; set; }
 
-    public string PatientIdStr { get; set; } = null!;
 
-    public string PatientName { get; set; } = null!;
+        public Guid? SubjectId { get; set; }
-
+        public Guid TrialId { get; set; }
-    public string PatientSex { get; set; } = null!;
+        public Guid TrialSiteId { get; set; }
-
-    public Guid? SubjectId { get; set; }
-
-    public Guid TrialId { get; set; }
-
-    public Guid TrialSiteId { get; set; }
 
 
 
+
+    }
 }

IRaCIS.Core.Domain/Image/SCPSeries.cs

@@ -1,70 +1,45 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("项目中心 - 推送序列")]
-[Table("SCPSeries")]
-public class SCPSeries : BaseFullDeleteAuditEntity, IEntitySeqId
 {
-    #region 导航属性
+    [Table("SCPSeries")]
-    [JsonIgnore]
+    public class SCPSeries : BaseFullDeleteAuditEntity, IEntitySeqId
-    [ForeignKey("StudyId")]
+    {
-    public SCPStudy SCPStudy { get; set; }
+        #region 导航属性
+        [JsonIgnore]
+        [ForeignKey("StudyId")]
+        public SCPStudy SCPStudy { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<SCPInstance> SCPInstanceList { get; set; }
+        public List<SCPInstance> SCPInstanceList { get; set; }
-    #endregion
+        #endregion
 
 
-    public string AcquisitionNumber { get; set; } = null!;
+        public Guid SeqId { get; set; }
+        public Guid StudyId { get; set; }
+        public string StudyInstanceUid { get; set; } = string.Empty;
+        public string SeriesInstanceUid { get; set; } = string.Empty;
+        public int SeriesNumber { get; set; }
+        public DateTime? SeriesTime { get; set; }
+        public string Modality { get; set; } = string.Empty;
+        public string Description { get; set; } = string.Empty;
+        public int InstanceCount { get; set; }
+        public string SliceThickness { get; set; } = string.Empty;
 
-    public string AcquisitionTime { get; set; } = null!;
+        public string ImagePositionPatient { get; set; } = string.Empty;
+        public string ImageOrientationPatient { get; set; } = string.Empty;
+        public string BodyPartExamined { get; set; } = string.Empty;
+        public string SequenceName { get; set; } = string.Empty;
+        public string ProtocolName { get; set; } = string.Empty;
+        public string ImagerPixelSpacing { get; set; } = string.Empty;
 
-    public string BodyPartExamined { get; set; } = null!;
+        public string AcquisitionTime { get; set; } = string.Empty;
+        public string AcquisitionNumber { get; set; } = string.Empty;
+        public string TriggerTime { get; set; } = string.Empty;
 
-    public string BodyPartForEdit { get; set; } = null!;
+        public string BodyPartForEdit { get; set; } = string.Empty;
 
-    [StringLength(500)]
+        public bool IsReading { get; set; } = true;
-    public string Description { get; set; } = null!;
 
-    public string ImageOrientationPatient { get; set; } = null!;
+        public string ImageResizePath { get; set; } = string.Empty;
-
-    public string ImagePositionPatient { get; set; } = null!;
-
-    [StringLength(520)]
-    public string ImageResizePath { get; set; } = null!;
-
-    public string ImagerPixelSpacing { get; set; } = null!;
-
-    public int InstanceCount { get; set; }
-
-    public bool? IsReading { get; set; }
-
-    public string Modality { get; set; } = null!;
-
-    [StringLength(500)]
-    public string ProtocolName { get; set; } = null!;
-
-    public Guid SeqId { get; set; }
-
-    public string SequenceName { get; set; } = null!;
-
-    public string SeriesInstanceUid { get; set; } = null!;
-
-    public int SeriesNumber { get; set; }
-
-    public DateTime? SeriesTime { get; set; }
-
-    public string SliceThickness { get; set; } = null!;
-
-    public Guid StudyId { get; set; }
-
-    public string StudyInstanceUid { get; set; } = null!;
-
-    public string TriggerTime { get; set; } = null!;
 
+    }
 }

IRaCIS.Core.Domain/Image/SCPStudy.cs

@@ -1,103 +1,82 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("项目中心 - 推送检查")]
-[Table("SCPStudy")]
-public class SCPStudy : BaseFullDeleteAuditEntity, IEntitySeqId
 {
+    [Table("SCPStudy")]
+    public class SCPStudy : BaseFullDeleteAuditEntity, IEntitySeqId
+    {
 
-    #region 导航属性
+        #region 导航属性
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<SCPInstance> InstanceList { get; set; }
+        public List<SCPInstance> InstanceList { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<SCPSeries> SeriesList { get; set; }
+        public List<SCPSeries> SeriesList { get; set; }
-    [JsonIgnore]
+        [JsonIgnore]
-    public SubjectVisit SubjectVisit { get; set; }
+        public SubjectVisit SubjectVisit { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public Trial Trial { get; set; }
+        public Trial Trial { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public TrialSite TrialSite { get; set; }
+        public TrialSite TrialSite { get; set; }
 
-    [ForeignKey("PatientId")]
+        #endregion
-    [JsonIgnore]
-    public SCPPatient Patient { get; set; }
 
-    #endregion
 
-    public string AccessionNumber { get; set; } = null!;
 
-    public string AcquisitionNumber { get; set; } = null!;
+        //0 未知  1 单重  2 双重
+        public bool IsDoubleReview { get; set; }
 
-    public string AcquisitionTime { get; set; } = null!;
+        public Guid SeqId { get; set; }
 
-    [StringLength(512)]
+        [ForeignKey("PatientId")]
-    public string BodyPartExamined { get; set; } = null!;
+        [JsonIgnore]
+        public SCPPatient Patient { get; set; }
+        public Guid PatientId { get; set; }
 
-    public string BodyPartForEdit { get; set; } = null!;
+        public string StudyInstanceUid { get; set; } = string.Empty;
+        public DateTime? StudyTime { get; set; }
+        public string Modalities { get; set; } = string.Empty;
 
-    public string CalledAE { get; set; } = null!;
+        public string Description { get; set; } = string.Empty;
+        public int SeriesCount { get; set; } = 0;
+        public int InstanceCount { get; set; } = 0;
 
-    public string CallingAE { get; set; } = null!;
 
-    [StringLength(1000)]
+        public string InstitutionName { get; set; } = string.Empty;
-    public string Description { get; set; } = null!;
+        public string PatientIdStr { get; set; } = string.Empty;
+        public string PatientName { get; set; } = string.Empty;
+        public string PatientAge { get; set; } = string.Empty;
+        public string PatientSex { get; set; } = string.Empty;
 
-    public int InstanceCount { get; set; }
+        public string StudyId { get; set; } = string.Empty;
+        public string AccessionNumber { get; set; } = string.Empty;
+        public string PatientBirthDate { get; set; } = string.Empty;
+        public string AcquisitionTime { get; set; } = string.Empty;
+        public string AcquisitionNumber { get; set; } = string.Empty;
+        public string TriggerTime { get; set; } = string.Empty;
 
-    public string InstitutionName { get; set; } = null!;
+        public string BodyPartExamined { get; set; } = string.Empty;
 
-    public bool IsDoubleReview { get; set; }
+        public string BodyPartForEdit { get; set; } = string.Empty;
 
-    public bool IsUploadFinished { get; set; }
+        public string ModalityForEdit { get; set; } = string.Empty;
 
-    public string Modalities { get; set; } = null!;
 
-    public string ModalityForEdit { get; set; } = null!;
 
-    public string PatientAge { get; set; } = null!;
+        public string CallingAE { get; set; } = string.Empty;
 
-    public string PatientBirthDate { get; set; } = null!;
+        public string CalledAE { get; set; } = string.Empty;
 
-    public Guid PatientId { get; set; }
+        public bool IsUploadFinished { get; set; }
 
-    public string PatientIdStr { get; set; } = null!;
 
-    public string PatientName { get; set; } = null!;
+        public Guid TrialId { get; set; }
+        public Guid TrialSiteId { get; set; }
 
-    public string PatientSex { get; set; } = null!;
+        public Guid? SubjectVisitId { get; set; }
 
-    [Comment(" 序列Id 避免内存移动")]
-    public Guid SeqId { get; set; }
 
-    public int SeriesCount { get; set; }
 
-    [Comment(" DicomTag.StudyID")]
-    public string StudyId { get; set; } = null!;
-
-    [StringLength(500)]
-    public string StudyInstanceUid { get; set; } = null!;
-
-    public DateTime? StudyTime { get; set; }
-
-    public Guid? SubjectVisitId { get; set; }
-
-    public Guid TrialId { get; set; }
-
-    public Guid TrialSiteId { get; set; }
-
-    public string TriggerTime { get; set; } = null!;
-
-    [Comment(" 上传时间")]
-    public DateTime? UploadedTime { get; set; }
-
-    public string Uploader { get; set; } = null!;
 
+    }
 }

IRaCIS.Core.Domain/Image/SystemAnonymization.cs

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

IRaCIS.Core.Domain/Image/TaskInstance.cs

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

IRaCIS.Core.Domain/Image/TaskSeries.cs

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

IRaCIS.Core.Domain/Image/TaskStudy.cs

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

IRaCIS.Core.Domain/Image/TrialDicomAE.cs

@@ -1,41 +1,39 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2024-03-22 15:44:11 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("项目 - 项目DicomAE")]
-[Table("TrialDicomAE")]
-public class TrialDicomAE : BaseFullAuditEntity
 {
-    #region 导航属性
+    ///<summary>
+    ///DicomAE
+    ///</summary>
+    [Table("TrialDicomAE")]
+    public class TrialDicomAE : BaseFullAuditEntity
+    {
+        #region 导航属性
 
-    #endregion
+        #endregion
-    public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
 
-    public string CalledAE { get; set; } = string.Empty;
+        public string CalledAE { get; set; } = string.Empty;
 
-    public string IP { get; set; } = string.Empty;
+        public string IP { get; set; } = string.Empty;
 
 
-    public int Port { get; set; }
+        public int Port { get; set; }
 
 
-    public string Modality { get; set; } = string.Empty;
+        public string Modality { get; set; } = string.Empty;
 
 
-    public string Description { get; set; } = string.Empty;
+        public string Description { get; set; } = string.Empty;
 
 
-    public DateTime? LatestTestTime { get; set; }
+        public DateTime? LatestTestTime { get; set; }
 
-    public bool? IsTestOK { get; set; }
+        public bool? IsTestOK { get; set; }
+
+    }
 
 }

IRaCIS.Core.Domain/Image/TrialImageDownload.cs

@@ -1,55 +1,44 @@
-using IRaCIS.Core.Domain.Models;
+namespace 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;
-using System.Threading.Tasks;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("项目 - 影像下载监控")]
-[Table("TrialImageDownload")]
-public class TrialImageDownload : BaseFullAuditEntity
 {
-    #region 导航属性
+    [Table("TrialImageDownload")]
-    [JsonIgnore]
+    public class TrialImageDownload : BaseFullAuditEntity
-    public Trial Trial { get; set; }
+    {
+        #region 导航属性
+        [JsonIgnore]
+        public Trial Trial { get; set; }
 
-    #endregion
+        #endregion
 
-    public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
-    public string SubjectCode { get; set; }
+        public string SubjectCode { get; set; }
 
-    public bool IsSuccess { get; set; }
+        public bool IsSuccess { get; set; }
 
-    public DateTime DownloadStartTime { get; set; }
+        public DateTime DownloadStartTime { get; set; }
-    public DateTime? DownloadEndTime { get; set; }
+        public DateTime? DownloadEndTime { get; set; }
 
-    [StringLength(400)]
+        public string VisitName { get; set; }
-    public string VisitName { get; set; }
 
-    public ImageType ImageType { get; set; }
+        public ImageType ImageType { get; set; }
 
-    public int NoneDicomStudyCount { get; set; }
+        public int NoneDicomStudyCount { get; set; }
 
-    public int DicomStudyCount { get; set; }
+        public int DicomStudyCount { get; set; }
 
-    public int ImageCount { get; set; }
+        public int ImageCount { get; set; }
-    public long ImageSize { get; set; }
+        public long ImageSize { get; set; }
 
-    public string IP { get; set; }
+        public string IP { get; set; }
 
+    }
+
+    public enum ImageType
+    {
+        Dicom = 1,
+
+        NoneDicom = 2,
+
+        DicomAndNoneDicom = 3
+    };
 }
-
-public enum ImageType
-{
-    Dicom = 1,
-
-    NoneDicom = 2,
-
-    DicomAndNoneDicom = 3
-};

IRaCIS.Core.Domain/Institution/CRO.cs

@@ -1,8 +1,3 @@
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
 namespace IRaCIS.Core.Domain.Models;
 
 [Comment("机构 - CRO")]

IRaCIS.Core.Domain/Institution/Hospital.cs

@@ -1,47 +1,38 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("机构 - 医院")]
-[Table("Hospital")]
-public class Hospital : BaseFullAuditEntity
 {
-    #region 导航属性
+    [Table("Hospital")]
-    [JsonIgnore]
+    public class Hospital : BaseFullAuditEntity
-    [ForeignKey("SiteId")]
+    {
-    public Site Site { get; set; }
+        #region 导航属性
+        [JsonIgnore]
+        [ForeignKey("SiteId")]
+        public Site Site { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<Doctor> DoctorList { get; set; }
+        public List<Doctor> DoctorList { get; set; }
-    #endregion
+        #endregion
 
 
-    public string City { get; set; } = null!;
+        public string HospitalName { get; set; } = string.Empty;
+        public string UniversityAffiliated { get; set; } = string.Empty;
+        public string Country { get; set; } = string.Empty;
+        public string Province { get; set; } = string.Empty;
+        public string City { get; set; } = string.Empty;
 
-    public string CityCN { get; set; } = null!;
+        public string HospitalNameCN { get; set; } = string.Empty;
+        public string UniversityAffiliatedCN { get; set; } = string.Empty;
+        public string CountryCN { get; set; } = string.Empty;
+        public string ProvinceCN { get; set; } = string.Empty;
+        public string CityCN { get; set; } = string.Empty;
 
-    public string Country { get; set; } = null!;
 
-    public string CountryCN { get; set; } = null!;
+        /// <summary>
-
+        /// 中心Id
-    public string HospitalName { get; set; } = null!;
+        /// </summary>
-
+        public Guid? SiteId { get; set; } = Guid.Empty;
-    public string HospitalNameCN { get; set; } = null!;
-
-    public string Province { get; set; } = null!;
-
-    public string ProvinceCN { get; set; } = null!;
-
-    public Guid? SiteId { get; set; }
-
-    public string UniversityAffiliated { get; set; } = null!;
-
-    public string UniversityAffiliatedCN { get; set; } = null!;
 
 
 
 
+    }
 }

IRaCIS.Core.Domain/Institution/Site.cs

@@ -1,62 +1,42 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("»ú¹¹ - Site")]
-[Table("Site")]
-public partial class Site : BaseFullAuditEntity
 {
-    #region µ¼º½ÊôÐÔ
+    [Table("Site")]
-    [JsonIgnore]
+    public partial class Site : BaseFullAuditEntity
-    [ForeignKey("HospitalId")]
+    {
-    public Hospital Hospital { get; set; }
+        #region µ¼º½ÊôÐÔ
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<TrialSite> TrialSiteList { get; set; }
+        [ForeignKey("HospitalId")]
-    #endregion
+        public Hospital Hospital { get; set; }
+        [JsonIgnore]
+        public List<TrialSite> TrialSiteList { get; set; }
+        #endregion
 
-    [StringLength(500)]
+        public string SiteName { get; set; } = string.Empty;
-    public string Address { get; set; } = null!;
+        public string SiteNameCN { get; set; } = string.Empty;
+        public string AliasName { get; set; } = string.Empty;
+        public string SiteCode { get; set; } = string.Empty;
 
-    public string AliasName { get; set; } = null!;
+        public int Code { get; set; }
 
-    public string City { get; set; } = null!;
+        public string City { get; set; } = string.Empty;
+        public string Country { get; set; } = string.Empty;
+        public Guid? HospitalId { get; set; }
+        public int State { get; set; }
 
-    public int Code { get; set; }
+        public string Province { get; set; } = string.Empty;
 
-    public string ContactName { get; set; } = null!;
+        public string UniqueCode { get; set; } = string.Empty;
 
-    public string ContactPhone { get; set; } = null!;
+        public string Address { get; set; } = string.Empty;
 
-    public string Country { get; set; } = null!;
+        public string DirectorName { get; set; } = string.Empty;
-
+        public string DirectorPhone { get; set; } = string.Empty;
-    public string DirectorName { get; set; } = null!;
+        public string ContactName { get; set; } = string.Empty;
-
+        public string ContactPhone { get; set; } = string.Empty;
-    public string DirectorPhone { get; set; } = null!;
-
-    public Guid? HospitalId { get; set; }
-
-    public string Province { get; set; } = null!;
-
-    [StringLength(500)]
-    public string SiteCode { get; set; } = null!;
-
-    [StringLength(500)]
-    public string SiteName { get; set; } = null!;
-
-    [StringLength(400)]
-    public string SiteNameCN { get; set; } = null!;
-
-    [Comment(" ÔÝʱδÓÃ")]
-    public int State { get; set; }
-
-    public string UniqueCode { get; set; } = null!;
 
 
 
 
 
+    }
 }

IRaCIS.Core.Domain/Institution/Sponsor.cs

@@ -1,27 +1,19 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("»ú¹¹ - Sponsor")]
-[Table("Sponsor")]
-public partial class Sponsor : BaseFullAuditEntity
 {
-    #region µ¼º½ÊôÐÔ
+    [Table("Sponsor")]
+    public partial class Sponsor : BaseFullAuditEntity
+    {
+        #region µ¼º½ÊôÐÔ
 
-    #endregion
+        #endregion
+        public string SponsorName { get; set; } = String.Empty;
+        public string SponsorNameCN { get; set; } = String.Empty;
 
-    public bool IsTrialLevel { get; set; }
+        public string SponsorCode { get; set; } = String.Empty;
 
-    public string SponsorCode { get; set; } = null!;
+        public bool IsTrialLevel { get; set; }
 
-    [StringLength(1000)]
-    public string SponsorName { get; set; } = null!;
 
-    [StringLength(1000)]
+        public Guid? TrialId { get; set; }
-    public string SponsorNameCN { get; set; } = null!;
+    }
-
-    public Guid? TrialId { get; set; }
 }

IRaCIS.Core.Domain/Management/Menu.cs

@@ -1,60 +1,59 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("后台 - 系统菜单 （需要同步）")]
-[Table("Menu")]
-public class Menu : BaseFullAuditEntity
 {
-    #region 导航属性
+    [Table("Menu")]
-    [JsonIgnore]
+    public class Menu : BaseFullAuditEntity
-    public List<UserTypeMenu> UserTypeMenuList { get; set; }
+    {
-    #endregion
+        #region 导航属性
-
+        [JsonIgnore]
-    public string ApiPath { get; set; } = null!;
+        public List<UserTypeMenu> UserTypeMenuList { get; set; }
-
+        #endregion
-    [StringLength(400)]
-    public string Component { get; set; } = null!;
-
-    public bool IsCache { get; set; }
-
-    public bool IsDisplay { get; set; }
-
-    public bool IsEnable { get; set; }
-
-    public bool IsExternalLink { get; set; }
-
-    public bool? IsInTabDisplay { get; set; }
-
-    public string LanguageMark { get; set; } = null!;
-
-    public string MenuIcon { get; set; } = null!;
-
-    public string MenuName { get; set; } = null!;
-    [Comment("类型（M目录 C菜单 F按钮 L链接）")]
-    public string MenuType { get; set; } = null!;
-
-    public string Meta { get; set; } = null!;
 
 
-    [MaxLength]
-    public string Note { get; set; }
 
-    public Guid ParentId { get; set; }
+        //上级菜单
+        public Guid? ParentId { get; set; } = Guid.Empty;
 
-    [Comment("路由地址")]
+        // 类型（M目录 C菜单 F按钮 L链接）
-    [StringLength(500)]
+        public string MenuType { get; set; } = string.Empty;
-    public string Path { get; set; } = null!;
 
-    public string PermissionStr { get; set; } = null!;
+        public string MenuIcon { get; set; } = string.Empty;
 
-    public string Redirect { get; set; } = null!;
+        public string MenuName { get; set; } = string.Empty;
 
-    public int ShowOrder { get; set; }
+        //路由地址
+        public string Path { get; set; } = string.Empty;
+
+        //组件路径
+        public string Component { get; set; } = string.Empty;
+
+        public int ShowOrder { get; set; }
+
+        //启用 禁用
+        public bool IsEnable { get; set; } = true;
+
+        public bool IsCache { get; set; } = false;
+
+        public bool IsDisplay { get; set; }
+
+        public bool IsInTabDisplay { get; set; }
+
+        public bool IsExternalLink { get; set; }
+
+        //权限点
+        public string PermissionStr { get; set; } = string.Empty;
+
+        //Api 接口地址
+        public string ApiPath { get; set; } = string.Empty;
+
+        public string Note { get; set; } = string.Empty;
+
+        public string Meta { get; set; } = string.Empty;
+
+        public string Redirect { get; set; } = string.Empty;
 
 
+        public string LanguageMark { get; set; } = string.Empty;
+
+
+    }
 }

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

@@ -3,54 +3,52 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-04-25 09:46:09 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
-using System.Collections.Generic;
-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
-
-[Comment("后台 - 系统通知")]
-[Table("SystemNotice")]
-public class SystemNotice : BaseFullAuditEntity
 {
-    #region 导航属性
+    ///<summary>
-    [JsonIgnore]
+    ///SystemNotice
-    public List<SystemNoticeUserType> NoticeUserTypeList { get; set; } = new List<SystemNoticeUserType>();
+    ///</summary>
-    [JsonIgnore]
+    [Table("SystemNotice")]
-    public List<SystemNoticeUserRead> NoticeUserReadList { get; set; } = new List<SystemNoticeUserRead>();
+    public class SystemNotice : BaseFullAuditEntity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        public List<SystemNoticeUserType> NoticeUserTypeList { get; set; } = new List<SystemNoticeUserType>();
+        [JsonIgnore]
+        public List<SystemNoticeUserRead> NoticeUserReadList { get; set; } = new List<SystemNoticeUserRead>();
 
-    #endregion
+        #endregion
 
 
-    [MaxLength]
-    public string NoticeContent { get; set; } = string.Empty;
 
-    public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; }
+        public string NoticeContent { get; set; } = string.Empty;
 
-    public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; }
+        public SystemNotice_NoticeTypeEnum NoticeTypeEnum { get; set; }
 
-    public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; }
+        public SystemNotice_NoticeLevelEnum NoticeLevelEnum { get; set; }
 
-    public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; }
+        public SystemNotice_ApplicableProjectEnum ApplicableProjectEnum { get; set; }
 
-    public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; }
+        public SystemNotice_NoticeModeEnum NoticeModeEnum { get; set; }
 
-    public DateTime? StartDate { get; set; }
+        public SystemNotice_NoticeStateEnum NoticeStateEnum { get; set; }
 
-    public DateTime? EndDate { get; set; }
+        public DateTime? StartDate { get; set; }
 
-    public string FileName { get; set; } = string.Empty;
+        public DateTime? EndDate { get; set; }
 
-    public string Path { get; set; } = string.Empty;
+        public string FileName { get; set; } = string.Empty;
 
-    public Guid? PublishedUserId { get; set; }
+        public string Path { get; set; } = string.Empty;
 
-    public User PublishedUser { get; set; }
+        public Guid? PublishedUserId { get; set; }
 
-    public DateTime? PublishedTime { get; set; }
+        public User PublishedUser { get; set; }
+
+        public DateTime? PublishedTime { get; set; }
+
+    }
 
 }

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

@@ -1,25 +1,23 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-04-25 09:46:09 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("后台 - 系统通知用户读取记录")]
-[Table("SystemNoticeUserRead")]
-public class SystemNoticeUserRead : BaseAddAuditEntity
 {
+    ///<summary>
+    ///SystemNoticeUserRead
+    ///</summary>
+    [Table("SystemNoticeUserRead")]
+    public class SystemNoticeUserRead : BaseAddAuditEntity
+    {
 
-    #region 导航属性
+        #region 导航属性
 
-    #endregion
+        #endregion
 
-    public Guid SystemNoticeId { get; set; }
+        public Guid SystemNoticeId { get; set; }
 
 
+    }
+
 }

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

@@ -1,32 +1,30 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-04-25 09:46:09 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("后台 - 系统通知用户类型配置")]
-[Table("SystemNoticeUserType")]
-public class SystemNoticeUserType : BaseAddAuditEntity
 {
+    ///<summary>
+    ///SystemNoticeUserType
+    ///</summary>
+    [Table("SystemNoticeUserType")]
+    public class SystemNoticeUserType : BaseAddAuditEntity
+    {
 
-    #region 导航属性
+        #region 导航属性
-    [JsonIgnore]
+        [JsonIgnore]
 
-    [ForeignKey("UserTypeId")]
+        [ForeignKey("UserTypeId")]
-    public UserType NoticeUserType { get; set; }
+        public UserType NoticeUserType { get; set; }
-    #endregion
+        #endregion
 
-    public Guid SystemNoticeId { get; set; }
+        public Guid SystemNoticeId { get; set; }
 
 
-    public Guid UserTypeId { get; set; }
+        public Guid UserTypeId { get; set; }
 
 
 
+    }
+
 }

IRaCIS.Core.Domain/Management/Role.cs

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

IRaCIS.Core.Domain/Management/User.cs

@@ -1,98 +1,95 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 using EntityFrameworkCore.Projectables;
 using IRaCIS.Core.Domain.Share;
 
-namespace IRaCIS.Core.Domain.Models;
+namespace IRaCIS.Core.Domain.Models
-
-[Table("User")]
-public partial class User : BaseFullAuditEntity
 {
-    #region 导航属性
+    [Table("User")]
-    [ForeignKey("UserTypeId")]
+    public partial class User : BaseFullAuditEntity
-    public UserType UserTypeRole { get; set; }
+    {
+        #region 导航属性
+        [ForeignKey("UserTypeId")]
+        public UserType UserTypeRole { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<SystemDocConfirmedUser> SystemDocConfirmedList { get; set; }
+        public List<SystemDocConfirmedUser> SystemDocConfirmedList { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<TrialUser> UserTrials { get; set; } = new List<TrialUser>();
+        public List<TrialUser> UserTrials { get; set; } = new List<TrialUser>();
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<VisitTask> VisitTaskList { get; set; }
+        public List<VisitTask> VisitTaskList { get; set; }
 
-    #endregion
+        #endregion
 
 
 
-    [StringLength(255)]
+        [StringLength(255)]
-    public string UserName { get; set; } = String.Empty;
+        public string UserName { get; set; } = String.Empty;
 
-    [StringLength(255)]
+        [StringLength(255)]
-    public string Password { get; set; } = String.Empty;
+        public string Password { get; set; } = String.Empty;
-    [StringLength(255)]
+        [StringLength(255)]
 
-    public string LastName { get; set; } = String.Empty;
+        public string LastName { get; set; } = String.Empty;
-    public string FirstName { get; set; } = String.Empty;
+        public string FirstName { get; set; } = String.Empty;
 
-    public string Phone { get; set; } = string.Empty;
+        public string Phone { get; set; } = string.Empty;
-    public string EMail { get; set; } = string.Empty;
+        public string EMail { get; set; } = string.Empty;
-    public int? Sex { get; set; }
+        public int? Sex { get; set; }
-    public UserStateEnum Status { get; set; } = UserStateEnum.Enable;
+        public UserStateEnum Status { get; set; } = UserStateEnum.Enable;
 
-    public DateTime? LastLoginTime { get; set; }
+        public DateTime? LastLoginTime { get; set; }
 
-    public Guid UserTypeId { get; set; } = Guid.Empty;
+        public Guid UserTypeId { get; set; } = Guid.Empty;
 
 
-   // 内部用户  外部用户
+        // 内部用户  外部用户
-    public bool IsZhiZhun { get; set; }
+        public bool IsZhiZhun { get; set; }
 
-    public UserTypeEnum UserTypeEnum { get; set; }
+        public UserTypeEnum UserTypeEnum { get; set; }
 
-    public string OrganizationName { get; set; } = String.Empty;
+        public string OrganizationName { get; set; } = String.Empty;
 
-    public bool PasswordChanged { get; set; }
+        public bool PasswordChanged { get; set; }
 
 
-    public string UserCode { get; set; } = string.Empty;
+        public string UserCode { get; set; } = string.Empty;
 
-    public int Code { get; set; }
+        public int Code { get; set; }
 
 
-    public string DepartmentName { get; set; } = String.Empty;
+        public string DepartmentName { get; set; } = String.Empty;
 
-    public string PositionName { get; set; } = String.Empty;
+        public string PositionName { get; set; } = String.Empty;
 
 
-    public bool IsFirstAdd { get; set; } = true;
+        public bool IsFirstAdd { get; set; } = true;
 
-    public string EmailToken { get; set; } = string.Empty;
+        public string EmailToken { get; set; } = string.Empty;
 
-    /// <summary>
+        /// <summary>
-    /// 上一次修改密码的时间
+        /// 上一次修改密码的时间
-    /// </summary>
+        /// </summary>
-    public DateTime? LastChangePassWordTime { get; set; }
+        public DateTime? LastChangePassWordTime { get; set; }
 
-		/// <summary>
+        /// <summary>
-		/// LastLoginIP
+        /// LastLoginIP
-		/// </summary>
+        /// </summary>
-		public string LastLoginIP { get; set; } = string.Empty;
+        public string LastLoginIP { get; set; } = string.Empty;
 
-		//医生生成账号后，会有值
+        //医生生成账号后，会有值
-		public Guid? DoctorId { get; set; }
+        public Guid? DoctorId { get; set; }
 
-    public bool IsTestUser { get; set; }
+        public bool IsTestUser { get; set; }
 
-    /// <summary>
+        /// <summary>
-    /// 自动切换下一个任务
+        /// 自动切换下一个任务
-    /// </summary>
+        /// </summary>
-    public bool AutoCutNextTask { get; set; } = false;
+        public bool AutoCutNextTask { get; set; } = false;
 
-    [Projectable]
+        [Projectable]
-    public string FullName => LastName + " / " + FirstName;
+        public string FullName => LastName + " / " + FirstName;
 
-    //[Projectable] public string FullName => $"{LastName} / {FirstName}";
+        //[Projectable] public string FullName => $"{LastName} / {FirstName}";
+    }
 }

IRaCIS.Core.Domain/Management/UserFeedBack.cs

@@ -1,61 +1,59 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2024-07-30 10:39:01 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-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;
-
-[Comment("后台 - 用户反馈")]
-[Table("UserFeedBack")]
-public class UserFeedBack : BaseFullAuditEntity
 {
-    #region 导航属性
+    ///<summary>
-    [JsonIgnore]
+    ///UserFeedBack
-    public Trial Trial { get; set; }
+    ///</summary>
-    [JsonIgnore]
+    [Table("UserFeedBack")]
-    public Subject Subject { get; set; }
+    public class UserFeedBack : BaseFullAuditEntity
-    [JsonIgnore]
+    {
-    public SubjectVisit SubjectVisit { get; set; }
+        #region 导航属性
-    [JsonIgnore]
+        [JsonIgnore]
-    public TrialSite TrialSite { get; set; }
+        public Trial Trial { get; set; }
+        [JsonIgnore]
+        public Subject Subject { get; set; }
+        [JsonIgnore]
+        public SubjectVisit SubjectVisit { get; set; }
+        [JsonIgnore]
+        public TrialSite TrialSite { get; set; }
 
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public VisitTask VisitTask { get; set; }
+        public VisitTask VisitTask { get; set; }
 
-    [NotMapped]
+        [NotMapped]
-    public List<string> FeedBackScreenshotList => JsonConvert.DeserializeObject<List<string>>(ScreenshotListStr);
+        public List<string> FeedBackScreenshotList => JsonConvert.DeserializeObject<List<string>>(ScreenshotListStr);
-    #endregion
+        #endregion
 
 
-    public Guid? VisitTaskId { get; set; }
+        public Guid? VisitTaskId { get; set; }
 
-    public Guid? SubjectId { get; set; }
+        public Guid? SubjectId { get; set; }
 
 
-    public Guid? SubjectVisitId { get; set; }
+        public Guid? SubjectVisitId { get; set; }
 
 
-    public int QuestionType { get; set; }
+        public int QuestionType { get; set; }
 
-    [MaxLength]
+        public string QuestionDescription { get; set; } = string.Empty;
-    public string QuestionDescription { get; set; } = string.Empty;
-
-    public int State { get; set; }
 
 
-    public Guid? TrialSiteId { get; set; }
 
 
-    public Guid? TrialId { get; set; }
+
-    [MaxLength]
+        public int State { get; set; }
-    public string ScreenshotListStr { get; set; } = string.Empty;
+
+
+        public Guid? TrialSiteId { get; set; }
+
+
+        public Guid? TrialId { get; set; }
+
+        public string ScreenshotListStr { get; set; } = string.Empty;
 
 
 
@@ -63,5 +61,5 @@ public class UserFeedBack : BaseFullAuditEntity
 
 
 
+    }
 }
-

IRaCIS.Core.Domain/Management/UserLog.cs

@@ -1,95 +1,91 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2023-07-04 16:10:43 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("后台 - 用户账户操作日志")]
-[Table("UserLog")]
-public class UserLog : BaseAddAuditEntity
 {
-    #region 导航属性
+    ///<summary>
-    [JsonIgnore]
+    ///UserLog
-    public User LoginUser { get; set; }
+    ///</summary>
+    [Table("UserLog")]
+    public class UserLog : BaseAddAuditEntity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        public User LoginUser { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public User OptUser { get; set; }
+        public User OptUser { get; set; }
-    #endregion
+        #endregion
-
+        public string IP { get; set; } = string.Empty;
-    [StringLength(400)]
-    public string IP { get; set; } = string.Empty;
-
-    [StringLength(400)]
-    public string LoginFaildName { get; set; }=string.Empty;
 
 
-    public UserOptType OptType { get; set; }
+        public string LoginFaildName { get; set; } = string.Empty;
 
 
-    public string LoginPassword { get; set; } = string.Empty;
+        public UserOptType OptType { get; set; }
 
 
-    public Guid? LoginUserId { get;set; }
+        public string LoginPassword { get; set; } = string.Empty;
 
-    public Guid? OptUserId { get;set; }
 
-  
+        public Guid? LoginUserId { get; set; }
 
-    public string IPRegion { get; set; } = string.Empty;
+        public Guid? OptUserId { get; set; }
+
+
+
+        public string IPRegion { get; set; } = string.Empty;
+
+    }
+
+    /// <summary>
+    /// 登录或者登出 锁定类型
+    /// </summary>
+    public enum UserOptType
+    {
+
+        /// <summary>
+        /// 用户登录
+        /// </summary>
+        Login = 1,
+
+        /// <summary>
+        /// 用户登出
+        /// </summary>
+        LoginOut = 2,
+
+        /// <summary>
+        ///账号或者密码错误
+        /// </summary>
+        AccountOrPasswordError = 3,
+
+        /// <summary>
+        /// 账号锁定
+        /// </summary>
+        AccountLocked = 4,
+
+        //账号启用
+        AccountEnable = 5,
+
+        //登录锁定账户
+        LoginLockedAccount = 6,
+
+        //修改密码
+        LoginModifyPassword = 7,
+
+        UnloginModifyPasswoed = 8,
+
+        //admin 重置密码
+        ResetPassword = 9,
+
+        DeleteUser = 10,
+
+        UpdateUser = 11,
+
+        MFALogin = 12,
+
+        MFALoginFail = 13,
+    }
 
 }
-
-/// <summary>
-/// 登录或者登出 锁定类型
-/// </summary>
-public enum UserOptType
-{
-
-    /// <summary>
-    /// 用户登录
-    /// </summary>
-    Login = 1,
-
-    /// <summary>
-    /// 用户登出
-    /// </summary>
-    LoginOut = 2,
-
-    /// <summary>
-    ///账号或者密码错误
-    /// </summary>
-    AccountOrPasswordError = 3,
-
-    /// <summary>
-    /// 账号锁定
-    /// </summary>
-    AccountLocked = 4,
-
-    //账号启用
-    AccountEnable = 5,
-
-    //登录锁定账户
-    LoginLockedAccount=6,
-
-    //修改密码
-    LoginModifyPassword =7,
-
-    UnloginModifyPasswoed=8,
-
-    //admin 重置密码
-    ResetPassword=9,
-
-    DeleteUser=10,
-
-    UpdateUser=11,
-
-    MFALogin=12,
-
-    MFALoginFail=13,
-}

IRaCIS.Core.Domain/Management/UserPassWordLog.cs

@@ -1,31 +1,32 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2024-05-07 13:47:08 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("后台 - 用户修改密码")]
-[Table("UserPassWordLog")]
-public class UserPassWordLog : BaseAddAuditEntity
 {
-    #region 导航属性
+    ///<summary>
+    ///UserPassWordLog
+    ///</summary>
+    [Table("UserPassWordLog")]
+    public class UserPassWordLog : BaseAddAuditEntity
+    {
+        #region 导航属性
 
-    #endregion
+        #endregion
+
+        /// <summary>
+        /// 用户Id
+        /// </summary>
+        public Guid UserId { get; set; }
+
+        /// <summary>
+        /// 密码
+        /// </summary>
+        public string PassWord { get; set; } = string.Empty;
 
 
-    public Guid UserId { get; set; }
-
-    public string PassWord { get; set; } = string.Empty;
 
+    }
 
 
 }
-
-
-

IRaCIS.Core.Domain/Management/UserType.cs

@@ -1,54 +1,41 @@
-using System;
+using IRaCIS.Core.Domain.Share;
-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
 {
+    public class UserType : Entity
+    {
 
 
-    #region 导航属性
+        #region 导航属性
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<UserTypeMenu> UserTypeMenuList { get; set; }
+        public List<UserTypeMenu> UserTypeMenuList { get; set; }
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<UserTypeGroup> UserTypeGroupList { get; set; }
+        public List<UserTypeGroup> UserTypeGroupList { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<SystemDocNeedConfirmedUserType> SystemDocNeedConfirmedUserTypeList { get; set; }
+        public List<SystemDocNeedConfirmedUserType> SystemDocNeedConfirmedUserTypeList { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<User> UserList { get; set; }
+        public List<User> UserList { get; set; }
-    #endregion
+        #endregion
+        public UserTypeEnum UserTypeEnum { get; set; }
 
-    public string Description { get; set; } = null!;
+        public string UserTypeName { get; set; } = string.Empty;
 
-    public bool IsEnable { get; set; }
+        public string Description { get; set; } = string.Empty;
 
-    [Comment(" 是否是内部用户类型")]
+        public int Order { get; set; }
-    public bool IsInternal { get; set; }
 
-    [Comment(" 用于前端界面下拉框展示排序")]
+        public string UserTypeShortName { get; set; } = string.Empty;
-    public int Order { get; set; }
 
-    public string PermissionStr { get; set; } = null!;
+        public bool IsEnable { get; set; } = true;
 
-    [Comment(" 此数据固定，不能更改，和代码耦合")]
-    public UserTypeEnum UserTypeEnum { get; set; }
 
-    [Comment(" 名称、描述可以更改")]
+        public string PermissionStr { get; set; } = string.Empty;
-    public string UserTypeName { get; set; } = null!;
-
-    [Comment(" 用户类型名称简写")]
-    public string UserTypeShortName { get; set; } = null!;
 
 
 
 
 
+    }
 }

IRaCIS.Core.Domain/Management/UserTypeGroup.cs

@@ -1,35 +1,33 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-03-16 09:50:51 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
+namespace IRaCIS.Core.Domain.Models
-using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("后台 - 用户类型组（需要同步）")]
-[Table("UserTypeGroup")]
-public class UserTypeGroup : Entity
 {
-    #region 导航属性
+    ///<summary>
-    [JsonIgnore]
+    ///UserTypeGroup
-    [ForeignKey("DictionaryId")]
+    ///</summary>
-    public Dictionary Group { get; set; }
+    [Table("UserTypeGroup")]
+    public class UserTypeGroup : Entity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        [ForeignKey("DictionaryId")]
+        public Dictionary Group { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    [ForeignKey("UserTypeId")]
+        [ForeignKey("UserTypeId")]
-    public UserType UserType { get; set; }
+        public UserType UserType { get; set; }
-    #endregion
+        #endregion
 
 
-    public Guid UserTypeId { get; set; }
+        public Guid UserTypeId { get; set; }
 
 
-    public Guid DictionaryId { get; set; }
+        public Guid DictionaryId { get; set; }
+
+
+
+    }
 
 }
-
-

IRaCIS.Core.Domain/Management/UserTypeMenu.cs

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

IRaCIS.Core.Domain/QC/CheckChallengeDialog.cs

@@ -1,11 +1,4 @@
-using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Domain.Share;
-using IRaCIS.Core.Domain.Share;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Text;
 
 namespace IRaCIS.Core.Domain.Models;
 

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

@@ -1,44 +1,48 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2021-11-22 11:15:18 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("受试者访视 - 既往放疗史")]
-[Table("PreviousHistory")]
-public class PreviousHistory : BaseAddAuditEntity
 {
-    #region 导航属性
+    ///<summary>
-    [JsonIgnore]
+    ///PreviousHistory
-    public SubjectVisit SubjectVisit { get; set; }
+    ///</summary>
-    #endregion
+    [Table("PreviousHistory")]
+    public class PreviousHistory : BaseAddAuditEntity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        public SubjectVisit SubjectVisit { get; set; }
+        #endregion
 
 
-    [Comment(" 临床数据类型Id")]
+        public DateTime? StartTime { get; set; }
-    public Guid ClinicalDataTrialSetId { get; set; }
 
-    public DateTime? EndTime { get; set; }
+        public DateTime? EndTime { get; set; }
 
-    public string FileName { get; set; } = null!;
 
-    public int IsPD { get; set; }
+        public int? IsPD { get; set; }
 
-    public bool IsSubjectLevel { get; set; }
 
-    public string Path { get; set; } = null!;
+        public Guid SubjectVisitId { get; set; }
 
-    public string Position { get; set; } = null!;
 
-    public DateTime? StartTime { get; set; }
+        public bool IsSubjectLevel { get; set; }
 
-    public Guid SubjectVisitId { get; set; }
 
+        public string Path { get; set; } = String.Empty;
+
+
+        public string FileName { get; set; } = String.Empty;
+
+
+        public string Position { get; set; } = String.Empty;
+
+
+
+        public Guid ClinicalDataTrialSetId { get; set; }
+
+
+    }
 
 }
-
-

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

@@ -1,43 +1,49 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2021-11-22 11:15:18 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("受试者访视 - 既往其他治疗史")]
-[Table("PreviousOther")]
-public class PreviousOther : BaseAddAuditEntity
 {
-    #region 导航属性
+    ///<summary>
+    ///PreviousOther
+    ///</summary>
+    [Table("PreviousOther")]
+    public class PreviousOther : BaseAddAuditEntity
+    {
+        #region 导航属性
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public SubjectVisit SubjectVisit { get; set; }
+        public SubjectVisit SubjectVisit { get; set; }
-    #endregion
+        #endregion
 
-    [Comment(" 临床数据类型Id")]
+        public DateTime? StartTime { get; set; }
-    public Guid ClinicalDataTrialSetId { get; set; }
 
-    public DateTime? EndTime { get; set; }
 
-    public string FileName { get; set; } = null!;
+        public DateTime? EndTime { get; set; }
 
-    public bool? IsPD { get; set; }
 
-    public bool IsSubjectLevel { get; set; }
+        public bool IsPD { get; set; }
 
-    public string Path { get; set; } = null!;
+        public Guid SubjectVisitId { get; set; }
 
-    public DateTime? StartTime { get; set; }
 
-    public Guid SubjectVisitId { get; set; }
+        public bool IsSubjectLevel { get; set; }
 
-    public string TreatmentType { get; set; } = null!;
+
+        public string Path { get; set; } = String.Empty;
+
+
+        public string FileName { get; set; } = String.Empty;
+
+
+        public string TreatmentType { get; set; } = String.Empty;
+
+        /// <summary>
+        /// 临床数据类型Id
+        /// </summary>
+        [Required]
+        public Guid ClinicalDataTrialSetId { get; set; }
+
+    }
 
 }
-
-

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

@@ -4,47 +4,52 @@
 //	   生成时间 2021-12-09 11:35:31 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("受试者访视 - 临床数据配置")]
-[Table("PreviousPDF")]
-public class PreviousPDF : BaseAddAuditEntity
 {
-    #region 导航属性
+    ///<summary>
-    [JsonIgnore]
+    ///PreviousPDF
-    public SubjectVisit SubjectVisit { get; set; }
+    ///</summary>
+    [Table("PreviousPDF")]
+    public class PreviousPDF : BaseAddAuditEntity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        public SubjectVisit SubjectVisit { get; set; }
 
-    #endregion
+        #endregion
 
 
-    [Comment("临床级别")]
+        public Guid SubjectVisitId { get; set; }
-    public ClinicalLevel? ClinicalLevel { get; set; }
 
-    public ClinicalDataType? DataType { get; set; }
+        public string Path { get; set; } = string.Empty;
 
-    public string FileName { get; set; } = null!;
+        public string FileName { get; set; } = string.Empty;
 
-    public bool? IsVisist { get; set; }
 
-    [StringLength(512)]
+        public bool? IsVisist { get; set; }
-    public string Path { get; set; } = null!;
 
-    public Guid? SubjectId { get; set; }
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel? ClinicalLevel { get; set; }
+
+        /// <summary>
+        /// 数据类型
+        /// </summary>
+        public ClinicalDataType? DataType { get; set; }
+
+        /// <summary>
+        /// 上传方式
+        /// </summary>
+        public ClinicalUploadType? UploadType { get; set; }
+
+        public Guid? TrialId { get; set; }
+
+        public Guid? SubjectId { get; set; }
+
+    }
 
-    public Guid SubjectVisitId { get; set; }
 
-    public Guid? TrialId { get; set; }
 
-    [Comment("上传方式")]
-    public ClinicalUploadType? UploadType { get; set; }
 
 }
-
-
-
-
-

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

@@ -1,41 +1,43 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2021-11-22 11:15:18 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("受试者访视 - 既往手术史")]
-[Table("PreviousSurgery")]
-public class PreviousSurgery : BaseAddAuditEntity
 {
+    ///<summary>
+    ///PreviousSurgery
+    ///</summary>
+    [Table("PreviousSurgery")]
+    public class PreviousSurgery : BaseAddAuditEntity
+    {
 
-    #region 导航属性
+        #region 导航属性
 
-    #endregion
+        #endregion
 
-    [Comment(" 临床数据类型Id")]
-    public Guid ClinicalDataTrialSetId { get; set; }
 
-    public string FileName { get; set; } = null!;
 
-    public bool IsSubjectLevel { get; set; }
+        public DateTime? OperationTime { get; set; }
 
-    public string OperationName { get; set; } = null!;
+        public Guid SubjectVisitId { get; set; }
 
-    public DateTime? OperationTime { get; set; }
+        public bool IsSubjectLevel { get; set; }
 
-    public string Path { get; set; } = null!;
+        public string Path { get; set; } = String.Empty;
 
-    public Guid SubjectVisitId { get; set; }
+        public string FileName { get; set; } = String.Empty;
 
+        public string OperationName { get; set; } = String.Empty;
+
+        /// <summary>
+        /// 临床数据类型Id
+        /// </summary>
+        [Required]
+        public Guid ClinicalDataTrialSetId { get; set; }
+
+
+
+    }
 
 
 }
-
-
-

IRaCIS.Core.Domain/QC/ConsistencyCheckFile.cs

@@ -1,31 +1,25 @@
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("稽查 - 后端接收前端上传 文件记录表")]
-[Table("InspectionFile")]
-public class InspectionFile : BaseAddAuditEntity
 {
-    #region 导航属性
+    ///<summary>
+    /// 一致性核查文件
+    ///</summary>
+    [Table("InspectionFile")]
+    public class InspectionFile : BaseAddAuditEntity
+    {
+        #region 导航属性
 
-    #endregion
+        #endregion
 
-    [Comment(" 文件名称")]
+        public string FileName { get; set; } = string.Empty;
-    [StringLength(400)]
-    public string FileName { get; set; } = null!;
 
-    [Comment(" 相对路径")]
-    [StringLength(400)]
-    public string RelativePath { get; set; } = null!;
 
-    [Comment(" 项目ID")]
+        public string RelativePath { get; set; } = string.Empty;
-    public Guid TrialId { get; set; }
+
+        public Guid TrialId { get; set; }
+
+
+
+    }
 
 
 }
-
-
-

IRaCIS.Core.Domain/QC/QCChallenge.cs

@@ -1,81 +1,82 @@
 using IRaCIS.Core.Domain.Share;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
-namespace IRaCIS.Core.Domain.Models;
+namespace IRaCIS.Core.Domain.Models
-
-[Comment("受试者访视 - QC质疑")]
-[Table("QCChallenge")]
-public class QCChallenge : BaseAddAuditEntity
 {
-    #region 导航属性
+    public class QCChallenge : BaseAddAuditEntity
-    [JsonIgnore]
+    {
-    [ForeignKey("LatestReplyUserId")]
+        #region 导航属性
-    public User LatestReplyUser { get; set; }
+        [JsonIgnore]
-    [JsonIgnore]
+        [ForeignKey("LatestReplyUserId")]
-    //导航属性
+        public User LatestReplyUser { get; set; }
-    [ForeignKey("SubjectVisitId")]
+        [JsonIgnore]
-    public SubjectVisit SubjectVisit { get; set; }
+        //导航属性
+        [ForeignKey("SubjectVisitId")]
+        public SubjectVisit SubjectVisit { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<QCChallengeDialog> DialogList { get; set; } = new List<QCChallengeDialog>();
+        public List<QCChallengeDialog> DialogList { get; set; } = new List<QCChallengeDialog>();
 
-    #endregion
+        #endregion
 
-    [Comment(" 行动事项")]
-    [StringLength(1024)]
-    public string ActionContent { get; set; } = null!;
 
-    public string ChallengeCode { get; set; } = null!;
 
-    [StringLength(1024)]
-    public string ChallengeType { get; set; } = null!;
 
-    public DateTime? ClosedTime { get; set; }
+        public Guid TrialId { get; set; }
+        public Guid SubjectVisitId { get; set; }
 
-    public string ClosedUser { get; set; } = null!;
+        public DateTime? DeadlineTime { get; set; }
 
-    public QCChallengeCloseEnum CloseResonEnum { get; set; }
+        public string Note { get; set; } = string.Empty;
 
-    public int Code { get; set; }
+        public QCChanllengeReuploadEnum ReuploadEnum { get; set; }
 
-    [Comment(" 质疑内容")]
-    [StringLength(1024)]
-    public string Content { get; set; } = null!;
 
-    [Comment(" 用于双审的时候 区分 第一个人和第二个人的数据")]
+        public DateTime? ReUploadedTime { get; set; }
-    public CurrentQC CurrentQCEnum { get; set; }
 
-    public DateTime? DeadlineTime { get; set; }
+        public string ReUploader { get; set; } = string.Empty;
 
-    public bool IsClosed { get; set; }
+        public Guid? ReUploadUserId { get; set; }
 
-    public DateTime? LatestMsgTime { get; set; }
+        public TrialQCProcess QCProcessEnum { get; set; }
 
-    public Guid? LatestReplyUserId { get; set; }
+        public CurrentQC CurrentQCEnum { get; set; }
 
-    [Comment(" 额外补充")]
+        public DateTime? LatestMsgTime { get; set; }
-    [StringLength(1024)]
-    public string Note { get; set; } = null!;
 
-    public TrialQCProcess QCProcessEnum { get; set; }
 
-    public DateTime? ReUploadedTime { get; set; }
+        public Guid? LatestReplyUserId { get; set; }
 
-    public QCChanllengeReuploadEnum? ReuploadEnum { get; set; }
 
-    [Comment(" 记录重传人")]
+        public string ChallengeCode { get; set; } = string.Empty;
-    public string ReUploader { get; set; } = null!;
 
-    public Guid? ReUploadUserId { get; set; }
+        public int Code { get; set; }
 
-    public Guid SubjectVisitId { get; set; }
 
-    public Guid TrialId { get; set; }
 
-    public UserTypeEnum UserTypeEnum { get; set; }
+        public bool IsClosed { get; set; }
 
+        public DateTime? ClosedTime { get; set; }
+
+        public string ClosedUser { get; set; } = string.Empty;
+
+
+
+        public QCChallengeCloseEnum CloseResonEnum { get; set; }
+
+        public string Content { get; set; } = string.Empty;
+
+        public string ActionContent { get; set; } = string.Empty;
+
+        public UserTypeEnum UserTypeEnum { get; set; }
+
+
+        public string ChallengeType { get; set; } = string.Empty;
+
+
+
+
+
+
+
+    }
 }

IRaCIS.Core.Domain/QC/QCChallengeDialog.cs

@@ -1,26 +1,20 @@
 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
-
-[Comment("受试者访视 - QC质疑对话")]
-[Table("QCChallengeDialog")]
-public class QCChallengeDialog : BaseAddAuditEntity
 {
-    #region 导航属性
+    public class QCChallengeDialog : BaseAddAuditEntity
-    [JsonIgnore]
+    {
-    public QCChallenge QCChallenge { get; set; }
+        #region 导航属性
-    #endregion
+        [JsonIgnore]
+        public QCChallenge QCChallenge { get; set; }
+        #endregion
 
-    public Guid QCChallengeId { get; set; }
+        public string TalkContent { get; set; } = string.Empty;
 
-    public Guid SubjectVisitId { get; set; }
+        public Guid QCChallengeId { get; set; }
 
-    [StringLength(500)]
+        public Guid SubjectVisitId { get; set; }
-    public string TalkContent { get; set; } = null!;
 
-    public UserTypeEnum UserTypeEnum { get; set; }
+        public UserTypeEnum UserTypeEnum { get; set; }
+    }
 }

IRaCIS.Core.Domain/QC/QCQuestion.cs

@@ -3,45 +3,46 @@
 //	   生成时间 2021-11-11 11:19:10 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("后台 - QC质控问题（需要同步）")]
-[Table("QCQuestion")]
-public class QCQuestion : BaseFullAuditEntity
 {
-    #region 导航属性
+    ///<summary>
+    ///QCQuestionConfigure
+    ///</summary>
+    [Table("QCQuestion")]
+    public class QCQuestion : BaseFullAuditEntity
+    {
+        #region 导航属性
 
-    [JsonIgnore]
+        [JsonIgnore]
-    [ForeignKey("ParentId")]
+        [ForeignKey("ParentId")]
-    public QCQuestion ParentQuestion { get; set; }
+        public QCQuestion ParentQuestion { get; set; }
-    #endregion
+        #endregion
 
-    public bool IsEnable { get; set; }
+        public string QuestionName { get; set; } = string.Empty;
 
-    public bool IsRequired { get; set; }
 
-    public LanguageType LanguageType { get; set; }
+        /// <summary> 语言类型 </summary>
+        public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
 
-    public Guid? ParentId { get; set; }
 
-    public string ParentTriggerValue { get; set; } = null!;
+        public bool IsRequired { get; set; }
 
-    [StringLength(510)]
+        public bool IsEnable { get; set; }
-    public string QuestionName { get; set; } = null!;
 
-    public int ShowOrder { get; set; }
+        /// <summary> 下拉框、文本、单选、多选 </summary>
+        public string Type { get; set; } = string.Empty;
 
-    [Comment(" 下拉框、文本、单选、多选")]
+        public string TypeValue { get; set; } = string.Empty;
-    public string Type { get; set; } = null!;
 
-    public string TypeValue { get; set; } = null!;
+        public string ParentTriggerValue { get; set; } = string.Empty;
+        public Guid? ParentId { get; set; }
+
+
+        public int ShowOrder { get; set; }
+
+
+
+    }
 
 
 }
-
-
-

IRaCIS.Core.Domain/QC/TrialQCQuestion.cs

@@ -3,62 +3,63 @@
 //	   生成时间 2021-11-11 11:19:10 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 using IRaCIS.Core.Domain.Share;
-using Microsoft.EntityFrameworkCore;
+namespace IRaCIS.Core.Domain.Models
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("项目 - 质控问题")]
-[Table("TrialQCQuestion")]
-public class TrialQCQuestion : BaseFullAuditEntity
 {
-    #region 导航属性
+    ///<summary>
-    [JsonIgnore]
+    ///TrialQCQuestionConfigure
-    public Trial Trial { get; set; }
+    ///</summary>
-    [JsonIgnore]
+    [Table("TrialQCQuestion")]
-    [ForeignKey("ParentId")]
+    public class TrialQCQuestion : BaseFullAuditEntity
-    public TrialQCQuestion ParentQCQuestion { get; set; }
+    {
+        #region 导航属性
+        [JsonIgnore]
+        public Trial Trial { get; set; }
+        [JsonIgnore]
+        [ForeignKey("ParentId")]
+        public TrialQCQuestion ParentQCQuestion { get; set; }
 
-    [JsonIgnore]
+        [JsonIgnore]
-    public List<TrialQCQuestionAnswer> TrialQCQuestionAnswerList { get; set; }
+        public List<TrialQCQuestionAnswer> TrialQCQuestionAnswerList { get; set; }
 
-    #endregion
+        #endregion
 
 
-    public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
-
-    [StringLength(500)]
-    public string QuestionName { get; set; } = string.Empty;
-
-    public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
-
-    public bool IsRequired { get; set; }
-
-    public bool IsEnable { get; set; }
-    [Comment(" 下拉框、文本、单选、多选")]
-    public string Type { get; set; } = string.Empty;
 
 
-    public Guid? ParentId { get; set; }
+        public string QuestionName { get; set; } = string.Empty;
+        /// <summary> 语言类型 </summary>
+
+        public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
 
 
-    public string TypeValue { get; set; } = string.Empty;
+        public bool IsRequired { get; set; }
 
 
-    public string ParentTriggerValue { get; set; } = string.Empty;
+        public bool IsEnable { get; set; }
+
+        /// <summary> 下拉框、文本、单选、多选 </summary>
+        public string Type { get; set; } = string.Empty;
 
 
-    public int ShowOrder { get; set; }
+        public Guid? ParentId { get; set; }
 
-    public bool? IsConfirm { get; set; }
+
+        public string TypeValue { get; set; } = string.Empty;
+
+
+        public string ParentTriggerValue { get; set; } = string.Empty;
+
+
+        public int ShowOrder { get; set; }
+
+        public bool? IsConfirm { get; set; }
 
 
 
 
 
+    }
+
+
 }
-
-
-