Compare commits

..

No commits in common. "0e12f2cdac336797bd3c318a8f198689321bda4d" and "935dafb917b734490e83cf1d5f9dd250c480f9bd" have entirely different histories.

1 changed files with 6 additions and 10 deletions

View File

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