退回影响列表和实际退回一致

This commit is contained in:
2025-08-04 18:03:54 +08:00
parent e4b06786de
commit f2f8d00e31
@@ -2643,7 +2643,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
/// <param name="applyId"> 申请记录的Id</param>
/// <returns></returns>
[HttpGet("{taskId:guid}/{isReReading:bool}")]
public async Task<(List<InfluenceTaskInfo>, object)> GetReReadingOrBackInfluenceTaskList(Guid taskId, bool isReReading, Guid? applyId)
public async Task<IResponseOutput<List<InfluenceTaskInfo>>> GetReReadingOrBackInfluenceTaskList(Guid taskId, bool isReReading, Guid? applyId)
{
var isIRAppyTaskInfluenced = false;
@@ -2686,7 +2686,7 @@ public class VisitTaskService(IRepository<VisitTask> _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<VisitTask> _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<VisitTask> _visitTaskRepository,
}
#endregion
return (list, new { IsIRAppyTaskInfluenced = isIRAppyTaskInfluenced });
//IsIRAppyTaskInfluenced 列表中存在IR已申请重阅的任务!
return ResponseOutput.Ok(list, new { IsIRAppyTaskInfluenced = isIRAppyTaskInfluenced });
}