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

---
 .../IRaCIS.Core.Application.xml                 |  4 ++--
 .../General/ReadingCalculateService.cs          | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index cf0fb265e..fb95d88cd 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -15909,7 +15909,7 @@
         </member>
         <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.ImageConsumer.SendImageReuploadEmail(IRaCIS.Core.Application.MassTransit.Consumer.Dto.SendImageReuploadEmailInDto)">
             <summary>
-            发送影像重传相关邮件的通用方法
+            发送影像重传相关邮件的通用方法  已经处理项目
             </summary>
         </member>
         <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.ImageConsumer.Consume(MassTransit.ConsumeContext{IRaCIS.Core.Domain._DomainEvent.ReviewerPMApplyEvent})">
@@ -15924,7 +15924,7 @@
         </member>
         <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.ImageConsumer.SendReviewerSelectionEmail(IRaCIS.Core.Domain.Models.EmailNoticeConfig,System.Guid,System.Collections.Generic.List{System.Guid})">
             <summary>
-            发送阅片人筛选相关邮件的通用方法
+            发送阅片人筛选相关邮件的通用方法  已经处理项目
             </summary>
         </member>
         <member name="T:IRaCIS.Core.Application.MassTransit.Consumer.UrgentMedicalReviewAddedEventConsumer">
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
index e4819690c..2b792748e 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
@@ -449,6 +449,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var  alldata = r1Data.VisitTaskList.Count() > r2Data.VisitTaskList.Count() ? r1Data : r2Data;
             var visitTaskName = alldata.VisitTaskList.Select(x => x.BlindName).ToList();
             var length = alldata.VisitTaskList.Count();
+
+            // -1转为空
+            List<QuestionType?> negativeToString = new List<QuestionType?>() 
+            {
+               QuestionType.DaysBetween,
+            };
        
             async Task<GetReadingReportEvaluationOutDto> GetData(List<Arm> arms)
             {
@@ -568,6 +574,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             Name = item?.QuestionName??string.Empty,
                             Value = itemdata?.Answer?.Select(a => a.Answer).ToList() ?? new List<string>()
                         };
+                        if (negativeToString.Contains(item.QuestionType))
+                        {
+                            cd.Value.ForEach(item1 =>
+                            {
+                                item1 = item1 == "-1" ? string.Empty : item1;
+                            });
+                        }
                         chartList.Add(cd);
                     }
                     groups.Add(new ChartItem
@@ -627,6 +640,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 result.QuestionCharts.AddRange(r2Groups);
             }
 
+            if (criterion.CriterionType == CriterionType.PCWG3)
+            {
+                result.TargetCharts = new List<ChartItem>() { };
+            }
             return result;
 
         }

From 7ceca5d802548d717c7ba99dee538951bbb71038 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 5 Jan 2026 18:01:07 +0800
Subject: [PATCH 2/2] =?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               | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
index 2b792748e..a120a38f2 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
@@ -486,7 +486,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     Evaluation = new List<List<EvaluationValue>>() { }
                 };
 
-            
+                var visitAnswerType = QuestionType.Tumor;
+                if (criterion.CriterionType == CriterionType.PCWG3)
+                {
+                    visitAnswerType = QuestionType.SiteVisitForTumorEvaluation;
+                }
+
+
                 result.Evaluation.Add(visitTaskName.Select(x=> new EvaluationValue() { 
                 Value=x
                 }).ToList());
@@ -504,7 +510,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 var r1data = r1.TaskQuestions
                              .SelectMany(x => x.Childrens)
-                             .Where(x => x.QuestionType == QuestionType.Tumor)
+                             .Where(x => x.QuestionType == visitAnswerType)
                              .SelectMany(x => x.Answer.Select(a => new EvaluationValue
                              {
                                  DictionaryCode = x.DictionaryCode,
@@ -535,7 +541,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                     var r2data = r2.TaskQuestions
                                  .SelectMany(x => x.Childrens)
-                                 .Where(x => x.QuestionType == QuestionType.Tumor)
+                                 .Where(x => x.QuestionType == visitAnswerType)
                                  .SelectMany(x => x.Answer.Select(a => new EvaluationValue
                                  {
                                      DictionaryCode = x.DictionaryCode,