增加Global Using

IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs

@@ -1,9 +1,4 @@
 using IRaCIS.Core.Domain.Share;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
@@ -14,27 +9,27 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     }
 
 
-	public class DeleteStudyClinicalInDto
-	{
-		public Guid StudyId { get; set; }
-	}
-
-	public class AddStudyClinicalInDto
+    public class DeleteStudyClinicalInDto
     {
-		public Guid StudyId { get; set; }
-	}
+        public Guid StudyId { get; set; }
+    }
 
-	public class AutoAddClinicalInDto
+    public class AddStudyClinicalInDto
     {
-		public Guid? SubjectId { get; set; }
+        public Guid StudyId { get; set; }
+    }
 
-		//public Guid? VisitId { get; set; }
+    public class AutoAddClinicalInDto
+    {
+        public Guid? SubjectId { get; set; }
 
-		public Guid TrialId { get; set; }
-	}
+        //public Guid? VisitId { get; set; }
+
+        public Guid TrialId { get; set; }
+    }
 
 
-	public class GetCRCSubjectClinicalInDto:PageInput
+    public class GetCRCSubjectClinicalInDto : PageInput
     {
         public Guid TrialId { get; set; }
 
@@ -46,25 +41,25 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class GetCRCSubjectClinicalOutDto
     {
-		public Guid SubjectId { get; set; }
+        public Guid SubjectId { get; set; }
 
         public Guid ReadingClinicalDataId { get; set; }
 
-		/// <summary>
-		/// 上传角色
-		/// </summary>
-		public UploadRole UploadRole { get; set; }
-		public Guid TrialId { get; set; }
+        /// <summary>
+        /// 上传角色
+        /// </summary>
+        public UploadRole UploadRole { get; set; }
+        public Guid TrialId { get; set; }
 
-		/// <summary>
-		/// 访视Id  或者模块Id
-		/// </summary>
-		public Guid ReadingId { get; set; }
+        /// <summary>
+        /// 访视Id  或者模块Id
+        /// </summary>
+        public Guid ReadingId { get; set; }
 
-		/// <summary>
-		/// 临床级别
-		/// </summary>
-		public ClinicalLevel ClinicalDataLevel { get; set; }
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel ClinicalDataLevel { get; set; }
 
 
         public Guid? BaseLineVisitId { get; set; }
@@ -75,13 +70,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public ClinicalUploadType ClinicalUploadType { get; set; }
 
         public string SubjectCode { get; set; }
-		public Guid ClinicalDataTrialSetId { get; set; }
+        public Guid ClinicalDataTrialSetId { get; set; }
 
         public string ClinicalDataSetName { get; set; }
 
-		public string ClinicalDataSetEnName { get; set; }
+        public string ClinicalDataSetEnName { get; set; }
 
-		public int ClinicalCount { get; set; } = 0;
+        public int ClinicalCount { get; set; } = 0;
     }
 
 
@@ -92,19 +87,19 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string SubjectCode { get; set; }
 
         public List<GetCRCSubjectClinicalOutDto> ClinicalDataList { get; set; }
-	}
+    }
 
 
 
 
-	public class GetClinicalQuestionAnswerListInDto
+    public class GetClinicalQuestionAnswerListInDto
     {
         public Guid SubjectId { get; set; }
 
 
-		public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
-		public Guid ClinicalDataTrialSetId { get; set; }
+        public Guid ClinicalDataTrialSetId { get; set; }
     }
 
 
@@ -143,69 +138,69 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public string Answer { get; set; } = string.Empty;
     }
 
-    public class GetPMConfirmListInDto: PageInput
+    public class GetPMConfirmListInDto : PageInput
     {
         public Guid TrialId { get; set; }
 
         public Guid TrialReadingCriterionId { get; set; }
     }
 
-    public class GetCRCConfirmListInDto:PageInput
+    public class GetCRCConfirmListInDto : PageInput
     {
 
         public bool? IsCRCConfirm { get; set; }
 
-        public bool? IsPMConfirm { get; set; } 
+        public bool? IsPMConfirm { get; set; }
 
         public Guid? TrialReadingCriterionId { get; set; }
 
-		public Guid? SubjectId { get; set; }
+        public Guid? SubjectId { get; set; }
 
         public DateTime? StartTime { get; set; }
         public DateTime? EndTime { get; set; }
 
         public Guid TrialId { get; set; }
 
-		public Guid? ReadModuleId { get; set; }
+        public Guid? ReadModuleId { get; set; }
 
         public string? SubjectCode { get; set; }
     }
 
     public class CRCCancelConfirmClinicalInDto
     {
-		public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
-		public Guid ReadModuleId { get; set; }
-	}
+        public Guid ReadModuleId { get; set; }
+    }
 
-	public class GetClinicalDateListOutDto
-	{
-		public string ClinicalDataSetName { get; set; }
-
-
-		public List<GetCRCBeConfirmListOutDto> DateList { get; set; }
-	}
-
-
-	public class GetCRCBeConfirmListInDto
+    public class GetClinicalDateListOutDto
     {
-		public Guid TrialId { get; set; }
-
-        public  Guid ReadModuleId { get; set; }
-	}
+        public string ClinicalDataSetName { get; set; }
 
 
-	public class GetClinicalTableListInDto
-	{
-		public Guid TrialId { get; set; }
-
-		public Guid ReadModuleId { get; set; }
-	}
+        public List<GetCRCBeConfirmListOutDto> DateList { get; set; }
+    }
 
 
-	public class GetClinicalTableListOutDto: GetClinicalQuestionAnswerListOutDto
-	{
-		public string ClinicalDataSetName { get; set; }
+    public class GetCRCBeConfirmListInDto
+    {
+        public Guid TrialId { get; set; }
+
+        public Guid ReadModuleId { get; set; }
+    }
+
+
+    public class GetClinicalTableListInDto
+    {
+        public Guid TrialId { get; set; }
+
+        public Guid ReadModuleId { get; set; }
+    }
+
+
+    public class GetClinicalTableListOutDto : GetClinicalQuestionAnswerListOutDto
+    {
+        public string ClinicalDataSetName { get; set; }
 
         /// <summary>
         /// 模块名称
@@ -214,34 +209,34 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     }
 
 
-	public class GetCRCBeConfirm: GetCRCBeConfirmListOutDto
-	{
-		public Guid ReadModuleId { get; set; }
-	}
-
-
-	public class GetCRCBeConfirmListOutDto
+    public class GetCRCBeConfirm : GetCRCBeConfirmListOutDto
     {
-		public Guid ClinicalDataTrialSetId { get; set; }
+        public Guid ReadModuleId { get; set; }
+    }
 
-		public Guid ClinicalFormId { get; set; }
 
-		public string ClinicalDataSetName { get; set; }
+    public class GetCRCBeConfirmListOutDto
+    {
+        public Guid ClinicalDataTrialSetId { get; set; }
 
-		public string ClinicalDataSetEnName { get; set; }
+        public Guid ClinicalFormId { get; set; }
+
+        public string ClinicalDataSetName { get; set; }
+
+        public string ClinicalDataSetEnName { get; set; }
 
         public DateTime CheckDate { get; set; }
 
-		public bool IsHaveTableQuestion { get; set; }
-	}
+        public bool IsHaveTableQuestion { get; set; }
+    }
 
-	public class CRCConfirmClinicalInDto
+    public class CRCConfirmClinicalInDto
     {
-		public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
-		public Guid SubjectId { get; set; }
+        public Guid SubjectId { get; set; }
 
-		public Guid ReadModuleId { get; set; }
+        public Guid ReadModuleId { get; set; }
 
         /// <summary>
         /// 临床数据是否完整
@@ -258,39 +253,39 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     }
 
 
-	public class CRCClinicalForm
+    public class CRCClinicalForm
     {
-		/// <summary>
-		/// 受试者Id
-		/// </summary>
-		public Guid SubjectId { get; set; }
-		public DateTime? CheckDate { get; set; }
+        /// <summary>
+        /// 受试者Id
+        /// </summary>
+        public Guid SubjectId { get; set; }
+        public DateTime? CheckDate { get; set; }
 
         public Guid ClinicalFormId { get; set; }
 
-		/// <summary>
-		/// 临床级别
-		/// </summary>
-		public ClinicalLevel ClinicalDataLevel { get; set; }
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel ClinicalDataLevel { get; set; }
 
 
         public Guid ClinicalDataTrialSetId { get; set; }
 
-		public string ClinicalDataSetName { get; set; }
+        public string ClinicalDataSetName { get; set; }
 
-		public bool IsHaveTableQuestion { get; set; }
+        public bool IsHaveTableQuestion { get; set; }
 
-		public string ClinicalDataSetEnName { get; set; }
-	}
+        public string ClinicalDataSetEnName { get; set; }
+    }
 
 
-	public class GetCRCConfirmListOutDto
+    public class GetCRCConfirmListOutDto
     {
 
-		/// <summary>
-		/// 受试者ID
-		/// </summary>
-		public Guid SubjectId { get; set; }
+        /// <summary>
+        /// 受试者ID
+        /// </summary>
+        public Guid SubjectId { get; set; }
 
         public bool IsNotNeedPMConfirm { get; set; } = false;
         public Guid ReadModuleId { get; set; }
@@ -304,9 +299,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public bool IsPMConfirm { get; set; }
 
-		public ReadingSetType ReadingSetType { get; set; }
+        public ReadingSetType ReadingSetType { get; set; }
 
-		public bool IsCRCConfirm { get; set; } = false;
+        public bool IsCRCConfirm { get; set; } = false;
 
 
         /// <summary>
@@ -316,17 +311,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string SubjectCode { get; set; }
 
-		public bool IsHaveTableQuestion
-		{
-			get
-			{
-				return ClinicalFormList.Any(x => x.IsHaveTableQuestion);
-			}
-		}
-		/// <summary>
-		/// 最晚拍片日期
-		/// </summary>
-		public DateTime? LatestScanDate { get; set; }
+        public bool IsHaveTableQuestion
+        {
+            get
+            {
+                return ClinicalFormList.Any(x => x.IsHaveTableQuestion);
+            }
+        }
+        /// <summary>
+        /// 最晚拍片日期
+        /// </summary>
+        public DateTime? LatestScanDate { get; set; }
 
         public List<string> ClinicalNameList
         {
@@ -339,20 +334,20 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public List<GetCRCBeConfirmListOutDto> ClinicalFormList { get; set; }
 
-		public int FormCount
-		{
-			get
-			{
-				return this.ClinicalFormList.Count();
-			}
-		}
-	}
+        public int FormCount
+        {
+            get
+            {
+                return this.ClinicalFormList.Count();
+            }
+        }
+    }
 
     public class DeleteClinicalFormInDto
     {
-		public Guid ClinicalFormId { get; set; }
-	}
-	public class SubmitClinicalFormInDto
+        public Guid ClinicalFormId { get; set; }
+    }
+    public class SubmitClinicalFormInDto
     {
         /// <summary>
         /// VisitId
@@ -361,13 +356,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid? ClinicalFormId { get; set; }
 
-        public string? PicturePath { get; set; } 
+        public string? PicturePath { get; set; }
 
         public Guid SubjectId { get; set; }
 
-		public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
-		public Guid ClinicalDataTrialSetId { get; set; }
+        public Guid ClinicalDataTrialSetId { get; set; }
 
 
         public List<ClinicalFormQuestionAnswer> QuestionAnswers { get; set; }

IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs

@@ -1,9 +1,4 @@
 using IRaCIS.Core.Domain.Share;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
@@ -23,15 +18,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ClinicalDataSetName { get; set; }
 
-		/// <summary>
-		/// 英文名称
-		/// </summary>
-		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+        /// <summary>
+        /// 英文名称
+        /// </summary>
+        public string ClinicalDataSetEnName { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 临床级别
-		/// </summary>
-		public ClinicalLevel ClinicalDataLevel { get; set; }
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel ClinicalDataLevel { get; set; }
 
 
         /// <summary>
@@ -44,12 +39,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public UploadRole UploadRole { get; set; }
 
-		public DateTime CreateTime { get; set; }
+        public DateTime CreateTime { get; set; }
 
-		/// <summary>
-		/// 是否启用
-		/// </summary>
-		public bool IsEnable { get; set; }
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool IsEnable { get; set; }
 
         /// <summary>
         /// 项目ID
@@ -107,15 +102,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ClinicalDataSetName { get; set; }
 
-		/// <summary>
-		/// 英文名称
-		/// </summary>
-		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+        /// <summary>
+        /// 英文名称
+        /// </summary>
+        public string ClinicalDataSetEnName { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 临床级别
-		/// </summary>
-		public ClinicalLevel ClinicalDataLevel { get; set; }
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel ClinicalDataLevel { get; set; }
 
         /// <summary>
         /// 上传角色
@@ -156,7 +151,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 
 
-    public class ClinicalDataTrialSetView: ClinicalDataTrialSetAddOrEdit
+    public class ClinicalDataTrialSetView : ClinicalDataTrialSetAddOrEdit
     {
         public List<string> TrialCriterionNameList { get; set; }
 
@@ -173,7 +168,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public Guid? SystemClinicalDataSetId { get; set; }
 
-      
+
 
         /// <summary>
         /// 是否来自于系统数据
@@ -240,12 +235,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ClinicalDataSetName { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 英文名称
-		/// </summary>
-		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+        /// <summary>
+        /// 英文名称
+        /// </summary>
+        public string ClinicalDataSetEnName { get; set; } = string.Empty;
 
-	}
+    }
     public class GetTrialClinicalDataSystemIndto
     {
         /// <summary>
@@ -253,15 +248,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ClinicalDataSetName { get; set; } = String.Empty;
 
-		/// <summary>
-		/// 英文名称
-		/// </summary>
-		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+        /// <summary>
+        /// 英文名称
+        /// </summary>
+        public string ClinicalDataSetEnName { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 临床级别
-		/// </summary>
-		public ClinicalLevel? ClinicalDataLevel { get; set; }
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel? ClinicalDataLevel { get; set; }
 
 
         /// <summary>
@@ -293,15 +288,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ClinicalDataSetName { get; set; } = String.Empty;
 
-		/// <summary>
-		/// 英文名称
-		/// </summary>
-		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+        /// <summary>
+        /// 英文名称
+        /// </summary>
+        public string ClinicalDataSetEnName { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 临床级别
-		/// </summary>
-		public ClinicalLevel? ClinicalDataLevel { get; set; }
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel? ClinicalDataLevel { get; set; }
 
 
         /// <summary>

IRaCIS.Core.Application/Service/Reading/Dto/ClinicalQuestionDto.cs

@@ -1,11 +1,6 @@
 using IRaCIS.Core.Domain.Share;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
@@ -16,74 +11,74 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class GetTrialClinicalQuestionCalculateRelationInDto
     {
-		/// <summary>
-		/// 项目临床数据Id
-		/// </summary>
-		public Guid TrialClinicalId { get; set; }
-	}
+        /// <summary>
+        /// 项目临床数据Id
+        /// </summary>
+        public Guid TrialClinicalId { get; set; }
+    }
 
 
     public class GetTrialClinicalQuestionCalculateRelationOutDto
     {
-		public Guid QuestionId { get; set; }
+        public Guid QuestionId { get; set; }
 
-		/// <summary>
-		/// 问题名称
-		/// </summary>
-		public string QuestionName { get; set; }
+        /// <summary>
+        /// 问题名称
+        /// </summary>
+        public string QuestionName { get; set; }
 
-		/// <summary>
-		/// 自定义计算标记
-		/// </summary>
-		public ClinicalCalculateMark? CustomCalculateMark { get; set; }
+        /// <summary>
+        /// 自定义计算标记
+        /// </summary>
+        public ClinicalCalculateMark? CustomCalculateMark { get; set; }
 
-		/// <summary>
-		/// 数值类型
-		/// </summary>
-		public ValueOfType? ValueType { get; set; }
+        /// <summary>
+        /// 数值类型
+        /// </summary>
+        public ValueOfType? ValueType { get; set; }
 
-		/// <summary>
-		/// 单位
-		/// </summary>
-		public ValueUnit? Unit { get; set; }
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public ValueUnit? Unit { get; set; }
 
-		/// <summary>
-		/// 自定义单位
-		/// </summary>
-		public string CustomUnit { get; set; } = string.Empty;
+        /// <summary>
+        /// 自定义单位
+        /// </summary>
+        public string CustomUnit { get; set; } = string.Empty;
 
-		public List<CalculateInfo> CalculateQuestionList { get; set; }
-	}
+        public List<CalculateInfo> CalculateQuestionList { get; set; }
+    }
 
 
-	public class GetClinicalCalculateQuestionsOutDto
+    public class GetClinicalCalculateQuestionsOutDto
     {
-		public Guid QuestionId { get; set; }
+        public Guid QuestionId { get; set; }
 
-		public string QuestionName { get; set; }
+        public string QuestionName { get; set; }
 
-		public List<CalculateQuestion> TableQuestions { get; set; }
-	}
+        public List<CalculateQuestion> TableQuestions { get; set; }
+    }
 
 
-	public class GetClinicalCalculateQuestionsInDto
+    public class GetClinicalCalculateQuestionsInDto
     {
-		/// <summary>
-		/// 项目临床数据Id
-		/// </summary>
-		public Guid TrialClinicalId { get; set; }
+        /// <summary>
+        /// 项目临床数据Id
+        /// </summary>
+        public Guid TrialClinicalId { get; set; }
 
         /// <summary>
         /// 临床问题类型(分组，单选。)
         /// </summary>
         public string ClinicalQuestionType { get; set; } = string.Empty;
-	}
-	#endregion
+    }
+    #endregion
 
-	#region 预览
+    #region 预览
 
 
-	public class GetSystemClinicalQuestionPreviewDto
+    public class GetSystemClinicalQuestionPreviewDto
     {
         /// <summary>
         /// 系统临床数据Id
@@ -119,17 +114,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public List<ClinicalQuestionPreviewDto> Childrens { get; set; } = new List<ClinicalQuestionPreviewDto>();
 
 
-		/// <summary>
-		/// 关联问题
-		/// </summary>
-		public List<ClinicalQuestionPreviewDto> RelationQuestions { get; set; } = new List<ClinicalQuestionPreviewDto>();
+        /// <summary>
+        /// 关联问题
+        /// </summary>
+        public List<ClinicalQuestionPreviewDto> RelationQuestions { get; set; } = new List<ClinicalQuestionPreviewDto>();
 
-		/// <summary>
-		/// 表格问题
-		/// </summary>
-		public List<ClinicalTablePreviewDto> TableQuestions { get; set; } = new List<ClinicalTablePreviewDto>();
+        /// <summary>
+        /// 表格问题
+        /// </summary>
+        public List<ClinicalTablePreviewDto> TableQuestions { get; set; } = new List<ClinicalTablePreviewDto>();
 
-        public List<Dictionary<Guid,string>> TableAnswer { get; set; }
+        public List<Dictionary<Guid, string>> TableAnswer { get; set; }
     }
 
 
@@ -226,25 +221,25 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public int ShowOrder { get; set; } = 0;
 
-		/// <summary>
-		/// 是否必填
-		/// </summary>
-		public IsRequired IsRequired { get; set; }
+        /// <summary>
+        /// 是否必填
+        /// </summary>
+        public IsRequired IsRequired { get; set; }
 
-		/// <summary>
-		/// 关联Value
-		/// </summary>
-		public string RelevanceValue { get; set; } = string.Empty;
+        /// <summary>
+        /// 关联Value
+        /// </summary>
+        public string RelevanceValue { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 关联ID
-		/// </summary>
-		public Guid? RelevanceId { get; set; }
+        /// <summary>
+        /// 关联ID
+        /// </summary>
+        public Guid? RelevanceId { get; set; }
 
-		/// <summary>
-		/// 父问题Id
-		/// </summary>
-		public Guid? ParentId { get; set; }
+        /// <summary>
+        /// 父问题Id
+        /// </summary>
+        public Guid? ParentId { get; set; }
 
         /// <summary>
         /// 父问题触发值
@@ -271,36 +266,36 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string Unit { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 自定义计算标记
-		/// </summary>
-		public ClinicalCalculateMark? CustomCalculateMark { get; set; }
+        /// <summary>
+        /// 自定义计算标记
+        /// </summary>
+        public ClinicalCalculateMark? CustomCalculateMark { get; set; }
 
-		/// <summary>
-		/// 自定义计算问题
-		/// </summary>
-		public string CalculateQuestions { get; set; } = "[]";
+        /// <summary>
+        /// 自定义计算问题
+        /// </summary>
+        public string CalculateQuestions { get; set; } = "[]";
 
-		[NotMapped]
-		public List<CalculateInfo> CalculateQuestionList
-		{
-			get
-			{
+        [NotMapped]
+        public List<CalculateInfo> CalculateQuestionList
+        {
+            get
+            {
 
-				try
-				{
-					var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
-					return result == null ? new List<CalculateInfo>() : result;
-				}
-				catch (Exception)
-				{
+                try
+                {
+                    var result = JsonConvert.DeserializeObject<List<CalculateInfo>>(this.CalculateQuestions);
+                    return result == null ? new List<CalculateInfo>() : result;
+                }
+                catch (Exception)
+                {
 
-					return new List<CalculateInfo>();
-				}
+                    return new List<CalculateInfo>();
+                }
 
-			}
-		}
-	}
+            }
+        }
+    }
 
     /// <summary>
     /// 查询临床数据基类
@@ -433,15 +428,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public int ShowOrder { get; set; }
 
-		/// <summary>
-		/// 是否必填
-		/// </summary>
-		public IsRequired IsRequired { get; set; }
+        /// <summary>
+        /// 是否必填
+        /// </summary>
+        public IsRequired IsRequired { get; set; }
 
-		/// <summary>
-		/// 创建时间
-		/// </summary>
-		public DateTime CreateTime { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
 
         /// <summary>
         /// 创建人
@@ -519,7 +514,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid SystemClinicalId { get; set; }
     }
 
-   
+
 
 
     /// <summary>
@@ -543,7 +538,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     /// </summary>
     public class TrialClinicalTableQuestionQuery : ClinicalTableQuestionQueryBase
     {
-       
+
     }
 
     /// <summary>
@@ -551,7 +546,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     /// </summary>
     public class SystemClinicalTableQuestionQuery : ClinicalTableQuestionQueryBase
     {
-      
+
     }
     #endregion
 

IRaCIS.Core.Application/Service/Reading/Dto/DefaultShortcutKeyViewModel.cs

@@ -3,80 +3,77 @@
 //	   生成时间 2023-02-13 10:38:12 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
-using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
 namespace IRaCIS.Core.Application.ViewModel
-{	
-	  /// <summary> DefaultShortcutKeyView  列表视图模型 </summary>
-	 public class DefaultShortcutKeyView
-	 {
-	 		public Guid Id { get; set; }
-	 		public string Keyboardkey { get; set; }
-	 		public int ShortcutKeyEnum { get; set; }
-	 		public int ImageToolType { get; set; }
-	        public bool AltKey { get; set; }
-	        
-	        public bool CtrlKey { get; set; }
-	        
-	        public bool ShiftKey { get; set; }
-	        
-	        public bool MetaKey { get; set; }
+{
+    /// <summary> DefaultShortcutKeyView  列表视图模型 </summary>
+    public class DefaultShortcutKeyView
+    {
+        public Guid Id { get; set; }
+        public string Keyboardkey { get; set; }
+        public int ShortcutKeyEnum { get; set; }
+        public int ImageToolType { get; set; }
+        public bool AltKey { get; set; }
 
-		    public string Text { get; set; }
+        public bool CtrlKey { get; set; }
 
-		public string Code { get; set; } = string.Empty;
-	}
+        public bool ShiftKey { get; set; }
 
-	public class RestoreDefaultShortcutKeyInDto 
-	{
-		public int ImageToolType { get; set; }
-	}
+        public bool MetaKey { get; set; }
 
-	public class SetDefaultShortcutKey
-	{
-		public int ImageToolType { get; set; }
+        public string Text { get; set; }
 
-		public List<DefaultShortcutKeyItem> ShortcutKeyList { get; set; }
-	}
+        public string Code { get; set; } = string.Empty;
+    }
 
-	public class DefaultShortcutKeyItem
-	{
-		public string Keyboardkey { get; set; }
-		public int ShortcutKeyEnum { get; set; }
+    public class RestoreDefaultShortcutKeyInDto
+    {
+        public int ImageToolType { get; set; }
+    }
 
-		public bool AltKey { get; set; }
+    public class SetDefaultShortcutKey
+    {
+        public int ImageToolType { get; set; }
+
+        public List<DefaultShortcutKeyItem> ShortcutKeyList { get; set; }
+    }
+
+    public class DefaultShortcutKeyItem
+    {
+        public string Keyboardkey { get; set; }
+        public int ShortcutKeyEnum { get; set; }
+
+        public bool AltKey { get; set; }
 
 
-		public string Text { get; set; }
+        public string Text { get; set; }
 
-		public bool CtrlKey { get; set; }
+        public bool CtrlKey { get; set; }
 
-		public bool ShiftKey { get; set; }
+        public bool ShiftKey { get; set; }
 
-		public bool MetaKey { get; set; }
-		public string Code { get; set; } = string.Empty;
-	}
+        public bool MetaKey { get; set; }
+        public string Code { get; set; } = string.Empty;
+    }
 
 
-	 ///<summary>DefaultShortcutKeyQuery  列表查询参数模型</summary>
-	public class DefaultShortcutKeyQuery
-	 {
-		public int ImageToolType { get; set; }
+    ///<summary>DefaultShortcutKeyQuery  列表查询参数模型</summary>
+    public class DefaultShortcutKeyQuery
+    {
+        public int ImageToolType { get; set; }
 
-		public int? ShortcutKeyEnum { get; set; }
-	} 
+        public int? ShortcutKeyEnum { get; set; }
+    }
+
+    ///<summary> DefaultShortcutKeyAddOrEdit  列表查询参数模型</summary>
+    public class DefaultShortcutKeyAddOrEdit
+    {
+        public Guid Id { get; set; }
+        public string Keyboardkey { get; set; }
+        public int ShortcutKeyEnum { get; set; }
+        public int ImageToolType { get; set; }
+    }
 
-	 ///<summary> DefaultShortcutKeyAddOrEdit  列表查询参数模型</summary>
-	 public class  DefaultShortcutKeyAddOrEdit
-	 {
-	 		public Guid Id { get; set; }
-	 		public string Keyboardkey { get; set; }
-	 		public int ShortcutKeyEnum { get; set; }
-	 		public int ImageToolType { get; set; }
-	      } 
 
-	 
 }
 
 

IRaCIS.Core.Application/Service/Reading/Dto/GetReadModuleDto.cs

@@ -1,11 +1,6 @@
 using IRaCIS.Core.Domain.Share;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
@@ -15,12 +10,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid? SubjectId { get; set; }
 
-		public CompleteClinicalDataEnum? CompleteClinicalData { get; set; }
+        public CompleteClinicalDataEnum? CompleteClinicalData { get; set; }
 
-		/// <summary>
-		/// 项目中心Code
-		/// </summary>
-		public string? TrialSiteCode { get; set; }
+        /// <summary>
+        /// 项目中心Code
+        /// </summary>
+        public string? TrialSiteCode { get; set; }
 
         /// <summary>
         /// 受试者Code
@@ -221,10 +216,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 状态
         /// </summary>
-        public  ReadingStatusEnum Status { get; set; }
+        public ReadingStatusEnum Status { get; set; }
     }
 
- 
+
 
 
     public class GetReadModuleResultDto
@@ -302,12 +297,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     }
 
     public class ReadMoudleView
-    {     
+    {
         public Guid Id { get; set; }
- 
+
         public string Name { get; set; }
-    
-		public Guid SubjectId { get; set; }
+
+        public Guid SubjectId { get; set; }
 
         public ModuleTypeEnum ModuleType { get; set; }
 
@@ -331,7 +326,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string? ReadModuleName { get; set; }
 
-        public DateTime CreateTime { get; set; }    
+        public DateTime CreateTime { get; set; }
 
         public bool IsVisit { get; set; }
 

IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs

@@ -3,9 +3,7 @@
 //	   生成时间 2022-08-12 14:07:12 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace IRaCIS.Core.Application.ViewModel
@@ -36,14 +34,14 @@ namespace IRaCIS.Core.Application.ViewModel
         public DicDataTypeEnum DataTypeEnum { get; set; }
 
 
-     
+
         public string Value { get; set; } = string.Empty;
 
-       
+
         public string ValueCN { get; set; } = string.Empty;
 
 
-      
+
         public string Description { get; set; } = string.Empty;
 
         public int ShowOrder { get; set; }
@@ -69,8 +67,8 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid? SystemCriterionId { get; set; }
 
-		public Guid? TrialCriterionId { get; set; }
-	}
+        public Guid? TrialCriterionId { get; set; }
+    }
 
     ///<summary>CriterionNidusQuery  列表查询参数模型</summary>
     public class CriterionNidusQuery
@@ -160,14 +158,14 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public string PartEN { get; set; } = string.Empty;
 
-      
+
 
         /// <summary>
         /// TULOC 英文
         /// </summary>
         public string TULOCEN { get; set; } = string.Empty;
 
-      
+
 
 
         /// <summary>
@@ -196,18 +194,18 @@ namespace IRaCIS.Core.Application.ViewModel
     public class GetTrialSelectOrganListInDto
     {
         public Guid TrialId { get; set; }
-    
+
     }
 
     public class CriterionNidusData : CriterionNidusSystem
-	{
+    {
         public Guid OriginalId { get; set; }
     }
 
 
     public class SynchronizeSystemOrganInDto
     {
-         [NotDefault]
+        [NotDefault]
         public Guid FromCriterionId { get; set; }
         [NotDefault]
         public Guid ToCriterionId { get; set; }
@@ -219,7 +217,7 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public Guid TrialReadingCriterionId { get; set; }
 
-      
+
 
         public Guid? SystemCriterionId { get; set; }
     }
@@ -370,7 +368,7 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public string TULOCEN { get; set; } = string.Empty;
 
-     
+
 
         /// <summary>
         /// 位置 英文
@@ -380,7 +378,7 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
     ///<summary>OrganInfoQuery  列表查询参数模型</summary>
-    public class OrganInfoQuery:PageInput
+    public class OrganInfoQuery : PageInput
     {
 
         /// <summary>
@@ -467,14 +465,14 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public string PartEN { get; set; } = string.Empty;
 
-     
+
 
         /// <summary>
         /// TULOC 英文
         /// </summary>
         public string TULOCEN { get; set; } = string.Empty;
 
-     
+
 
 
         /// <summary>

IRaCIS.Core.Application/Service/Reading/Dto/PreviousPDFViewModel.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IRaCIS.Core.Application.Service.Reading.Dto
+namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
 
 
@@ -32,7 +26,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public Guid? TrialId { get; set; }
 
-     
+
 
         /// <summary>
         /// 页码

IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs

@@ -3,10 +3,7 @@
 //	   生成时间 2022-08-22 09:36:37 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
-using System.Reflection.Metadata.Ecma335;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
@@ -14,29 +11,29 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class GetIsSuvMaxLesionInDto
     {
         public Guid VisitTaskId { get; set; }
-		public Guid RowId { get; set; }
-	}
+        public Guid RowId { get; set; }
+    }
 
-	public class GetIsSuvMaxLesionOutDto
-	{
-		public bool IsSuvMaxLesion { get; set; }
-	}
+    public class GetIsSuvMaxLesionOutDto
+    {
+        public bool IsSuvMaxLesion { get; set; }
+    }
 
     public class GetCanChooseNotMergeInDto
     {
-		public Guid VisitTaskId { get; set; }
-	}
+        public Guid VisitTaskId { get; set; }
+    }
 
-	public class GetCanChooseNotMergeOutDto
-	{
-		public bool IsCanChooseNotMerge { get; set; }
-	}
+    public class GetCanChooseNotMergeOutDto
+    {
+        public bool IsCanChooseNotMerge { get; set; }
+    }
 
-	public class GetPPDInfoInDto
+    public class GetPPDInfoInDto
     {
         public Guid VisitTaskId { get; set; }
 
-        public Guid  QuestionId { get; set; }
+        public Guid QuestionId { get; set; }
 
         public decimal RowIndex { get; set; }
 
@@ -69,7 +66,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         public Guid VisitTaskId { get; set; }
 
-          
+
         public bool IsChangeOtherTask { get; set; }
 
         public ComputationTrigger ComputationTrigger { get; set; }
@@ -210,9 +207,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public bool IsConvertedTask { get; set; }
 
-		public Guid? BeforeConvertedTaskId { get; set; }
+        public Guid? BeforeConvertedTaskId { get; set; }
 
-		public bool IsAnalysisCreate { get; set; }
+        public bool IsAnalysisCreate { get; set; }
 
         public bool? IsSelfAnalysis { get; set; }
 
@@ -221,7 +218,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// TrialReadingCriterionId
         /// </summary>
-        public Guid  TrialReadingCriterionId { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }
 
         public string VisitName { get; set; }
 
@@ -243,7 +240,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Arm ArmEnum { get; set; }
 
-        public ComputationTrigger ComputationTrigger { get; set; } 
+        public ComputationTrigger ComputationTrigger { get; set; }
 
         /// <summary>
         /// 是否修改其他任务
@@ -306,7 +303,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public decimal FristAddTaskNum { get; set; }
 
-        public string? OtherMeasureData { get; set; } 
+        public string? OtherMeasureData { get; set; }
         public string? MeasureData { get; set; }
 
         public List<TableQuestionInfo> TableQuestionList { get; set; } = new List<TableQuestionInfo>();
@@ -374,7 +371,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public QuestionType QuestionType { get; set; }
 
 
-        public List<ComputationTrigger> ComputationTriggerList { get; set; }=new  List<ComputationTrigger>();
+        public List<ComputationTrigger> ComputationTriggerList { get; set; } = new List<ComputationTrigger>();
 
         public Func<ReadingCalculateDto, Task<decimal>> GetDecimalFun { get; set; }
 
@@ -384,7 +381,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Func<ReadingCalculateDto, Task<string>> GetStringFun { get; set; }
 
-        public Func<ChangeAllTaskDto,Task> ChangeAllTaskFun { get; set; }
+        public Func<ChangeAllTaskDto, Task> ChangeAllTaskFun { get; set; }
 
         public bool? IsConvertedTask { get; set; }
 
@@ -393,7 +390,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public bool IsBeTransforming { get; set; } = false;
 
-	}
+    }
 }
 
 

IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs

@@ -1,23 +1,18 @@
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Domain.Share;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
-	public class SetTaskValidInDto
-	{
+    public class SetTaskValidInDto
+    {
         public Guid VisitTaskId { get; set; }
     }
 
 
     public class SignConsistencyAnalysisReadingClinicalDataInDto
-	{
-		public Guid ConsistentClinicalDataId { get; set; }
+    {
+        public Guid ConsistentClinicalDataId { get; set; }
 
         /// <summary>
         /// 是否盲化
@@ -33,114 +28,114 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 
     public class AddOrUpdateReadingClinicalDataDto
-	{
+    {
 
-		public Guid? Id { get; set; }
+        public Guid? Id { get; set; }
 
-		public Guid? StudyId { get; set; }
+        public Guid? StudyId { get; set; }
 
-		/// <summary>
-		/// 项目ID
-		/// </summary>
-		public Guid TrialId { get; set; }
+        /// <summary>
+        /// 项目ID
+        /// </summary>
+        public Guid TrialId { get; set; }
 
-		/// <summary>
-		///  受试者ID
-		/// </summary>
-		public Guid SubjectId { get; set; }
+        /// <summary>
+        ///  受试者ID
+        /// </summary>
+        public Guid SubjectId { get; set; }
 
-		/// <summary>
-		/// 阅片ID
-		/// </summary>
-		public Guid ReadingId { get; set; }
+        /// <summary>
+        /// 阅片ID
+        /// </summary>
+        public Guid ReadingId { get; set; }
 
-		/// <summary>
-		/// 临床数据类型Id
-		/// </summary>
-		public Guid ClinicalDataTrialSetId { get; set; }
+        /// <summary>
+        /// 临床数据类型Id
+        /// </summary>
+        public Guid ClinicalDataTrialSetId { get; set; }
 
-		/// <summary>
-		/// 是否是访视
-		/// </summary>
-		public bool IsVisit { get; set; }
+        /// <summary>
+        /// 是否是访视
+        /// </summary>
+        public bool IsVisit { get; set; }
 
 
-		///// <summary>
-		///// 是否盲化
-		///// </summary>
-		//public bool IsBlind { get; set; }
+        ///// <summary>
+        ///// 是否盲化
+        ///// </summary>
+        //public bool IsBlind { get; set; }
 
-		///// <summary>
-		///// 是否完整
-		///// </summary>
-		//public bool IsComplete { get; set; }
+        ///// <summary>
+        ///// 是否完整
+        ///// </summary>
+        //public bool IsComplete { get; set; }
 
-		/// <summary>
-		/// 要删除的对象
-		/// </summary>
+        /// <summary>
+        /// 要删除的对象
+        /// </summary>
 
-		public List<Guid> DeleteFileIds { get; set; } = new List<Guid>();
+        public List<Guid> DeleteFileIds { get; set; } = new List<Guid>();
 
 
-		public List<FileDto> AddFileList { get; set; } = new List<FileDto>();
-	}
+        public List<FileDto> AddFileList { get; set; } = new List<FileDto>();
+    }
 
-	public class GetCRCClinicalDataOutDto
-	{
+    public class GetCRCClinicalDataOutDto
+    {
 
-		public Guid Id { get; set; }
+        public Guid Id { get; set; }
 
-		/// <summary>
-		/// 名称
-		/// </summary>
-		public Guid ClinicalDataTrialSetId { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public Guid ClinicalDataTrialSetId { get; set; }
 
-		/// <summary>
-		/// 名称
-		/// </summary>
-		public string ClinicalDataSetName { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string ClinicalDataSetName { get; set; }
 
-		/// <summary>
-		/// 英文名称
-		/// </summary>
-		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+        /// <summary>
+        /// 英文名称
+        /// </summary>
+        public string ClinicalDataSetEnName { get; set; } = string.Empty;
 
 
-		/// <summary>
-		/// 上传方式
-		/// </summary>
-		public ClinicalUploadType ClinicalUploadType { get; set; }
+        /// <summary>
+        /// 上传方式
+        /// </summary>
+        public ClinicalUploadType ClinicalUploadType { get; set; }
 
-		/// <summary>
-		/// 临床级别
-		/// </summary>
-		public ClinicalLevel ClinicalDataLevel { get; set; }
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel ClinicalDataLevel { get; set; }
 
 
-		/// <summary>
-		/// 上传角色
-		/// </summary>
-		public UploadRole UploadRole { get; set; }
+        /// <summary>
+        /// 上传角色
+        /// </summary>
+        public UploadRole UploadRole { get; set; }
 
-		/// <summary>
-		/// 模板文件名称
-		/// </summary>
-		public string FileName { get; set; }
+        /// <summary>
+        /// 模板文件名称
+        /// </summary>
+        public string FileName { get; set; }
 
-		/// <summary>
-		/// 文件路径
-		/// </summary>
-		public string Path { get; set; }
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        public string Path { get; set; }
 
-		/// <summary>
-		/// 是否盲化
-		/// </summary>
-		public bool? IsBlind { get; set; }
+        /// <summary>
+        /// 是否盲化
+        /// </summary>
+        public bool? IsBlind { get; set; }
 
-		/// <summary>
-		/// 是否完整
-		/// </summary>
-		public bool? IsComplete { get; set; }
+        /// <summary>
+        /// 是否完整
+        /// </summary>
+        public bool? IsComplete { get; set; }
 
         public List<ClinicalFromData> ClinicalFromList { get; set; }
 
@@ -148,29 +143,29 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public List<GetFileDto> PDFFileList { get; set; } = new List<GetFileDto>();
 
-		public ClinicalDataTable ClinicalTableData { get; set; }
-	}
+        public ClinicalDataTable ClinicalTableData { get; set; }
+    }
 
 
-	public class ClinicalDataTable
-	{
-		public List<PreviousHistoryView> PreviousHistoryList { get; set; }
+    public class ClinicalDataTable
+    {
+        public List<PreviousHistoryView> PreviousHistoryList { get; set; }
 
-		public List<PreviousOtherView> PreviousOtherList { get; set; }
+        public List<PreviousOtherView> PreviousOtherList { get; set; }
 
-		public List<PreviousSurgeryView> PreviousSurgeryList { get; set; }
+        public List<PreviousSurgeryView> PreviousSurgeryList { get; set; }
 
 
-	}
+    }
 
-	public class GetStudyClinicalDataInDto
-	{
-		public Guid SubjectVisitId { get; set; }
-	}
+    public class GetStudyClinicalDataInDto
+    {
+        public Guid SubjectVisitId { get; set; }
+    }
 
-	public class GetCRCClinicalDataInDto
-	{
-		public Guid SubjectVisitId { get; set; }
+    public class GetCRCClinicalDataInDto
+    {
+        public Guid SubjectVisitId { get; set; }
 
         public Guid TrialId { get; set; }
 
@@ -181,59 +176,59 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public bool IsBaseline { get; set; }
 
-		public Guid? StudyId { get; set; }
+        public Guid? StudyId { get; set; }
 
-		public bool FilterNoneForm { get; set; } = false;
+        public bool FilterNoneForm { get; set; } = false;
 
 
-	}
+    }
 
-	/// <summary>
-	/// 是否盲化
-	/// </summary>
-	public class SetReadingClinicalDataIsBlind
-	{
-		public Guid Id { get; set; }
+    /// <summary>
+    /// 是否盲化
+    /// </summary>
+    public class SetReadingClinicalDataIsBlind
+    {
+        public Guid Id { get; set; }
 
-		public bool IsBlind { get; set; }
-	}
+        public bool IsBlind { get; set; }
+    }
 
-	public class FileDto
-	{
-		/// <summary>
-		/// 文件名称
-		/// </summary>
-		public string FileName { get; set; }
+    public class FileDto
+    {
+        /// <summary>
+        /// 文件名称
+        /// </summary>
+        public string FileName { get; set; }
 
-		/// <summary>
-		/// 路径
-		/// </summary>
-		public string Path { get; set; }
+        /// <summary>
+        /// 路径
+        /// </summary>
+        public string Path { get; set; }
 
         /// <summary>
         /// 大小
         /// </summary>
         public int Size { get; set; } = 0;
 
-		/// <summary>
-		/// 文件类型
-		/// </summary>
-		public string Type { get; set; } = string.Empty;
+        /// <summary>
+        /// 文件类型
+        /// </summary>
+        public string Type { get; set; } = string.Empty;
     }
 
 
-	public class GetReadingOrTaskClinicalDataListInDto
-	{
+    public class GetReadingOrTaskClinicalDataListInDto
+    {
 
         public Guid? TrialReadingCriterionId { get; set; }
 
         [NotDefault]
-		public Guid SubjectId { get; set; }
+        public Guid SubjectId { get; set; }
 
-		[NotDefault]
-		public Guid TrialId { get; set; }
+        [NotDefault]
+        public Guid TrialId { get; set; }
 
-		public Guid? ReadingId { get; set; }
+        public Guid? ReadingId { get; set; }
 
         /// <summary>
         /// 临床数据类型Id
@@ -249,25 +244,25 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid? ReadingClinicalDataId { get; set; }
 
-		/// <summary>
-		/// 只获取CRC上传的阅片模块结构化录入
-		/// </summary>
-		public bool IsOnlyGetCRCReadModule { get; set; } = false;
+        /// <summary>
+        /// 只获取CRC上传的阅片模块结构化录入
+        /// </summary>
+        public bool IsOnlyGetCRCReadModule { get; set; } = false;
 
         /// <summary>
         /// 只查询已经签名的临床数据
         /// </summary>
         public bool SelectIsSign { get; set; } = true;
 
-		/// <summary>
-		/// 是否查询所有的一致性分析临床数据 (为否只查询PDF)
-		/// </summary>
-		public bool IsGetAllConsistencyAnalysis { get; set; } = true;
+        /// <summary>
+        /// 是否查询所有的一致性分析临床数据 (为否只查询PDF)
+        /// </summary>
+        public bool IsGetAllConsistencyAnalysis { get; set; } = true;
 
     }
 
-	public class GetConsistencyAnalysisReadingClinicalDataListInDto
-	{
+    public class GetConsistencyAnalysisReadingClinicalDataListInDto
+    {
         [NotDefault]
         public Guid SubjectId { get; set; }
         [NotDefault]
@@ -281,11 +276,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     /// 获取访视列表
     /// </summary>
     public class GetReadingClinicalDataListIndto
-	{
-		[NotDefault]
-		public Guid SubjectId { get; set; }
-		[NotDefault]
-		public Guid ReadingId { get; set; }
+    {
+        [NotDefault]
+        public Guid SubjectId { get; set; }
+        [NotDefault]
+        public Guid ReadingId { get; set; }
 
         /// <summary>
         /// 临床数据类型Id
@@ -298,110 +293,110 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public GetClinicalType? GetClinicalType { get; set; }
 
         [NotDefault]
-		public Guid TrialReadingCriterionId { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }
 
-		public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
-		/// <summary>
-		/// 是否是访视
-		/// </summary>
-		public bool IsVisit { get; set; }
+        /// <summary>
+        /// 是否是访视
+        /// </summary>
+        public bool IsVisit { get; set; }
 
-		/// <summary>
-		/// 是否是基线
-		/// </summary>
-		public bool IsBaseLine { get; set; }
-	}
+        /// <summary>
+        /// 是否是基线
+        /// </summary>
+        public bool IsBaseLine { get; set; }
+    }
 
-	public class GetReadingClinicalDataPDFListIndto : PageInput
-	{
-		public Guid ReadingClinicalDataId { get; set; }
-	}
+    public class GetReadingClinicalDataPDFListIndto : PageInput
+    {
+        public Guid ReadingClinicalDataId { get; set; }
+    }
 
-	public class GetReadingClinicalDataPDFListOutDto
-	{
-		public Guid? Id { get; set; }
+    public class GetReadingClinicalDataPDFListOutDto
+    {
+        public Guid? Id { get; set; }
 
 
-		/// <summary>
-		/// 阅片临床数据ID
-		/// </summary>
-		public Guid ReadingClinicalDataId { get; set; }
+        /// <summary>
+        /// 阅片临床数据ID
+        /// </summary>
+        public Guid ReadingClinicalDataId { get; set; }
 
-		/// <summary>
-		/// Path
-		/// </summary>
-		public string Path { get; set; }
+        /// <summary>
+        /// Path
+        /// </summary>
+        public string Path { get; set; }
 
-		/// <summary>
-		/// FileName
-		/// </summary>
-		public string FileName { get; set; }
+        /// <summary>
+        /// FileName
+        /// </summary>
+        public string FileName { get; set; }
 
-		/// <summary>
-		/// 是否为访视
-		/// </summary>
-		public bool IsVisit { get; set; }
+        /// <summary>
+        /// 是否为访视
+        /// </summary>
+        public bool IsVisit { get; set; }
 
 
-	}
+    }
 
-	public class AddOrUpdateReadingClinicalDataPDFDto
-	{
+    public class AddOrUpdateReadingClinicalDataPDFDto
+    {
 
-		public Guid? Id { get; set; }
+        public Guid? Id { get; set; }
 
 
 
-		/// <summary>
-		/// 阅片临床数据ID
-		/// </summary>
-		public Guid ReadingClinicalDataId { get; set; }
+        /// <summary>
+        /// 阅片临床数据ID
+        /// </summary>
+        public Guid ReadingClinicalDataId { get; set; }
 
-		/// <summary>
-		/// Path
-		/// </summary>
-		public string Path { get; set; }
+        /// <summary>
+        /// Path
+        /// </summary>
+        public string Path { get; set; }
 
-		/// <summary>
-		/// FileName
-		/// </summary>
-		public string FileName { get; set; }
+        /// <summary>
+        /// FileName
+        /// </summary>
+        public string FileName { get; set; }
 
-		/// <summary>
-		/// 是否为访视
-		/// </summary>
-		public bool IsVisit { get; set; }
-	}
+        /// <summary>
+        /// 是否为访视
+        /// </summary>
+        public bool IsVisit { get; set; }
+    }
 
 
-	public class PMClinicalDataConfirmCommand
-	{
-		public Guid Id { get; set; }
+    public class PMClinicalDataConfirmCommand
+    {
+        public Guid Id { get; set; }
 
-		/// <summary>
-		/// 是否盲化
-		/// </summary>
-		public bool? IsBlind { get; set; }
+        /// <summary>
+        /// 是否盲化
+        /// </summary>
+        public bool? IsBlind { get; set; }
 
-		/// <summary>
-		/// 是否完整
-		/// </summary>
-		public bool? IsComplete { get; set; }
+        /// <summary>
+        /// 是否完整
+        /// </summary>
+        public bool? IsComplete { get; set; }
 
-	}
+    }
 
 
-	public class GetReadingClinicalDataListOutDto
-	{
+    public class GetReadingClinicalDataListOutDto
+    {
 
-		public Guid Id { get; set; }
+        public Guid Id { get; set; }
 
 
-		/// <summary>
-		/// 访视Id  或者模块Id
-		/// </summary>
-		public Guid ReadingId { get; set; }
+        /// <summary>
+        /// 访视Id  或者模块Id
+        /// </summary>
+        public Guid ReadingId { get; set; }
 
         /// <summary>
         /// CRC是否正在申请撤回
@@ -416,133 +411,133 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string ClinicalDataSetName { get; set; }
 
-		/// <summary>
-		/// 英文名称
-		/// </summary>
-		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+        /// <summary>
+        /// 英文名称
+        /// </summary>
+        public string ClinicalDataSetEnName { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 下拉ID
-		/// </summary>
-		public Guid ClinicalDataTrialSetId { get; set; }
+        /// <summary>
+        /// 下拉ID
+        /// </summary>
+        public Guid ClinicalDataTrialSetId { get; set; }
 
-		/// <summary>
-		/// 临床级别
-		/// </summary>
-		public ClinicalLevel ClinicalDataLevel { get; set; }
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel ClinicalDataLevel { get; set; }
 
-		/// <summary>
-		/// 上传角色
-		/// </summary>
-		public UploadRole UploadRole { get; set; }
+        /// <summary>
+        /// 上传角色
+        /// </summary>
+        public UploadRole UploadRole { get; set; }
 
-		public Guid SubjectId { get; set; }
+        public Guid SubjectId { get; set; }
 
-		/// <summary>
-		/// 上传方式
-		/// </summary>
-		public ClinicalUploadType ClinicalUploadType { get; set; }
+        /// <summary>
+        /// 上传方式
+        /// </summary>
+        public ClinicalUploadType ClinicalUploadType { get; set; }
 
-		/// <summary>
-		/// 标准枚举
-		/// </summary>
-		public List<int> CriterionEnumList { get; set; }
+        /// <summary>
+        /// 标准枚举
+        /// </summary>
+        public List<int> CriterionEnumList { get; set; }
 
-		/// <summary>
-		/// 临床级别名称
-		/// </summary>
-		public string ClinicalDataLevelName { get; set; }
+        /// <summary>
+        /// 临床级别名称
+        /// </summary>
+        public string ClinicalDataLevelName { get; set; }
 
-		/// <summary>
-		/// 上传方式名称
-		/// </summary>
-		public string ClinicalUploadTypeName { get; set; }
+        /// <summary>
+        /// 上传方式名称
+        /// </summary>
+        public string ClinicalUploadTypeName { get; set; }
 
-		/// <summary>
-		/// 是否为CRC上传
-		/// </summary>
-		public bool IsCRCUpload { get; set; }
+        /// <summary>
+        /// 是否为CRC上传
+        /// </summary>
+        public bool IsCRCUpload { get; set; }
 
-		public bool IsNeedMerge { get; set; } = false;
+        public bool IsNeedMerge { get; set; } = false;
 
-		public Guid ReadModuleId { get; set; }
+        public Guid ReadModuleId { get; set; }
 
 
-		/// <summary>
-		/// 是否签名
-		/// </summary>
-		public bool IsSign { get; set; }
+        /// <summary>
+        /// 是否签名
+        /// </summary>
+        public bool IsSign { get; set; }
 
 
-		/// <summary>
-		/// 是否盲化
-		/// </summary>
-		public bool? IsBlind { get; set; }
+        /// <summary>
+        /// 是否盲化
+        /// </summary>
+        public bool? IsBlind { get; set; }
 
-		/// <summary>
-		/// 是否完整
-		/// </summary>
-		public bool? IsComplete { get; set; }
+        /// <summary>
+        /// 是否完整
+        /// </summary>
+        public bool? IsComplete { get; set; }
 
 
-		//临床数据状态
-		public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
+        //临床数据状态
+        public ReadingClinicalDataStatus ReadingClinicalDataState { get; set; }
 
-		/// <summary>
-		/// 文件数量
-		/// </summary>
-		public int FileCount { get; set; }
-		//{ 
-		//	get 
-		//	{
-		//		return this.FileList.Count();
-		//	} 
-		//} 
+        /// <summary>
+        /// 文件数量
+        /// </summary>
+        public int FileCount { get; set; }
+        //{ 
+        //	get 
+        //	{
+        //		return this.FileList.Count();
+        //	} 
+        //} 
 
-		public List<ClinicalFromData> ClinicalFromList { get; set; }
+        public List<ClinicalFromData> ClinicalFromList { get; set; }
 
-		public List<GetFileDto> FileList { get; set; } = new List<GetFileDto>();
+        public List<GetFileDto> FileList { get; set; } = new List<GetFileDto>();
 
 
-		public ClinicalDataTable ClinicalTableData { get; set; }
+        public ClinicalDataTable ClinicalTableData { get; set; }
 
-		public List<TrialClinicalDataSetCriterion> TrialClinicalDataSetCriteriaList { get; set; }
-	}
+        public List<TrialClinicalDataSetCriterion> TrialClinicalDataSetCriteriaList { get; set; }
+    }
 
 
-	public class ClinicalFromData
-	{
-		/// <summary>
-		/// 表单Id
-		/// </summary>
-		public Guid ClinicalFormId { get; set; }
+    public class ClinicalFromData
+    {
+        /// <summary>
+        /// 表单Id
+        /// </summary>
+        public Guid ClinicalFormId { get; set; }
 
-		/// <summary>
-		/// 检查日期
-		/// </summary>
-		public DateTime? CheckDate { get; set; }
-	}
+        /// <summary>
+        /// 检查日期
+        /// </summary>
+        public DateTime? CheckDate { get; set; }
+    }
 
-	public class GetFileDto
-	{
+    public class GetFileDto
+    {
 
-		/// <summary>
-		/// Id
-		/// </summary>
+        /// <summary>
+        /// Id
+        /// </summary>
 
-		public Guid Id { get; set; }
+        public Guid Id { get; set; }
 
-		/// <summary>
-		/// Path
-		/// </summary>
+        /// <summary>
+        /// Path
+        /// </summary>
 
-		public string Path { get; set; }
+        public string Path { get; set; }
 
-		/// <summary>
-		/// FileName
-		/// </summary>
-	
-		public string FileName { get; set; }
+        /// <summary>
+        /// FileName
+        /// </summary>
+
+        public string FileName { get; set; }
 
 
         /// <summary>
@@ -559,99 +554,99 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// 上传时间
         /// </summary>
         public DateTime CreateTime { get; set; }
-	}
+    }
 
 
-	public class GetTrialClinicalDataSelectIndto
-	{
-		/// <summary>
-		/// 项目ID
-		/// </summary>
-		[NotDefault]
-		public Guid TrialId { get; set; }
+    public class GetTrialClinicalDataSelectIndto
+    {
+        /// <summary>
+        /// 项目ID
+        /// </summary>
+        [NotDefault]
+        public Guid TrialId { get; set; }
 
-		/// <summary>
-		/// 阅片期临床数据ID
-		/// </summary>
-		public Guid? ReadingClinicalDataId { get; set; }
+        /// <summary>
+        /// 阅片期临床数据ID
+        /// </summary>
+        public Guid? ReadingClinicalDataId { get; set; }
 
-		/// <summary>
-		/// 对象ID
-		/// </summary>
-		public Guid? ReadingId { get; set; }
+        /// <summary>
+        /// 对象ID
+        /// </summary>
+        public Guid? ReadingId { get; set; }
 
-		public Guid? SubjectId { get; set; }
+        public Guid? SubjectId { get; set; }
 
-		/// <summary>
-		/// 是否是访视
-		/// </summary>
-		public bool IsVisit { get; set; }
+        /// <summary>
+        /// 是否是访视
+        /// </summary>
+        public bool IsVisit { get; set; }
 
-		/// <summary>
-		/// 是否是基线
-		/// </summary>
-		public bool IsBaseLine { get; set; }
+        /// <summary>
+        /// 是否是基线
+        /// </summary>
+        public bool IsBaseLine { get; set; }
 
 
-		/// <summary>
-		/// 上传角色
-		/// </summary>
-		public UploadRole? UploadRole { get; set; }
+        /// <summary>
+        /// 上传角色
+        /// </summary>
+        public UploadRole? UploadRole { get; set; }
 
 
-		public Guid? TrialReadingCriterionId { get; set; }
-	}
+        public Guid? TrialReadingCriterionId { get; set; }
+    }
 
-	public class GetTrialClinicalDataSelectOutDto
-	{
+    public class GetTrialClinicalDataSelectOutDto
+    {
 
-		public Guid Id { get; set; }
+        public Guid Id { get; set; }
 
-		/// <summary>
-		/// 名称
-		/// </summary>
-		public string ClinicalDataSetName { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string ClinicalDataSetName { get; set; }
 
-		/// <summary>
-		/// 英文名称
-		/// </summary>
-		public string ClinicalDataSetEnName { get; set; } = string.Empty;
+        /// <summary>
+        /// 英文名称
+        /// </summary>
+        public string ClinicalDataSetEnName { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 临床级别
-		/// </summary>
-		public ClinicalLevel ClinicalDataLevel { get; set; }
+        /// <summary>
+        /// 临床级别
+        /// </summary>
+        public ClinicalLevel ClinicalDataLevel { get; set; }
 
 
-		/// <summary>
-		/// 上传方式
-		/// </summary>
-		public ClinicalUploadType ClinicalUploadType { get; set; }
+        /// <summary>
+        /// 上传方式
+        /// </summary>
+        public ClinicalUploadType ClinicalUploadType { get; set; }
 
-		/// <summary>
-		/// 临床级别名称
-		/// </summary>
-		public string ClinicalDataLevelName { get; set; }
+        /// <summary>
+        /// 临床级别名称
+        /// </summary>
+        public string ClinicalDataLevelName { get; set; }
 
-		/// <summary>
-		/// 上传方式名称
-		/// </summary>
-		public string ClinicalUploadTypeName { get; set; }
+        /// <summary>
+        /// 上传方式名称
+        /// </summary>
+        public string ClinicalUploadTypeName { get; set; }
 
 
-		/// <summary>
-		/// 模板文件名称
-		/// </summary>
-		public string FileName { get; set; }
+        /// <summary>
+        /// 模板文件名称
+        /// </summary>
+        public string FileName { get; set; }
 
-		/// <summary>
-		/// 文件路径
-		/// </summary>
-		public string Path { get; set; }
+        /// <summary>
+        /// 文件路径
+        /// </summary>
+        public string Path { get; set; }
 
-		public List<int> CriterionEnumList { get; set; }
+        public List<int> CriterionEnumList { get; set; }
 
 
-	}
+    }
 
 }

IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs

@@ -1,11 +1,5 @@
-using IRaCIS.Core.Application.Contracts;
-using IRaCIS.Core.Domain.Share;
-using System;
-using System.Collections.Generic;
+using IRaCIS.Core.Domain.Share;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
@@ -34,19 +28,19 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class GetNextIRMedicalFeedbackInDto
     {
-		/// <summary>
-		/// 项目Id
-		/// </summary>
-		[NotDefault]
-		public Guid TrialId { get; set; }
+        /// <summary>
+        /// 项目Id
+        /// </summary>
+        [NotDefault]
+        public Guid TrialId { get; set; }
 
-		public Guid TrialReadingCriterionId { get; set; }
+        public Guid TrialReadingCriterionId { get; set; }
 
-		public Guid TaskMedicalReviewId { get; set; }
-	}
+        public Guid TaskMedicalReviewId { get; set; }
+    }
 
 
-	public class GetIRMedicalFeedbackListInDto:PageInput
+    public class GetIRMedicalFeedbackListInDto : PageInput
     {
         /// <summary>
         /// 项目Id
@@ -60,7 +54,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid? SubjectId { get; set; }
 
 
-		public MedicalReviewAuditState? AuditState { get; set; }
+        public MedicalReviewAuditState? AuditState { get; set; }
 
         public string SubjectCode { get; set; } = string.Empty;
 
@@ -101,7 +95,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public bool IsNotHaveSigned { get; set; } = false;
 
-	}
+    }
 
     public class GetIRMedicalFeedbackListOutDto
     {
@@ -182,7 +176,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// <summary>
         /// 任务展示访视 读片任务显示是否顺序
         /// </summary>
-          public ReadingOrder IsReadingTaskViewInOrder { get; set; }
+        public ReadingOrder IsReadingTaskViewInOrder { get; set; }
 
 
         /// <summary>
@@ -290,7 +284,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     }
 
- 
+
 
     public class GetMedicalReviewDialogInDto
     {
@@ -303,14 +297,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid TrialId { get; set; }
 
- 
+
 
         public string RequestReReadingReason { get; set; } = string.Empty;
 
 
         public Guid TaskMedicalReviewId { get; set; }
 
-        public string Content { get; set; }=string.Empty;
+        public string Content { get; set; } = string.Empty;
 
         /// <summary>
 		/// 阅片人是否认同
@@ -335,7 +329,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public List<OSSImageInfo> FileList { get; set; } = new List<OSSImageInfo>();
 
-       
+
 
 
         public string FileName { get; set; } = string.Empty;
@@ -348,7 +342,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string Content { get; set; } = string.Empty;
 
-      
+
         /// <summary>
         /// 是否有问题
         /// </summary>
@@ -371,7 +365,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid TaskMedicalReviewId { get; set; }
         public Guid VisitTaskId { get; set; }
 
-     
+
 
         public List<MedicineQuestionAnswer> QuestionAnswerList { get; set; }
     }
@@ -386,7 +380,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     public class GetMedicalReviewReadingTaskInDto
     {
-        public Guid TrialId  { get; set; }
+        public Guid TrialId { get; set; }
 
         public Guid TrialReadingCriterionId { get; set; }
 
@@ -436,11 +430,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public bool IsClosedDialog { get; set; }
 
-   
+
 
         public List<TaskInfo> TaskList { get; set; } = new List<TaskInfo>();
 
- 
+
         public List<ReadingMedicineQuestion> QuestionAnswerList { get; set; } = new List<ReadingMedicineQuestion>();
 
 
@@ -507,7 +501,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public AuditAdvice AuditAdviceEnum { get; set; }
     }
 
-    public class MedicalReviewInfo 
+    public class MedicalReviewInfo
     {
         public Guid TaskMedicalReviewId { get; set; }
 
@@ -542,7 +536,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public bool IsSendMessage { get; set; }
     }
 
-    public class ReadingMedicineQuestion 
+    public class ReadingMedicineQuestion
     {
         /// <summary>
         /// 答案
@@ -566,15 +560,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string QuestionName { get; set; }
 
-		/// <summary>
-		/// 问题英文名称
-		/// </summary>
-		public string QuestionEnName { get; set; } = string.Empty;
+        /// <summary>
+        /// 问题英文名称
+        /// </summary>
+        public string QuestionEnName { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 类型值
-		/// </summary>
-		public string TypeValue { get; set; }
+        /// <summary>
+        /// 类型值
+        /// </summary>
+        public string TypeValue { get; set; }
 
         /// <summary>
         /// 是否启用
@@ -601,13 +595,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public bool? IsConfirm { get; set; }
 
-		/// <summary>
-		/// 语言类型
-		/// </summary>
-		public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
+        /// <summary>
+        /// 语言类型
+        /// </summary>
+        public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
 
 
-		public List<ReadingMedicineQuestion> Childrens { get; set; }
+        public List<ReadingMedicineQuestion> Childrens { get; set; }
     }
 
     public class TaskInfo
@@ -640,7 +634,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Arm ArmEnum { get; set; }
 
 
-      
+
 
         /// <summary>
         /// 评估结果
@@ -694,12 +688,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string QuestionName { get; set; }
 
-		/// <summary>
-		/// 问题英文名称
-		/// </summary>
-		public string QuestionEnName { get; set; } = string.Empty;
+        /// <summary>
+        /// 问题英文名称
+        /// </summary>
+        public string QuestionEnName { get; set; } = string.Empty;
 
-		public string Answer { get; set; }
+        public string Answer { get; set; }
 
         /// <summary>
         /// 排序

IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs

@@ -1,14 +1,12 @@
-using System;
 using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace IRaCIS.Core.Application.ViewModel
 {
 
-    public class ReadingMedicineSystemQuestionView: ReadingMedicineSystemQuestionAddOrEdit
+    public class ReadingMedicineSystemQuestionView : ReadingMedicineSystemQuestionAddOrEdit
     {
-       
+
 
         /// <summary>
         /// 排序
@@ -17,18 +15,18 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
     ///<summary>ReadingMedicineSystemQuestionQuery  列表查询参数模型</summary>
-    public class ReadingMedicineSystemQuestionQuery:PageInput
+    public class ReadingMedicineSystemQuestionQuery : PageInput
     {
         public string Type { get; set; } = string.Empty;
         public string ParentTriggerValue { get; set; } = string.Empty;
         public string QuestionName { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 语言类型
-		/// </summary>
-		public LanguageType? LanguageType { get; set; }
+        /// <summary>
+        /// 语言类型
+        /// </summary>
+        public LanguageType? LanguageType { get; set; }
 
-		public string TypeValue { get; set; } = string.Empty;
+        public string TypeValue { get; set; } = string.Empty;
 
 
         public CriterionType? CurrentCriterionType { get; set; }
@@ -56,15 +54,15 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string QuestionName { get; set; }
 
-		/// <summary>
-		/// 语言类型
-		/// </summary>
-		public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
+        /// <summary>
+        /// 语言类型
+        /// </summary>
+        public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
 
-		/// <summary>
-		/// 类型值
-		/// </summary>
-		public string TypeValue { get; set; }
+        /// <summary>
+        /// 类型值
+        /// </summary>
+        public string TypeValue { get; set; }
 
         /// <summary>
         /// 任务类型
@@ -92,17 +90,17 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
 
-	public class AddDefaultQuestionsInDto
+    public class AddDefaultQuestionsInDto
     {
-		public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
-		[NotDefault]
-		public Guid TrialReadingCriterionId { get; set; }
+        [NotDefault]
+        public Guid TrialReadingCriterionId { get; set; }
 
-		public LanguageType LanguageType { get; set; }
-	}
+        public LanguageType LanguageType { get; set; }
+    }
 
-	public class AddTrialDataFromSystemInDto
+    public class AddTrialDataFromSystemInDto
     {
         public Guid TrialId { get; set; }
 
@@ -193,15 +191,15 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public string QuestionName { get; set; }
 
-		/// <summary>
-		/// 语言类型
-		/// </summary>
-		public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
+        /// <summary>
+        /// 语言类型
+        /// </summary>
+        public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
 
-		/// <summary>
-		/// 是否是必须
-		/// </summary>
-		public bool IsRequired { get; set; }
+        /// <summary>
+        /// 是否是必须
+        /// </summary>
+        public bool IsRequired { get; set; }
 
         /// <summary>
         /// 排序
@@ -237,12 +235,12 @@ namespace IRaCIS.Core.Application.ViewModel
     public class ReadingMedicineTrialQuestionView : ReadingMedicineSystemQuestionAddOrEdit
     {
         public DateTime CreateTime { get; set; }
-      
+
         public Guid UpdateUserId { get; set; }
         public Guid CreateUserId { get; set; }
         public Guid TrialId { get; set; }
         public DateTime UpdateTime { get; set; }
-       
+
         public bool? IsConfirm { get; set; }
 
         public int? ParentShowOrder { get; set; }
@@ -265,10 +263,10 @@ namespace IRaCIS.Core.Application.ViewModel
 
     public class VerifyIsCanConfirmInDto
     {
-		public Guid TrialReadingCriterionId { get; set; }
-	}
+        public Guid TrialReadingCriterionId { get; set; }
+    }
 
-	public class GetMedicineQuestionPreviewOutDto
+    public class GetMedicineQuestionPreviewOutDto
     {
         public Guid Id { get; set; }
 
@@ -287,15 +285,15 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public string QuestionName { get; set; }
 
-		/// <summary>
-		/// 语言类型
-		/// </summary>
-		public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
+        /// <summary>
+        /// 语言类型
+        /// </summary>
+        public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
 
-		/// <summary>
-		/// 类型值
-		/// </summary>
-		public string TypeValue { get; set; }
+        /// <summary>
+        /// 类型值
+        /// </summary>
+        public string TypeValue { get; set; }
 
 
 
@@ -340,7 +338,7 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
     ///<summary>ReadingMedicineTrialQuestionQuery  列表查询参数模型</summary>
-    public class ReadingMedicineTrialQuestionQuery:PageInput
+    public class ReadingMedicineTrialQuestionQuery : PageInput
     {
         /// <summary>
         /// 项目Id
@@ -356,12 +354,12 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string QuestionName { get; set; } = string.Empty;
 
-		/// <summary>
-		/// 语言类型
-		/// </summary>
-		public LanguageType? LanguageType { get; set; }
+        /// <summary>
+        /// 语言类型
+        /// </summary>
+        public LanguageType? LanguageType { get; set; }
 
-		public string TypeValue { get; set; } = string.Empty;
+        public string TypeValue { get; set; } = string.Empty;
 
         /// <summary>
         /// 任务类型
@@ -382,11 +380,11 @@ namespace IRaCIS.Core.Application.ViewModel
         public string? ParentTriggerValue { get; set; } = string.Empty;
         public string QuestionName { get; set; }
 
-		/// <summary>
-		/// 语言类型
-		/// </summary>
-		public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
-		public string TypeValue { get; set; }
+        /// <summary>
+        /// 语言类型
+        /// </summary>
+        public LanguageType LanguageType { get; set; } = LanguageType.Chinese;
+        public string TypeValue { get; set; }
         public Guid TrialId { get; set; }
 
         public bool IsEnable { get; set; }

IRaCIS.Core.Application/Service/Reading/Dto/ReadingPeriodSetViewModel.cs

@@ -1,16 +1,11 @@
 using IRaCIS.Core.Domain.Share;
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
-    public class ReadingPeriodSetAddOrEdit 
+    public class ReadingPeriodSetAddOrEdit
     {
-        public  Guid? Id { get; set; }
+        public Guid? Id { get; set; }
 
         /// <summary>
         /// 项目ID
@@ -54,9 +49,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public ReadingSetType ReadingSetType { get; set; } = ReadingSetType.ImageReading;
 
-        public  List<Guid> SiteIds { get; set; }  = new List<Guid>();
+        public List<Guid> SiteIds { get; set; } = new List<Guid>();
 
-        public  List<Guid> SubjectVisitIds { get; set; } = new List<Guid>();
+        public List<Guid> SubjectVisitIds { get; set; } = new List<Guid>();
 
     }
 
@@ -318,7 +313,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public ReadingPeriodStatus IsTakeEffect { get; set; }
     }
 
-    public class ReadingPeriodSetQuery:PageInput
+    public class ReadingPeriodSetQuery : PageInput
     {
 
         /// <summary>

IRaCIS.Core.Application/Service/Reading/Dto/UserWLTemplateViewModel.cs

@@ -3,53 +3,50 @@
 //	   生成时间 2023-05-08 15:20:44 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using System;
-using IRaCIS.Core.Domain.Share;
-using System.Collections.Generic;
 namespace IRaCIS.Core.Application.ViewModel
-{	
-	  /// <summary> UserWLTemplateView  列表视图模型 </summary>
-	 public class UserWLTemplateView
-	 {
-	 		public Guid Id { get; set; }
-	 		public string TemplateName { get; set; }
-	 		public Guid UserId { get; set; }
-	 		public DateTime CreateTime { get; set; }
-	 		public Guid CreateUserId { get; set; }
-	 		public int WW { get; set; }
-	 		public int WL { get; set; }
-		    public int ShowOrder { get; set; } = 0;
-	 		public bool IsPitchOn { get; set; }
-	      }
+{
+    /// <summary> UserWLTemplateView  列表视图模型 </summary>
+    public class UserWLTemplateView
+    {
+        public Guid Id { get; set; }
+        public string TemplateName { get; set; }
+        public Guid UserId { get; set; }
+        public DateTime CreateTime { get; set; }
+        public Guid CreateUserId { get; set; }
+        public int WW { get; set; }
+        public int WL { get; set; }
+        public int ShowOrder { get; set; } = 0;
+        public bool IsPitchOn { get; set; }
+    }
 
-	///<summary>UserWLTemplateQuery  列表查询参数模型</summary>
-	public class UserWLTemplateQuery
-	{
-		///<summary> TemplateName</summary>
+    ///<summary>UserWLTemplateQuery  列表查询参数模型</summary>
+    public class UserWLTemplateQuery
+    {
+        ///<summary> TemplateName</summary>
 
 
-	}
+    }
 
-	public class SetAutoCutNextTaskInDto
-	{
-		public bool AutoCutNextTask { get; set; }
-	}
+    public class SetAutoCutNextTaskInDto
+    {
+        public bool AutoCutNextTask { get; set; }
+    }
+
+    ///<summary> UserWLTemplateAddOrEdit  列表查询参数模型</summary>
+    public class UserWLTemplateAddOrEdit
+    {
+        public Guid? Id { get; set; }
+        public string TemplateName { get; set; }
+        public Guid UserId { get; set; }
+        public DateTime CreateTime { get; set; }
+        public Guid CreateUserId { get; set; }
+        public int WW { get; set; }
+        public int WL { get; set; }
+        //public int ShowOrder { get; set; }
+        //public bool IsPitchOn { get; set; }
+    }
 
-	///<summary> UserWLTemplateAddOrEdit  列表查询参数模型</summary>
-	public class  UserWLTemplateAddOrEdit
-	 {
-	 		public Guid? Id { get; set; }
-	 		public string TemplateName { get; set; }
-	 		public Guid UserId { get; set; }
-	 		public DateTime CreateTime { get; set; }
-	 		public Guid CreateUserId { get; set; }
-	 		public int WW { get; set; }
-	 		public int WL { get; set; }
-	 		//public int ShowOrder { get; set; }
-	 		//public bool IsPitchOn { get; set; }
-	      } 
 
-	 
 }
 
 

IRaCIS.Core.Application/Service/Reading/Dto/VisitTaskDto.cs

@@ -1,12 +1,7 @@
 using IRaCIS.Core.Domain.Share;
 using Newtonsoft.Json;
-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.Application.Service.Reading.Dto
 {
@@ -231,7 +226,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public bool IsAnalysisCreate { get; set; }
 
 
-      
+
 
         /// <summary>
         /// 转换之前的任务Id(转化的任务才有该值)
@@ -241,7 +236,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         // [Projectable]
 
-         public bool IsConvertedTask { get; set; }
+        public bool IsConvertedTask { get; set; }
 
         //[NotMapped]
         //public List<CrterionDictionaryGroup> CrterionDictionaryGroup
@@ -296,7 +291,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         //前序任务需要签名 但是未签名
         public bool IsFrontTaskNeedSignButNotSign { get; set; }
 
-     
+
         /// <summary>
         /// 裁判结果图片地址
         /// </summary>