From 855f260aed41227452afec2b5f5dcef23b6776b6 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 13 Sep 2022 16:06:49 +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/Dto/ReadingQuestionViewModel.cs   | 20 +++++++++++++++++++
 .../Service/Reading/ReadingQuestionService.cs |  8 +++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index b03219547..558cc57ee 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -42,6 +42,26 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 	public class GetTumorAssessmentListInDto
 	{
 		public Guid CriterionId { get; set; }
+
+		/// <summary>
+		/// 靶病灶
+		/// </summary>
+		public string TargetLesion { get; set; }
+
+		/// <summary>
+		/// 非靶病灶
+		/// </summary>
+		public string NonTargetLesions { get; set; }
+
+		/// <summary>
+		/// 新病灶
+		/// </summary>
+		public string NewLesion { get; set; }
+
+		/// <summary>
+		/// 整体疗效
+		/// </summary>
+		public string OverallEfficacy { get; set; }
 	}
 	public class CopySystemCriterionDataInDto
 	{
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
index 6cba81870..82934a0a9 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
@@ -88,7 +88,13 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<List<TumorAssessment>> GetTumorAssessmentList(GetTumorAssessmentListInDto inDto)
         {
-            var result= await _tumorAssessmentRepository.Where(x => x.CriterionId == inDto.CriterionId).ToListAsync();
+            var result= await _tumorAssessmentRepository
+                .Where(x => x.CriterionId == inDto.CriterionId)
+                .WhereIf(!inDto.OverallEfficacy.IsNullOrEmpty(),x=>x.OverallEfficacy==inDto.OverallEfficacy)
+                 .WhereIf(!inDto.TargetLesion.IsNullOrEmpty(), x => x.TargetLesion == inDto.TargetLesion)
+                  .WhereIf(!inDto.NonTargetLesions.IsNullOrEmpty(), x => x.NonTargetLesions == inDto.NonTargetLesions)
+                   .WhereIf(!inDto.NewLesion.IsNullOrEmpty(), x => x.NewLesion == inDto.NewLesion)
+                .ToListAsync();
             return result;
         }