修改一版

Uat_Study
he 2022-07-28 13:31:31 +08:00
parent 42c444c4b3
commit 134531cf9f
2 changed files with 7 additions and 2 deletions

View File

@ -15,6 +15,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string TaskName { get; set; }
public ReadingTaskState ReadingTaskState { get; set; }
public decimal VisitTaskNum { get; set; }
}
public class GetHistoryGlobalInfoInDto
@ -292,6 +294,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string TaskName { get; set; }
public string TaskBlindName { get; set; }
public decimal VisitTaskNum { get; set; }
}
public class GetReadingPastResultListInDto

View File

@ -106,7 +106,8 @@ namespace IRaCIS.Application.Services
ReadingTaskState = x.ReadingTaskState,
TaskName = x.TaskName,
VisitTaskId = x.Id,
}).ToListAsync();
VisitTaskNum=x.VisitTaskNum
}).OrderBy(x=>x.VisitTaskNum).ToListAsync();
return result;
}
@ -873,7 +874,7 @@ namespace IRaCIS.Application.Services
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
var readingPastResultList = await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.SubjectId == inDto.SubjectId && x.DoctorUserId == _userInfo.Id
&& x.Id != inDto.VisitTaskId && x.ReadingTaskState == ReadingTaskState.HaveSigned&&x.TaskState==TaskState.Effect)
.Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate).ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).ToListAsync();
.Where(x=>x.IsAnalysisCreate== taskInfo.IsAnalysisCreate).ProjectTo<GetReadingPastResultListOutDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.VisitTaskNum).ToListAsync();
return readingPastResultList;
}
#endregion