diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs index 273bd9683..dfeb6e08b 100644 --- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs @@ -731,7 +731,7 @@ namespace IRaCIS.Core.Application.Service /// /// [HttpPost] - public async Task> GetSelfConsistentDoctorStatList(TaskConsistentRuleQuery inQuery) + public async Task>> GetSelfConsistentDoctorStatList(TaskConsistentRuleQuery inQuery) { @@ -812,7 +812,10 @@ namespace IRaCIS.Core.Application.Service //var taskConsistentRuleQueryable = _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId) // .ProjectTo(_mapper.ConfigurationProvider); - return await taskConsistentRuleQueryable.ToListAsync(); + var list= await taskConsistentRuleQueryable.ToListAsync(); + + var rule= await _taskConsistentRuleRepository.Where(t => t.TrialId == inQuery.TrialId && t.IsSelfAnalysis == inQuery.IsSelfAnalysis && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId).ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync(); + return ResponseOutput.Ok(list, rule); } [HttpPost] diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs index cbe137ae4..e418f26e6 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs @@ -715,7 +715,7 @@ namespace IRaCIS.Core.Application .Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == _userInfo.Id)) .Where(u => u.SubmitState == SubmitStateEnum.ToSubmit).Count(), - }).Where(x => x.ToBeDealedCount > 0); ; + }).Where(x => x.ToBeDealedCount > 0);