Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
5fc53a1999
|
|
@ -3412,6 +3412,15 @@ namespace IRaCIS.Core.Application.Service
|
||||||
throw new BusinessValidationFailedException(_localizer["ReadingImage_IDMust"]);
|
throw new BusinessValidationFailedException(_localizer["ReadingImage_IDMust"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (inDto.SubjectCode.IsNotNullOrEmpty() && inDto.SubjectId != null)
|
||||||
|
{
|
||||||
|
if (! (await _visitTaskRepository.AnyAsync(x => x.TrialReadingCriterionId == inDto.TrialReadingCriterionId
|
||||||
|
&& x.SubjectId == inDto.SubjectId && (x.BlindSubjectCode == inDto.SubjectCode || x.Subject.Code == inDto.SubjectCode))))
|
||||||
|
{
|
||||||
|
throw new BusinessValidationFailedException(_localizer["ReadingImage_SubjectCodeError"]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#region 跳过阅片
|
#region 跳过阅片
|
||||||
var clearSkipReadingCache = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.SkipReadingCacheKey(_userInfo.UserRoleId));
|
var clearSkipReadingCache = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.SkipReadingCacheKey(_userInfo.UserRoleId));
|
||||||
|
|
@ -3776,11 +3785,12 @@ namespace IRaCIS.Core.Application.Service
|
||||||
});
|
});
|
||||||
await _visitTaskRepository.SaveChangesAsync();
|
await _visitTaskRepository.SaveChangesAsync();
|
||||||
_userInfo.IsNotNeedInspection = true;
|
_userInfo.IsNotNeedInspection = true;
|
||||||
|
await AddDefaultValueToTask(inDto.VisitTaskId);
|
||||||
await _readingCalculateService.AddTaskLesionAnswerFromLastTask(new AddTaskLesionAnswerFromLastTaskInDto()
|
await _readingCalculateService.AddTaskLesionAnswerFromLastTask(new AddTaskLesionAnswerFromLastTaskInDto()
|
||||||
{
|
{
|
||||||
VisitTaskId = inDto.VisitTaskId
|
VisitTaskId = inDto.VisitTaskId
|
||||||
});
|
});
|
||||||
await AddDefaultValueToTask(inDto.VisitTaskId);
|
|
||||||
return new ResetReadingTaskOutDto() { };
|
return new ResetReadingTaskOutDto() { };
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue