From e56e269f2eb26ede7370e0c35aeb9c985fff9c2c Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 2 Dec 2025 16:31:59 +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

---
 .../Service/ReadingCalculate/PCWG3CalculateService.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index 57cb3aa35..2def35635 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -820,7 +820,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         {
             if (inDto.IsBaseLine)
             {
-                return -1;
+                return -2;
             }
             var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
             var taskList = await GetSiteVisitForTumorList(inDto);

From ecfadcb5a310aa5b1cfb5e53aabfa23847e5fb9d Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 2 Dec 2025 17:24:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9F=BA=E7=BA=BF?=
 =?UTF-8?q?=E7=97=85=E7=81=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../General/ReadingCalculateService.cs        | 29 ++++++++++++++++++-
 IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs  |  6 ++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
index c79fd0f8f..fb946bcc3 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
@@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
+using Org.BouncyCastle.Asn1.X509;
 using System.Data;
 using System.IO;
 
@@ -326,7 +327,33 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                           
                         }
                         break;
-                 
+
+                    case ReportChartType.BaseLineTarget:
+                        // 这是病灶
+                        var baseTarget = data.TaskQuestions.SelectMany(x => x.Childrens)
+                            .Where(x => x.LesionType == LesionType.BaselineLesions).SelectMany(x => x.Childrens)
+                            .ToList();
+
+                        foreach (var item in baseTarget)
+                        {
+                            ReportChartData chartData = new ReportChartData()
+                            {
+                                Name = item.QuestionName,
+                                Value = new List<string>(),
+                            };
+
+                            for (var i = 0; i < result.VisitTaskNameList.Count; i++)
+                            {
+
+                                chartData.Value.Add(item.Childrens.Where(x => x.QuestionMark == QuestionMark.LesionNumber).Select(x => x.Answer[i].Answer).FirstOrDefault());
+                                result.Unit = item.Childrens.Where(x => x.QuestionMark == QuestionMark.LesionNumber).Select(x => x.Unit).FirstOrDefault();
+
+
+                            }
+
+                            result.ChartDataList.Add(chartData);
+                        }
+                        break;
                     default:
                         break;
                 }
diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
index 895d30f2c..116988839 100644
--- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
+++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
@@ -2526,6 +2526,12 @@ namespace IRaCIS.Core.Domain.Share
         /// </summary>
         Target = 0,
 
+
+        /// <summary>
+        /// 基线病灶
+        /// </summary>
+        BaseLineTarget = 1,
+
     }