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(); @@ -61,7 +59,8 @@ namespace IRaCIS.Core.Application.Service CreateMap() .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 DicomStudyMonitorList { get; set; } = new List(); [JsonIgnore] - public List StudyDTFList { get; set;} = new List(); + public List SeriesList { get; set; } + [JsonIgnore] public TrialSite TrialSite { get; set; } [JsonIgnore]