IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -445,11 +445,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var result= new GetReportsChartSummaryOutDto();
             var r1Data = await GetData(new List<Arm>() { Arm.SingleReadingArm, Arm.DoubleReadingArm1 });
             var r2Data = await GetData(new List<Arm>() { Arm.DoubleReadingArm2 });
-
-            var  alldata = r1Data.VisitTaskList.Count() > r2Data.VisitTaskList.Count() ? r1Data : r2Data;
-            var visitTaskName = alldata.VisitTaskList.Select(x => x.BlindName).ToList();
-            var length = alldata.VisitTaskList.Count();
-       
             async Task<GetReadingReportEvaluationOutDto> GetData(List<Arm> arms)
             {
                 var data = new GetReadingReportEvaluationOutDto() { };
@@ -480,12 +475,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     Evaluation = new List<List<EvaluationValue>>() { }
                 };
 
-            
+                var data = r1.VisitTaskList.Count() > r2.VisitTaskList.Count() ? r1 : r2;
+                var visitTaskName = data.VisitTaskList.Select(x => x.BlindName).ToList();
+                var length = data.VisitTaskList.Count();
                 result.Evaluation.Add(visitTaskName.Select(x=> new EvaluationValue() { 
                 Value=x
                 }).ToList());
 
-                var r1baseLine= alldata.TaskQuestions
+                var r1baseLine= data.TaskQuestions
                              .SelectMany(x => x.Childrens)
                              .Where(x => x.QuestionType == QuestionType.ExistDisease)
                              .SelectMany(x => x.Answer.Select(a => new EvaluationValue
@@ -496,7 +493,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                              .ToList();
 
 
-                var r1data = alldata.TaskQuestions
+                var r1data = data.TaskQuestions
                              .SelectMany(x => x.Childrens)
                              .Where(x => x.QuestionType == QuestionType.Tumor)
                              .SelectMany(x => x.Answer.Select(a => new EvaluationValue
@@ -514,37 +511,34 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 result.Evaluation.Add(r1data);
 
 
-                if (criterion.ReadingType == ReadingMethod.Double)
-                {
-                    var r2baseLine = alldata.TaskQuestions
-                          .SelectMany(x => x.Childrens)
-                          .Where(x => x.QuestionType == QuestionType.ExistDisease)
-                          .SelectMany(x => x.Answer.Select(a => new EvaluationValue
-                          {
-                              DictionaryCode = x.DictionaryCode,
-                              Value = a.Answer
-                          }))
+
+                var r2baseLine = data.TaskQuestions
+                           .SelectMany(x => x.Childrens)
+                           .Where(x => x.QuestionType == QuestionType.ExistDisease)
+                           .SelectMany(x => x.Answer.Select(a => new EvaluationValue
+                           {
+                               DictionaryCode = x.DictionaryCode,
+                               Value = a.Answer
+                           }))
+                           .ToList();
+
+
+                var r2data = data.TaskQuestions
+                             .SelectMany(x => x.Childrens)
+                             .Where(x => x.QuestionType == QuestionType.Tumor)
+                             .SelectMany(x => x.Answer.Select(a => new EvaluationValue
+                             {
+                                 DictionaryCode = x.DictionaryCode,
+                                 Value = a.Answer
+                             }))
+                             .ToList();
+
+                r2data = r2baseLine.Take(1).Concat(r2data.Skip(1)).ToList();
+
+                r2data = r2data.Concat(Enumerable.Repeat(new EvaluationValue() { Value = "" }, length))
+                          .Take(length)
                           .ToList();
-
-
-                    var r2data = alldata.TaskQuestions
-                                 .SelectMany(x => x.Childrens)
-                                 .Where(x => x.QuestionType == QuestionType.Tumor)
-                                 .SelectMany(x => x.Answer.Select(a => new EvaluationValue
-                                 {
-                                     DictionaryCode = x.DictionaryCode,
-                                     Value = a.Answer
-                                 }))
-                                 .ToList();
-
-                    r2data = r2baseLine.Take(1).Concat(r2data.Skip(1)).ToList();
-
-                    r2data = r2data.Concat(Enumerable.Repeat(new EvaluationValue() { Value = "" }, length))
-                              .Take(length)
-                              .ToList();
-                    result.Evaluation.Add(r2data);
-                }
-               
+                result.Evaluation.Add(r2data);
 
                 return result;
             }