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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-05-06 13:13:39 +08:00
parent 5bb0231354 58eec48af7
commit 6220e53d8f
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -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; }

17
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -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;
}

1
README.md Normal file
View File

@ -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)