阅片期修改

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

@@ -46,12 +46,20 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class GetReadModulePageListInDto : PageInput
     {
         public Guid TrialId { get; set; }
+
+        public Guid TrialReadingCriterionId { get; set; }
+
+        /// <summary>
+        /// 阅片期名称
+        /// </summary>
+        public string ModuleName { get; set; } = string.Empty;
+
         public string SubjectCode { get; set; }
 
         public string VisitName { get; set; }
 
-        [NotDefault]
-        public Guid TrialReadingCriterionId { get; set; }
+
+
         /// <summary>
         /// 阅片配置的类型
         /// </summary>
@@ -59,54 +67,60 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public ReadModuleAddType? ReadModuleAddTypeEnum { get; set; }
     }
+
+
     public class GetReadModulePageListOutDto
     {
-        public Guid SubjectId { get; set; }
 
-        public string SubjectCode { get; set; }
+        public Guid Id { get; set; }
 
-        public Guid TrialReadingCriterionId { get; set; }
-
-
-        public ModuleTypeEnum ModuleType { get; set; }
-
-        public string VisitName { get; set; } = string.Empty;
-
-
-        public string ModuleName { get; set; } = string.Empty;
-
-
-        public bool? IsUrgent { get; set; }
-
-        public Guid SubjectVisitId { get; set; }
-
-        public Guid? ReadingPeriodSetId { get; set; }
-
-        public Guid TrialId { get; set; }
-        public bool IsCRCConfirm { get; set; } = false;
-
-        public bool IsPMConfirm { get; set; } = false;
-
-        public bool IsNotNeedPMConfirm { get; set; } = false;
-
-
-        public bool IsCRCApplicationRevoke { get; set; } = false;
-        [Comment("临床数据是否完整")]
-        public bool? IsClinicalDataComplete { get; set; }
-
-        [Comment("临床数据是否盲化")]
-        public bool? IsClinicalDataBlind { get; set; }
-
-        [Comment("阅片配置的类型")]
+        /// <summary>
+        /// 阅片期类型
+        /// </summary>
         public ReadingSetType ReadingSetType { get; set; }
 
         /// <summary>
-        /// 添加方式
+        /// 阅片期名称
+        /// </summary>
+        public string ModuleName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 中心编号
+        /// </summary>
+        public string SiteCode { get; set; }
+
+        /// <summary>
+        /// 受试者编号
+        /// </summary>
+
+        public string SubjectCode { get; set; }
+
+        /// <summary>
+        /// 访视名称
+        /// </summary>
+        public string VisitName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 最晚拍片日期
+        /// </summary>
+        public DateTime? LatestScanDate { get; set; }
+
+
+        /// <summary>
+        /// 来源
         /// </summary>
         public ReadModuleAddType ReadModuleAddTypeEnum { get; set; } = ReadModuleAddType.Normal;
 
+        /// <summary>
+        /// 是否生成任务
+        /// </summary>
+        public bool IsGenerateTask { get; set; }
+
+        /// <summary>
+        /// 生成任务时间
+        /// </summary>
+        public DateTime? GenerateTaskTime { get; set; }
 
-        public ReadingStatusEnum ReadingStatus { get; set; } = ReadingStatusEnum.TaskAllocate;
     }
 
     public class GetSubjectReadVisitsOutDto

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

@@ -138,11 +138,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         public List<Guid> SubjectVisitIdList { get; set; } = new List<Guid>();
 
-        /// <summary>
-        /// 是否加入阅片计划
-        /// </summary>
-        public bool IsJoin { get; set; }
-
         public Guid Id { get; set; }
     }
 
@@ -283,6 +278,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public bool? IsGenerate { get; set; }
 
+        /// <summary>
+        /// 是否生成任务
+        /// </summary>
+        public bool? IsGenerateTask { get; set; }
+
+        /// <summary>
+        /// 生成时间
+        /// </summary>
+        public DateTime? GeneratedTime { get; set; }
+
     }
 
     public class ReadingPeriodSetView
@@ -431,6 +436,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class AddReadModuleVisitInfo
     {
         public Guid SubjectId { get; set; }
+
+        public Guid? ReadingPeriodPlanId { get; set; }
         public bool IsUrgent { get; set; }
         public Guid SubjectVisitId { get; set; }