From fa9573cf54150f22344d48f834a76f0536068192 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 20 Dec 2023 16:56:18 +0800
Subject: [PATCH] =?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

---
 .../ClinicalData/ClinicalQuestionService.cs   | 30 +++++++++++++++++++
 .../Service/Reading/_MapConfig.cs             |  2 ++
 2 files changed, 32 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
index 93e63756f..6950d35d9 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs
@@ -121,9 +121,23 @@ namespace IRaCIS.Core.Application.Service
             var questions = await _systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId)
                 .ProjectTo<ClinicalQuestionPreviewDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
 
+            if (_userInfo.IsEn_Us)
+            {
+                questions.ForEach(x => {
+                    x.GroupName = x.GroupEnName;
+                    x.QuestionName = x.QuestionEnName;
+                });
+            }
             var tableQuestions= await _systemClinicalTableQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId)
                 .ProjectTo<ClinicalTablePreviewDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
 
+
+            if (_userInfo.IsEn_Us)
+            {
+                tableQuestions.ForEach(x => {
+                    x.QuestionName = x.QuestionEnName;
+                });
+            }
             questions.ForEach(x => x.CreateTime = null);
             var result = questions.Where(x => x.ClinicalQuestionType == ReadingQestionType.Group).ToList();
 
@@ -146,10 +160,26 @@ namespace IRaCIS.Core.Application.Service
         {
             var questions = await _trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId)
                 .ProjectTo<ClinicalQuestionPreviewDto>(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder).ToListAsync();
+          
+            if (_userInfo.IsEn_Us)
+            {
+                questions.ForEach(x => {
+                    x.GroupName = x.GroupEnName;
+                    x.QuestionName = x.QuestionEnName;
+                });
+            }
+
 
             var tableQuestions = await _trialClinicalTableQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId)
                 .ProjectTo<ClinicalTablePreviewDto>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
 
+            if (_userInfo.IsEn_Us)
+            {
+                tableQuestions.ForEach(x => {
+                    x.QuestionName = x.QuestionEnName;
+                });
+            }
+
             questions.ForEach(x => x.CreateTime = null);
             var result = questions.Where(x => x.ClinicalQuestionType == ReadingQestionType.Group).OrderBy(x => x.ShowOrder).ToList();
 
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index 0c91f8dc2..f54ef8d61 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -50,7 +50,9 @@ namespace IRaCIS.Core.Application.Service
 
             // 预览
             CreateMap<TrialClinicalQuestion, ClinicalQuestionPreviewDto>();
+
             CreateMap<SystemClinicalQuestion, ClinicalQuestionPreviewDto>();
+                
             CreateMap<SystemClinicalTableQuestion, ClinicalTablePreviewDto>();
             CreateMap<TrialClinicalTableQuestion, ClinicalTablePreviewDto>();
             #endregion