diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index 67a57d78e..f8d80e7d0 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -437,7 +437,7 @@ namespace IRaCIS.Core.Application.Services
///
///
[HttpPost]
- public async Task GetKeySeries(GetReadingVisitStudyListIndto indto)
+ public async Task 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) };
}
///
@@ -664,19 +664,21 @@ namespace IRaCIS.Core.Application.Services
{
studyList.Insert(0, keySeries);
}
-
-
+
- studyList.ForEach(x =>
- {
- x.SeriesList.ForEach(y =>
+
+
+
+ studyList.ForEach(x =>
{
- y.IsBeMark = rowInfoList.Any(z => z.SeriesId == y.Id);
- });
+ 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;