IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs

@@ -663,7 +663,6 @@ namespace IRaCIS.Core.Application.Service
                                     var isNeedClinicalDataSign = IsNeedClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionConfig.TrialReadingCriterionId, clinicalDataConfirmList);
                                     var isClinicalDataSign = IsClinicalDataSign(ReadingCategory.Visit, subjectVisit.IsBaseLine, trialReadingCriterionConfig.TrialReadingCriterionId, clinicalDataConfirmList, subjectVisit.Id, trialId);
 
-                                    var isFrontTaskNeedSignButNotSign = await _visitTaskRepository.AnyAsync(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.TaskState == TaskState.Effect && t.VisitTaskNum < subjectVisit.VisitNum && t.IsNeedClinicalDataSign == true && t.IsClinicalDataSign == false);
 
                                     if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0)
                                     {
@@ -720,8 +719,7 @@ namespace IRaCIS.Core.Application.Service
 
                                                 TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
                                                 IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                                IsClinicalDataSign = isClinicalDataSign,
+                                                IsClinicalDataSign = isClinicalDataSign
-                                                IsFrontTaskNeedSignButNotSign = isFrontTaskNeedSignButNotSign
                                             });
                                         }
 
@@ -748,8 +746,7 @@ namespace IRaCIS.Core.Application.Service
 
                                                 TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
                                                 IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                                IsClinicalDataSign = isClinicalDataSign,
+                                                IsClinicalDataSign = isClinicalDataSign
-                                                IsFrontTaskNeedSignButNotSign = isFrontTaskNeedSignButNotSign
                                             });
                                         }
 
@@ -1071,8 +1068,7 @@ namespace IRaCIS.Core.Application.Service
 
                                             TrialReadingCriterionId = trialReadingCriterionConfig.TrialReadingCriterionId,
                                             IsNeedClinicalDataSign = isNeedClinicalDataSign,
-                                            IsClinicalDataSign = isClinicalDataSign,
+                                            IsClinicalDataSign = isClinicalDataSign
-                                            IsFrontTaskNeedSignButNotSign= isFrontTaskNeedSignButNotSign
                                         });
 
 

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -1074,6 +1074,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
         {
             var trialReadingCriterionId = inDto.TrialReadingCriterionId;
 
+            //Expression<Func<VisitTask, bool>> visitTaskLambda = x => x.DoctorUserId == _userInfo.Id && x.TaskState == TaskState.Effect && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId;
 
             var critrion = await _trialReadingCriterionRepository.FindAsync(trialReadingCriterionId);