From 0af910f3ec69cb0735a81f5605692df63911e28d Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 17 Aug 2022 16:14:33 +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

---
 .../Service/Reading/Dto/OrganInfoViewModel.cs          | 10 ++++++++++
 .../Service/Reading/OrganInfoService.cs                |  7 +++++++
 .../Service/Reading/ReadingQuestionService.cs          |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
index 2ddd4c272..26693ce86 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
@@ -131,6 +131,16 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public bool IsEnable { get; set; }
 
+        /// <summary>
+        /// 病灶类型
+        /// </summary>
+        public string NidusType { get; set; }
+
+        /// <summary>
+        /// 病灶类型
+        /// </summary>
+        public string NidusTypeCN { get; set; }
+
         /// <summary>
 		/// 备注
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
index 04d9367ef..ae9ec5b58 100644
--- a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
@@ -174,6 +174,11 @@ namespace IRaCIS.Core.Application.Service
                                      join trialData in _organTrialInfoRepository.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable)
                                      .Where(x => x.TrialId == inDto.TrialId)
                                      on data.Id equals trialData.OrganInfoId
+
+                                     join criterionNidus in _criterionNidusRepository.AsQueryable() on trialData.CriterionNidusId equals criterionNidus.Id into criterionNidustemp
+                                     from leftcriterionNidus in criterionNidustemp.DefaultIfEmpty()
+
+                                   
                                      select new GetTrialOrganListOutDto()
                                      {
                                          Id = trialData.Id,
@@ -183,6 +188,8 @@ namespace IRaCIS.Core.Application.Service
                                          Remark= data.Remark,
                                          CriterionNidusId = data.CriterionNidusId,
                                          IsEnable= trialData.IsEnable,
+                                         NidusType= leftcriterionNidus.NidusType,
+                                         NidusTypeCN= leftcriterionNidus.NidusTypeCN,
                                      };
 
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
index f4924cbc7..9606096cd 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
@@ -327,7 +327,7 @@ namespace IRaCIS.Application.Services
                     });
 
 
-                    //var list
+                    //var trial
                     await _readingQuestionTrialRepository.SaveChangesAsync();
                 }
             }