任务修改

2022-06-27 15:18:57 +08:00
parent b26e596ffb
commit 3d02f19e8f
4 changed files with 11 additions and 9 deletions
@@ -597,6 +597,7 @@ namespace IRaCIS.Application.Services
            //x.ReReadingApplyState!=ReReadingApplyState.Agree  排除重阅的
            var visitTask = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstOrDefaultAsync();
            var visitTaskids = await _visitTaskRepository.Where(x => x.ReadingTaskState == ReadingTaskState.HaveSigned &&x.ReadingCategory!= ReadingCategory.Judge && x.ReReadingApplyState!=ReReadingApplyState.Agree && x.SourceSubjectVisitId == visitTask.SourceSubjectVisitId && x.SouceReadModuleId == visitTask.SouceReadModuleId).Select(x => x.Id).ToListAsync();
+
            if (visitTaskids.Count == 2)
            {
                var query = from questionAnswet in _readingTaskQuestionAnswerRepository.Where(x => visitTaskids.Contains(x.VisitTaskId))
@@ -610,6 +611,7 @@ namespace IRaCIS.Application.Services
                                QuestionId = question.Id,
                                VisitTaskId = questionAnswet.VisitTaskId,
                            };
+
                var questionAnswerlist = await query.ToListAsync();
                List<GroupTaskAnswerDto> groupTasks = questionAnswerlist.GroupBy(x => new { x.QuestionId, x.AnswerGroup,x.JudgeType,x.AnswerCombination }).Select(x => new GroupTaskAnswerDto
                {
@@ -619,6 +621,7 @@ namespace IRaCIS.Application.Services
                    JudgeType=x.Key.JudgeType,
                    TaskAnswerList = x.ToList(),
                }).ToList();
+
                var noteEqual = false;
                foreach (var item in groupTasks)
                {