From 2b71a73baee1b287da5db038870c7fe21bf5bb7d Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 28 Jul 2022 15:07:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E9=A1=B9=E7=9B=AE=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/TaskConsistentRuleService.cs         | 6 ++++--
 .../Service/Allocation/VisitTaskService.cs                  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
index 77d804b4f..dbc44e0de 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
@@ -14,6 +14,7 @@ using System.Linq.Expressions;
 using IRaCIS.Core.Infra.EFCore.Common;
 using System.Linq;
 using Nito.AsyncEx;
+using IRaCIS.Core.Application.Contracts;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -48,7 +49,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="queryVisitTask"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<PageOutput<AnalysisTaskView>> GetAnalysisTaskList(VisitTaskQuery queryVisitTask)
+        public async Task<(PageOutput<AnalysisTaskView>,object?)> GetAnalysisTaskList(VisitTaskQuery queryVisitTask)
         {
             var visitTaskQueryable = _visitTaskRepository.Where(t => t.TrialId == queryVisitTask.TrialId)
                 .Where(t => t.IsAnalysisCreate)
@@ -73,7 +74,8 @@ namespace IRaCIS.Core.Application.Service
 
             var pageList = await visitTaskQueryable.ToPagedListAsync(queryVisitTask.PageIndex, queryVisitTask.PageSize, queryVisitTask.SortField, queryVisitTask.Asc, string.IsNullOrWhiteSpace(queryVisitTask.SortField), defalutSortArray);
 
-            return (pageList);
+            var trialTaskConfig = _repository.Where<Trial>(t => t.Id == queryVisitTask.TrialId).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstOrDefault();
+            return (pageList, trialTaskConfig);
         }
 
 
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 1966e5893..a7dacf9f7 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -748,7 +748,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
         /// <param name="_visitTaskCommonService"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<(PageOutput<VisitTaskView>, object)> GetVisitTaskList(VisitTaskQuery queryVisitTask, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
+        public async Task<(PageOutput<VisitTaskView>, object?)> GetVisitTaskList(VisitTaskQuery queryVisitTask, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
         {
             //以前访视未产生任务的，在查询这里要产生 
             var svIdList = await _subjectVisitRepository.Where(t => t.TrialId == queryVisitTask.TrialId && t.CheckState == CheckStateEnum.CVPassed && t.IsVisitTaskGenerated == false).Select(t => t.Id).ToListAsync();