修改一版
parent
67badea30d
commit
03ddc55975
|
@ -20,15 +20,18 @@ namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
|
|
||||||
private readonly IRepository<TaskMedicalReview> _taskMedicalReviewRepository;
|
private readonly IRepository<TaskMedicalReview> _taskMedicalReviewRepository;
|
||||||
|
private readonly IRepository<Trial> _trialRepository;
|
||||||
private readonly IRepository<TrialUser> _trialUserRepository;
|
private readonly IRepository<TrialUser> _trialUserRepository;
|
||||||
|
|
||||||
private readonly IRepository<TaskMedicalReviewRule> _taskMedicalReviewRuleRepository;
|
private readonly IRepository<TaskMedicalReviewRule> _taskMedicalReviewRuleRepository;
|
||||||
|
|
||||||
public TaskMedicalReviewService(IRepository<TaskMedicalReview> taskMedicalReviewRepository, IRepository<TrialUser> trialUserRepository, IRepository<TaskMedicalReviewRule> taskMedicalReviewRuleRepository)
|
public TaskMedicalReviewService(IRepository<TaskMedicalReview> taskMedicalReviewRepository,
|
||||||
|
IRepository<Trial> trialRepository,
|
||||||
|
IRepository<TrialUser> trialUserRepository,
|
||||||
|
IRepository<TaskMedicalReviewRule> taskMedicalReviewRuleRepository)
|
||||||
{
|
{
|
||||||
_taskMedicalReviewRepository = taskMedicalReviewRepository;
|
_taskMedicalReviewRepository = taskMedicalReviewRepository;
|
||||||
|
this._trialRepository = trialRepository;
|
||||||
_trialUserRepository = trialUserRepository;
|
_trialUserRepository = trialUserRepository;
|
||||||
|
|
||||||
_taskMedicalReviewRuleRepository = taskMedicalReviewRuleRepository;
|
_taskMedicalReviewRuleRepository = taskMedicalReviewRuleRepository;
|
||||||
|
@ -181,7 +184,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
/// <param name="inQuery"></param>
|
/// <param name="inQuery"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
public async Task<PageOutput<TaskMedicalReviewView>> GetMIMMedicalReviewTaskList(TaskMedicalReviewQuery inQuery)
|
public async Task<(PageOutput<TaskMedicalReviewView>,object)> GetMIMMedicalReviewTaskList(TaskMedicalReviewQuery inQuery)
|
||||||
{
|
{
|
||||||
|
|
||||||
var taskMedicalReviewQueryable = _taskMedicalReviewRepository.Where(t => t.VisitTask.TrialId == inQuery.TrialId && t.MedicalManagerUserId == _userInfo.Id)
|
var taskMedicalReviewQueryable = _taskMedicalReviewRepository.Where(t => t.VisitTask.TrialId == inQuery.TrialId && t.MedicalManagerUserId == _userInfo.Id)
|
||||||
|
@ -196,7 +199,10 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
var pageList = await taskMedicalReviewQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TaskMedicalReviewView.Id) : inQuery.SortField, inQuery.Asc);
|
var pageList = await taskMedicalReviewQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrWhiteSpace(inQuery.SortField) ? nameof(TaskMedicalReviewView.Id) : inQuery.SortField, inQuery.Asc);
|
||||||
|
|
||||||
return pageList;
|
return (pageList,new {
|
||||||
|
|
||||||
|
IsConfirmMedicineQuestion= await _trialRepository.Where(x=>x.Id== inQuery.TrialId).Select(x=>x.IsConfirmMedicineQuestion).FirstOrDefaultAsync()
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue