多帧配合玲姐修改模块1

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

@@ -33,19 +33,43 @@
         public bool IsDeleted { get; set; }
         public bool IsReading { get; set; } = true;
 
+
+        public List<InstanceBasicInfo> InstanceInfoList { get; set; }
+
+        public bool IsExistMutiFrames => InstanceInfoList.Any(t => t.NumberOfFrames > 1);
+
+
+        #region 以后废弃
+
         public List<Guid> InstanceList { get; set; } = new List<Guid>();
 
         public List<string> InstancePathList { get; set; } = new List<string>();
 
         public List<string> InstanceHtmlPathList { get; set; }
 
+
+
         //存放在instance 上面
         public string WindowCenter { get; set; } = string.Empty;
         public string WindowWidth { get; set; } = string.Empty;
+        #endregion
+
+
 
         public string ImageResizePath { get; set; } 
     }
 
+    public class InstanceBasicInfo
+    {
+        public Guid Id { get; set; }
+
+        public string Path { get; set; }
+
+        public string HtmlPath { get; set; }
+
+        public int NumberOfFrames { get; set; }
+    }
+
     public class DicomSeriesWithLabelDTO : DicomSeriesDTO
     {
         public bool HasLabel { get; set; } = false;

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

@@ -281,42 +281,22 @@ 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.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
-                    series.InstanceHtmlPathList = instanceList.Where(t => t.SeriesId == series.Id && t.HtmlPath != string.Empty).OrderBy(t => t.InstanceNumber).Select(k => k.HtmlPath).ToList();
+                    new InstanceBasicInfo()
-
-
-                    //处理多帧
-                    series.InstancePathList = instanceList.OrderBy(t => t.InstanceNumber).Where(s => s.SeriesId == series.Id)
-                        .SelectMany(u =>
                     {
-
+                        Id = k.Id,
-                            if (u.NumberOfFrames > 1)
+                        NumberOfFrames = k.NumberOfFrames,
-                            {
+                        HtmlPath = k.HtmlPath,
-                                var pathList = new List<string>();
+                        Path = k.Path
-
+                    }).ToList();
-                                for (int i = 1; i <= u.NumberOfFrames; i++)
-                                {
-                                    pathList.Add(u.Path + "?frame=" + (i - 1));
-                                }
-                                return pathList;
-                            }
-                            else
-                            {
-                                return new List<string> { u.Path };
-
-                            }
-                        })
-                        .ToList();
-
                 }
 
                 );
 
                 //设置为阅片与否 不更改数据库检查  的instance数量 和 SeriesCount  所以这里要实时统计
                 t.SeriesCount = t.SeriesList.Count;
-                t.InstanceCount = t.SeriesList.SelectMany(t => t.InstanceList).Count();
+                t.InstanceCount = t.SeriesList.SelectMany(t => t.InstanceInfoList).Count();
             }