From 984b840fa7a052388182072708752dbb58b53725 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 18 Mar 2024 18:01:23 +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

---
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 1a2206d05..0286f39b1 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1649,10 +1649,14 @@ namespace IRaCIS.Application.Services
             {
 			
 				case CriterionType.Lugano2014:
-                    query = query.Where(x => x.MeasureData == string.Empty ||
+                  // (无法评估 或者 状态为消失的非靶病灶） 并且不能是无法评估的病灶
+                    query = query.Where(x => 
+                    (x.MeasureData == string.Empty ||
                     (x.LesionAnswerList.Any(y => y.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State && y.Answer == TargetState.Loss.GetEnumInt()) &&
                     x.LesionAnswerList.Any(y => y.ReadingTableQuestionTrial.QuestionMark == QuestionMark.IsLymph && y.Answer == ReadingYesOrNo.No.GetEnumInt())
-                    ));
+                    )&& !x.LesionAnswerList.Any(y => y.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State && y.Answer == TargetState.UnableEvaluate.GetEnumInt()))
+                    
+                    );
 
 					break;