Merge branch 'Test.Study' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.Study
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
c54074dd3d
|
@ -531,12 +531,22 @@ namespace IRaCIS.Core.Application.Services
|
||||||
foreach (var item in noDicomStudyList)
|
foreach (var item in noDicomStudyList)
|
||||||
{
|
{
|
||||||
var nodicom = noDicomList.Where(x => x.Id == item.StudyId).First();
|
var nodicom = noDicomList.Where(x => x.Id == item.StudyId).First();
|
||||||
|
|
||||||
|
var instanceCount = await _noneDicomStudyFileRepository.Where(x => x.NoneDicomStudyId == item.StudyId).CountAsync();
|
||||||
|
|
||||||
|
if (instanceCount == 0)
|
||||||
|
{
|
||||||
|
item.SeriesList = new List<DicomSeriesDTO>();
|
||||||
|
item.SeriesCount = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
item.SeriesList = new List<DicomSeriesDTO>()
|
item.SeriesList = new List<DicomSeriesDTO>()
|
||||||
{
|
{
|
||||||
new DicomSeriesDTO (){
|
new DicomSeriesDTO (){
|
||||||
IsDicom=false,
|
IsDicom=false,
|
||||||
Id=item.StudyId,
|
Id=item.StudyId,
|
||||||
InstanceCount=await _noneDicomStudyFileRepository.Where(x=>x.NoneDicomStudyId==item.StudyId).CountAsync(),
|
InstanceCount=instanceCount,
|
||||||
Modality=item.Modalities,
|
Modality=item.Modalities,
|
||||||
StudyId=item.StudyId,
|
StudyId=item.StudyId,
|
||||||
TrialId=nodicom.TrialId,
|
TrialId=nodicom.TrialId,
|
||||||
|
@ -550,6 +560,8 @@ namespace IRaCIS.Core.Application.Services
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if (studyList == null || studyList.Count == 0)
|
if (studyList == null || studyList.Count == 0)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue