添加 阅片期添加类型字段

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -1965,6 +1965,7 @@ namespace IRaCIS.Core.Application.Image.QA
                                 SubjectVisitId = dbSubjectVisit.Id,
                                 ModuleName = $"G-{dbSubjectVisit.VisitName}",
                                 ModuleType = ModuleTypeEnum.Global,
+                                ReadModuleAddTypeEnum= dbSubjectVisit.PDState == PDStateEnum.PDProgress? ReadModuleAddType.PDConfirmation : ReadModuleAddType.FinalVisit,
                                 IsUrgent = dbSubjectVisit.IsUrgent,
                                 TrialId = dbSubjectVisit.TrialId,
                                 SubjectId = dbSubjectVisit.SubjectId

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

@@ -43,6 +43,72 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
     }
 
+    public class GetReadModulePageListInDto : PageInput
+    {
+        public Guid TrialId { get; set; }
+        public string SubjectCode { get; set; }
+
+        public string VisitName { get; set; }
+
+        [NotDefault]
+        public Guid TrialReadingCriterionId { get; set; }
+        /// <summary>
+        /// 阅片配置的类型
+        /// </summary>
+        public ReadingSetType? ReadingSetType { get; set; }
+
+        public ReadModuleAddType? ReadModuleAddTypeEnum { get; set; }
+    }
+    public class GetReadModulePageListOutDto
+    {
+        public Guid SubjectId { get; set; }
+
+        public string SubjectCode { 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("阅片配置的类型")]
+        public ReadingSetType ReadingSetType { get; set; }
+
+        /// <summary>
+        /// 添加方式
+        /// </summary>
+        public ReadModuleAddType ReadModuleAddTypeEnum { get; set; } = ReadModuleAddType.Normal;
+
+
+        public ReadingStatusEnum ReadingStatus { get; set; } = ReadingStatusEnum.TaskAllocate;
+    }
+
     public class GetSubjectReadVisitsOutDto
     {
         public Guid SubjectVisitId { get; set; }

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs

@@ -826,6 +826,28 @@ namespace IRaCIS.Core.Application.Service
         //}
 
 
+        /// <summary>
+        /// 获取读片模块分页列表  //加了标准参数
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<PageOutput<GetReadModulePageListOutDto>> GetReadModulePageList(GetReadModulePageListInDto inDto)
+        {
+
+            var readModuleQueryable = _readModuleRepository
+                                  .Where(x => x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
+                                  .WhereIf(inDto.ReadModuleAddTypeEnum != null, x => x.ReadModuleAddTypeEnum == inDto.ReadModuleAddTypeEnum)
+                                       .WhereIf(inDto.ReadingSetType != null, x => x.ReadingSetType == inDto.ReadingSetType)
+                                     .WhereIf(inDto.SubjectCode.IsNotNullOrEmpty(), x => x.Subject.Code.Contains(inDto.SubjectCode))
+                                          .WhereIf(inDto.VisitName.IsNotNullOrEmpty(), x => x.SubjectVisit.VisitName.Contains(inDto.VisitName))
+                                     .ProjectTo<GetReadModulePageListOutDto>(_mapper.ConfigurationProvider);
+
+            var pageList = await readModuleQueryable.ToPagedListAsync(inDto);
+      
+            return pageList;
+        }
+
 
         /// <summary>
         /// 获取单条详情信息   
@@ -962,6 +984,7 @@ namespace IRaCIS.Core.Application.Service
                     SubjectId = dto.SubjectId,
                     ModuleType = moduleType,
                     IsUrgent = visit.IsUrgent,
+                    ReadModuleAddTypeEnum=ReadModuleAddType.Normal,
                     ModuleName = dto.Name,
                     SubjectVisitId = visit.Id,
                     ReadingSetType = dto.ReadingSetType,

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs

@@ -127,6 +127,8 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
+      
+
 
         /// <summary>
         /// 删除
@@ -185,6 +187,7 @@ namespace IRaCIS.Core.Application.Service
                         SubjectId = item.SubjectVisit.SubjectId,
                         ModuleType = item.ReadingPeriodSet.ReadingSetType == ReadingSetType.ImageReading ? ModuleTypeEnum.Global : ModuleTypeEnum.Oncology,
                         IsUrgent = item.SubjectVisit.IsUrgent,
+                        ReadModuleAddTypeEnum = ReadModuleAddType.ReadingPlan,
                         ModuleName = item.ReadingPeriodSet.ReadingPeriodName,
                         SubjectVisitId = item.SubjectVisitId,
                         ReadingSetType = item.ReadingPeriodSet.ReadingSetType,