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

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

Test_HIR_Net8
hang 2025-08-29 11:36:31 +08:00
parent a19ba3c215 5975004858
commit 224382bf62
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,7 +437,7 @@ namespace IRaCIS.Core.Application.Services
/// <param name="indto"></param> /// <param name="indto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [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() 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> /// <summary>
@ -664,19 +664,21 @@ namespace IRaCIS.Core.Application.Services
{ {
studyList.Insert(0, keySeries); 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; return result;