修改列表

2022-07-21 13:27:44 +08:00
parent ea88cdba57
commit e1f3e20962
4 changed files with 12 additions and 6 deletions
@@ -130,7 +130,7 @@ namespace IRaCIS.Core.Application.Service

                        int.TryParse(maxCodeStr, out maxCodeInt);

-                        blindSubjectCode = (maxCodeInt + 1).ToString($"D{filterObj.BlindSubjectNumberOfPlaces}");
+                        blindSubjectCode = filterObj.BlindTrialSiteCode + (maxCodeInt + 1).ToString($"D{filterObj.BlindSubjectNumberOfPlaces}");
                    }

                    subject.VisitTaskList = subject.VisitTaskList.Take(filterObj.PlanVisitCount).ToList();
@@ -1215,10 +1215,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
                        //有序阅片
                        if (trialConfig.IsReadingTaskViewInOrder)
                        {
-                            Expression<Func<VisitTask, bool>> filterExpression = t => t.TrialId == trialId && t.SubjectId == origenalTask.SubjectId && t.TaskState == TaskState.Effect;
-
-                            //是否是一致性分析任务
-                            filterExpression = filterExpression.And(t => t.IsAnalysisCreate == origenalTask.IsAnalysisCreate);
+   

                            //访视影响当前以及当前之后的  两个阅片人的
                            filterExpression = filterExpression.And(t => t.VisitTaskNum > origenalTask.VisitTaskNum && t.DoctorUserId == origenalTask.DoctorUserId || t.VisitTaskNum >= origenalTask.VisitTaskNum && t.DoctorUserId != origenalTask.DoctorUserId);