Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs

@@ -54,9 +54,10 @@ namespace IRaCIS.Application.Services
 
             VisitTask? globalTaskInfo = null;
             var relatedVisitTaskIdList = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.RelatedVisitTaskIdList).FirstNotNullAsync();
+            Guid? judgeResultTaskId = null;
             if (taskInfo.ReadingTaskState == ReadingTaskState.HaveSigned && relatedVisitTaskIdList.Count() > 0)
             {
-                var judgeResultTaskId = await _visitTaskRepository.Where(x => x.Id == relatedVisitTaskIdList[0]).Select(x => x.JudgeResultTaskId).FirstOrDefaultAsync();
+                 judgeResultTaskId = await _visitTaskRepository.Where(x => x.Id == relatedVisitTaskIdList[0]).Select(x => x.JudgeResultTaskId).FirstOrDefaultAsync();
 
                 // 说明是裁判 取裁判结果
                 if (judgeResultTaskId != null)
@@ -100,11 +101,15 @@ namespace IRaCIS.Application.Services
             }
             else
             {
-                var judgeResultTaskId = await _visitTaskRepository.Where(x => x.Id == globalTaskInfo.JudgeVisitTaskId).Select(x => x.JudgeResultTaskId).FirstOrDefaultAsync();
+                if (judgeResultTaskId == null)
+                {
+                    judgeResultTaskId = await _visitTaskRepository.Where(x => x.Id == globalTaskInfo.JudgeVisitTaskId).Select(x => x.JudgeResultTaskId).FirstOrDefaultAsync();
                     if (judgeResultTaskId == null)
                     {
                         throw new BusinessValidationFailedException(_localizer["ReadingOncology_Abnormal"]);
                     }
+                }
+               
                 visitTask = await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).FirstNotNullAsync();
                 visitTaskIdList= await _visitTaskRepository.Where(x => x.Id == judgeResultTaskId).Select(x=>x.RelatedVisitTaskIdList).FirstNotNullAsync();
             }