From 03ddc55975bcf55c2c92c477c6729fa27f66287d Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 6 Jul 2022 14:51:16 +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

---
 .../Allocation/TaskMedicalReviewService.cs       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
index ab18cd687..be54204a5 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
@@ -20,15 +20,18 @@ namespace IRaCIS.Core.Application.Service
     {
 
         private readonly IRepository<TaskMedicalReview> _taskMedicalReviewRepository;
-
+        private readonly IRepository<Trial> _trialRepository;
         private readonly IRepository<TrialUser> _trialUserRepository;
 
         private readonly IRepository<TaskMedicalReviewRule> _taskMedicalReviewRuleRepository;
 
-        public TaskMedicalReviewService(IRepository<TaskMedicalReview> taskMedicalReviewRepository, IRepository<TrialUser> trialUserRepository, IRepository<TaskMedicalReviewRule> taskMedicalReviewRuleRepository)
+        public TaskMedicalReviewService(IRepository<TaskMedicalReview> taskMedicalReviewRepository,
+               IRepository<Trial> trialRepository,
+            IRepository<TrialUser> trialUserRepository,
+            IRepository<TaskMedicalReviewRule> taskMedicalReviewRuleRepository)
         {
             _taskMedicalReviewRepository = taskMedicalReviewRepository;
-
+            this._trialRepository = trialRepository;
             _trialUserRepository = trialUserRepository;
 
             _taskMedicalReviewRuleRepository = taskMedicalReviewRuleRepository;
@@ -181,7 +184,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inQuery"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<PageOutput<TaskMedicalReviewView>> GetMIMMedicalReviewTaskList(TaskMedicalReviewQuery inQuery)
+        public async Task<(PageOutput<TaskMedicalReviewView>,object)> GetMIMMedicalReviewTaskList(TaskMedicalReviewQuery inQuery)
         {
 
             var taskMedicalReviewQueryable = _taskMedicalReviewRepository.Where(t => t.VisitTask.TrialId == inQuery.TrialId && t.MedicalManagerUserId == _userInfo.Id)
@@ -196,7 +199,10 @@ namespace IRaCIS.Core.Application.Service
 
             var pageList = await taskMedicalReviewQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TaskMedicalReviewView.Id) : inQuery.SortField, inQuery.Asc);
 
-            return pageList;
+            return (pageList,new {
+
+                IsConfirmMedicineQuestion= await _trialRepository.Where(x=>x.Id== inQuery.TrialId).Select(x=>x.IsConfirmMedicineQuestion).FirstOrDefaultAsync()
+            });
         }