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

修改

Uat_Study
he 2023-02-21 11:46:09 +08:00
parent 0241f5f635
commit 32595ca92f
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs
View File

@ -88,6 +88,9 @@ namespace IRaCIS.Application.Services
public async Task<GetJudgeReadingInfoOutDto> GetJudgeReadingInfo(GetJudgeReadingInfo inDto) public async Task<GetJudgeReadingInfoOutDto> GetJudgeReadingInfo(GetJudgeReadingInfo inDto)
{ {
var visitTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstOrDefaultAsync(); var visitTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstOrDefaultAsync();
var criterionType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == visitTask.TrialReadingCriterionId).Select(x => x.CriterionType).FirstNotNullAsync();
GetJudgeReadingInfoOutDto judgeInfo = new GetJudgeReadingInfoOutDto() GetJudgeReadingInfoOutDto judgeInfo = new GetJudgeReadingInfoOutDto()
{ {
ReadingTaskState = visitTask.ReadingTaskState, ReadingTaskState = visitTask.ReadingTaskState,
@ -302,14 +305,17 @@ namespace IRaCIS.Application.Services
}; };
if (criterionType != CriterionType.PCWG3)
// 加全局是否更新 和访视点注释
judgeReadingQuestion.JudgeQuestionList.Add(new JudgeQuestion()
{ {
Answer = item.AfterQuestionList.Any(x => x.IsHaveChange), // 加全局是否更新 和访视点注释 PCWG3不要
QuestionType = JudgeReadingQuestionType.GlobalChange, judgeReadingQuestion.JudgeQuestionList.Add(new JudgeQuestion()
{
Answer = item.AfterQuestionList.Any(x => x.IsHaveChange),
QuestionType = JudgeReadingQuestionType.GlobalChange,
}); });
}
judgeReadingQuestion.JudgeQuestionList.Add(new JudgeQuestion() judgeReadingQuestion.JudgeQuestionList.Add(new JudgeQuestion()
{ {
@ -338,13 +344,21 @@ namespace IRaCIS.Application.Services
}).ToList() }).ToList()
}; };
// 加全局是否更新 和访视点注释
rTwoJudge.JudgeQuestionList.Add(new JudgeQuestion()
{
Answer = twoItem.AfterQuestionList.Any(x => x.IsHaveChange),
QuestionType = JudgeReadingQuestionType.GlobalChange,
});
if (criterionType != CriterionType.PCWG3)
{
// 加全局是否更新 和访视点注释
rTwoJudge.JudgeQuestionList.Add(new JudgeQuestion()
{
Answer = twoItem.AfterQuestionList.Any(x => x.IsHaveChange),
QuestionType = JudgeReadingQuestionType.GlobalChange,
});
}
rTwoJudge.JudgeQuestionList.Add(new JudgeQuestion() rTwoJudge.JudgeQuestionList.Add(new JudgeQuestion()
{ {