From 625a4819e9fd172b744e597a5a45a4e67b5b0c70 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 20 Dec 2023 14:54:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingImageTask/ReadingOncologyTaskService.cs    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
index 2000770b2..b28a4570f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
+++ b/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)
                 {
-                    throw new BusinessValidationFailedException(_localizer["ReadingOncology_Abnormal"]);
+                    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();
             }

From 1316dae035be2a1432ce410313b2ca6f11621ec2 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 20 Dec 2023 15:53:51 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingImageTask/ReadingOncologyTaskService.cs     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
index b28a4570f..268ad1b50 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs
@@ -266,6 +266,16 @@ namespace IRaCIS.Application.Services
                 && x.ReadingCategory == ReadingCategory.Global
                          && x.ReadingTaskState == ReadingTaskState.HaveSigned).Select(x => x.JudgeVisitTaskId).FirstOrDefaultAsync();
 
+                // 要判断是否为老裁判任务的Id
+                if (judgeVisitTaskId != null)
+                {
+                    // 如果不存在有效的裁判
+                    if (!(await _visitTaskRepository.AnyAsync(x => x.Id == judgeVisitTaskId && x.TaskState == TaskState.Effect)))
+                    {
+                        judgeVisitTaskId = null;
+                    }
+                }
+
                 // 获取系统配置
                 var readingType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == readModuleInfo.TrialReadingCriterionId).Select(x => x.ReadingType).FirstOrDefaultAsync();
 

From 6d4ce03c10e9ebad5751effb690958e0e5a1f40b Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 20 Dec 2023 16:04:46 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/ClinicalData/ClinicalAnswerService.cs  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
index cbe5c9cae..6b0a3b09a 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
@@ -271,6 +271,13 @@ namespace IRaCIS.Core.Application.Service
             &&x.ClinicalQuestionType!= ReadingQestionType.Group
             && x.ClinicalQuestionType != ReadingQestionType.Table).OrderByDescending(x=>x.IsCheckDate).ThenBy(x=>x.ShowOrder)
                .ProjectTo<TrialClinicalQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
+            if (_userInfo.IsEn_Us)
+            {
+                result.QuestionList.ForEach(x => {
+                    x.GroupName = x.GroupEnName;
+                    x.QuestionName = x.QuestionEnName;
+                });
+            }
 
             var answers = await _clinicalQuestionAnswerRepository.Where(x => x.SubjectId == inDto.SubjectId && x.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
                 .Select(x => new