Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

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>
 		/// 问题类型

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= _mapper.Map<List<GetTrialReadingQuestionOutDto>>(tableQuestionLists.Where(z => (z.DependParentId ?? default(Guid)) == x.Id));
-                x.RelationQuestions = tableQuestionLists.Where(z => (z.DependParentId ?? default(Guid)) == x.Id).Select(x => new GetTrialReadingQuestionOutDto
+                x.RelationQuestions.ForEach(y =>
                 {
-                    Childrens = new List<GetTrialReadingQuestionOutDto>(),
+                    y.Childrens = new List<GetTrialReadingQuestionOutDto>();
-                    ShowOrder = x.ShowOrder,
+                    y.GroupName = string.Empty;
-                    GroupName = string.Empty,
+                    y.ImageCount = 0;
-                    Id = x.Id,
+                    y.ParentId = item.Id;
-                    DictionaryCode = x.DictionaryCode,
+                    y.LesionType = item.LesionType;
-                    Type = x.Type,
+                    y.RelationQuestions = new List<GetTrialReadingQuestionOutDto>();
-                    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();
             });
 
             var thisAnswer = tableAnswers.Where(x => x.QuestionId == item.Id).ToList();

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs

@@ -1,9 +1,12 @@
-using IRaCIS.Core.Application.Contracts;
+using DocumentFormat.OpenXml.Office2019.Excel.ThreadedComments;
+using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore.Common;
 using Microsoft.AspNetCore.Mvc;
+using NPOI.POIFS.Properties;
 using Panda.DynamicWebApi.Attributes;
+using System.Collections.Generic;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -265,64 +268,27 @@ namespace IRaCIS.Core.Application.Service
         public void FindSystemChildQuestion(GetSystemReadingQuestionOutDto item, List<GetSystemReadingQuestionOutDto> questionlists, List<TableQuestionDataInfo> tableQuestions)
         {
             item.Childrens = questionlists.Where(x => x.ParentId == item.Id || (item.Type == ReadingQestionType.Group && x.Type != ReadingQestionType.Group && x.ParentId == null && x.GroupId == item.Id)).ToList();
-
+            var itemChild = _mapper.Map<List<GetSystemReadingQuestionOutDto>>(tableQuestions.Where(x => x.ReadingQuestionId == item.Id).ToList());
-            item.Childrens.AddRange(tableQuestions.Where(x => x.ReadingQuestionId == item.Id).Select(x => new GetSystemReadingQuestionOutDto
+            itemChild.ForEach(x =>
             {
-                Childrens = new List<GetSystemReadingQuestionOutDto>(),
+                x.Childrens = new List<GetSystemReadingQuestionOutDto>();
-                ShowOrder = x.ShowOrder,
+                x.GroupName = string.Empty;
-                GroupName = string.Empty,
+                x.ImageCount = 0;
-                Id = x.Id,
+                x.ParentId = item.Id;
-                Type = x.Type,
+                var relationQuestions= _mapper.Map<List<GetSystemReadingQuestionOutDto>>(tableQuestions.Where(z => (z.DependParentId ?? default(Guid)) == x.Id).ToList());
-                DictionaryCode = x.DictionaryCode,
+                relationQuestions.ForEach(y =>
-                TableQuestionType = x.TableQuestionType,
-                DependParentId = x.DependParentId,
-                IsDepend = x.IsDepend,
-                QuestionMark = x.QuestionMark,
-                TypeValue = x.TypeValue,
-                RelevanceId = x.RelevanceId,
-                IsRequired = x.IsRequired,
-                RelevanceValue = x.RelevanceValue,
-                ImageCount = 0,
-                ParentId = item.Id,
-                ShowQuestion=x.ShowQuestion,
-                DataTableColumn = x.DataTableColumn,
-                LesionType = item.LesionType,
-                QuestionName = x.QuestionName,
-                IsCopy=x.IsCopy,
-                ClassifyTableQuestionId= x.ClassifyTableQuestionId,
-                ClassifyAlgorithms=x.ClassifyAlgorithms,
-                RelationQuestions = tableQuestions.Where(z => (z.DependParentId ?? default(Guid)) == x.Id).Select(x => new GetSystemReadingQuestionOutDto
                 {
-                    Childrens = new List<GetSystemReadingQuestionOutDto>(),
+                    y.Childrens = new List<GetSystemReadingQuestionOutDto>();
-                    ShowOrder = x.ShowOrder,
+                    y.GroupName = string.Empty;
-                    GroupName = string.Empty,
+                    y.ImageCount = 0;
-                    Id = x.Id,
+                    y.ParentId = item.Id;
-                    DictionaryCode = x.DictionaryCode,
+                    y.LesionType = item.LesionType;
-                    Type = x.Type,
+                    y.RelationQuestions = new List<GetSystemReadingQuestionOutDto>();
-                    ShowQuestion = x.ShowQuestion,
+                });
-                    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,
-                    RelationQuestions = new List<GetSystemReadingQuestionOutDto>(),
-                    Remark = x.Remark,
-                    IsCopy = x.IsCopy,
-                    ClassifyTableQuestionId = x.ClassifyTableQuestionId,
-                    ClassifyAlgorithms = x.ClassifyAlgorithms,
-
-                }).ToList(),
-                Remark = x.Remark,
-
-            }));
 
+                x.RelationQuestions= relationQuestions;
+            });
+            item.Childrens.AddRange(itemChild);
             if (item.Childrens != null && item.Childrens.Count != 0)
             {
                 item.Childrens.ForEach(x =>

IRaCIS.Core.Application/Service/Reading/_MapConfig.cs

@@ -211,6 +211,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ReadingQuestionSystem, GetSystemReadingQuestionOutDto>()
                ;
 
+            CreateMap<TableQuestionDataInfo, GetSystemReadingQuestionOutDto>();
+
             CreateMap<ReadingTableQuestionSystem, TableQuestionDataInfo>();
             CreateMap<ReadingTableQuestionTrial, TableQuestionDataInfo>()
                  .ForMember(d => d.QuestionName, u => u.MapFrom(s => isEn_Us ? s.QuestionEnName : s.QuestionName));
@@ -351,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)));