修改一版

2023-02-09 15:08:47 +08:00
parent cb78bd6a66
commit 6b0eed3fb7
6 changed files with 204 additions and 4 deletions
@@ -135,7 +135,16 @@ namespace IRaCIS.Application.Services
                                                                                          x.TaskBlindName,
                                                                                      } ).ToListAsync();

-                  
+                        var globalVisitTwoTaskIds = await _visitTaskRepository.Where(x => x.Id == taskList[1].Id).Select(x => x.RelatedVisitTaskIdList).FirstNotNullAsync();
+
+                        // 找到所有的的任务
+                        var globalVisitTwoTasks = await _visitTaskRepository.Where(x => globalVisitTwoTaskIds.Contains(x.Id)).Select(x => new {
+                            x.Id,
+                            x.ArmEnum,
+                            x.VisitTaskNum,
+                            x.SourceSubjectVisitId,
+                            x.TaskBlindName,
+                        }).ToListAsync();

                        var taskNum = globalVisitTasks.Select(x => x.VisitTaskNum).Distinct().OrderBy(x=>x).ToList();

@@ -153,6 +162,19 @@ namespace IRaCIS.Application.Services

                            }).ToListAsync();

+                        var judgeQuestionTwoAnswer = await _readingTaskQuestionAnswerRepository.Where(x => globalVisitTwoTaskIds.Contains(x.VisitTaskId) && x.ReadingQuestionTrial.IsJudgeQuestion).OrderBy(x => x.ReadingQuestionTrial.ShowOrder)
+                           .Select(x => new GlobalVisitJudgeQuestion()
+                           {
+                               Answer = x.Answer,
+                               ShowOrder = x.ReadingQuestionTrial.ShowOrder,
+                               VisitTaskId = x.VisitTaskId,
+                               QuestionId = x.ReadingQuestionTrial.Id,
+                               QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us),
+                               QuestionGenre = x.ReadingQuestionTrial.QuestionGenre,
+                               DictionaryCode = x.ReadingQuestionTrial.DictionaryCode,
+
+                           }).ToListAsync();
+
                        foreach (var item in taskNum)
                        {
                            var globalTaskInfos = globalVisitTasks.Where(x => x.VisitTaskNum == item).OrderBy(x => x.ArmEnum).ToList();
@@ -181,6 +203,25 @@ namespace IRaCIS.Application.Services

                                }).ToList(),
                                });
+
+
+                                var towtask = globalVisitTwoTasks.Where(x => x.VisitTaskNum == globalitem.VisitTaskNum).FirstOrDefault();
+
+                                judgeReadingInfoDto.VisitTaskInfoList.Add(new JudgeReadingQuestion()
+                                {
+                                    ArmEnum = towtask.ArmEnum,
+                                    VisitTaskId = towtask.Id,
+                                    JudgeQuestionList = judgeQuestionTwoAnswer.Where(x => x.VisitTaskId == towtask.Id).OrderBy(x => x.ShowOrder)
+                                .Select(x => new JudgeQuestion()
+                                {
+                                    Answer = x.Answer,
+                                    QuestionId = x.QuestionId,
+                                    QuestionName = x.QuestionName,
+                                    QuestionGenre = x.QuestionGenre,
+                                    DictionaryCode = x.DictionaryCode,
+
+                                }).ToList(),
+                                });
                            }
                            judgeInfo.VisitInfoList.Add(judgeReadingInfoDto);
                        }
@@ -521,7 +562,7 @@ namespace IRaCIS.Application.Services
                                }

                            }
-                            else 
+                            else if(!criterionInfo.IsReadingPeriod)
                            {
                                var query = from questionAnswet in _readingTaskQuestionAnswerRepository.Where(x => visitTaskids.Contains(x.VisitTaskId))
                                            join question in _readingQuestionTrialRepository.Where(x => x.IsJudgeQuestion) on new { ReadingQuestionTrialId = questionAnswet.ReadingQuestionTrialId } equals new { ReadingQuestionTrialId = question.Id }