From 67069b151186bd0aae8fc179e27a0ed06b9231aa Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 14 Nov 2022 10:27:17 +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

---
 .../Service/ReadingCalculate/PCWG3CalculateService.cs       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index bd5780b54..efa81ead8 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -113,7 +113,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             var criterionId = visitTaskInfo.TrialReadingCriterionId;
             var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId)
-                .Where(x => x.LesionType != LesionType.BaselineLesions)
+                //.Where(x => x.LesionType != LesionType.BaselineLesions)
+                .Where(x=>x.QuestionType!=QuestionType.TherapeuticEffectEvaluationGroup)
                 .ToListAsync();
 
             // 新病灶
@@ -627,7 +628,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <returns></returns>
         public async Task<int> GetBaseLineLesionsCount(ReadingCalculateDto inDto)
         {
-           return inDto.QuestionInfo.Where(x => x.LesionType == LesionType.BaselineLesions).SelectMany(x => x.TableRowInfoList).Count();
+           return inDto.QuestionInfo.Where(x => x.LesionType == LesionType.BaselineLesions).SelectMany(x => x.TableRowInfoList)
+                .Where(x => x.TableQuestionList.Any(y => y.QuestionMark == QuestionMark.State && y.Answer == EvaluationOfState.Exists.GetEnumInt())).Count();
         }
 
         #endregion