From 547f7e82dc60d38cb976043638e4c18cd9364b68 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 22 Jul 2022 16:08:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=85=8D=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Allocation/DTO/VisitTaskViewModel.cs             | 1 -
 .../Service/Allocation/VisitTaskService.cs                   | 5 +++--
 .../Service/TrialSiteUser/DTO/TrialConfigDTO.cs              | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index 265bc5fb9..73575daa0 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -351,7 +351,6 @@ namespace IRaCIS.Core.Application.ViewModel
         public String TrialSiteCode { get; set; } = String.Empty;
         public string SubjectCode { get; set; } = String.Empty;
 
-
         public int? VisitTaskTypeCount { get; set; }
         public int? GlobalTaskTypeCount { get; set; }
         public int? JudgeTaskTypeCount { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 4f4f30199..76d5fffe2 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -62,7 +62,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<PageOutput<SubjectAssignStat>> GetSubjectAssignAndTaskStatList(SubjectAssignStatQuery querySubjectAssign)
+        public async Task<(PageOutput<SubjectAssignStat>,object)> GetSubjectAssignAndTaskStatList(SubjectAssignStatQuery querySubjectAssign)
         {
             var subjectQuery = _subjectRepository.Where(t => t.TrialId == querySubjectAssign.TrialId && t.SubjectVisitTaskList.Any())
                  .WhereIf(querySubjectAssign.SiteId != null, t => t.SiteId == querySubjectAssign.SiteId)
@@ -74,7 +74,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             var pageList = await subjectQuery.ToPagedListAsync(querySubjectAssign.PageIndex, querySubjectAssign.PageSize, string.IsNullOrWhiteSpace(querySubjectAssign.SortField) ? nameof(querySubjectAssign.SubjectId) : querySubjectAssign.SortField, querySubjectAssign.Asc);
 
-            return pageList;
+            var trialTaskConfig = _trialRepository.Where(t => t.Id == querySubjectAssign.TrialId).ProjectTo<TrialTaskConfigView>(_mapper.ConfigurationProvider).FirstOrDefault();
+            return (pageList, trialTaskConfig);
         }
 
         /// <summary>
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
index 776ef704a..fb26b4c83 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
@@ -221,7 +221,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public bool IsReadingTaskViewInOrder { get; set; } = true;
 
-        public bool IsFollowJudgeTaskAutoAssign { get; set; }
+        public ReadingMethod ReadingType { get; set; }
 
         /// <summary>
         /// 阅片是否显示受试者信息
@@ -233,7 +233,6 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public bool IsReadingShowPreviousResults { get; set; } 
 
-        public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; }
 
 
         /// <summary>