影像阅片排序换到后端做

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs

@@ -108,6 +108,10 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
         public string WindowCenter { get; set; }
         [JsonIgnore]
         public string WindowWidth { get; set; }
+        [JsonIgnore]
+        public string ImagePositionPatient { get; set; }
+        [JsonIgnore]
+        public string ImageOrientationPatient { get; set; }
 
         public DateTime? RowDate { get; set; }
     }

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

@@ -2,6 +2,7 @@
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Contracts.Dicom.DTO;
 using IRaCIS.Core.Application.Filter;
+using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Domain.Models;
@@ -254,7 +255,7 @@ namespace IRaCIS.Core.Application.Services
           .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" || t.ModalityForEdit == "DSA"  || t.ModalityForEdit == "OCT")
+          .WhereIf(isImageSegmentLabel == true && isVisitTask && (criterionType == CriterionType.OCT || criterionType == CriterionType.IVUS), t => t.ModalityForEdit == "XA" || t.ModalityForEdit == "DSA" || t.ModalityForEdit == "OCT")
           .Select(k => new VisitStudyDTO()
           {
               InstanceCount = k.InstanceCount,
@@ -362,7 +363,7 @@ namespace IRaCIS.Core.Application.Services
             }
             else
             {
-                 series = await _taskSeriesRepository .Where(s => s.Id == inDto.SeriesId).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+                series = await _taskSeriesRepository.Where(s => s.Id == inDto.SeriesId).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
                 var instanceList = await _taskInstanceRepository.Where(t => t.SeriesId == inDto.SeriesId)
                           .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.SliceLocation, t.FileSize }).ToListAsync();
@@ -556,13 +557,13 @@ namespace IRaCIS.Core.Application.Services
                 .WhereIf(isManualGenerate, t => t.SubjectCriteriaEvaluationVisitStudyFilterList.Any(t => t.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId && t.IsConfirmed && t.IsReading))
                 //影像后处理  上传了新的影像 还要原始dsa
                 .WhereIf(taskInfo.IsHaveTaskStudy && taskInfo.CriterionType == CriterionType.OCT,
-                t => t.ModalityForEdit == "XA" || t.ModalityForEdit == "DSA" )
+                t => t.ModalityForEdit == "XA" || t.ModalityForEdit == "DSA")
 
                  .WhereIf(taskInfo.CriterionType == CriterionType.IVUS,
-                t => t.ModalityForEdit == "XA" || t.ModalityForEdit == "DSA"  || t.ModalityForEdit == "IVUS")
+                t => t.ModalityForEdit == "XA" || t.ModalityForEdit == "DSA" || t.ModalityForEdit == "IVUS")
 
                   .WhereIf(taskInfo.IsHaveTaskStudy == false && taskInfo.CriterionType == CriterionType.OCT,
-                t => t.ModalityForEdit == "XA" || t.ModalityForEdit == "DSA"  || t.ModalityForEdit == "OCT")
+                t => t.ModalityForEdit == "XA" || t.ModalityForEdit == "DSA" || t.ModalityForEdit == "OCT")
 
 
                 //其他 不应该看原始影像
@@ -588,7 +589,7 @@ namespace IRaCIS.Core.Application.Services
             if (studyIds.Count > 0)
             {
                 var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId) && t.IsReading)
-                    .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.IsReading, t.FileSize }).ToListAsync();
+                    .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.IsReading, t.FileSize, t.ImagePositionPatient, t.ImageOrientationPatient }).ToListAsync();
 
                 List<DicomSeriesDTO> seriesLists = await _dicomSeriesRepository.Where(s => studyIds.Contains(s.StudyId))
                      .WhereIf(isManualGenerate == false, t => t.IsReading)
@@ -597,11 +598,23 @@ namespace IRaCIS.Core.Application.Services
 
                 foreach (var t in dicomStudyList)
                 {
+
                     t.SeriesList = seriesLists.Where(s => s.StudyId == t.StudyId).OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ToList();
 
                     t.SeriesList.ForEach(series =>
                     {
-                        series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
+
+                        var instances = instanceList.Where(x => x.SeriesId == series.Id);
+
+                        // ⭐ DICOM 空间排序（带兜底）
+                        var sorted = DicomSortHelper.SortSlices(
+                            instances,
+                            x => x.ImagePositionPatient,
+                            x => x.ImageOrientationPatient,
+                            x => x.InstanceNumber
+                        );
+
+                        series.InstanceInfoList = sorted.Select(k =>
                        new InstanceBasicInfo()
                        {
                            Id = k.Id,
@@ -642,6 +655,20 @@ namespace IRaCIS.Core.Application.Services
                 {
                     study.SeriesList = study.SeriesList.OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ToList();
 
+                    study.SeriesList.ForEach(series =>
+                    {
+
+                        // ⭐ DICOM 空间排序（带兜底）
+                        var sorted = DicomSortHelper.SortSlices(
+                            series.InstanceInfoList,
+                            x => x.ImagePositionPatient,
+                            x => x.ImageOrientationPatient,
+                            x => x.InstanceNumber
+                        );
+
+                        series.InstanceInfoList = sorted;
+                    });
+
                     study.InstanceCount = study.SeriesList.SelectMany(t => t.InstanceInfoList).Count();
                 }
 
@@ -823,7 +850,7 @@ namespace IRaCIS.Core.Application.Services
 
                 var instanceCount = await _noneDicomStudyFileRepository.Where(t => t.IsReading)
                     .WhereIf(taskInfo.IsHaveTaskNoneDicomStudyFile == false && taskInfo.IsMarkNoneDicomStudy == true, x => x.ImageLabelNoneDicomStudyId == item.StudyId)
-                    .WhereIf(taskInfo.IsHaveTaskNoneDicomStudyFile && taskInfo.IsMarkNoneDicomStudy, x => x.OriginNoneDicomStudyId == item.StudyId && x.VisitTaskId==indto.VisitTaskId)
+                    .WhereIf(taskInfo.IsHaveTaskNoneDicomStudyFile && taskInfo.IsMarkNoneDicomStudy, x => x.OriginNoneDicomStudyId == item.StudyId && x.VisitTaskId == indto.VisitTaskId)
                     .WhereIf(taskInfo.IsHaveTaskNoneDicomStudyFile == false && taskInfo.IsMarkNoneDicomStudy == false, x => x.NoneDicomStudyId == item.StudyId)
                     .Where(t => !t.FileType.Contains(StaticData.FileType.Zip))
                     .CountAsync();