Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

2023-05-22 17:43:30 +08:00
parent af86dd92c5 3ed4d29af3
commit bebb76e51a
2 changed files with 2 additions and 3 deletions
@@ -43,8 +43,6 @@ public class LimitUserRequestAuthorization :BaseService, IAsyncAuthorizationFilt
            {
                //1、用户登陆的时候，设置缓存

-
-
                //没有从请求中取到token
                if (string.IsNullOrWhiteSpace(_userInfo.UserToken))
                {
@@ -1354,7 +1354,8 @@ namespace IRaCIS.Core.Application.Service.Allocation
                            var originalTask = pmApply.OriginalReReadingTask;

                            //PM 有序影响列表
-                            if (await _visitTaskRepository.Where(t => t.TrialId == originalTask.TrialId && t.SubjectId == originalTask.SubjectId && t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.Allocated && t.IsAnalysisCreate == false && t.TrialReadingCriterionId == originalTask.TrialReadingCriterionId && t.VisitTaskNum > originalTask.VisitTaskNum).AnyAsync(t => t.VisitTaskNum == task.VisitTaskNum))
+                            if (await _visitTaskRepository.Where(t => t.TrialId == originalTask.TrialId && t.SubjectId == originalTask.SubjectId && t.TaskState == TaskState.Effect && t.TaskAllocationState == TaskAllocationState.Allocated && t.IsAnalysisCreate == false && t.TrialReadingCriterionId == originalTask.TrialReadingCriterionId && t.VisitTaskNum >= originalTask.VisitTaskNum)
+                                .AnyAsync(t => t.VisitTaskNum == task.VisitTaskNum))
                            {
                                //---当前为有序阅片，影像存在问题，项目组已申请回退,暂不能申请重阅
                                return ResponseOutput.NotOk(_localizer["VisitTask_ImageProblem"]);