盲态名称修改
continuous-integration/drone/push Build is running Details

Uat_IRC_Net10
hang 2026-07-10 14:26:35 +08:00
parent 4ca67212aa
commit 2be6757e23
1 changed files with 12 additions and 4 deletions

View File

@ -212,6 +212,8 @@ namespace IRaCIS.Core.Application.Service
var blindTaskName = string.Empty; var blindTaskName = string.Empty;
var isRandom = false;
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder) if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
{ {
if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0 && subjectVisit.VisitNum == 0) if (visitNumList.IndexOf(subjectVisit.VisitNum) == 0 && subjectVisit.VisitNum == 0)
@ -227,6 +229,8 @@ namespace IRaCIS.Core.Application.Service
else if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.Random) else if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.Random)
{ {
blindTaskName = await GetRandomTaskName(trialId, randomTaskBlindNameList); blindTaskName = await GetRandomTaskName(trialId, randomTaskBlindNameList);
isRandom = true;
} }
else else
{ {
@ -300,7 +304,8 @@ namespace IRaCIS.Core.Application.Service
{ {
currentMaxCodeInt = currentMaxCodeInt + 1; currentMaxCodeInt = currentMaxCodeInt + 1;
var blindTaskName2= await GetRandomTaskName(trialId, randomTaskBlindNameList);
var blindTaskName2 = isRandom ? await GetRandomTaskName(trialId, randomTaskBlindNameList) : blindTaskName;
task2 = await _visitTaskRepository.AddAsync(new VisitTask() task2 = await _visitTaskRepository.AddAsync(new VisitTask()
{ {
@ -700,6 +705,7 @@ namespace IRaCIS.Core.Application.Service
var blindTaskName = string.Empty; var blindTaskName = string.Empty;
var isFullRandom = false;
if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder) if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.InOrder)
{ {
@ -716,6 +722,7 @@ namespace IRaCIS.Core.Application.Service
else if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.Random) else if (trialReadingCriterionConfig.IsReadingTaskViewInOrder == ReadingOrder.Random)
{ {
blindTaskName = await GetRandomTaskName(trialId, randomTaskBlindNameList); blindTaskName = await GetRandomTaskName(trialId, randomTaskBlindNameList);
isFullRandom = true;
} }
//受试者随机 //受试者随机
else else
@ -772,7 +779,8 @@ namespace IRaCIS.Core.Application.Service
{ {
currentMaxCodeInt = currentMaxCodeInt + 1; currentMaxCodeInt = currentMaxCodeInt + 1;
var blindTaskName2 = await GetRandomTaskName(trialId, randomTaskBlindNameList); var blindTaskName2 = isFullRandom ? await GetRandomTaskName(trialId, randomTaskBlindNameList) : blindTaskName;
task2 = await _visitTaskRepository.AddAsync(new VisitTask() task2 = await _visitTaskRepository.AddAsync(new VisitTask()
{ {
@ -1607,9 +1615,9 @@ namespace IRaCIS.Core.Application.Service
var subjectUser = await _subjectUserRepository.Where(x => x.SubjectId == firstTask.SubjectId && x.ArmEnum == Arm.JudgeArm && x.IsConfirmed && x.TrialReadingCriterionId == firstTask.TrialReadingCriterionId).FirstOrDefaultAsync(); var subjectUser = await _subjectUserRepository.Where(x => x.SubjectId == firstTask.SubjectId && x.ArmEnum == Arm.JudgeArm && x.IsConfirmed && x.TrialReadingCriterionId == firstTask.TrialReadingCriterionId).FirstOrDefaultAsync();
var isRandom = trialReadingCriterionConfigList.FirstOrDefault(t => t.TrialReadingCriterionId == firstTask.TrialReadingCriterionId)?.IsReadingTaskViewInOrder == ReadingOrder.Random; var isRandom = trialReadingCriterionConfigList.FirstOrDefault(t => t.TrialReadingCriterionId == firstTask.TrialReadingCriterionId)?.IsReadingTaskViewInOrder == ReadingOrder.Random;
var blindName = isRandom ? await GetRandomTaskName(trialId, randomTaskBlindNameList) : firstTask.TaskBlindName; var blindName = isRandom ? await GetRandomTaskName(trialId, randomTaskBlindNameList) : firstTask.TaskBlindName;
VisitTask visitTask = new VisitTask() VisitTask visitTask = new VisitTask()
{ {