uat-标注-28

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             //要根据标准阅片顺序，确定是否查询单个任务的，还是查询所有的
             var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId)
-                 .Select(t => new { t.IsReadingTaskViewInOrder, t.Trial.Modalitys,t.IsImageFilter,t.CriterionModalitys }).FirstNotNullAsync();
+                 .Select(t => new { t.IsReadingTaskViewInOrder, t.Trial.Modalitys, t.IsImageFilter, t.CriterionModalitys }).FirstNotNullAsync();
 
             var subjectCode = string.Empty;
             var subjectId = inQuery.SubjectId;
@@ -329,7 +329,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 {
                     foreach (var item in list)
                     {
-                        item.OrginalStudyList.AddRange(item.OriginalTaskStudyList.WhereIf(criterionInfo.IsImageFilter, t=>("|" + criterionInfo.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|")));
+                        item.OrginalStudyList.AddRange(item.OriginalTaskStudyList.WhereIf(criterionInfo.IsImageFilter, t => ("|" + criterionInfo.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|")));
                     }
                 }
 
@@ -831,11 +831,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 //靶段标注删除访视影像
                 if (visitTaskId == Guid.Empty && subjectVisitId != null && subjectVisitId != Guid.Empty)
                 {
-                    var fisrtPath = await _taskInstanceRepository.Where(t => t.SubjectVisitId == subjectVisitId ).Select(t => t.Path).FirstOrDefaultAsync();
+                    var fisrtPath = await _taskInstanceRepository.Where(t => t.SubjectVisitId == subjectVisitId).Select(t => t.Path).FirstOrDefaultAsync();
                     var prefix = fisrtPath.Substring(1, fisrtPath.LastIndexOf('/') - 1);
                     await _oSSService.DeleteFromPrefix(prefix, true);
 
-                    await _taskStudyRepository.DeleteFromQueryAsync(t => t.SubjectVisitId == subjectVisitId );
+                    await _taskStudyRepository.DeleteFromQueryAsync(t => t.SubjectVisitId == subjectVisitId);
                     await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisitId == subjectVisitId);
                     await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisitId == subjectVisitId);
                 }
@@ -961,7 +961,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                             Path = t.Path
                         }).ToList(),
 
-                        ReadingFileCount = u.FileCount,
+                        ReadingFileCount = u.NoneDicomFileList.Where(t => t.IsReading).Count(),
 
                     }).ToList();
 
@@ -1013,7 +1013,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                 ImageDate = ns.ImageDate,
                                 BodyPart = ns.BodyPart,
                                 BodyPartForEditOther = ns.BodyPartForEditOther,
-                                FileCount = ns.FileCount,
+
                                 Modality = ns.Modality,
                                 StudyCode = ns.StudyCode,
 
@@ -1027,7 +1027,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                                     Path = t.Path
                                 }).ToList(),
 
-                                ReadingFileCount = ns.FileCount,
+                                FileCount = (inQuery.IsImageSegmentLabel == false ? ns.ImageLabelNoneDicomFileList : ns.NoneDicomFileList).Count(),
+                                ReadingFileCount = (inQuery.IsImageSegmentLabel == false ? ns.ImageLabelNoneDicomFileList : ns.NoneDicomFileList).Where(t => t.IsReading).Count(),
 
                             };