From af1ca2ffc13a7b356c85d8c93684c4346f1cda6f Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Sun, 4 Jan 2026 10:41:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../General/ReadingCalculateService.cs        | 70 ++++++++++---------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
index 24d460cc7..33903bba9 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
@@ -445,6 +445,11 @@ 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() { };
@@ -475,14 +480,12 @@ 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= data.TaskQuestions
+                var r1baseLine= alldata.TaskQuestions
                              .SelectMany(x => x.Childrens)
                              .Where(x => x.QuestionType == QuestionType.ExistDisease)
                              .SelectMany(x => x.Answer.Select(a => new EvaluationValue
@@ -493,7 +496,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                              .ToList();
 
 
-                var r1data = data.TaskQuestions
+                var r1data = alldata.TaskQuestions
                              .SelectMany(x => x.Childrens)
                              .Where(x => x.QuestionType == QuestionType.Tumor)
                              .SelectMany(x => x.Answer.Select(a => new EvaluationValue
@@ -511,34 +514,37 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 result.Evaluation.Add(r1data);
 
 
-
-                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)
+                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
+                          }))
                           .ToList();
-                result.Evaluation.Add(r2data);
+
+
+                    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);
+                }
+               
 
                 return result;
             }