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

修改一版

Uat_Study
he 2022-07-28 13:31:31 +08:00
parent 42c444c4b3
commit 134531cf9f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

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

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

@ -106,7 +106,8 @@ namespace IRaCIS.Application.Services
ReadingTaskState = x.ReadingTaskState, ReadingTaskState = x.ReadingTaskState,
TaskName = x.TaskName, TaskName = x.TaskName,
VisitTaskId = x.Id, VisitTaskId = x.Id,
}).ToListAsync(); VisitTaskNum=x.VisitTaskNum
}).OrderBy(x=>x.VisitTaskNum).ToListAsync();
return result; return result;
} }
@ -873,7 +874,7 @@ namespace IRaCIS.Application.Services
var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); 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 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) && 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; return readingPastResultList;
} }
#endregion #endregion