Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
commit
1ef8d2913b
|
@ -2814,7 +2814,20 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
var visitTaskId = taskList.Skip(skipcount).FirstOrDefault();
|
var visitTaskId = taskList.Skip(skipcount).FirstOrDefault();
|
||||||
|
|
||||||
}
|
task = await _visitTaskRepository.Where(x=>x.Id== visitTaskId).Select(x => new GetReadingTaskDto()
|
||||||
|
{
|
||||||
|
VisitTaskId = x.Id,
|
||||||
|
ArmEnum = x.ArmEnum,
|
||||||
|
TaskBlindName = x.TaskBlindName,
|
||||||
|
ReadingCategory = x.ReadingCategory,
|
||||||
|
VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule == null ? default(Guid) : x.ReadModule.SubjectVisitId,
|
||||||
|
VisitNum = x.VisitTaskNum,
|
||||||
|
SubjectId = x.SubjectId,
|
||||||
|
SubjectCode = x.Subject.Code,
|
||||||
|
TrialReadingCriterionId = x.TrialReadingCriterionId,
|
||||||
|
}).FirstOrDefault();
|
||||||
|
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var query = _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == trialReadingCriterionId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.DoctorUserId == _userInfo.Id
|
var query = _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == trialReadingCriterionId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.DoctorUserId == _userInfo.Id
|
||||||
|
|
Loading…
Reference in New Issue