GlobalUsings 清理实体层

2024-09-20 09:20:04 +08:00
parent 0a1ce59670
commit 32931e155c
187 changed files with 7126 additions and 7323 deletions
@@ -1,39 +1,33 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2023-07-31 11:12:15 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-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("ReadingCustomTag")]
-public class ReadingCustomTag : BaseAddAuditEntity
+namespace IRaCIS.Core.Domain.Models
 {
-    #region 导航属性
+    ///<summary>
+    ///ReadingCustomTag
+    ///</summary>
+    [Table("ReadingCustomTag")]
+    public class ReadingCustomTag : BaseAddAuditEntity
+    {
+        #region 导航属性

-    #endregion
+        #endregion

-    public Guid? InstanceId { get; set; }
+        public Guid VisitTaskId { get; set; }
+
+        public Guid? StudyId { get; set; }


-    [MaxLength]
-    public string MeasureData { get; set; } = null!;
+        public Guid? SeriesId { get; set; }

-    public int? NumberOfFrames { get; set; }
+        public Guid? InstanceId { get; set; }

-    public Guid? SeriesId { get; set; }
+        public string MeasureData { get; set; } = string.Empty;

-    public Guid? StudyId { get; set; }
+        public int? NumberOfFrames { get; set; }
+
+    }

-    [Comment(" 任务Id")]
-    public Guid VisitTaskId { get; set; }

 }
-
-
-
@@ -1,46 +1,60 @@
-
-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("ReadingGlobalTaskInfo")]
-public class ReadingGlobalTaskInfo : BaseAddAuditEntity
+namespace IRaCIS.Core.Domain.Models
 {
-    #region 导航属性
-    [JsonIgnore]
-    [ForeignKey("TaskId")]
-    public VisitTask VisitTask { get; set; }
+    ///<summary>
+    /// 阅片全局任务信息
+    ///</summary>
+    [Table("ReadingGlobalTaskInfo")]
+    public class ReadingGlobalTaskInfo : BaseAddAuditEntity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        [ForeignKey("TaskId")]
+        public VisitTask VisitTask { get; set; }

-    [JsonIgnore]
-    [ForeignKey("GlobalTaskId")]
-    public VisitTask GlobalVisitTask { get; set; }
+        [JsonIgnore]
+        [ForeignKey("GlobalTaskId")]
+        public VisitTask GlobalVisitTask { get; set; }


-    [JsonIgnore]
-    [ForeignKey("QuestionId")]
-    public ReadingQuestionTrial TrialReadingQuestion { get; set; }
-    #endregion
+        [JsonIgnore]
+        [ForeignKey("QuestionId")]
+        public ReadingQuestionTrial TrialReadingQuestion { get; set; }
+        #endregion

-    [StringLength(4000)]
-    public string Answer { get; set; } = null!;
-    [Comment("全局答案类型")]
-    public GlobalAnswerType GlobalAnswerType { get; set; }
-    [Comment("全局任务Id")]
-    public Guid GlobalTaskId { get; set; }
+        /// <summary>
+        /// 全局任务Id
+        /// </summary>
+        public Guid GlobalTaskId { get; set; }

-    public Guid? QuestionId { get; set; }
+        /// <summary>
+        /// 原任务ID
+        /// </summary>

-    public Guid SubjectId { get; set; }
-    [Comment("原任务ID")]
-    public Guid TaskId { get; set; }
+        public Guid TaskId { get; set; }
+
+        /// <summary>
+        /// 问题ID
+        /// </summary>
+        public Guid? QuestionId { get; set; }
+
+        /// <summary>
+        /// 问题答案
+        /// </summary>
+
+        public string Answer { get; set; } = string.Empty;
+
+
+        public Guid TrialId { get; set; }
+
+        /// <summary>
+        /// 全局答案类型
+        /// </summary>
+        public GlobalAnswerType GlobalAnswerType { get; set; }
+
+        public Guid SubjectId { get; set; }
+
+    }

-    public Guid TrialId { get; set; }

 }
-
-
-
@@ -1,30 +1,40 @@
-
-
-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("ReadingJudgeInfo")]
-public class ReadingJudgeInfo : BaseAddAuditEntity
+namespace IRaCIS.Core.Domain.Models
 {
-    #region 导航属性
+    ///<summary>
+    ///阅片裁判信息
+    ///</summary>
+    [Table("ReadingJudgeInfo")]
+    public class ReadingJudgeInfo : BaseAddAuditEntity
+    {
+        #region 导航属性

-    #endregion
-    public Guid JudgeTaskId { get; set; }
+        #endregion
+        /// <summary>
+        /// 第一个任务ID
+        /// </summary>
+        [Required]
+        public Guid TaskIdOne { get; set; }

-    public Guid SubjectId { get; set; }
+        /// <summary>
+        /// 第二个任务ID
+        /// </summary>
+        [Required]
+        public Guid TaskIdTwo { get; set; }

-    public Guid TaskIdOne { get; set; }
+        /// <summary>
+        /// 裁判任务ID
+        /// </summary>
+        [Required]
+        public Guid JudgeTaskId { get; set; }

-    public Guid TaskIdTwo { get; set; }

-    public Guid TrialId { get; set; }
+
+        public Guid TrialId { get; set; }
+
+
+        public Guid SubjectId { get; set; }
+
+    }
+

 }
-
-
-
@@ -1,45 +1,58 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-08-01 14:50:23 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-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("ReadingOncologyTaskInfo")]
-public class ReadingOncologyTaskInfo : BaseAddAuditEntity
+namespace IRaCIS.Core.Domain.Models
 {
-    #region 导航属性
+    /// <summary>
+    /// 阅片肿瘤学  针对访视任务 添加了一个结果
+    /// </summary>
+    [Table("ReadingOncologyTaskInfo")]
+    public class ReadingOncologyTaskInfo : BaseAddAuditEntity
+    {
+        #region 导航属性

-    [JsonIgnore]
-    [ForeignKey("OncologyTaskId")]
-    public VisitTask OncologyVisitTask { get; set; }
+        [JsonIgnore]
+        [ForeignKey("OncologyTaskId")]
+        public VisitTask OncologyVisitTask { get; set; }

-    [JsonIgnore]
-    [ForeignKey("VisitTaskId")]
-    public VisitTask VisitTask { get; set; }
-    #endregion
+        [JsonIgnore]
+        [ForeignKey("VisitTaskId")]
+        public VisitTask VisitTask { get; set; }
+        #endregion
+        /// <summary>
+        /// 肿瘤学  阅片任务ID
+        /// </summary>
+        public Guid OncologyTaskId { get; set; }

-    [StringLength(1000)]
-    public string EvaluationReason { get; set; } = null!;
+        /// <summary>
+        ///  产生肿瘤学阅片任务的  访视类型的阅片任务Id
+        /// </summary>
+        public Guid VisitTaskId { get; set; }

-    public string EvaluationResult { get; set; } = null!;
+        /// <summary>
+        /// 结果
+        /// </summary>
+        public string EvaluationResult { get; set; } = string.Empty;

-    public Guid OncologyTaskId { get; set; }
+        /// <summary>
+        /// 原因
+        /// </summary>
+        public string EvaluationReason { get; set; } = string.Empty;

-    public Guid SubjectId { get; set; }

-    public Guid TrialId { get; set; }
+        /// <summary>
+        /// 项目Id
+        /// </summary>
+        public Guid TrialId { get; set; }

-    public Guid VisitTaskId { get; set; }
+        /// <summary>
+        /// 受试者Id
+        /// </summary>
+        public Guid SubjectId { get; set; }
+
+
+    }


 }
-
-
-
@@ -3,172 +3,171 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-08-26 10:38:09 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.EntityFrameworkCore;

-namespace IRaCIS.Core.Domain.Models;
-
-[Comment("项目阅片 - 表格问题行记录")]
-[Table("ReadingTableAnswerRowInfo")]
-public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity
+namespace IRaCIS.Core.Domain.Models
 {
-    #region 导航属性
-    [JsonIgnore]
-    [ForeignKey("InstanceId")]
-    public DicomInstance Instance { get; set; }
-    [JsonIgnore]
-    [ForeignKey("VisitTaskId")]
-    public VisitTask VisitTask { get; set; }
-    [JsonIgnore]
-    [ForeignKey("OrganInfoId")]
-    public OrganInfo OrganInfo { get; set; }
-    [JsonIgnore]
-    [ForeignKey("SplitRowId")]
-    public ReadingTableAnswerRowInfo SplitRow { get; set; }
-    [JsonIgnore]
-    [ForeignKey("MergeRowId")]
-    public ReadingTableAnswerRowInfo MergeRow { get; set; }
-    [JsonIgnore]
-    [ForeignKey("QuestionId")]
-    public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
+    ///<summary>
+    /// 表格问题答案行数据
+    ///</summary>
+    [Table("ReadingTableAnswerRowInfo")]
+    public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        [ForeignKey("InstanceId")]
+        public DicomInstance Instance { get; set; }
+        [JsonIgnore]
+        [ForeignKey("VisitTaskId")]
+        public VisitTask VisitTask { get; set; }
+        [JsonIgnore]
+        [ForeignKey("OrganInfoId")]
+        public OrganInfo OrganInfo { get; set; }
+        [JsonIgnore]
+        [ForeignKey("SplitRowId")]
+        public ReadingTableAnswerRowInfo SplitRow { get; set; }
+        [JsonIgnore]
+        [ForeignKey("MergeRowId")]
+        public ReadingTableAnswerRowInfo MergeRow { get; set; }
+        [JsonIgnore]
+        [ForeignKey("QuestionId")]
+        public ReadingQuestionTrial ReadingQuestionTrial { get; set; }


-    //病灶答案表
-    [JsonIgnore]
-    public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>();
-    #endregion
+        //病灶答案表
+        [JsonIgnore]
+        public List<ReadingTableQuestionAnswer> LesionAnswerList { get; set; } = new List<ReadingTableQuestionAnswer>();
+        #endregion




-    public Guid QuestionId { get; set; }
+        public Guid QuestionId { get; set; }


-    public Guid VisitTaskId { get; set; }
+        public Guid VisitTaskId { get; set; }

-    public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }


-    public Guid? InstanceId { get; set; }
+        public Guid? InstanceId { get; set; }

-    public Guid? SeriesId { get; set; }
+        public Guid? SeriesId { get; set; }


-    public Guid? StudyId { get; set; }
+        public Guid? StudyId { get; set; }

-    public Guid? OtherInstanceId { get; set; }
+        public Guid? OtherInstanceId { get; set; }

-    public Guid? OtherSeriesId { get; set; }
+        public Guid? OtherSeriesId { get; set; }

-    public Guid? OtherStudyId { get; set; }
+        public Guid? OtherStudyId { get; set; }

-    public string OtherMarkTool { get; set; } = string.Empty;
+        public string OtherMarkTool { get; set; } = string.Empty;

-    public string OtherPicturePath { get; set; } = string.Empty;
+        public string OtherPicturePath { get; set; } = string.Empty;

-    public int? OtherNumberOfFrames { get; set; }
+        public int? OtherNumberOfFrames { get; set; }

-    public bool IsCanEditPosition { get; set; } = false;
+        public bool IsCanEditPosition { get; set; } = false;


-    /// <summary>
-    /// 是Dicom阅片
-    /// </summary>
-    public bool IsDicomReading { get; set; } = true;
+        /// <summary>
+        /// 是Dicom阅片
+        /// </summary>
+        public bool IsDicomReading { get; set; } = true;

-    public decimal RowIndex { get; set; }
+        public decimal RowIndex { get; set; }

-    public string MeasureData { get; set; } = string.Empty;
+        public string MeasureData { get; set; } = string.Empty;

-    /// <summary>
-    /// 是否是当前任务添加
-    /// </summary>
-    public bool IsCurrentTaskAdd { get; set; } = false;
+        /// <summary>
+        /// 是否是当前任务添加
+        /// </summary>
+        public bool IsCurrentTaskAdd { get; set; } = false;

-    public Guid? SplitRowId { get; set; }
+        public Guid? SplitRowId { get; set; }

-    public Guid? MergeRowId { get; set; }
+        public Guid? MergeRowId { get; set; }

-    public string BlindName { get; set; } = string.Empty;
+        public string BlindName { get; set; } = string.Empty;

-    public string OrderMark { get; set; } = string.Empty;
+        public string OrderMark { get; set; } = string.Empty;

-    /// <summary>
-    /// 截图地址
-    /// </summary>
-    public string PicturePath { get; set; } = string.Empty;
+        /// <summary>
+        /// 截图地址
+        /// </summary>
+        public string PicturePath { get; set; } = string.Empty;

-    /// <summary>
-    /// 第一次添加的任务ID
-    /// </summary>
-    public decimal FristAddTaskNum { get; set; } = 0;
+        /// <summary>
+        /// 第一次添加的任务ID
+        /// </summary>
+        public decimal FristAddTaskNum { get; set; } = 0;

-    /// <summary>
-    /// 首次添加任务ID
-    /// </summary>
-    public Guid FristAddTaskId { get; set; }
+        /// <summary>
+        /// 首次添加任务ID
+        /// </summary>
+        public Guid FristAddTaskId { get; set; }

-    /// <summary>
-    /// 融合的PTSeriesId
-    /// </summary>
-    public Guid? PTSeriesId { get; set; }
+        /// <summary>
+        /// 融合的PTSeriesId
+        /// </summary>
+        public Guid? PTSeriesId { get; set; }

-    /// <summary>
-    /// 融合的CTSeriesId
-    /// </summary>
-    public Guid? CTSeriesId { get; set; }
+        /// <summary>
+        /// 融合的CTSeriesId
+        /// </summary>
+        public Guid? CTSeriesId { get; set; }

-    public SplitOrMergeType? SplitOrMergeType { get; set; }
+        public SplitOrMergeType? SplitOrMergeType { get; set; }



-    public int? NumberOfFrames { get; set; }
+        public int? NumberOfFrames { get; set; }


-    /// <summary>
-    /// 器官Id
-    /// </summary>
-    public Guid? OrganInfoId { get; set; }
+        /// <summary>
+        /// 器官Id
+        /// </summary>
+        public Guid? OrganInfoId { get; set; }


-    /// <summary>
-    /// 窗宽WW
-    /// </summary>
-    public decimal? WW { get; set; }
+        /// <summary>
+        /// 窗宽WW
+        /// </summary>
+        public decimal? WW { get; set; }

-    /// <summary>
-    /// 窗位WL
-    /// </summary>
-    public decimal? WL { get; set; }
+        /// <summary>
+        /// 窗位WL
+        /// </summary>
+        public decimal? WL { get; set; }

-    /// <summary>
-    /// 来自于哪个标记
-    /// </summary>
-    public string FromMark { get; set; } = string.Empty;
+        /// <summary>
+        /// 来自于哪个标记
+        /// </summary>
+        public string FromMark { get; set; } = string.Empty;

-    /// <summary>
-    /// 报告页面显示来自于哪个标记
-    /// </summary>
-    public string ReportMark { get; set; } = string.Empty;
+        /// <summary>
+        /// 报告页面显示来自于哪个标记
+        /// </summary>
+        public string ReportMark { get; set; } = string.Empty;



-    public string OtherMeasureData { get; set; } = string.Empty;
+        public string OtherMeasureData { get; set; } = string.Empty;


-    //病灶编号
-    public string RowMark { get; set; } = string.Empty;
+        //病灶编号
+        public string RowMark { get; set; } = string.Empty;

-    /// <summary>
-    /// 标记工具
-    /// </summary>
-    public string MarkTool { get; set; } = string.Empty;
+        /// <summary>
+        /// 标记工具
+        /// </summary>
+        public string MarkTool { get; set; } = string.Empty;



+    }
+
+
 }
@@ -1,68 +1,63 @@
-
 //--------------------------------------------------------------------
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2022-08-22 09:26:04 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-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("ReadingTableQuestionAnswer")]
-public class ReadingTableQuestionAnswer : BaseFullDeleteAuditEntity
+namespace IRaCIS.Core.Domain.Models
 {
-    #region 导航属性
-    [JsonIgnore]
-    [ForeignKey("RowId")]
+    ///<summary>
+    ///ReadingTableQuestionAnswer
+    ///</summary>
+    [Table("ReadingTableQuestionAnswer")]
+    public class ReadingTableQuestionAnswer : BaseFullDeleteAuditEntity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        [ForeignKey("RowId")]

-    public ReadingTableAnswerRowInfo Lesion { get; set; }
+        public ReadingTableAnswerRowInfo Lesion { get; set; }


-    [JsonIgnore]
-    [ForeignKey("QuestionId")]
+        [JsonIgnore]
+        [ForeignKey("QuestionId")]

-    public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
+        public ReadingQuestionTrial ReadingQuestionTrial { get; set; }


-    [JsonIgnore]
-    [ForeignKey("TableQuestionId")]
+        [JsonIgnore]
+        [ForeignKey("TableQuestionId")]

-    public ReadingTableQuestionTrial ReadingTableQuestionTrial { get; set; }
+        public ReadingTableQuestionTrial ReadingTableQuestionTrial { get; set; }



-    [JsonIgnore]
-    [ForeignKey("VisitTaskId")]
-    public VisitTask VisitTask { get; set; }
-    #endregion
+        [JsonIgnore]
+        [ForeignKey("VisitTaskId")]
+        public VisitTask VisitTask { get; set; }
+        #endregion


-    [Comment(" 答案")]
-    [MaxLength]
-    public string Answer { get; set; } = null!;
+        public Guid QuestionId { get; set; }

-    [Comment(" 问题Id")]
-    public Guid QuestionId { get; set; }
+        /// <summary>
+        /// 表格问题Id
+        /// </summary>
+        public Guid TableQuestionId { get; set; }

-    public Guid RowId { get; set; }
+        public Guid VisitTaskId { get; set; }

-    [Comment(" 行号")]
-    [DecimalPrecision(18, 2)]
-    public decimal RowIndex { get; set; }
+        public Guid TrialId { get; set; }

-    public Guid TableQuestionId { get; set; }

-    [Comment(" 项目Id")]
-    public Guid TrialId { get; set; }
+        public decimal RowIndex { get; set; }

-    [Comment(" 任务Id")]
-    public Guid VisitTaskId { get; set; }
+        public string Answer { get; set; } = string.Empty;
+
+
+        public Guid RowId { get; set; }
+
+
+
+    }


 }
-
-	 
-	 
@@ -1,49 +1,64 @@
-
-
-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("项目阅片 - 问题答案")]
-[Table("ReadingTaskQuestionAnswer")]
-public class ReadingTaskQuestionAnswer : BaseAddAuditEntity
+namespace IRaCIS.Core.Domain.Models
 {
-    #region 导航属性
+    ///<summary>
+    /// 阅片任务答案
+    ///</summary>
+    [Table("ReadingTaskQuestionAnswer")]
+    public class ReadingTaskQuestionAnswer : BaseAddAuditEntity
+    {
+        #region 导航属性

-    [JsonIgnore]
-    [ForeignKey("VisitTaskId")]
-    public VisitTask VisitTask { get; set; }
+        [JsonIgnore]
+        [ForeignKey("VisitTaskId")]
+        public VisitTask VisitTask { get; set; }

-    [JsonIgnore]
-    [ForeignKey("ReadingQuestionTrialId")]
-    public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
-    #endregion
-    [MaxLength]
-    public string Answer { get; set; } = null!;
+        [JsonIgnore]
+        [ForeignKey("ReadingQuestionTrialId")]
+        public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
+        #endregion
+        /// <summary>
+        /// 项目问题Id
+        /// </summary>
+        public Guid ReadingQuestionTrialId { get; set; }

-    [Comment("全局阅片修改的答案")]
-    [StringLength(400)]
-    public string GlobalChangeAnswer { get; set; } = null!;
+        /// <summary>
+        /// 项目问题标准Id
+        /// </summary>
+        public Guid ReadingQuestionCriterionTrialId { get; set; }

-    [Comment("全局阅片是否修改")]
-    public bool IsGlobalChange { get; set; }
+        public Guid TrialId { get; set; }
+
+        public Guid SubjectId { get; set; }
+
+        public Guid VisitTaskId { get; set; }
+
+        /// <summary>
+        /// 答案
+        /// </summary>
+        public string Answer { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 全局阅片修改的答案
+        /// </summary>
+        public string GlobalChangeAnswer { get; set; } = string.Empty;
+
+
+        /// <summary>
+        /// 全局阅片是否修改
+        /// </summary>
+        public bool IsGlobalChange { get; set; } = false;
+
+
+
+
+
+
+
+    }

-    public Guid ReadingQuestionCriterionTrialId { get; set; }

-    public Guid ReadingQuestionTrialId { get; set; }

-    public Guid SubjectId { get; set; }

-    public Guid TrialId { get; set; }

-    public Guid VisitTaskId { get; set; }

 }
-
-
-	
@@ -3,83 +3,69 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2023-09-21 16:08:07 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
-namespace IRaCIS.Core.Domain.Models;
-
-///<summary>
-/// 
-///</summary>
-[Table("ReadingTaskQuestionMark")]
-public class ReadingTaskQuestionMark : BaseAddAuditEntity
+namespace IRaCIS.Core.Domain.Models
 {
-    #region 导航属性
-    [JsonIgnore]
-    [ForeignKey("QuestionId")]
-    public ReadingQuestionTrial ReadingQuestionTrial { get; set; }
+    ///<summary>
+    /// 
+    ///</summary>
+    [Table("ReadingTaskQuestionMark")]
+    public class ReadingTaskQuestionMark : BaseAddAuditEntity
+    {
+        #region 导航属性
+        [JsonIgnore]
+        [ForeignKey("QuestionId")]
+        public ReadingQuestionTrial ReadingQuestionTrial { get; set; }

-    [JsonIgnore]
-    [ForeignKey("VisitTaskId")]
-    public VisitTask VisitTask { get; set; }
-    #endregion
+        [JsonIgnore]
+        [ForeignKey("VisitTaskId")]
+        public VisitTask VisitTask { get; set; }
+        #endregion


-    public Guid? FirstAddTaskId { get; set; }
+        public Guid VisitTaskId { get; set; }

-    public Guid? InstanceId { get; set; }
+        public Guid QuestionId { get; set; }

-    [StringLength(1000)]
-    public string MarkTool { get; set; } = null!;
+        public Guid? InstanceId { get; set; }
+
+        public Guid? SeriesId { get; set; }


-    [MaxLength]
-    public string MeasureData { get; set; } = null!;
-
-    public int? NumberOfFrames { get; set; }
-
-    public string OrderMarkName { get; set; } = null!;
-
-    public Guid? OtherInstanceId { get; set; }
+        public Guid? StudyId { get; set; }


-    [MaxLength]
-    public string OtherMarkTool { get; set; } = null!;
+        public string MarkTool { get; set; } = string.Empty;
+
+        public string PicturePath { get; set; } = string.Empty;
+
+        public int? NumberOfFrames { get; set; }
+
+        public string MeasureData { get; set; } = string.Empty;


-    [MaxLength]
-    public string OtherMeasureData { get; set; } = null!;
+        public Guid? FirstAddTaskId { get; set; }

-    public int? OtherNumberOfFrames { get; set; }
+        public QuestionType? QuestionType { get; set; }


-    [MaxLength]
-    public string OtherPicturePath { get; set; } = null!;
+        public string OrderMarkName { get; set; } = string.Empty;

-    public Guid? OtherSeriesId { get; set; }
+        public Guid? OtherInstanceId { get; set; }

-    public Guid? OtherStudyId { get; set; }
+        public Guid? OtherSeriesId { get; set; }
+
+        public Guid? OtherStudyId { get; set; }
+
+        public string OtherMarkTool { get; set; } = string.Empty;
+
+        public string OtherPicturePath { get; set; } = string.Empty;
+
+        public int? OtherNumberOfFrames { get; set; }
+        public string OtherMeasureData { get; set; } = string.Empty;


-    [MaxLength]
-    public string PicturePath { get; set; } = null!;
-
-    [Comment(" 问题Id")]
-    public Guid QuestionId { get; set; }
-
-    public QuestionType? QuestionType { get; set; }
-
-    public Guid? SeriesId { get; set; }
-
-    public Guid? StudyId { get; set; }
-
-    [Comment(" 任务Id")]
-    public Guid VisitTaskId { get; set; }
+    }


 }
-
-
-
@@ -3,33 +3,41 @@
 //     此代码由T4模板自动生成  byzhouhang 20210918
 //	   生成时间 2023-02-03 09:43:09 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
-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("ReadingTaskRelation")]
-public class ReadingTaskRelation : BaseAddAuditEntity
+namespace IRaCIS.Core.Domain.Models
 {
-    #region 导航属性
+    ///<summary>
+    ///任务关系表
+    ///</summary>
+    [Table("ReadingTaskRelation")]
+    public class ReadingTaskRelation : BaseAddAuditEntity
+    {
+        #region 导航属性

-    [ForeignKey("TaskId")]
-    [JsonIgnore]
-    public VisitTask VisitTask { get; set; }
-    #endregion
+        [ForeignKey("TaskId")]
+        [JsonIgnore]
+        public VisitTask VisitTask { get; set; }
+        #endregion

-    public Guid RelevanceTaskId { get; set; }
+        /// <summary>
+        /// 任务ID
+        /// </summary>
+        public Guid TaskId { get; set; }

-    public RelevanceType RelevanceType { get; set; }
+        /// <summary>
+        /// 关联的任务ID
+        /// </summary>
+        public Guid RelevanceTaskId { get; set; }

-    public Guid TaskId { get; set; }
+        /// <summary>
+        /// 类型具体解释 看枚举
+        /// </summary>
+        public RelevanceType RelevanceType { get; set; }



+
+    }
+
+
 }
-
-	
-