Uat_Study
			
			
		
		
							parent
							
								
									4f1fb691f2
								
							
						
					
					
						commit
						7c5e79d39e
					
				| 
						 | 
					@ -298,7 +298,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
				
			||||||
                    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.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
 | 
				
			||||||
                     x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
 | 
					                     x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
 | 
				
			||||||
                     x.DoctorUser==taskinfo.DoctorUser&&
 | 
					                     x.DoctorUserId ==taskinfo.DoctorUserId &&
 | 
				
			||||||
                        x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
 | 
					                        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.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
 | 
				
			||||||
                    ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
 | 
					                    ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -603,7 +603,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 | 
				
			||||||
                    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.TrialReadingCriterionId == taskinfo.TrialReadingCriterionId &&
 | 
				
			||||||
                    x.IsAnalysisCreate== taskinfo.IsAnalysisCreate&&
 | 
					                    x.IsAnalysisCreate== taskinfo.IsAnalysisCreate&&
 | 
				
			||||||
                     x.DoctorUser == taskinfo.DoctorUser &&
 | 
					                     x.DoctorUserId == taskinfo.DoctorUserId &&
 | 
				
			||||||
                     x.IsSelfAnalysis== taskinfo.IsSelfAnalysis &&
 | 
					                     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.VisitTaskNum < taskinfo.VisitTaskNum && x.TaskState == TaskState.Effect && x.ArmEnum == taskinfo.ArmEnum
 | 
				
			||||||
                    ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
 | 
					                    ).OrderByDescending(x => x.VisitTaskNum).Select(x => x.Id).FirstOrDefaultAsync();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue