From cc02e89e1b76746c1c04bcc82adb415e927aaa29 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 18 Jul 2023 11:14:20 +0800
Subject: [PATCH] =?UTF-8?q?hang-=20=E4=BF=AE=E6=94=B9CRC=20=20=E7=9C=8B?=
 =?UTF-8?q?=E5=88=B0=E7=9A=84=E6=A3=80=E6=9F=A5=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs | 7 +++----
 IRaCIS.Core.Domain/Image/DicomStudy.cs                    | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
index 9badbb824..3dca2c49c 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs
@@ -35,9 +35,7 @@ namespace IRaCIS.Core.Application.Service
             .ForMember(d => d.SiteName, u => u.MapFrom(s => s.Site.SiteName))
             .ForMember(d => d.UploaderFirstName, u => u.MapFrom(s => s.Uploader.FirstName))
             .ForMember(d => d.UploaderLastName, u => u.MapFrom(s => s.Uploader.LastName))
-              .ForMember(d => d.UploadedTime, u => u.MapFrom(s => s.CreateTime))
-
-            .ForMember(d => d.DTFCount, u => u.MapFrom(s => s.StudyDTFList.Count()));
+              .ForMember(d => d.UploadedTime, u => u.MapFrom(s => s.CreateTime));
 
             CreateMap<Subject, StudyDTO>();
 
@@ -61,7 +59,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<DicomStudy, QAStudyInfoDTO>()
                 .ForMember(o => o.UploadedTime, t => t.MapFrom(u => u.CreateTime))
                 .ForMember(o => o.Uploader, t => t.MapFrom(u => u.Uploader.LastName + " / " + u.Uploader.FirstName))
-                .ForMember(o => o.StudyId, t => t.MapFrom(u => u.Id));
+                .ForMember(o => o.StudyId, t => t.MapFrom(u => u.Id))
+                .ForMember(o => o.Modalities, t => t.MapFrom(u => string.Join('、', u.SeriesList.Select(t => t.Modality).Distinct()) ));
 
 
 
diff --git a/IRaCIS.Core.Domain/Image/DicomStudy.cs b/IRaCIS.Core.Domain/Image/DicomStudy.cs
index 861533503..a42a79b81 100644
--- a/IRaCIS.Core.Domain/Image/DicomStudy.cs
+++ b/IRaCIS.Core.Domain/Image/DicomStudy.cs
@@ -13,7 +13,8 @@ namespace IRaCIS.Core.Domain.Models
         [JsonIgnore]
         public List<StudyMonitor> DicomStudyMonitorList { get; set; } = new List<StudyMonitor>();
         [JsonIgnore]
-        public List <StudyDTF> StudyDTFList { get; set;} = new List<StudyDTF>();
+        public List<DicomSeries> SeriesList { get; set; }
+
         [JsonIgnore]
         public TrialSite TrialSite { get; set; }
         [JsonIgnore]