From 1e4d6419d2033480545b1c9a3b270a0392a40806 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 16 Nov 2022 16:08:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Visit/SubjectVisitService.cs | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index 305e663e8..8b6a980ce 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -253,31 +253,40 @@ namespace IRaCIS.Core.Application.Services var thisSeriesIdIds = thisRowinfo.Where(x=>x.SeriesId!=null).Select(x => x.SeriesId).ToList(); if (thisRowinfo.Count>0) { - var lastVisitTaskStudy= await _repository.Where(t => thisStudyIds.Contains(t.Id)).Select(k => new VisitStudyDTO() + var thisVisitTaskStudy= await _repository.Where(t => thisStudyIds.Contains(t.Id)).Select(k => new VisitStudyDTO() { InstanceCount = k.InstanceCount, - Modalities = k.Modalities, + SeriesCount = k.SeriesCount, - StudyCode = k.StudyCode, + StudyId = k.Id, IsCriticalSequence=true, }).FirstOrDefaultAsync(); - if (lastVisitTaskStudy != null) + if (thisVisitTaskStudy != null) { - lastVisitTaskStudy.SeriesList = await _repository.Where(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber). + var item = await _repository.Where(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber). ThenBy(s => s.SeriesTime) - .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); - lastVisitTaskStudy.SeriesCount = lastVisitTaskStudy.SeriesList.Count(); + .ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync(); - lastVisitTaskStudy.SeriesList.ForEach(x => + if (item != null) { - x.InstanceList = thisRowinfo.Where(y => y.SeriesId == x.Id&&y.InstanceId!=null).Select(y => y.InstanceId.Value).ToList(); - x.InstanceCount = x.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).ToList(); + x.InstanceCount = x.InstanceList.Count(); + }); + + + } + result.Add(thisVisitTaskStudy); + } - result.Add(lastVisitTaskStudy); + } }