修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
64c97b22d5
commit
5b92015c98
|
@ -1899,7 +1899,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
|
||||||
public class GetReadingPastResultListOutDto
|
public class GetReadingPastResultListOutDto
|
||||||
{
|
{
|
||||||
public Guid VisitTaskId { get; set; }
|
public Guid VisitTaskId { get; set; }
|
||||||
public string TaskName { get; set; }
|
|
||||||
|
public Guid? ReadModuleVisitId { get; set; }
|
||||||
|
public string TaskName { get; set; }
|
||||||
|
|
||||||
public string VisitBlindName { get; set; }
|
public string VisitBlindName { get; set; }
|
||||||
|
|
||||||
|
|
|
@ -693,12 +693,26 @@ namespace IRaCIS.Application.Services
|
||||||
VisitTaskId = x.Id,
|
VisitTaskId = x.Id,
|
||||||
TaskBlindName = x.TaskBlindName,
|
TaskBlindName = x.TaskBlindName,
|
||||||
TaskName = x.TaskName,
|
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,
|
VisitName = x.SourceSubjectVisit!=null? x.SourceSubjectVisit.VisitName: x.ReadModule==null?string.Empty: x.ReadModule.SubjectVisit.VisitName,
|
||||||
VisitBlindName = x.SourceSubjectVisit != null ? x.SourceSubjectVisit.BlindName : x.ReadModule!=null? x.ReadModule.SubjectVisit.BlindName:string.Empty,
|
VisitBlindName = x.TaskBlindName,
|
||||||
VisitTaskNum = x.VisitTaskNum,
|
VisitTaskNum = x.VisitTaskNum,
|
||||||
JudgeResultArm = x.JudgeResultTask == null ? null : x.JudgeResultTask.ArmEnum,
|
JudgeResultArm = x.JudgeResultTask == null ? null : x.JudgeResultTask.ArmEnum,
|
||||||
|
|
||||||
}).ToListAsync();
|
}).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();
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
return readingPastResultList;
|
return readingPastResultList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue