From bc3f5c939413a3b5cf63828c5b7557e9eb0fa2cc Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 12 Sep 2025 16:45:11 +0800
Subject: [PATCH] =?UTF-8?q?PCWG=E9=97=B4=E9=9A=94=E5=A4=A9=E6=95=B0?=
 =?UTF-8?q?=E5=9F=BA=E7=BA=BF=E6=94=B9=E4=B8=BANA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingCalculate/PCWG3CalculateService.cs | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index 4b29cd984..5e4264e1e 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -102,6 +102,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 taskIds.Add(relatedVisitTask.Item1[count - 1].VisitTaskId);
 
             }
+
+            var baseLineTaskid= relatedVisitTask.Item1[0].VisitTaskId== taskIds[0] ? relatedVisitTask.Item1[0].VisitTaskId: Guid.Empty();
+
             relatedVisitTask.Item1 = relatedVisitTask.Item1.Where(x => taskIds.Contains(x.VisitTaskId)).ToList();
             // 所有访视问题的答案
             var answerList = await _readingTaskQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).ToListAsync();
@@ -111,12 +114,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
                 if (item.ReadingQuestionTrial.QuestionType == QuestionType.DaysBetween)
                 {
-                    if (item.Answer == "-1")
+                    if (baseLineTaskid == item.VisitTaskId)
                     {
-                        item.Answer = _localizer["CriterionCalculateExport_Unknown"];
-
-
+                        if (item.Answer == "-1" )
+                        {
+                            item.Answer = "NA";
+                        }
                     }
+                    else
+                    {
+                        if (item.Answer == "-1" || item.Answer == string.Empty)
+                        {
+                            item.Answer = _localizer["CriterionCalculateExport_Unknown"];
+                        }
+                    }
+                   
                 }