Compare commits
No commits in common. "9356e6ed7e025adb76fe7b0ced730efd1497f575" and "f744124f17e4c5470ba8b7d6238f4ab5713a3cfd" have entirely different histories.
9356e6ed7e
...
f744124f17
|
|
@ -90,7 +90,6 @@ namespace IRaCIS.Core.Application.Service
|
||||||
.ForMember(o => o.IsReading, t => t.MapFrom(u => u.DicomSerie.IsReading));
|
.ForMember(o => o.IsReading, t => t.MapFrom(u => u.DicomSerie.IsReading));
|
||||||
CreateMap<DicomStudy, DicomStudyDTO>();
|
CreateMap<DicomStudy, DicomStudyDTO>();
|
||||||
CreateMap<DicomSeries, DicomSeriesDTO>();
|
CreateMap<DicomSeries, DicomSeriesDTO>();
|
||||||
CreateMap<SCPSeries, DicomSeriesDTO>();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,43 +69,6 @@ namespace IRaCIS.Application.Services
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public async Task<IResponseOutput<List<DicomSeriesDTO>>> GetPatientSeriesList(Guid scpStudyId,
|
|
||||||
[FromServices] IRepository<SCPSeries> _seriesRepository,
|
|
||||||
[FromServices] IRepository<SCPInstance> _instanceRepository
|
|
||||||
)
|
|
||||||
{
|
|
||||||
|
|
||||||
var seriesList = await _seriesRepository.Where(s => s.StudyId == scpStudyId).OrderBy(s => s.SeriesNumber).
|
|
||||||
ThenBy(s => s.SeriesTime).ThenBy(s => s.CreateTime)
|
|
||||||
.ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).ToListAsync();
|
|
||||||
|
|
||||||
var instanceList = await _instanceRepository.Where(s => s.StudyId == scpStudyId).OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber)
|
|
||||||
.ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
|
|
||||||
.Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber }).ToListAsync();//.GroupBy(u => u.SeriesId);
|
|
||||||
|
|
||||||
foreach (var series in seriesList)
|
|
||||||
{
|
|
||||||
|
|
||||||
series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
|
|
||||||
new InstanceBasicInfo()
|
|
||||||
{
|
|
||||||
Id = k.Id,
|
|
||||||
NumberOfFrames = k.NumberOfFrames,
|
|
||||||
//HtmlPath = string.Empty,
|
|
||||||
Path = k.Path,
|
|
||||||
InstanceNumber = k.InstanceNumber,
|
|
||||||
|
|
||||||
}).ToList();
|
|
||||||
}
|
|
||||||
|
|
||||||
var study = await _scpStudyRepository.FindAsync(scpStudyId);
|
|
||||||
|
|
||||||
return ResponseOutput.Ok(seriesList, study);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// scp 影像推送记录表
|
/// scp 影像推送记录表
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue