修改肿瘤学

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

@@ -64,6 +64,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         [NotDefault]
         public Guid TrialReadingCriterionId { get; set; }
 
+        /// <summary>
+        /// 阅片配置的类型
+        /// </summary>
+        public ReadingSetType ReadingSetType { get; set; }
+
         public Guid Id { get; set; }
     }
 

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

@@ -98,7 +98,8 @@ namespace IRaCIS.Application.Services
             var resultlist = await visitQuery.WhereIf(finalVisitNum != null && finalVisitNum != 0, x => x.VisitNum <= finalVisitNum)
                  .Where(x => x.VisitNum > mixReadVisitNum)
                  .Where(x => !x.IsBaseLine) // 排除基线
-                 .Where(x => readModulequery.Where(y => y.Id != inDto.Id && y.SubjectVisitId == x.Id && y.TrialReadingCriterionId == inDto.TrialReadingCriterionId && y.ReadingSetType == ReadingSetType.ImageReading).Count() == 0)
+                 .WhereIf(inDto.ReadingSetType == ReadingSetType.TumorReading, x => readModulequery.Where(y => y.SubjectVisitId == x.Id && y.TrialReadingCriterionId == inDto.TrialReadingCriterionId && y.ReadingSetType == ReadingSetType.ImageReading).Count() > 0)
+                 .WhereIf(inDto.ReadingSetType == ReadingSetType.ImageReading, x => readModulequery.Where(y => y.Id != inDto.Id && y.SubjectVisitId == x.Id && y.TrialReadingCriterionId == inDto.TrialReadingCriterionId && y.ReadingSetType == ReadingSetType.ImageReading).Count() == 0)
                  .Select(x => new GetSubjectReadVisitsOutDto()
                  {
                      SubjectVisitId = x.Id,