From 2930c2b640115292e99da2f63dec266a4c1b9e8f Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 4 Jul 2023 15:03:52 +0800
Subject: [PATCH] =?UTF-8?q?S-01=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ClinicalData/ClinicalAnswerService.cs     | 24 +++++++------------
 .../Service/Reading/Dto/ClinicalAnswerDto.cs  |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
index f806da039..6f7e7a5d8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
@@ -178,18 +178,14 @@ namespace IRaCIS.Core.Application.Service
 		/// <param name="inDto"></param>
 		/// <returns></returns>
 		[HttpPost]
-        public async Task<List<GetCRCSubjectClinicalOutDto>> GetCRCSubjectClinicalList(GetCRCSubjectClinicalInDto inDto)
+        public async Task<PageOutput<GetCRCSubjectClinicalOutDto>> GetCRCSubjectClinicalList(GetCRCSubjectClinicalInDto inDto)
         {
 
             //await AutoAddCRCClinical(new AutoAddClinicalInDto()
             //{
-
             //    TrialId = inDto.TrialId
             //}) ;
 
-
-
-
 			var subjects = await _subjectRepository.Where(x => x.TrialId == inDto.TrialId).Select(x => new GetCRCSubjectClinicalResultDto()
             {
                 SubjectId = x.Id,
@@ -197,7 +193,7 @@ namespace IRaCIS.Core.Application.Service
             }).ToListAsync();
 
 
-            var clinicalData=await _readingClinicalDataRepository.Where(x=>x.TrialId == inDto.TrialId&&x.ClinicalDataTrialSet.UploadRole==UploadRole.CRC&&x.ClinicalDataTrialSet.ClinicalDataLevel!= ClinicalLevel.SubjectVisit)
+            var clinicalData= _readingClinicalDataRepository.Where(x=>x.TrialId == inDto.TrialId&&x.ClinicalDataTrialSet.UploadRole==UploadRole.CRC&&x.ClinicalDataTrialSet.ClinicalDataLevel!= ClinicalLevel.SubjectVisit)
                 .Where(x=>!x.IsSign)
                 .Include(x=>x.ClinicalDataTrialSet).Select(x=>new GetCRCSubjectClinicalOutDto() { 
                   SubjectId=x.SubjectId,
@@ -206,24 +202,20 @@ namespace IRaCIS.Core.Application.Service
 					ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id,
 					ClinicalDataSetEnName= x.ClinicalDataTrialSet.ClinicalDataSetEnName,
 					ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
-				}).OrderBy(x=>x.SubjectCode).ToListAsync();
+				});
 
-            // 一次查询报错 分两次写
-            clinicalData.ForEach(x =>
+			var pageList = await clinicalData.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, string.IsNullOrWhiteSpace(inDto.SortField) ? nameof(GetCRCSubjectClinicalOutDto.SubjectCode) : inDto.SortField, inDto.Asc);
+			// 一次查询报错 分两次写
+			pageList.CurrentPageData.ForEach(x =>
             {
                 x.ClinicalDataSetEnName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us);
-
             });
-
-          
 			var clinicalFormData = await _clinicalFormRepository.Where(x => x.TrialId == inDto.TrialId).ToListAsync();
-			clinicalData.ForEach(n =>
+			pageList.CurrentPageData.ForEach(n =>
 			{
 				n.ClinicalCount = clinicalFormData.Where(y => y.ClinicalDataTrialSetId == n.ClinicalDataTrialSetId && y.SubjectId == n.SubjectId).Count();
 			});
-
-	
-            return clinicalData;
+            return pageList;
         }
 
         /// <summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
index c0562e954..bbdd38867 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
@@ -18,7 +18,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 	}
 
 
-	public class GetCRCSubjectClinicalInDto
+	public class GetCRCSubjectClinicalInDto:PageInput
     {
         public Guid TrialId { get; set; }
     }