Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
224382bf62
|
|
@ -437,7 +437,7 @@ namespace IRaCIS.Core.Application.Services
|
|||
/// <param name="indto"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<VisitStudyDTO?> GetKeySeries(GetReadingVisitStudyListIndto indto)
|
||||
public async Task<VisitStudyDTO> GetKeySeries(GetReadingVisitStudyListIndto indto)
|
||||
{
|
||||
var rowInfoList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == indto.VisitTaskId && x.StudyId != null).OrderBy(x => x.ReadingQuestionTrial.ShowOrder).ThenBy(x => x.RowIndex).Select(x => new StudyInstanceInfo()
|
||||
{
|
||||
|
|
@ -542,7 +542,7 @@ namespace IRaCIS.Core.Application.Services
|
|||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
return new VisitStudyDTO() { StudyId= default(Guid) };
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -669,14 +669,16 @@ namespace IRaCIS.Core.Application.Services
|
|||
|
||||
|
||||
|
||||
studyList.ForEach(x =>
|
||||
{
|
||||
x.SeriesList.ForEach(y =>
|
||||
{
|
||||
y.IsBeMark = rowInfoList.Any(z => z.SeriesId == y.Id);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
studyList.ForEach(x =>
|
||||
{
|
||||
x.SeriesList.ForEach(y =>
|
||||
{
|
||||
y.IsBeMark = rowInfoList.Any(z => z.SeriesId == y.Id);
|
||||
});
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -745,7 +747,7 @@ namespace IRaCIS.Core.Application.Services
|
|||
|
||||
|
||||
|
||||
var result = studyList.Where(x => x.SeriesCount > 0).ToList();
|
||||
var result = studyList.Where(x => x.SeriesCount > 0||x.StudyId== default(Guid)).ToList();
|
||||
|
||||
return result;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue