From 01ed29d3e36249ff870ae2c6e893ced9d8b92c16 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 30 Jun 2022 09:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/ReadingMedicineQuestionViewModel.cs   |  6 ++--
 .../Reading/ReadingMedicineQuestionService.cs | 35 ++++++++++++-------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
index cf0f882b3..41b1d9fe7 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
@@ -50,7 +50,7 @@ namespace IRaCIS.Core.Application.ViewModel
 	}
 
 	///<summary>ReadingMedicineSystemQuestionQuery  列表查询参数模型</summary>
-	public class ReadingMedicineSystemQuestionQuery:PageInput
+	public class ReadingMedicineSystemQuestionQuery
 	{
 		public string Type { get; set; }=string.Empty;
 		public string ParentTriggerValue { get; set; } = string.Empty;
@@ -82,6 +82,8 @@ namespace IRaCIS.Core.Application.ViewModel
 		public Guid TrialId { get; set; }
 
 		public Guid? Id { get; set; }
+
+		public int? ShowOrder { get; set; }
 	}
 
 
@@ -151,7 +153,7 @@ namespace IRaCIS.Core.Application.ViewModel
 	      }
 
     ///<summary>ReadingMedicineTrialQuestionQuery  列表查询参数模型</summary>
-    public class ReadingMedicineTrialQuestionQuery:PageInput
+    public class ReadingMedicineTrialQuestionQuery
     {
 		/// <summary>
 		/// 项目Id
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicineQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicineQuestionService.cs
index ec8885a66..df81cfdb8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicineQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicineQuestionService.cs
@@ -34,16 +34,15 @@ namespace IRaCIS.Core.Application.Service
 		/// <param name="inDto"></param>
 		/// <returns></returns>
 		[HttpPost]
-		public async Task<PageOutput<ReadingMedicineSystemQuestionView>> GetReadingMedicineSystemQuestionList(ReadingMedicineSystemQuestionQuery inDto)
+		public async Task<List<ReadingMedicineSystemQuestionView>> GetReadingMedicineSystemQuestionList(ReadingMedicineSystemQuestionQuery inDto)
 		{
 			var query = _readingMedicineSystemQuestionRepository.AsQueryable()
 				  .WhereIf(!inDto.TypeValue.IsNullOrEmpty(), x => x.TypeValue.Contains(inDto.TypeValue))
 				  .WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue))
 				  .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
 				  .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
-				  .ProjectTo<ReadingMedicineSystemQuestionView>(_mapper.ConfigurationProvider);
-			return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField.IsNullOrEmpty() ? nameof(ReadingMedicineSystemQuestionView.ShowOrder) : inDto.SortField,
-			 inDto.Asc);
+				  .ProjectTo<ReadingMedicineSystemQuestionView>(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder);
+			return await query.ToListAsync();
 		}
 
 		/// <summary>
@@ -85,7 +84,7 @@ namespace IRaCIS.Core.Application.Service
 		/// <param name="inDto"></param>
 		/// <returns></returns>
 		[HttpPost]
-		public async Task<PageOutput<ReadingMedicineTrialQuestionView>>  GetReadingMedicineTrialQuestionList(ReadingMedicineTrialQuestionQuery inDto)
+		public async Task<List<ReadingMedicineTrialQuestionView>>  GetReadingMedicineTrialQuestionList(ReadingMedicineTrialQuestionQuery inDto)
 		{
 			var query = _readingMedicineTrialQuestionRepository.AsQueryable()
 				   .Where(x=>x.TrialId==inDto.TrialId)
@@ -93,9 +92,8 @@ namespace IRaCIS.Core.Application.Service
 				   .WhereIf(!inDto.ParentTriggerValue.IsNullOrEmpty(), x => x.ParentTriggerValue.Contains(inDto.ParentTriggerValue))
 				   .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
 				   .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
-				   .ProjectTo<ReadingMedicineTrialQuestionView>(_mapper.ConfigurationProvider);
-			return await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField.IsNullOrEmpty() ? nameof(ReadingMedicineTrialQuestionView.ShowOrder) : inDto.SortField,
-			 inDto.Asc);
+				   .ProjectTo<ReadingMedicineTrialQuestionView>(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder);
+			return await query.ToListAsync();
 		}
 
 		/// <summary>
@@ -124,9 +122,11 @@ namespace IRaCIS.Core.Application.Service
 			{
 				"select","radio"
 			};
+
 			var questionList = await _readingMedicineTrialQuestionRepository.Where(x => x.TrialId == inDto.TrialId)
-				   .Where(x => types.Contains(x.Type))
+				.Where(x => types.Contains(x.Type))
 				.WhereIf(inDto.Id != null, x => x.Id != inDto.Id && x.ParentId != inDto.Id)
+				.WhereIf(inDto.ShowOrder != null, x => x.ShowOrder <inDto.ShowOrder)
 				.Select(x => new GetReadingMedicineTrialOtherQuestionOutDto()
 				{
 					Id = x.Id,
@@ -139,7 +139,7 @@ namespace IRaCIS.Core.Application.Service
 		/// <summary>
 		/// 从系统里面选择问题添加到项目里面
 		/// </summary>
-		/// <param name="InDto"></param>
+		/// <param name="inDto"></param>
 		/// <returns></returns>
 		[HttpPost]
 		public async Task<IResponseOutput> AddTrialDataFromSystem(AddTrialDataFromSystemInDto inDto)
@@ -179,6 +179,17 @@ namespace IRaCIS.Core.Application.Service
 			return ResponseOutput.Result(result);
 		}
 
-       
-    }
+
+		///// <summary>
+		///// 确认医学审核问题
+		///// </summary>
+		///// <returns></returns>
+		//public async Task<IResponseOutput> ConfirmReadingMedicineQuestion()
+		//{
+			
+		//}
+
+
+
+	}
 }