diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index f4f835247..c380370d2 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1899,9 +1899,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class GetReadingPastResultListOutDto { public Guid VisitTaskId { get; set; } - public string TaskName { get; set; } - public string TaskBlindName { get; set; } + public Guid? ReadModuleVisitId { get; set; } + public string TaskName { get; set; } + + public string VisitBlindName { get; set; } + + public string TaskBlindName { get; set; } public string VisitName { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 5dfa15cdb..a8aec027b 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -689,15 +689,30 @@ namespace IRaCIS.Application.Services var readingPastResultList = await taskQuery.OrderBy(x => x.VisitTaskNum).ThenBy(x => x.TaskState).Select(x => new GetReadingPastResultListOutDto() { + VisitTaskId = x.Id, TaskBlindName = x.TaskBlindName, TaskName = x.TaskName, + ReadModuleVisitId= x.ReadModule!=null?x.ReadModule.SubjectVisitId:null, VisitName = x.SourceSubjectVisit!=null? x.SourceSubjectVisit.VisitName: x.ReadModule==null?string.Empty: x.ReadModule.SubjectVisit.VisitName, - + VisitBlindName = x.TaskBlindName, VisitTaskNum = x.VisitTaskNum, JudgeResultArm = x.JudgeResultTask == null ? null : x.JudgeResultTask.ArmEnum, }).ToListAsync(); + + + foreach (var item in readingPastResultList) + { + if (item.ReadModuleVisitId != null) + { + item.VisitBlindName = (await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == item.ReadModuleVisitId && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis && + x.IsAnalysisCreate == taskInfo.IsAnalysisCreate ).Select(x => x.TaskBlindName).FirstOrDefaultAsync())??string.Empty; + + } + } + + return readingPastResultList; } diff --git a/README.md b/README.md new file mode 100644 index 000000000..8589e1b66 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +[![Build Status](https://drone.frp.extimaging.com/api/badges/XCKJ/irc-netcore-api/status.svg)](https://drone.frp.extimaging.com/XCKJ/irc-netcore-api) \ No newline at end of file