From a4eebf60cc5b4b08b17b769b65dd31eb12af3c15 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 8 Feb 2023 11:04:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=8F=E5=88=97=E8=BF=94=E5=9B=9E=E7=AA=97?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=8A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/VisitTaskService.cs                   | 2 +-
 .../Service/ImageAndDoc/DTO/DicomSeriesModel.cs              | 4 ++++
 IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 1d5f2ac7c..9a606e0c4 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -694,7 +694,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
             var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId && t.IsAnalysisCreate == false)
                 //.Where(t => t.IsAnalysisCreate == false && t.DoctorUserId != null)
 
-                .WhereIf(queryVisitTask.TaskState != null, t => t.TaskState == queryVisitTask.TaskState)
+               .WhereIf(queryVisitTask.TaskState != null, t => t.TaskState == queryVisitTask.TaskState)
                .WhereIf(queryVisitTask.SiteId != null, t => t.Subject.SiteId == queryVisitTask.SiteId)
                .WhereIf(queryVisitTask.SubjectId != null, t => t.SubjectId == queryVisitTask.SubjectId)
                .WhereIf(queryVisitTask.IsUrgent != null, t => t.IsUrgent == queryVisitTask.IsUrgent)
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs
index be345a98e..eca8d7fb8 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs
@@ -36,6 +36,10 @@
         public List<Guid> InstanceList { get; set; } = new List<Guid>();
 
         public List<string> InstancePathList { get; set; } = new List<string>();
+
+        //存放在instance 上面
+        public string WindowCenter { get; set; } = string.Empty;
+        public string WindowWidth { get; set; } = string.Empty;
     }
 
     public class DicomSeriesWithLabelDTO : DicomSeriesDTO
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index d465c4388..fa6c0c65f 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -400,7 +400,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, t.NumberOfFrames }).ToListAsync();
+                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames,t.WindowCenter,t.WindowWidth }).ToListAsync();
 
 
 
@@ -441,6 +441,9 @@ namespace IRaCIS.Core.Application.Services
                             }
                         })
                         .ToList();
+
+                    series.WindowWidth = instanceList.FirstOrDefault()?.WindowWidth;
+                    series.WindowCenter = instanceList.FirstOrDefault()?.WindowCenter;
                 });
 
                 //设置为阅片与否 不更改数据库检查  的instance数量 和 SeriesCount  所以这里要实时统计