From 03026a84c72cfda384aa21bbd83bf463c9eee412 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 28 Jun 2023 14:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml    |  7 +++++++
 .../Reading/ClinicalData/ClinicalAnswerService.cs      | 10 +++++++++-
 .../Service/Reading/Dto/ClinicalAnswerDto.cs           |  4 +++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index e9b41531c..9b20bf2e4 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2494,6 +2494,13 @@
             临床答案
             </summary>	
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ClinicalAnswerService.AutoAddCRCClinical(IRaCIS.Core.Application.Service.Reading.Dto.AutoAddClinicalInDto)">
+            <summary>
+            自动添加CRC临床数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ClinicalAnswerService.GetCRCSubjectClinicalList(IRaCIS.Core.Application.Service.Reading.Dto.GetCRCSubjectClinicalInDto)">
             <summary>
             获取CRC受试者临床数据
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
index 59268af2f..30d4df490 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs
@@ -192,12 +192,20 @@ namespace IRaCIS.Core.Application.Service
                 .Include(x=>x.ClinicalDataTrialSet).Select(x=>new GetCRCSubjectClinicalOutDto() { 
                   SubjectId=x.SubjectId,
 					ClinicalDataTrialSetId = x.ClinicalDataTrialSet.Id,
-					ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName.LanguageName(x.ClinicalDataTrialSet.ClinicalDataSetEnName, _userInfo.IsEn_Us),
+					ClinicalDataSetEnName= x.ClinicalDataTrialSet.ClinicalDataSetEnName,
+					ClinicalDataSetName = x.ClinicalDataTrialSet.ClinicalDataSetName,
 				}).OrderBy(x=>x.ClinicalDataSetName).ToListAsync();
 
+            // 一次查询报错 分两次写
+            clinicalData.ForEach(x =>
+            {
+                x.ClinicalDataSetEnName = x.ClinicalDataSetName.LanguageName(x.ClinicalDataSetEnName, _userInfo.IsEn_Us);
 
+            });
 			
 
+
+
 			var clinicalFormData = await _clinicalFormRepository.Where(x => x.SubjectId == inDto.TrialId).ToListAsync();
 
 			subjects.ForEach(x =>
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
index 80825b48d..5c242ed5f 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalAnswerDto.cs
@@ -30,7 +30,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string ClinicalDataSetName { get; set; }
 
-        public int ClinicalCount { get; set; } = 0;
+		public string ClinicalDataSetEnName { get; set; }
+
+		public int ClinicalCount { get; set; } = 0;
     }