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
///
///
[HttpPost]
- public async Task> GetSubjectAssignAndTaskStatList(SubjectAssignStatQuery querySubjectAssign)
+ public async Task<(PageOutput,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(_mapper.ConfigurationProvider).FirstOrDefault();
+ return (pageList, trialTaskConfig);
}
///
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; }
///
/// 阅片是否显示受试者信息
@@ -233,7 +233,6 @@ namespace IRaCIS.Core.Application.Contracts
///
public bool IsReadingShowPreviousResults { get; set; }
- public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; }
///