Uat_Study
parent
50842718a7
commit
cf8b587faa
|
@ -999,7 +999,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
|
||||||
SubjectCode = x.Key.BlindSubjectCode == string.Empty ? x.Key.Code : x.Key.BlindSubjectCode,
|
SubjectCode = x.Key.BlindSubjectCode == string.Empty ? x.Key.Code : x.Key.BlindSubjectCode,
|
||||||
UnReadTaskCount = x.Where(y => y.ReReadingApplyState != ReReadingApplyState.HaveApplyed).Count(),
|
UnReadTaskCount = x.Where(y => y.ReReadingApplyState != ReReadingApplyState.HaveApplyed).Count(),
|
||||||
ExistReadingApply = x.Any(y => y.ReReadingApplyState == ReReadingApplyState.HaveApplyed),
|
ExistReadingApply = x.Any(y => y.ReReadingApplyState == ReReadingApplyState.HaveApplyed),
|
||||||
UnReadTaskList = x.Where(y => y.ReReadingApplyState != ReReadingApplyState.HaveApplyed)
|
UnReadTaskList = x.Where(y => y.ReReadingApplyState != ReReadingApplyState.HaveApplyed).OrderBy(x=>x.VisitTaskNum)
|
||||||
.Select(u => new IRUnreadTaskView() { Id = u.Id, IsUrgent = u.IsUrgent, SuggesteFinishedTime = u.SuggesteFinishedTime }).ToList(),
|
.Select(u => new IRUnreadTaskView() { Id = u.Id, IsUrgent = u.IsUrgent, SuggesteFinishedTime = u.SuggesteFinishedTime }).ToList(),
|
||||||
}).Where(x => x.UnReadTaskCount > 0).OrderBy(x => x.SubjectId);
|
}).Where(x => x.UnReadTaskCount > 0).OrderBy(x => x.SubjectId);
|
||||||
|
|
||||||
|
|
|
@ -567,7 +567,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
{
|
{
|
||||||
var taskMedicalReviewquery = _taskMedicalReviewRepository.Where(x => x.TrialId == inDto.TrialId).Include(x => x.VisitTask)
|
var taskMedicalReviewquery = _taskMedicalReviewRepository.Where(x => x.TrialId == inDto.TrialId).Include(x => x.VisitTask)
|
||||||
.Where(x => x.VisitTask.DoctorUserId == _userInfo.Id)
|
.Where(x => x.VisitTask.DoctorUserId == _userInfo.Id)
|
||||||
.Where(x=>!x.IsHaveQuestion)
|
.Where(x=>x.IsHaveQuestion)
|
||||||
.Select(x => new GetIRMedicalFeedbackListOutDto
|
.Select(x => new GetIRMedicalFeedbackListOutDto
|
||||||
{
|
{
|
||||||
Id = x.Id,
|
Id = x.Id,
|
||||||
|
|
Loading…
Reference in New Issue