修改

2023-04-07 11:48:29 +08:00
parent f03c384dab
commit 548d9cd820
1 changed files with 5 additions and 2 deletions
@@ -283,7 +283,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
        /// <returns></returns>
        public async Task<List<VisitTaskInfo>> GetReadingReportTaskList(Guid visitTaskId)
        {
-            var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).FirstNotNullAsync();
+            var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == visitTaskId).Include(x=>x.TrialReadingCriterion).FirstNotNullAsync();

            var isAdditionalQuestionId = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == visitTaskInfo.TrialReadingCriterionId && x.IsAdditional).IgnoreQueryFilters().Select(x => x.Id).ToListAsync();

@@ -302,7 +302,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
            {
                taskquery = _visitTaskRepository.Where(x => visitTaskInfo.ReportRelatedTaskIdList.Contains(x.Id)||x.Id==visitTaskInfo.Id);
            }
-
+            if (!visitTaskInfo.TrialReadingCriterion.IsReadingTaskViewInOrder)
+            {
+                taskquery = _visitTaskRepository.Where(x =>  x.Id == visitTaskInfo.Id);
+            }