无序阅片顺序
							parent
							
								
									edaab02d0b
								
							
						
					
					
						commit
						6a53aaf010
					
				| 
						 | 
					@ -2332,9 +2332,22 @@ namespace IRaCIS.Application.Services
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            else
 | 
					            else
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                task = await _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == trialReadingCriterionId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.DoctorUserId == _userInfo.Id
 | 
					                var query = _visitTaskRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == trialReadingCriterionId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.DoctorUserId == _userInfo.Id
 | 
				
			||||||
                && x.TrialReadingCriterionId == trialReadingCriterionId
 | 
					                && x.TrialReadingCriterionId == trialReadingCriterionId
 | 
				
			||||||
                && x.TaskState == TaskState.Effect).Select(x => new GetReadingTaskDto()
 | 
					                && x.TaskState == TaskState.Effect);
 | 
				
			||||||
 | 
					                var count = await query.CountAsync();
 | 
				
			||||||
 | 
					                if (count == 0)
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"]);
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                Random random = new Random();
 | 
				
			||||||
 | 
					                var skipcount = 0;
 | 
				
			||||||
 | 
					                if (count >= 2)
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    skipcount = random.Next(0, count - 1);
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                task = await query
 | 
				
			||||||
 | 
					                    .Select(x => new GetReadingTaskDto()
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    VisitTaskId = x.Id,
 | 
					                    VisitTaskId = x.Id,
 | 
				
			||||||
                    ArmEnum = x.ArmEnum,
 | 
					                    ArmEnum = x.ArmEnum,
 | 
				
			||||||
| 
						 | 
					@ -2345,7 +2358,7 @@ namespace IRaCIS.Application.Services
 | 
				
			||||||
                    SubjectId = x.SubjectId,
 | 
					                    SubjectId = x.SubjectId,
 | 
				
			||||||
                    SubjectCode = x.Subject.Code,
 | 
					                    SubjectCode = x.Subject.Code,
 | 
				
			||||||
                    TrialReadingCriterionId = x.TrialReadingCriterionId,
 | 
					                    TrialReadingCriterionId = x.TrialReadingCriterionId,
 | 
				
			||||||
                }).FirstOrDefaultAsync();
 | 
					                }).Skip(skipcount).FirstOrDefaultAsync();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue