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

修改

Uat_Study
he 2022-06-17 15:55:27 +08:00
parent ee0526986f
commit 819a6a0b07
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetReadingTaskDto public class GetReadingTaskDto
{ {
public Guid VisistTaskId { get; set; }
public Guid VisistId { get; set; } public Guid VisistId { get; set; }
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }

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

@ -62,7 +62,7 @@ namespace IRaCIS.Application.Services
{ {
task = await _visitTaskRepository.Where(x => x.TrialId == trialId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.SubjectId == subjectId.Value).Select(x => new GetReadingTaskDto() task = await _visitTaskRepository.Where(x => x.TrialId == trialId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.SubjectId == subjectId.Value).Select(x => new GetReadingTaskDto()
{ {
VisistTaskId=x.Id,
ReadingCategory = x.ReadingCategory, ReadingCategory = x.ReadingCategory,
VisistId = x.ReadingCategory == ReadingCategory.Visit ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId, VisistId = x.ReadingCategory == ReadingCategory.Visit ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId,
VisitNum = x.ReadingCategory == ReadingCategory.Visit ? x.SubjectVisit.VisitNum : x.ReadModule.VisitNum VisitNum = x.ReadingCategory == ReadingCategory.Visit ? x.SubjectVisit.VisitNum : x.ReadModule.VisitNum
@ -75,7 +75,7 @@ namespace IRaCIS.Application.Services
{ {
task = await _visitTaskRepository.Where(x => x.TrialId == trialId && x.ReadingTaskState != ReadingTaskState.HaveSigned).Select(x => new GetReadingTaskDto() task = await _visitTaskRepository.Where(x => x.TrialId == trialId && x.ReadingTaskState != ReadingTaskState.HaveSigned).Select(x => new GetReadingTaskDto()
{ {
VisistTaskId = x.Id,
ReadingCategory = x.ReadingCategory, ReadingCategory = x.ReadingCategory,
VisistId = x.ReadingCategory == ReadingCategory.Visit ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId, VisistId = x.ReadingCategory == ReadingCategory.Visit ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId,
VisitNum = x.ReadingCategory == ReadingCategory.Visit ? x.SubjectVisit.VisitNum : x.ReadModule.VisitNum VisitNum = x.ReadingCategory == ReadingCategory.Visit ? x.SubjectVisit.VisitNum : x.ReadModule.VisitNum
@ -99,7 +99,7 @@ namespace IRaCIS.Application.Services
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<List<GetReadingImgOutDto>> GetReadingImageFile(GetReadingImgInDto inDto) public async Task<(List<GetReadingImgOutDto>,object)> GetReadingImageFile(GetReadingImgInDto inDto)
{ {
var task=await GetNextTaskId(inDto.SubjectId, inDto.TrialId); var task=await GetNextTaskId(inDto.SubjectId, inDto.TrialId);
List<Guid> visitIds = new List<Guid>(); List<Guid> visitIds = new List<Guid>();
@ -120,7 +120,9 @@ namespace IRaCIS.Application.Services
FileName = x.FileName, FileName = x.FileName,
Path = x.Path Path = x.Path
}).ToListAsync(); }).ToListAsync();
return imgList; return (imgList,new {
VisitTaskId= task.VisistTaskId
});
} }
/// <summary> /// <summary>