质控预览再次修改0214

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -212,6 +212,13 @@ namespace IRaCIS.Core.Application.Services
         [AllowAnonymous]
         public async Task<List<VisitStudyDTO>> GetVisitStudyList(Guid trialId, Guid sujectVisitId, int isReading, [FromQuery] Guid? visitTaskId)
         {
+
+            var qcAuditState = await _subjectVisitRepository.Where(s => s.Id == sujectVisitId).Select(t => t.AuditState).FirstOrDefaultAsync();
+
+            //质控通过以后，过滤删除的   质控之前的不过滤
+            var isQCFinished = qcAuditState == AuditStateEnum.QCPassed;
+
+
             var isImageFilter = false;
             var criterionModalitys = "";
             if (visitTaskId != null)
@@ -238,12 +245,15 @@ namespace IRaCIS.Core.Application.Services
 
             var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId)).IgnoreQueryFilters()
                    .WhereIf(isReading == 1, s => s.IsReading && s.IsDeleted == false)
+                   .WhereIf(isQCFinished, t => t.IsDeleted == false)
                    .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.HtmlPath, t.IsReading, t.IsDeleted }).ToListAsync();
 
             foreach (var t in studyList)
             {
                 t.SeriesList = await _dicomSeriesRepository.Where(s => s.StudyId == t.StudyId).IgnoreQueryFilters()
-               .WhereIf(isReading == 1, s => s.IsReading && s.IsDeleted == false).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime)
+               .WhereIf(isReading == 1, s => s.IsReading && s.IsDeleted == false)
+                .WhereIf(isQCFinished, t => t.IsDeleted == false)
+               .OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime)
                .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();