diff --git a/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs
index d347e03a4..3eed41f3b 100644
--- a/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs
+++ b/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs
@@ -342,7 +342,7 @@ public static class ExcelExportHelper
             IgnoreTemplateParameterMissing = true,
         };
 
-        await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, translateData, config);
+        await MiniExcel.SaveAsByTemplateAsync(memoryStream, templateStream.ToArray(), translateData, config);
 
         memoryStream.Seek(0, SeekOrigin.Begin);
 
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 96c28bf13..863ef4c7e 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1088,7 +1088,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                  .WhereIf(critrion.IsAutoCreate == false, t => !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum))
 
                 // 前序 不存在 未一致性核查未通过的
-                .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum))
+                .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum >= sv.VisitNum))
                 //.WhereIf(critrion.IsAutoCreate == false, t => t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(t => t.IsGeneratedTask == false) ?
                 //t.VisitTaskNum <= t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsGeneratedTask == false).Min(t => t.SubjectVisit.VisitNum) : true)
                 //.Where(t => t.Subject.SubjectVisitList.Any(t => t.CheckState != CheckStateEnum.CVPassed) ? t.VisitTaskNum <= t.Subject.SubjectVisitList.Where(t => t.CheckState != CheckStateEnum.CVPassed).Min(t => t.VisitNum) : true)
@@ -2281,7 +2281,13 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                     #region 方式二
 
-                    var origenalTask = influenceTaskList.Where(t => t.Id == task.Id).FirstOrDefault();
+
+                    //pm退回的时候，影响的任务里不一定有该任务id  双重 分配了一个人，退回的时候，选择的是未分配的
+
+                    //var origenalTask = influenceTaskList.Where(t => t.Id == task.Id).FirstOrDefault();
+
+                    var origenalTask = await _visitTaskRepository.FindAsync(task.Id);
+
 
                     foreach (var influenceTask in influenceTaskList)
                     {
@@ -2340,7 +2346,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
                     await SetMedicalReviewInvalidAsync(currentVisitList);
 
-                    var origenalTask = currentVisitList.Where(t => t.Id == task.Id).First();
+                    //var origenalTask = currentVisitList.Where(t => t.Id == task.Id).First();
+
+                    var origenalTask = await _visitTaskRepository.FindAsync(task.Id);
 
                     foreach (var influenceTask in currentVisitList)
                     {