From b89cfeb90c66e2cdfb022605724ae8aca3ecf64a Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Thu, 7 Nov 2024 10:19:25 +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

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs  |  3 ++
 .../ReadingImageTaskService.cs                | 43 ++++++-------------
 .../Service/Reading/_MapConfig.cs             |  3 ++
 3 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 071c9b024..e165d3563 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -2436,6 +2436,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string Type { get; set; }
 
+        public ValueUnit? Unit { get; set; }
+
         /// <summary>
         /// ParentId
         /// </summary>
@@ -2566,6 +2568,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public Guid ReadingQuestionCriterionSystemId { get; set; }
 
+        public ValueUnit? Unit { get; set; }
 
         /// <summary>
 		/// 问题类型
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 0a661d684..733d7bc52 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1,4 +1,5 @@
-using IRaCIS.Core.Application.Contracts;
+using DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments;
+using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Interfaces;
@@ -14,6 +15,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using NPOI.POIFS.Properties;
 using NPOI.SS.Formula.Functions;
 using Panda.DynamicWebApi.Attributes;
 using ZiggyCreatures.Caching.Fusion;
@@ -1308,38 +1310,19 @@ namespace IRaCIS.Core.Application.Service
             item.TableQuestions = new TrialReadTableQuestion();
 
             item.TableQuestions.Questions = tableQuestionLists.Where(x => x.ReadingQuestionId == item.Id).OrderBy(x => x.ShowOrder).ToList();
-
             item.TableQuestions.Questions.ForEach(x =>
             {
-
-                x.RelationQuestions = tableQuestionLists.Where(z => (z.DependParentId ?? default(Guid)) == x.Id).Select(x => new GetTrialReadingQuestionOutDto
+                x.RelationQuestions= _mapper.Map<List<GetTrialReadingQuestionOutDto>>(tableQuestionLists.Where(z => (z.DependParentId ?? default(Guid)) == x.Id));
+                x.RelationQuestions.ForEach(y =>
                 {
-                    Childrens = new List<GetTrialReadingQuestionOutDto>(),
-                    ShowOrder = x.ShowOrder,
-                    GroupName = string.Empty,
-                    Id = x.Id,
-                    DictionaryCode = x.DictionaryCode,
-                    Type = x.Type,
-                    TableQuestionType = x.TableQuestionType,
-                    DependParentId = x.DependParentId,
-                    IsDepend = x.IsDepend,
-                    QuestionMark = x.QuestionMark,
-                    TypeValue = x.TypeValue,
-                    RelevanceId = x.RelevanceId,
-                    RelevanceValue = x.RelevanceValue,
-                    ImageCount = 0,
-                    ParentId = item.Id,
-                    DataTableColumn = x.DataTableColumn,
-                    LesionType = item.LesionType,
-                    QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us),
-                    RelationQuestions = new List<GetTrialReadingQuestionOutDto>(),
-                    Remark = x.Remark,
-                    ValueType = x.ValueType,
-                    Unit = x.Unit,
-                    ClassifyAlgorithms=x.ClassifyAlgorithms,
-                    IsCopy=x.IsCopy,
-                    ClassifyTableQuestionId=x.ClassifyTableQuestionId,
-                }).ToList();
+                    y.Childrens = new List<GetTrialReadingQuestionOutDto>();
+                    y.GroupName = string.Empty;
+                    y.ImageCount = 0;
+                    y.ParentId = item.Id;
+                    y.LesionType = item.LesionType;
+                    y.RelationQuestions = new List<GetTrialReadingQuestionOutDto>();
+                });
+               
             });
 
             var thisAnswer = tableAnswers.Where(x => x.QuestionId == item.Id).ToList();
diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
index 73aad5acf..15258cf36 100644
--- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
@@ -353,6 +353,9 @@ namespace IRaCIS.Core.Application.Service
                   .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName))
                 .ForMember(x => x.Id, y => y.MapFrom(z => z.Id));
 
+            CreateMap<TableQuestionTrial, GetTrialReadingQuestionOutDto>();
+              
+
             //CreateMap<VisitTask, GetReadingPastResultListOutDto>()
             //      .ForMember(x => x.VisitTaskId, y => y.MapFrom(z => z.Id))
             //     .ForMember(x => x.JudgeResultArm, y => y.MapFrom(z => (z.JudgeResultTask==null?null:z.JudgeResultTask.ArmEnum)));