From 8575df5eb94ffa122e46b63d322762b9b7215976 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 20 Sep 2022 15:49:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/OrganInfoViewModel.cs |  6 ++++-
 .../Reading/Dto/ReadingQuestionViewModel.cs   |  2 +-
 .../Service/Reading/OrganInfoService.cs       | 26 +++++++++++++++++++
 .../Service/Reading/ReadingQuestionService.cs | 18 +++++++++++++
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
index f76b9f9d0..e8729a0f7 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
@@ -221,7 +221,7 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
     ///<summary>OrganInfoQuery  列表查询参数模型</summary>
-    public class OrganInfoQuery
+    public class OrganInfoQuery:PageInput
     {
 
         /// <summary>
@@ -238,6 +238,10 @@ namespace IRaCIS.Core.Application.ViewModel
 
     }
 
+   
+
+
+
     ///<summary> OrganInfoAddOrEdit  列表查询参数模型</summary>
     public class OrganInfoAddOrEdit
     {
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index 1fcc9580d..881bd9c76 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -47,7 +47,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 	}
 
-	public class GetTumorAssessmentListInDto
+	public class GetTumorAssessmentListInDto:PageInput
 	{
 		public Guid CriterionId { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
index 2f2907a16..0a463e519 100644
--- a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
@@ -141,6 +141,32 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
+        /// <summary>
+        /// 获取系统器官分页信息
+        /// </summary>
+        /// <param name="inQuery"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<PageOutput<OrganInfoView>> GetOrganPageList(OrganInfoQuery inQuery)
+        {
+
+
+            List<OrganType> organs = new List<OrganType>();
+
+            if (inQuery.LesionType != null)
+            {
+                organs = await _criterionNidusRepository.Where(x => x.CriterionId == inQuery.SystemCriterionId && x.LesionType == inQuery.LesionType)
+                    .Select(x => x.OrganType).ToListAsync();
+            }
+
+            var organInfoQueryable = _organInfoRepository
+               .Where(x => x.SystemCriterionId == inQuery.SystemCriterionId)
+               .WhereIf(inQuery.LesionType != null, x => organs.Contains(x.OrganType))
+                 .WhereIf(inQuery.OrganType != null, x => x.OrganType == inQuery.OrganType)
+               .ProjectTo<OrganInfoView>(_mapper.ConfigurationProvider);
+            return await organInfoQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(OrganInfoView.OrganType) : inQuery.SortField, inQuery.Asc);
+        }
+
         /// <summary>
         /// 新增或修改系统器官数据
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
index abd2d588b..3f8934159 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
@@ -98,6 +98,24 @@ namespace IRaCIS.Application.Services
             return result;
         }
 
+        /// <summary>
+        /// 获取疗效对照
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<PageOutput<TumorAssessmentView>> GetTumorAssessmentPageList(GetTumorAssessmentListInDto inQuery)
+        {
+            var query =  _tumorAssessmentRepository
+                .Where(x => x.CriterionId == inQuery.CriterionId)
+                .WhereIf(inQuery.OverallEfficacy != null, x => x.OverallEfficacy == inQuery.OverallEfficacy)
+                 .WhereIf(inQuery.TargetLesion != null, x => x.TargetLesion == inQuery.TargetLesion)
+                  .WhereIf(inQuery.NonTargetLesions != null, x => x.NonTargetLesions == inQuery.NonTargetLesions)
+                   .WhereIf(inQuery.NewLesion != null, x => x.NewLesion == inQuery.NewLesion)
+                  .ProjectTo<TumorAssessmentView>(_mapper.ConfigurationProvider);
+
+            return await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TumorAssessmentView.Id) : inQuery.SortField, inQuery.Asc); 
+        }
+
 
         /// <summary>
         /// 新增修改疗效对照