diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs index 393991169..3be404ccf 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs @@ -938,6 +938,9 @@ namespace IRaCIS.Application.Services }); await _readingQuestionTrialRepository.AddRangeAsync(trialQuestionList); + + + // await _readingQuestionTrialRepository.SaveChangesAsync(); } diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index 2c7ca2104..08968b6bc 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -21,6 +21,7 @@ namespace IRaCIS.Core.Application.Services private readonly IRepository _trialRepository; private readonly IRepository _readingPeriodSetRepository; private readonly IRepository _noneDicomStudyRepository; + private readonly IRepository _dicomInstanceRepository; private readonly IRepository _visitTaskRepository; private readonly IRepository _readingTableAnswerRowInfoRepository; private readonly IRepository _noneDicomStudyFileRepository; @@ -32,6 +33,7 @@ namespace IRaCIS.Core.Application.Services IRepository trialRepository, IRepository readingPeriodSetRepository, IRepository noneDicomStudyRepository, + IRepository dicomInstanceRepository, IRepository visitTaskRepository, IRepository readingTableAnswerRowInfoRepository, IRepository noneDicomStudyFileRepository, @@ -43,6 +45,7 @@ namespace IRaCIS.Core.Application.Services this._trialRepository = trialRepository; this._readingPeriodSetRepository = readingPeriodSetRepository; this._noneDicomStudyRepository = noneDicomStudyRepository; + this._dicomInstanceRepository = dicomInstanceRepository; this._visitTaskRepository = visitTaskRepository; this._readingTableAnswerRowInfoRepository = readingTableAnswerRowInfoRepository; this._noneDicomStudyFileRepository = noneDicomStudyFileRepository; @@ -282,14 +285,15 @@ namespace IRaCIS.Core.Application.Services if (item != null) { item.SeriesInstanceUid = string.Empty; + item.InstanceList = thisRowinfo.Where(y => y.InstanceId != null).Select(y => y.InstanceId.Value).Distinct().ToList(); + item.InstancePathList = await _dicomInstanceRepository.Where(x => item.InstanceList.Contains(x.Id)).Select(x => x.Path).ToListAsync(); + item.InstanceCount = item.InstanceList.Count(); + thisVisitTaskStudy.SeriesList.Add(item); thisVisitTaskStudy.SeriesCount = thisVisitTaskStudy.SeriesList.Count(); - thisVisitTaskStudy.SeriesList.ForEach(x => - { - x.InstanceList = thisRowinfo.Where(y => y.InstanceId != null).Select(y => y.InstanceId.Value).Distinct().ToList(); - x.InstanceCount = x.InstanceList.Count(); - }); + + }