Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

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

@@ -90,6 +90,7 @@ namespace IRaCIS.Core.Application.Service
                   .ForMember(o => o.IsReading, t => t.MapFrom(u => u.DicomSerie.IsReading));
             CreateMap<DicomStudy, DicomStudyDTO>();
             CreateMap<DicomSeries, DicomSeriesDTO>();
+            CreateMap<SCPSeries, DicomSeriesDTO>();
 
 
 

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

@@ -69,6 +69,43 @@ namespace IRaCIS.Application.Services
         }
 
 
+
+        public async Task<IResponseOutput<List<DicomSeriesDTO>>> GetPatientSeriesList(Guid scpStudyId,
+            [FromServices] IRepository<SCPSeries> _seriesRepository,
+            [FromServices] IRepository<SCPInstance> _instanceRepository
+            )
+        {
+
+            var seriesList = await _seriesRepository.Where(s => s.StudyId == scpStudyId).OrderBy(s => s.SeriesNumber).
+             ThenBy(s => s.SeriesTime).ThenBy(s => s.CreateTime)
+             .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
+
+            var instanceList = await _instanceRepository.Where(s => s.StudyId == scpStudyId).OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
+                        .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
+                .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber }).ToListAsync();//.GroupBy(u => u.SeriesId);
+
+            foreach (var series in seriesList)
+            {
+
+                series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
+                   new InstanceBasicInfo()
+                   {
+                       Id = k.Id,
+                       NumberOfFrames = k.NumberOfFrames,
+                       //HtmlPath = string.Empty,
+                       Path = k.Path,
+                       InstanceNumber = k.InstanceNumber,
+
+                   }).ToList();
+            }
+
+            var study = await _scpStudyRepository.FindAsync(scpStudyId);
+
+            return ResponseOutput.Ok(seriesList, study);
+        }
+
+
+
         /// <summary>
         /// scp 影像推送记录表
         /// </summary>