Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -56,9 +56,21 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<bool> SetTrialQuestionExportResult(SetTrialQuestionExportResultInDto inDto)
         {
+            List<ExportResult> needAdd = new List<ExportResult>()
+            {
+                ExportResult.DetailedTableOfAdjudicationResults,
+                ExportResult.DetailedTableOfIntraReaderAnalysisResults,
+                ExportResult.DetailedTableOfInterReaderAnalysisResults
+            };
             foreach (var item in inDto.QuestionList) 
              {
 
+                if (item.ExportResult.Contains(ExportResult.TableOfAssessmentResults))
+                {
+                    item.ExportResult.AddRange(needAdd);
+                }
+                 
+
                 var ExportResultStr=JsonConvert.SerializeObject(item.ExportResult);
                 await _readingQuestionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == item.QuestionId, x => new ReadingQuestionTrial()
                 {
@@ -68,6 +80,10 @@ namespace IRaCIS.Core.Application.Service
 
             foreach (var item in inDto.TableQuestionList)
             {
+                if (item.ExportResult.Contains(ExportResult.TableOfAssessmentResults))
+                {
+                    item.ExportResult.AddRange(needAdd);
+                }
 
                 var ExportResultStr = JsonConvert.SerializeObject(item.ExportResult);
                 await _readingTableQuestionTrialRepository.UpdatePartialFromQueryAsync(x => x.Id == item.TableQuestionId, x => new ReadingTableQuestionTrial()
@@ -114,7 +130,9 @@ namespace IRaCIS.Core.Application.Service
                 x.Children = tableQuestionList.Where(y => y.QuestionId == x.QuestionId).OrderBy(y => y.ShowOrder).ToList();
             });
 
+            List<string> dicCode = new List<string>() { "1","2"};
             var dicList = await _dictionaryRepository.Where(x => x.Parent.Code == "ExportResult")
+                .Where(x=> dicCode.Contains(x.Code))
                 .OrderBy(x => x.ShowOrder)
                 .Select(x => new TrialQuestionExportDic()
                 {