From 353fc63f5ef3611b1298a4cda6ce7839737efb05 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 13 Jul 2022 15:48:05 +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/Reading/Dto/ReadingQuestionViewModel.cs          | 2 +-
 .../Service/Reading/ReadingQuestionService.cs                | 5 ++---
 .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs              | 2 +-
 .../Service/TrialSiteUser/TrialConfigService.cs              | 5 ++++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
index b3260d137..14f1b4da3 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
@@ -306,7 +306,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 	}
 
 
-	public class ReadingQuestionTrialViewInDto : PageInput
+	public class ReadingQuestionTrialViewInDto
 	{
 		/// <summary>
 		/// 系统标准Id
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
index a8134af10..9ae857a03 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
@@ -706,7 +706,7 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<PageOutput<ReadingQuestionTrialView>> GetReadingQuestionTrialList(ReadingQuestionTrialViewInDto inDto)
+        public async Task<List<ReadingQuestionTrialView>> GetReadingQuestionTrialList(ReadingQuestionTrialViewInDto inDto)
         {
             var query = _readingQuestionTrialRepository.AsQueryable()
                 .Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId)
@@ -714,8 +714,7 @@ namespace IRaCIS.Application.Services
                   .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
                      .WhereIf(inDto.ReadingCriterionPageId!=null, x => x.ReadingCriterionPageId==inDto.ReadingCriterionPageId)
                  .ProjectTo<ReadingQuestionTrialView>(_mapper.ConfigurationProvider);
-            return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, "GroupName ASC,ShowOrder",
-             inDto.Asc);
+            return await query.ToListAsync();
         }
 
         /// <summary>
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 452103f4f..ba932872e 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -559,7 +559,7 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class SetTrialReadingCriterionInDto
     {
-        public Guid ReadingQuestionCriterionTrialId { get; set; }
+        public Guid TrialCriterionId { get; set; }
 
         /// <summary>
         /// 表单类型
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
index 673181179..a4203c34f 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs
@@ -126,13 +126,16 @@ namespace IRaCIS.Core.Application
             return result;
         }
 
+
+       
+
         /// <summary>
         /// 设置项目阅片标准
         /// </summary>
         /// <returns></returns>
         public async Task<IResponseOutput> SetTrialReadingCriterion(SetTrialReadingCriterionInDto inDto)
         {
-            await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.ReadingQuestionCriterionTrialId, x => new ReadingQuestionCriterionTrial()
+            await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialCriterionId, x => new ReadingQuestionCriterionTrial()
             {
                
                 FormType = inDto.FormType,