diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index eb467c64e..f3f8344e2 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -2643,7 +2643,7 @@ public class VisitTaskService(IRepository _visitTaskRepository, /// 申请记录的Id /// [HttpGet("{taskId:guid}/{isReReading:bool}")] - public async Task<(List, object)> GetReReadingOrBackInfluenceTaskList(Guid taskId, bool isReReading, Guid? applyId) + public async Task>> GetReReadingOrBackInfluenceTaskList(Guid taskId, bool isReReading, Guid? applyId) { var isIRAppyTaskInfluenced = false; @@ -2686,7 +2686,7 @@ public class VisitTaskService(IRepository _visitTaskRepository, } } - //(1、PM回退,PM申请重阅,SPM同意回退) + //(1、PM回退,PM申请重阅,SPM同意回退)--20250804-感觉这里没用,不用限制 else { filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId || t.TrialReadingCriterion.CriterionType == CriterionType.RECIST1Pointt1_MB); @@ -2695,8 +2695,12 @@ public class VisitTaskService(IRepository _visitTaskRepository, } else { - //默认影响的都是该标准的任务 - filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId); + if (isReReading == true) + { + //默认影响的都是该标准的任务 + filterExpression = filterExpression.And(t => t.TrialReadingCriterionId == filterObj.TrialReadingCriterionId); + } + } @@ -2938,8 +2942,8 @@ public class VisitTaskService(IRepository _visitTaskRepository, } #endregion - - return (list, new { IsIRAppyTaskInfluenced = isIRAppyTaskInfluenced }); + //IsIRAppyTaskInfluenced 列表中存在IR已申请重阅的任务! + return ResponseOutput.Ok(list, new { IsIRAppyTaskInfluenced = isIRAppyTaskInfluenced }); }