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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Browse Source
This commit is contained in:
he
2023-01-12 12:04:34 +08:00
parent dab955b151 a79338ab32
commit 07f7a420f3
7 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+2 -2
View File
@@ -1124,14 +1124,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class GetNextTaskInDto
{
public Guid? SubjectId { get; set; }
public string SubjectCode { get; set; }=string.Empty;
public Guid TrialId { get; set; }
public Guid? SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid? TrialReadingCriterionId { get; set; }
public Guid? VisitTaskId { get; set; }
}
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+2 -2
View File
@@ -1659,7 +1659,7 @@ namespace IRaCIS.Application.Services
var subjectTaskList = (await _visitTaskService.GetOrderReadingIQueryable(new GetOrderReadingIQueryableInDto()
{
TrialId = inDto.TrialId,
TrialReadingCriterionId = inDto.TrialReadingCriterionId,
TrialReadingCriterionId = trialReadingCriterionId.Value,
})).Item2;
var index = 0;
@@ -1678,7 +1678,7 @@ namespace IRaCIS.Application.Services
throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"]);
}
task = currentSubject.UnReadTaskList.Select(x => new GetReadingTaskDto()
task = currentSubject.UnReadCanReadTaskList.Select(x => new GetReadingTaskDto()
{
ReadingCategory = x.ReadingCategory,
SubjectCode = currentSubject.SubjectCode,