uat-标注-13

2025-11-26 16:45:08 +08:00
parent 00255e902c
commit 6705cf0fc0
4 changed files with 72 additions and 20 deletions
@@ -224,27 +224,42 @@ namespace IRaCIS.Core.Application.Services

            var isImageFilter = false;
            var criterionModalitys = "";
+            var criterionType = CriterionType.NoCriterion;
+
+            var isVisitTask = false;
+
+            bool? isImageSegmentLabel = null;
            if (visitTaskId != null && visitTaskId != Guid.Empty)
            {
+                isVisitTask = true;
                var info = await _visitTaskRepository.Where(t => t.Id == visitTaskId)
-                    .Select(t => new { t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys }).FirstNotNullAsync();
+                    .Select(t => new { t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys, t.TrialReadingCriterion.CriterionType }).FirstNotNullAsync();
                isImageFilter = info.IsImageFilter;
                criterionModalitys = info.CriterionModalitys;
+
+                criterionType = info.CriterionType;
+
+                if (criterionType == CriterionType.OCT || criterionType == CriterionType.IVUS)
+                {
+                    isImageSegmentLabel = true;
+                }
            }



            var studyList = await _dicomStudyRepository.Where(t => t.TrialId == trialId && t.SubjectVisitId == sujectVisitId).IgnoreQueryFilters()
-            .Where(t => isImageFilter ? ("|" + criterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") : true)
-            .WhereIf(isReading == 1 || isQCFinished, s => s.IsDeleted == false)
-                .Select(k => new VisitStudyDTO()
-                {
-                    InstanceCount = k.InstanceCount,
-                    Modalities = k.Modalities,
-                    //SeriesCount = k.SeriesCount,
-                    StudyCode = k.StudyCode,
-                    StudyId = k.Id
-                }).ToListAsync();
+          .Where(t => isImageFilter ? ("|" + criterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") : true)
+          .WhereIf(isReading == 1 || isQCFinished, s => s.IsDeleted == false)
+          //预览靶段标注上传的影像 影像后处理  上传了新的影像 还要原始dsa
+          .WhereIf(isImageSegmentLabel == true && isVisitTask && (criterionType == CriterionType.OCT || criterionType == CriterionType.IVUS), t => t.ModalityForEdit == "XA")
+          .Select(k => new VisitStudyDTO()
+          {
+              InstanceCount = k.InstanceCount,
+              Modalities = k.Modalities,
+              //SeriesCount = k.SeriesCount,
+              StudyCode = k.StudyCode,
+              StudyId = k.Id
+          }).ToListAsync();

            var studyIds = studyList.Select(t => t.StudyId).ToList();

@@ -287,12 +302,29 @@ namespace IRaCIS.Core.Application.Services
                t.InstanceCount = t.SeriesList.SelectMany(t => t.InstanceInfoList).Count();
            }

+            //预览靶段标注上传的影像
+            if (isImageSegmentLabel == true && isVisitTask)
+            {
+                var taskStudyList = await _taskStudyRepository.Where(t => t.SubjectVisitId == sujectVisitId)
+                   .WhereIf(isImageFilter, t => ("|" + criterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|"))
+                   .ProjectTo<VisitStudyDTO>(_mapper.ConfigurationProvider).ToListAsync();
+
+                foreach (var study in taskStudyList)
+                {
+                    study.SeriesList = study.SeriesList.OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ToList();
+
+                    study.InstanceCount = study.SeriesList.SelectMany(t => t.InstanceInfoList).Count();
+                }
+
+                studyList.AddRange(taskStudyList);
+            }



            return studyList.Where(x => x.SeriesList.Count() > 0).ToList();

-            //return ResponseOutput.Ok(studyList.Where(t => t.SeriesList.Count > 0).ToList());
+
+

        }