From a92a8c8c9aad6c38b2ed9fee26dca28aa46fe036 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 20 Sep 2022 14:07:57 +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/ReadingImageTaskViewModel.cs       | 7 +++++++
 .../Service/Reading/ReadingCalculateService.cs             | 1 -
 .../Service/Reading/ReadingImageTaskService.cs             | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 9cb9b2f2d..73ce11096 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -1104,6 +1104,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
 		public Guid ReadingQuestionId { get; set; }
 
+        /// <summary>
+        /// 字典code
+        /// </summary>
+        public string DictionaryCode { get; set; } = string.Empty;
+
+
+
         /// <summary>
         /// Type
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
index 34049e0d2..b244a892c 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
@@ -594,7 +594,6 @@ namespace IRaCIS.Core.Application.Service
 			var questionIds = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).Select(x => x.QuestionId).ToList();
 			var lastQuestionAsnwer = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == LastVisitTaskId && questionIds.Contains(x.QuestionId)).Include(x=>x.ReadingQuestionTrial).Include(x => x.ReadingTableQuestionTrial).ToListAsync();
 			var rowIndexs = lastQuestionAsnwer.Where(x=>x.ReadingTableQuestionTrial.QuestionMark==QuestionMark.IsLymph&& (x.Answer == "是" || x.Answer.ToLower() == "true".ToLower())).Select(x => x.RowIndex).Distinct().OrderBy(x => x).ToList();
-
 			var thisQuestionAsnwer = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList();
 
 			var isExists = false;
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index c0d99b0c1..93ecf831c 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -1460,6 +1460,7 @@ namespace IRaCIS.Application.Services
                 GroupName = string.Empty,
                 Id = x.Id,
                 Type = x.Type,
+                DictionaryCode=x.DictionaryCode,
                 TableQuestionType = x.TableQuestionType,
                 DependParentId = x.DependParentId,
                 IsDepend = x.IsDepend,
@@ -1479,6 +1480,7 @@ namespace IRaCIS.Application.Services
                     ShowOrder = x.ShowOrder,
                     GroupName = string.Empty,
                     Id = x.Id,
+                    DictionaryCode = x.DictionaryCode,
                     Type = x.Type,
                     TableQuestionType = x.TableQuestionType,
                     DependParentId = x.DependParentId,