修改退回bug
							parent
							
								
									3d3ac28848
								
							
						
					
					
						commit
						8075684d1d
					
				| 
						 | 
				
			
			@ -2191,18 +2191,21 @@ namespace IRaCIS.Core.Application.Service.Allocation
 | 
			
		|||
            Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == task.SubjectId && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze) && t.TaskAllocationState == TaskAllocationState.Allocated;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
            if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
 | 
			
		||||
            {
 | 
			
		||||
                //影像退回,必定影响两个标准的任务
 | 
			
		||||
                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == task.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
 | 
			
		||||
            #region 退回到访视 不区分标准
 | 
			
		||||
            //if (criterionConfig.CriterionType == CriterionType.RECIST1Point1 && criterionConfig.IsAdditionalAssessment)
 | 
			
		||||
            //{
 | 
			
		||||
            //    //影像退回,必定影响两个标准的任务
 | 
			
		||||
            //    filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == task.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
            }
 | 
			
		||||
            else
 | 
			
		||||
            {
 | 
			
		||||
                //默认影响的都是该标准的任务
 | 
			
		||||
                filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == task.TrialReadingCriterionId);
 | 
			
		||||
            }
 | 
			
		||||
            //}
 | 
			
		||||
            //else
 | 
			
		||||
            //{
 | 
			
		||||
            //    //默认影响的都是该标准的任务
 | 
			
		||||
            //    filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == task.TrialReadingCriterionId);
 | 
			
		||||
            //}
 | 
			
		||||
            #endregion
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
            //PM 才允许操作
 | 
			
		||||
            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue