Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

关联任务修改
2024-09-06 09:22:08 +08:00 · 2024-09-06 09:22:06 +08:00
1 changed files with 5 additions and 2 deletions
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@ -502,9 +502,12 @@ namespace IRaCIS.Application.Services
           x.ReadingTaskState == ReadingTaskState.HaveSigned &&
           x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
           x.TaskState == TaskState.Effect &&
-           x.VisitTaskNum <= taskInfo.VisitTaskNum &&
           x.IsAnalysisCreate == taskInfo.IsAnalysisCreate &&
-           x.ReadingCategory == ReadingCategory.Visit) || x.Id == inDto.VisitTaskId);
+           x.ReadingCategory == ReadingCategory.Visit) || x.Id == inDto.VisitTaskId)
+           .WhereIf(taskInfo.TrialReadingCriterion.IsReadingTaskViewInOrder != ReadingOrder.SubjectRandom,x=> x.VisitTaskNum <= taskInfo.VisitTaskNum);
+
+                
+               

            if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned)
            {
Author	SHA1	Message	Date
he	caf5946b9e	Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8 continuous-integration/drone/push Build is passing Details	2024-09-06 09:22:08 +08:00
he	7dce99e045	关联任务修改	2024-09-06 09:22:06 +08:00