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

修改一版

Uat_Study
he 2022-07-18 13:39:28 +08:00
parent 5af9e4e206
commit 192a4eb621
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -351,7 +351,9 @@ namespace IRaCIS.Core.Application.Service
var visitGroupQuery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.DoctorUserId == _userInfo.Id)
.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned)
.Where(x=>!x.Subject.IsDeleted).Where(x => x.Subject.SubjectDoctorList.Where(y=>y.TrialId==iRUnReadSubjectQuery.TrialId&&y.DoctorUserId==_userInfo.Id).Count()>0)
.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned&&t.TaskState== TaskState.Effect)
.GroupBy(x => new { x.SubjectId, x.Subject.Code, x.BlindSubjectCode });
var visitTaskQuery = visitGroupQuery.Select(x => new IRUnReadSubjectView()
@ -385,7 +387,8 @@ namespace IRaCIS.Core.Application.Service
else
{
var taskQuery = _visitTaskRepository.Where(x => x.TrialId == iRUnReadSubjectQuery.TrialId && x.DoctorUserId == _userInfo.Id);
var taskQuery = _visitTaskRepository.Where(x => x.TrialId == iRUnReadSubjectQuery.TrialId && x.DoctorUserId == _userInfo.Id&&x.TaskState == TaskState.Effect)
.Where(x => !x.Subject.IsDeleted).Where(x => x.Subject.SubjectDoctorList.Where(y => y.TrialId == iRUnReadSubjectQuery.TrialId && y.DoctorUserId == _userInfo.Id).Count() > 0);
IRUnReadOutDto iRUnReadOut = new IRUnReadOutDto()
{

4
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
View File

@ -107,7 +107,7 @@ namespace IRaCIS.Application.Services
.Select(s => new SubjectTask()
{
SubjectId = s.Id,
UnReadTaskCount = s.SubjectVisitTaskList.Count(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.DoctorUserId == _userInfo.Id),
UnReadTaskCount = s.SubjectVisitTaskList.Count(t => t.ReadingTaskState != ReadingTaskState.HaveSigned && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect),
}).ToListAsync();
subjectList = subjectList.Select((x, index) => new SubjectTask()
{
@ -140,7 +140,7 @@ namespace IRaCIS.Application.Services
}
else
{
task = await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.DoctorUserId == _userInfo.Id).Select(x => new GetReadingTaskDto()
task = await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.DoctorUserId == _userInfo.Id&&x.TaskState==TaskState.Effect).Select(x => new GetReadingTaskDto()
{
VisitTaskId = x.Id,
TaskBlindName = x.TaskBlindName,

2
IRaCIS.Core.Infra.EFCore/Repository/ICommandRepository.cs
View File

@ -107,6 +107,8 @@ namespace IRaCIS.Core.Infra.EFCore
Task<bool> AnyAsync(Expression<Func<TEntity, bool>> exp, bool ignoreQueryFilters = false);
bool Any(Expression<Func<TEntity, bool>> exp, bool ignoreQueryFilters = false);
Task<TResult> MaxAsync<TResult>(Expression<Func<TEntity, TResult>> selector);
Task<int> CountAsync(Expression<Func<TEntity, bool>> whereLambda = null, bool ignoreQueryFilters = false);

13
IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
View File

@ -469,6 +469,19 @@ namespace IRaCIS.Core.Infra.EFCore
return await query.AsNoTracking().AnyAsync(exp);
}
public bool Any(Expression<Func<TEntity, bool>> exp, bool ignoreQueryFilters = false)
{
var query = _dbSet.AsQueryable();
if (ignoreQueryFilters)
{
query = query.IgnoreQueryFilters();
}
return query.AsNoTracking().Any(exp);
}
public async Task<int> CountAsync(Expression<Func<TEntity, bool>> whereLambda = null, bool ignoreQueryFilters = false)
{
var query = _dbSet.AsQueryable();