diff --git a/IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs b/IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs index ff508d461..a59bc54b2 100644 --- a/IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs +++ b/IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs @@ -63,6 +63,9 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject.DTO public decimal VisitTaskNum { get; set; } public int ImageStudyState { get; set; } + + public Guid TrialReadingCriterionId { get; set; } + public string TrialReadingCriterionName { get; set; } } public class UpdateTaskImageStateCommand @@ -86,6 +89,9 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject.DTO public string StudyCode { get; set; } + + public List ModalitySeriesList => SeriesModalityList.GroupBy(t=>t.Modality).Select(g=>new ModalitySeriesIdList() { Modality= g.Key,SeriesIdList=g.Select(t=>t.SeriesId).ToList() }).ToList(); + public List SeriesModalityList { get; set; } } @@ -97,6 +103,13 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject.DTO public List SeriesIdList { get; set; } } + + public class ModalitySeriesIdList + { + public string Modality { get; set; } + + public List SeriesIdList { get; set; } + } public class SeriesModality { public Guid SeriesId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Third-partyProject/_MapConfig.cs b/IRaCIS.Core.Application/Service/Third-partyProject/_MapConfig.cs index 582212586..900ca913f 100644 --- a/IRaCIS.Core.Application/Service/Third-partyProject/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Third-partyProject/_MapConfig.cs @@ -20,7 +20,9 @@ namespace IRaCIS.Core.Application.Service .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode)) .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code)) .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName)) - .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName)); + .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName)) + .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName)) + ; } }