Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api
						commit
						d65c1d5bb8
					
				| 
						 | 
					@ -1247,8 +1247,8 @@ namespace IRaCIS.Core.Application.Image.QA
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => trialInOrderCriterionIdList.Contains(x.TrialReadingCriterionId)&& x.SubjectId == dbSubjectVisit.SubjectId 
 | 
					                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => trialInOrderCriterionIdList.Contains(x.TrialReadingCriterionId)&& x.SubjectId == dbSubjectVisit.SubjectId&&
 | 
				
			||||||
                        &&x.VisitTaskNum < Math.Ceiling(dbSubjectVisit.VisitNum+0.01m)  // 当前的访视 全局 裁判 及之前 全都加急
 | 
					                        dbSubjectVisit.VisitNum<= x.VisitTaskNum && x.VisitTaskNum < Math.Ceiling(dbSubjectVisit.VisitNum+0.01m)  // 当前的访视 全局 裁判 及之前 全都加急
 | 
				
			||||||
                        && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
 | 
					                        && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
 | 
				
			||||||
                        {
 | 
					                        {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1256,6 +1256,17 @@ namespace IRaCIS.Core.Application.Image.QA
 | 
				
			||||||
                            TaskUrgentType = TaskUrgentType.PDProgress,
 | 
					                            TaskUrgentType = TaskUrgentType.PDProgress,
 | 
				
			||||||
                            IsCanEditUrgentState=false,
 | 
					                            IsCanEditUrgentState=false,
 | 
				
			||||||
                        });
 | 
					                        });
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                        await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => trialInOrderCriterionIdList.Contains(x.TrialReadingCriterionId) && x.SubjectId == dbSubjectVisit.SubjectId
 | 
				
			||||||
 | 
					                       && x.VisitTaskNum < dbSubjectVisit.VisitNum  // 当前的访视 全局 裁判 及之前 全都加急
 | 
				
			||||||
 | 
					                       && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.TaskState == TaskState.Effect, x => new VisitTask()
 | 
				
			||||||
 | 
					                       {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                           IsUrgent = true,
 | 
				
			||||||
 | 
					                           TaskUrgentType = TaskUrgentType.Other,
 | 
				
			||||||
 | 
					                           TaskUrgentRemake= "后续访视设为pd",
 | 
				
			||||||
 | 
					                           IsCanEditUrgentState = false,
 | 
				
			||||||
 | 
					                       });
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                    else if (dbSubjectVisit.IsEnrollmentConfirm)
 | 
					                    else if (dbSubjectVisit.IsEnrollmentConfirm)
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue