XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

分配配置

Uat_Study
hang 2022-07-22 16:08:09 +08:00
parent bf703be85c
commit 547f7e82dc
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
View File

@ -351,7 +351,6 @@ namespace IRaCIS.Core.Application.ViewModel
public String TrialSiteCode { get; set; } = String.Empty; public String TrialSiteCode { get; set; } = String.Empty;
public string SubjectCode { get; set; } = String.Empty; public string SubjectCode { get; set; } = String.Empty;
public int? VisitTaskTypeCount { get; set; } public int? VisitTaskTypeCount { get; set; }
public int? GlobalTaskTypeCount { get; set; } public int? GlobalTaskTypeCount { get; set; }
public int? JudgeTaskTypeCount { get; set; } public int? JudgeTaskTypeCount { get; set; }

5
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -62,7 +62,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [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()) var subjectQuery = _subjectRepository.Where(t => t.TrialId == querySubjectAssign.TrialId && t.SubjectVisitTaskList.Any())
.WhereIf(querySubjectAssign.SiteId != null, t => t.SiteId == querySubjectAssign.SiteId) .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); 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> /// <summary>

3
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
View File

@ -221,7 +221,7 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsReadingTaskViewInOrder { get; set; } = true; public bool IsReadingTaskViewInOrder { get; set; } = true;
public bool IsFollowJudgeTaskAutoAssign { get; set; } public ReadingMethod ReadingType { get; set; }
/// <summary> /// <summary>
/// 阅片是否显示受试者信息 /// 阅片是否显示受试者信息
@ -233,7 +233,6 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary> /// </summary>
public bool IsReadingShowPreviousResults { get; set; } public bool IsReadingShowPreviousResults { get; set; }
public TaskAllocateDefaultState FollowJudgeTaskAutoAssignDefaultState { get; set; }
/// <summary> /// <summary>