修改多选导表

IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs

@@ -1,15 +1,19 @@
 using DocumentFormat.OpenXml.Spreadsheet;
 using DocumentFormat.OpenXml.Wordprocessing;
+using FellowOakDicom.Imaging.LUT;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore.Migrations;
+using IRaCIS.Core.Infrastructure.Extention;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Hosting;
 using MiniExcelLibs;
 using MiniExcelLibs.OpenXml;
+using Newtonsoft.Json;
 using NPOI.HSSF.UserModel;
 using NPOI.SS.Formula.Functions;
 using NPOI.SS.UserModel;
@@ -681,9 +685,45 @@ public static class ExcelExportHelper
                     if (itemDicName.IsNotNullOrEmpty())
                     {
 
-                        var translatedItemData = dynamicTranslateDataList[itemDicName].Where(t => t.Code.ToLower() == itemValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+                        var optionTypeEnumStr = iteObjDic.ContainsKey("OptionTypeEnum") ? iteObjDic["OptionTypeEnum"]?.ToString() : "0";
+
+                        var translatedItemData = "";
+                        //多选
+                        if (optionTypeEnumStr == "1")
+                        {
+                            int[] enumValues = new int[0];
+                            // 1. 反序列化 JSON 数组 (字符串枚举)
+                            if (!itemValue.StartsWith("[") || !itemValue.EndsWith("]"))
+                            {
+                                enumValues = new int[1] { int.Parse(itemValue) };
+                            }
+                            else
+                            {
+                                 enumValues = JsonConvert.DeserializeObject<int[]>(itemValue)?? new int[0];
+
+                            }
+
+
+                            // 2. 翻译每一项并输出逗号拼接字符串
+                            translatedItemData = string.Join(",",
+                                enumValues.Select(code =>
+                                    dynamicTranslateDataList[itemDicName]
+                                        .FirstOrDefault(t =>
+                                           string.Equals(code.ToString(),t.Code, StringComparison.OrdinalIgnoreCase)
+                                        ) is var r && r != null
+                                            ? (isEn_US ? r.Value : r.ValueCN)
+                                            : string.Empty
+                                ));
+                        }
+                        else
+                        {
+
+                             translatedItemData = dynamicTranslateDataList[itemDicName].Where(t => t.Code.ToLower() == itemValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
+
+                        }
 
                         row.GetCell(writeIndex).SetCellValue(translatedItemData);
+
                     }
                     else
                     {

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -3168,7 +3168,7 @@ namespace IRaCIS.Core.Application.Service.Common
                                     addLessionInfoList.Add(new CommonQuesionInfo() { QuestionName = _userInfo.IsEn_Us ? "Lesion Type" : "病灶类型", QuestionValue = lession.LessionType, TranslateDicName = "LesionType" });
                                 }
 
-                                var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionName = t.QuestionName, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName });
+                                var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionName = t.QuestionName, OptionTypeEnum = t.OptionTypeEnum, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName });
 
                                 //有三部分组成  外层问题+ 没有配置病灶编号和类型+ 动态的表格问题
                                 var dynamicLessionInfoList = item.QuestionAnswerList.Union(addLessionInfoList).Union(dynamicPartialLessionInfoList).ToList();
@@ -3316,14 +3316,14 @@ namespace IRaCIS.Core.Application.Service.Common
 
                                         addLessionInfoList.Add(new CommonQuesionInfo() { QuestionId = Guid.Empty, QuestionName = _userInfo.IsEn_Us ? "Table Name" : "表格名称", QuestionValue = firstLessionAnser.TableName });
 
-                                        var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionId = t.TableQuesionId, QuestionName = t.TableName + "_" + t.QuestionName, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName, CDISCCode = t.CDISCCode });
+                                        var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionId = t.TableQuesionId, OptionTypeEnum = t.OptionTypeEnum, QuestionName = t.TableName + "_" + t.QuestionName, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName, CDISCCode = t.CDISCCode });
 
                                         //有三部分组成  外层问题+  固定列表格名称 + 动态的表格问题
                                         dynamicLessionInfoList = item.QuestionAnswerList.Union(addLessionInfoList).Union(dynamicPartialLessionInfoList).ToList();
                                     }
                                     else
                                     {
-                                        var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionId = t.TableQuesionId, QuestionName = t.QuestionName, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName, CDISCCode = t.CDISCCode });
+                                        var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionId = t.TableQuesionId, OptionTypeEnum = t.OptionTypeEnum, QuestionName = t.QuestionName, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName, CDISCCode = t.CDISCCode });
 
                                         //两部分组成  外层问题+   动态的表格问题
                                         dynamicLessionInfoList = item.QuestionAnswerList.Union(dynamicPartialLessionInfoList).ToList();
@@ -3389,7 +3389,7 @@ namespace IRaCIS.Core.Application.Service.Common
                     var trialConfigTableQuestionList = _trialReadingTableQuestionRepository.Where(t => t.TrialId == trialId && t.TrialCriterionId == trialReadingCriterionId).Where(t => t.ExportResultStr.Contains(((int)inQuery.ReadingExportType).ToString()))
                         .Select(t => new ExportQuestionBasicInfo()
                         {
-                            QuestionId = t.Id,
+                            QuestionId = t.Id,                           
                             TableName = _userInfo.IsEn_Us ? t.ReadingQuestionTrial.QuestionEnName : t.ReadingQuestionTrial.QuestionName,
                             QuestionName = _userInfo.IsEn_Us ? t.QuestionEnName : t.QuestionName,
                             CDISCCode = t.CDISCCode,
@@ -3433,7 +3433,7 @@ namespace IRaCIS.Core.Application.Service.Common
                                         var dynamicLessionInfoList = new List<CommonQuesionInfo>();
 
 
-                                        var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionId = t.TableQuesionId, QuestionName = t.QuestionName, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName, CDISCCode = t.CDISCCode });
+                                        var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionId = t.TableQuesionId,OptionTypeEnum=t.OptionTypeEnum, QuestionName = t.QuestionName, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName, CDISCCode = t.CDISCCode });
 
                                         //两部分组成  外层问题+   动态的表格问题
                                         dynamicLessionInfoList = item.QuestionAnswerList.Union(dynamicPartialLessionInfoList).ToList();

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -1256,6 +1256,8 @@ namespace IRaCIS.Core.Application.Contracts
         //问题标识，肿瘤评估用于区分是什么问题
         public QuestionType? QuestionType { get; set; }
 
+        public OptionType OptionTypeEnum { get; set; }
+
 
         public Guid QuestionId { get; set; }
         public string QuestionName { get; set; }
@@ -1421,6 +1423,7 @@ namespace IRaCIS.Core.Application.Contracts
         public string TableName { get; set; }
         #endregion
 
+        public OptionType OptionTypeEnum { get; set; }
 
         public Guid TableQuesionId { get; set; }
 

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

@@ -246,6 +246,7 @@ namespace IRaCIS.Core.Application.Service
                    .OrderBy(k => k.ReadingQuestionTrial.ShowOrder)
                 .Select(c => new CommonQuesionInfo()
                 {
+                    OptionTypeEnum=c.ReadingQuestionTrial.OptionTypeEnum,
                     QuestionType = c.ReadingQuestionTrial.QuestionType,
                     QuestionName = isEn_Us ? c.ReadingQuestionTrial.QuestionEnName : c.ReadingQuestionTrial.QuestionName,
                     QuestionValue = c.IsGlobalChange ? c.GlobalChangeAnswer : c.Answer,
@@ -286,6 +287,7 @@ namespace IRaCIS.Core.Application.Service
                 .Select(c => new CommonQuesionInfo()
                 {
                     QuestionType = c.ReadingQuestionTrial.QuestionType,
+                    OptionTypeEnum=c.ReadingQuestionTrial.OptionTypeEnum,
                     QuestionId = c.ReadingQuestionTrial.Id,
                     QuestionName = isEn_Us ? c.ReadingQuestionTrial.QuestionEnName : c.ReadingQuestionTrial.QuestionName,
                     QuestionValue = c.IsGlobalChange ? c.GlobalChangeAnswer : c.Answer,
@@ -304,9 +306,10 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.LessionAnswerList, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.ExportResultStr.Contains(((int)readingExportType).ToString()))));
 
             CreateMap<ReadingTableQuestionAnswer, CommonLessionQuestionAnswerInfo>()
-                  //.ForMember(o => o.LessionCode, t => t.MapFrom(u => u.Lesion.RowMark))
+                   //.ForMember(o => o.LessionCode, t => t.MapFrom(u => u.Lesion.RowMark))
-                  //.ForMember(o => o.LessionType, t => t.MapFrom(u => (int?)u.ReadingQuestionTrial.LesionType))
+                   //.ForMember(o => o.LessionType, t => t.MapFrom(u => (int?)u.ReadingQuestionTrial.LesionType))
-                  .ForMember(o => o.ShowOrder, t => t.MapFrom(u => u.ReadingTableQuestionTrial.ShowOrder))
+                 .ForMember(o => o.OptionTypeEnum, t => t.MapFrom(u => u.ReadingTableQuestionTrial.OptionTypeEnum))
+                 .ForMember(o => o.ShowOrder, t => t.MapFrom(u => u.ReadingTableQuestionTrial.ShowOrder))
                  .ForMember(o => o.CustomUnit, t => t.MapFrom(u => u.ReadingTableQuestionTrial.CustomUnit))
                  .ForMember(o => o.Unit, t => t.MapFrom(u => u.ReadingTableQuestionTrial.Unit))
                  .ForMember(o => o.TableQuesionId, t => t.MapFrom(u => u.ReadingTableQuestionTrial.Id))