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

修改

Uat_Study
he 2023-03-17 13:37:58 +08:00
parent 1a85dbf81a
commit b818c05525
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,6 +260,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string BlindName { get; set; } public string BlindName { get; set; }
public bool IsHaveAdditionalQuestion { get; set; }
public bool IsBaseLine { get; set; } public bool IsBaseLine { get; set; }
public DateTime? LatestScanDate { get; set; } public DateTime? LatestScanDate { get; set; }

12
IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs
View File

@ -150,6 +150,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync(); var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
var isAdditionalQuestionId = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == visitTaskInfo.TrialReadingCriterionId && x.IsAdditional).IgnoreQueryFilters().Select(x => x.Id).ToListAsync();
var taskquery = _visitTaskRepository var taskquery = _visitTaskRepository
.Where(x => (x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect .Where(x => (x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect
&& x.IsAnalysisCreate == visitTaskInfo.IsAnalysisCreate && x.IsAnalysisCreate == visitTaskInfo.IsAnalysisCreate
@ -166,11 +168,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
} }
var taskInfoList = await taskquery.OrderBy(x => x.VisitTaskNum).Select(x => new VisitTaskInfo() var taskInfoList = await taskquery.OrderBy(x => x.VisitTaskNum).Select(x => new VisitTaskInfo()
{ {
BlindName = x.TaskBlindName, BlindName = x.TaskBlindName,
IsBaseLine = x.SourceSubjectVisit.IsBaseLine, IsBaseLine = x.SourceSubjectVisit.IsBaseLine,
VisitTaskId = x.Id, VisitTaskId = x.Id,
TaskName = x.TaskName, TaskName = x.TaskName,
LatestScanDate= x.SourceSubjectVisit!=null?x.SourceSubjectVisit.LatestScanDate : null, LatestScanDate= x.SourceSubjectVisit!=null?x.SourceSubjectVisit.LatestScanDate : null,
VisitTaskNum = x.VisitTaskNum, VisitTaskNum = x.VisitTaskNum,
@ -178,6 +183,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}).ToListAsync(); }).ToListAsync();
var taskIds = taskInfoList.Select(x => x.VisitTaskId).ToList();
var isHaveAdditionalTaskIds = await _readingTaskQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId) && isAdditionalQuestionId.Contains(x.ReadingQuestionTrialId)).Select(x => x.VisitTaskId).Distinct().ToListAsync();
taskInfoList.ForEach(x => {
x.IsHaveAdditionalQuestion = isHaveAdditionalTaskIds.Contains(x.VisitTaskId);
});
return taskInfoList; return taskInfoList;
} }
} }