Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api
commit
33bcabaa73
|
@ -1189,10 +1189,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
|
||||||
|
|
||||||
var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == trialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsAutoCreate, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
|
var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == trialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsAutoCreate, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
|
||||||
|
|
||||||
if (criterionConfig.IsAutoCreate == false)
|
|
||||||
{
|
|
||||||
return ResponseOutput.NotOk("手动生成任务的不允许PM 申请影像重阅");
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var task in taskList)
|
foreach (var task in taskList)
|
||||||
{
|
{
|
||||||
|
@ -1213,6 +1210,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
|
||||||
|
|
||||||
if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
|
if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
|
||||||
{
|
{
|
||||||
|
if (criterionConfig.IsAutoCreate == false)
|
||||||
|
{
|
||||||
|
return ResponseOutput.NotOk("手动生成任务的不允许PM 申请影像重阅");
|
||||||
|
}
|
||||||
|
|
||||||
if (task.IsAnalysisCreate)
|
if (task.IsAnalysisCreate)
|
||||||
{
|
{
|
||||||
throw new BusinessValidationFailedException("PM 不允许对一致性分析任务进行申请重阅");
|
throw new BusinessValidationFailedException("PM 不允许对一致性分析任务进行申请重阅");
|
||||||
|
|
Loading…
Reference in New Issue