XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改一版

Uat_Study
he 2022-11-16 16:08:41 +08:00
parent 3b13e443bd
commit 1e4d6419d2
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -253,31 +253,40 @@ namespace IRaCIS.Core.Application.Services
var thisSeriesIdIds = thisRowinfo.Where(x=>x.SeriesId!=null).Select(x => x.SeriesId).ToList(); var thisSeriesIdIds = thisRowinfo.Where(x=>x.SeriesId!=null).Select(x => x.SeriesId).ToList();
if (thisRowinfo.Count>0) if (thisRowinfo.Count>0)
{ {
var lastVisitTaskStudy= await _repository.Where<DicomStudy>(t => thisStudyIds.Contains(t.Id)).Select(k => new VisitStudyDTO() var thisVisitTaskStudy= await _repository.Where<DicomStudy>(t => thisStudyIds.Contains(t.Id)).Select(k => new VisitStudyDTO()
{ {
InstanceCount = k.InstanceCount, InstanceCount = k.InstanceCount,
Modalities = k.Modalities,
SeriesCount = k.SeriesCount, SeriesCount = k.SeriesCount,
StudyCode = k.StudyCode,
StudyId = k.Id, StudyId = k.Id,
IsCriticalSequence=true, IsCriticalSequence=true,
}).FirstOrDefaultAsync(); }).FirstOrDefaultAsync();
if (lastVisitTaskStudy != null) if (thisVisitTaskStudy != null)
{ {
lastVisitTaskStudy.SeriesList = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber). var item = await _repository.Where<DicomSeries>(s => thisSeriesIdIds.Contains(s.Id)).OrderBy(s => s.SeriesNumber).
ThenBy(s => s.SeriesTime) ThenBy(s => s.SeriesTime)
.ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync(); .ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
lastVisitTaskStudy.SeriesCount = lastVisitTaskStudy.SeriesList.Count();
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(); thisVisitTaskStudy.SeriesList.Add(item);
x.InstanceCount = x.InstanceList.Count(); 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);
} }
} }