Uat_Study
			
			
		
		
							parent
							
								
									eddc091c0f
								
							
						
					
					
						commit
						2134aa4bef
					
				| 
						 | 
				
			
			@ -719,12 +719,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
			
		|||
                if (!(await _readingTableQuestionAnswerRepository.AnyAsync(x => x.VisitTaskId == visitTaskId)))
 | 
			
		||||
                {
 | 
			
		||||
 | 
			
		||||
                    var LastVisitTaskId = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Visit &&
 | 
			
		||||
                    var LastVisitTaskId = await _visitTaskRepository.Where(x =>( x.ReadingCategory == ReadingCategory.Visit &&
 | 
			
		||||
                    x.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
 | 
			
		||||
                    x.IsAnalysisCreate== taskinfo.IsAnalysisCreate&&
 | 
			
		||||
                     x.DoctorUserId == taskinfo.DoctorUserId &&
 | 
			
		||||
                     x.IsSelfAnalysis== taskinfo.IsSelfAnalysis &&
 | 
			
		||||
                    x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
 | 
			
		||||
                    x.SubjectId == taskinfo.SubjectId && x.ReadingTaskState == ReadingTaskState.HaveSigned && x.ArmEnum == taskinfo.ArmEnum) 
 | 
			
		||||
                    && ((x.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect)||(x.VisitTaskNum==taskinfo.VisitTaskNum&&x.TaskState==TaskState.Freeze) )
 | 
			
		||||
                    ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue