From 7408bd2abbc7cf4943c2f25741aa0b51ed40dcd4 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 27 Oct 2022 16:27:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=20=20?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E9=82=AE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs | 2 +-
 .../Reading/MedicalAudit/ReadingMedicineQuestionService.cs  | 6 +++---
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs     | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
index e7f08410f..d967834a3 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
@@ -288,7 +288,7 @@ namespace IRaCIS.Core.Application.ViewModel
     }
 
     ///<summary>ReadingMedicineTrialQuestionQuery  列表查询参数模型</summary>
-    public class ReadingMedicineTrialQuestionQuery
+    public class ReadingMedicineTrialQuestionQuery:PageInput
     {
         /// <summary>
         /// 项目Id
diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
index 64fe6ee86..0a35dbe12 100644
--- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
@@ -141,7 +141,7 @@ namespace IRaCIS.Core.Application.Service
 		/// <param name="inDto"></param>
 		/// <returns></returns>
 		[HttpPost]
-		public async Task<(List<ReadingMedicineTrialQuestionView>, object)> GetReadingMedicineTrialQuestionList(ReadingMedicineTrialQuestionQuery inDto)
+		public async Task<(PageOutput<ReadingMedicineTrialQuestionView>, object)> GetReadingMedicineTrialQuestionList(ReadingMedicineTrialQuestionQuery inDto)
 		{
 			var query = _readingMedicineTrialQuestionRepository.AsQueryable()
 				   .Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId)
@@ -154,11 +154,11 @@ namespace IRaCIS.Core.Application.Service
 
 
 			var isConfirmMedicineQuestion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).Select(x => x.IsConfirmMedicineQuestion).FirstOrDefaultAsync();
-			var questionList = await query.ToListAsync();
+			var questionList = await query.ToPagedListAsync(inDto.PageIndex, inDto.PageSize, inDto.SortField, inDto.Asc);
 			return (questionList, new
 			{
 				IsConfirmMedicineQuestion = isConfirmMedicineQuestion,
-				QuestionCount = questionList.Count(),
+				//QuestionCount = questionList.Count(),
 			});
 		}
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 685f0fc6d..9b67048c8 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -9,6 +9,7 @@ using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Application.Interfaces;
 
 namespace IRaCIS.Application.Services
 {
@@ -46,6 +47,8 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<NoneDicomStudyFile> _noneDicomStudyFileSystem;
         private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
 
+        private readonly ITrialEmailNoticeConfigService _trialEmailNoticeConfigService;
+
 
         public ReadingImageTaskService(
                   IMapper mapper,
@@ -73,6 +76,7 @@ namespace IRaCIS.Application.Services
                   IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
                   IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystemRepository,
                   IRepository<ReadingQuestionSystem> ReadingQuestionSystem,
+                   ITrialEmailNoticeConfigService trialEmailNoticeConfigService
                     IRepository<NoneDicomStudyFile> noneDicomStudyFileSystem,
                   IRepository<ReadingQuestionTrial> readingQuestionTrialRepository
           )
@@ -1176,6 +1180,8 @@ namespace IRaCIS.Application.Services
 
 
             await _visitTaskRepository.SaveChangesAsync();
+
+            await _trialEmailNoticeConfigService.BaseBusinessScenarioSendEmailAsync(visitTaskId);
         }