修改稽查

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

@@ -216,7 +216,7 @@ namespace IRaCIS.Core.Application.Services
             var studyIds = studyList.Select(t => t.StudyId).ToList();
 
             var instanceList = await _repository.Where<DicomInstance>(t => studyIds.Contains(t.StudyId))
-                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber,t.Path }).ToListAsync();
+                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber,t.Path,t.NumberOfFrames }).ToListAsync();
 
             foreach (var t in studyList)
             {
@@ -230,7 +230,29 @@ namespace IRaCIS.Core.Application.Services
                 {
                     series.InstanceList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k => k.Id).ToList();
 
-                    series.InstancePathList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k => k.Path).ToList();
+                    //series.InstancePathList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k => k.Path).ToList();
+
+                    //处理多帧
+                    series.InstancePathList = instanceList.Where(s => s.SeriesId == series.Id)
+                        .SelectMany(u =>
+                        {
+
+                            if (u.NumberOfFrames == 1)
+                            {
+                                return new List<string> { u.Path };
+                            }
+                            else
+                            {
+                                var pathList = new List<string>();
+
+                                for (int i = 1; i <= u.NumberOfFrames; i++)
+                                {
+                                    pathList.Add(u.Path + "?NumberOfFrames=" + i);
+                                }
+                                return pathList;
+                            }
+                        })
+                        .ToList();
 
                 }
 
@@ -325,7 +347,7 @@ namespace IRaCIS.Core.Application.Services
             var studyIds = studyList.Select(t => t.StudyId).ToList();
 
             var instanceList = await _repository.Where<DicomInstance>(t => studyIds.Contains(t.StudyId))
-                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber,t.Path }).ToListAsync();
+                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber,t.Path,t.NumberOfFrames }).ToListAsync();
 
 
 
@@ -339,7 +361,31 @@ namespace IRaCIS.Core.Application.Services
 
                 t.SeriesList.ForEach(series => { 
                     series.InstanceList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k => k.Id).ToList();
-                    series.InstancePathList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k => k.Path).ToList();
+
+
+                    //series.InstancePathList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k => k.Path).ToList();
+
+                    //处理多帧
+                    series.InstancePathList = instanceList.Where(s => s.SeriesId == series.Id).OrderBy(t => t.InstanceNumber)
+                        .SelectMany(u =>
+                        {
+
+                            if (u.NumberOfFrames == 1)
+                            {
+                                return new List<string> { u.Path };
+                            }
+                            else
+                            {
+                                var pathList = new List<string>();
+
+                                for (int i = 1; i <= u.NumberOfFrames; i++)
+                                {
+                                    pathList.Add(u.Path + "?NumberOfFrames=" + i);
+                                }
+                                return pathList;
+                            }
+                        })
+                        .ToList();
                 });
 
                 //设置为阅片与否 不更改数据库检查  的instance数量 和 SeriesCount  所以这里要实时统计