IRaCIS.Core.Application/Service/Common/Export/CDISCExportBaseModel.cs

@@ -15,8 +15,6 @@ public class TumorCommonQustionInfo
     //问题标识，肿瘤评估用于区分是什么问题
     public QuestionType? QuestionType { get; set; }
 
-    public OptionType OptionTypeEnum { get; set; }
-
     public Guid QuestionId { get; set; }
     public string QuestionName { get; set; }
 
@@ -53,8 +51,6 @@ public class TumorLessionAnswerInfo
 {
     public QuestionMark? QuestionMark { get; set; }
 
-    public OptionType OptionTypeEnum { get; set; }
-
     //病灶Id
     public Guid RowId { get; set; }
 

IRaCIS.Core.Application/Service/Common/Export/IVUS_OCTExportService.cs

@@ -1,5 +1,4 @@
-using DocumentFormat.OpenXml.Spreadsheet;
+using IRaCIS.Application.Contracts;
-using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.ViewModel;
@@ -11,9 +10,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using MiniExcelLibs;
 using MiniExcelLibs.OpenXml;
-using Newtonsoft.Json;
 using NPOI.SS.Formula.Functions;
-using Org.BouncyCastle.Asn1.X509;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -229,7 +226,6 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
         .Select(t => new IVUS_OCTBaseDto()
         {
             ResearchProgramNo = t.Trial.ResearchProgramNo,
-            TrialSiteCode = t.Subject.TrialSite.TrialSiteCode,
             SubjectCode = t.Subject.Code,
             UserName = t.DoctorUser.UserName,
             ArmEnum = t.ArmEnum,
@@ -282,7 +278,6 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
             .Select(c => new TumorCommonQustionInfo()
             {
                 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,
@@ -305,7 +300,6 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
                 {
 
                     RowId = k.RowId,
-                    OptionTypeEnum = k.ReadingTableQuestionTrial.OptionTypeEnum,
                     TranslateDicName = k.ReadingTableQuestionTrial.DictionaryCode,
                     QuestionMark = k.ReadingTableQuestionTrial.QuestionMark,
                     TableQuesionId = k.ReadingTableQuestionTrial.Id,
@@ -364,12 +358,9 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
 
         #region 字典和各个表的数组准备
 
-        var dicNameList = taskList.SelectMany(t => t.QuestionAnswerList).Select(t => t.TranslateDicName)
+        var dicNameList = new List<string>() { "ArmEnum", "ValueUnit" }
-        .Union(taskList.SelectMany(t => t.LesionList).SelectMany(t => t.LessionAnswerList).Where(t => t.TranslateDicName.IsNotNullOrEmpty()).Select(c => c.TranslateDicName))
-        .Union(new List<string>() { "ArmEnum", "ValueUnit" })
          .Distinct().ToArray();
 
-
         //翻译字典
         var translateDataList = await _dictionaryService.GetBasicDataSelect(dicNameList);
 
@@ -401,9 +392,7 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
 
 
                     //靶段
-                    var target = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegment).FirstOrDefault();
+                    ivus.TARGETV = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegment).FirstOrDefault()?.QuestionValue ?? string.Empty;
-
-                    ivus.TARGETV = translateDataList[target?.TranslateDicName].Where(t => t.Code.ToLower() == target?.QuestionValue?.ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
 
 
                     var marks = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegmentRemarks).FirstOrDefault()?.QuestionValue ?? string.Empty;
@@ -442,7 +431,7 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
                     ivus.TOTALPA = findStatLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.EEMSubtractLumenSum).FirstOrDefault()?.QuestionValue ?? string.Empty;
                     //冠状动脉粥样硬化体积百分比（PAV）
 
-                    ivus.PAV = findPAVLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.PAV).FirstOrDefault()?.QuestionValue ?? string.Empty;
+                    ivus.TOTALPA = findPAVLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.PAV).FirstOrDefault()?.QuestionValue ?? string.Empty;
 
                     ivusList.Add(ivus);
 
@@ -470,7 +459,7 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
                     {
                         pNoIndex++;
 
-                        foreach (var lessionAnswer in fctLesion?.LessionAnswerList.Where(t => t.QuestionMark != QuestionMark.PlaqueNumber).OrderBy(t => t.ShowOrder))
+                        foreach (var lessionAnswer in fctLesion?.LessionAnswerList.Where(t => t.QuestionMark != QuestionMark.PlaqueNumber).OrderBy(t=>t.ShowOrder))
                         {
                             var mark = string.Empty;
                             switch (lessionAnswer.QuestionMark)
@@ -488,19 +477,19 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
                                 case QuestionMark.AvgFCT:
                                     mark = "AVGFCT";                                   
                                     break;                             
-                                case QuestionMark.MacrophageInfiltrationMeasurement:
+                                case QuestionMark.MacrophageInfiltration:
                                     mark = "MACRI";
                                     break;
-                                case QuestionMark.MacrophageInfiltrationAngle:
+                                case QuestionMark.MacrophageExtensionAngle:
                                     mark = "MIARC";
                                     break;
-                                case QuestionMark.MicrochannelMeasurement:
+                                case QuestionMark.Microchannels:
                                     mark = "MC";
                                     break;
-                                case QuestionMark.CholesterolCrystalMeasurement:
+                                case QuestionMark.CholesterolCrystallization:
                                     mark = "CCS";
                                     break;
-                                case QuestionMark.LumenAreaMeasurement:
+                                case QuestionMark.LumenArea:
                                     mark = "LUMEN";
                                     break;
 
@@ -509,7 +498,7 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
 
                             if (mark.IsNotNullOrEmpty())
                             {
-                                var oct = CreatOCT(task, pNo, translateDataList);
+                                var oct = CreatOCT(task, pNo);
 
                                 //    测量标识 阅片人_斑块号_表格_行号
 
@@ -640,7 +629,7 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
 
                         if (findAngle != null)
                         {
-                            var oct = CreatOCT(task, pNo, translateDataList);
+                            var oct = CreatOCT(task, pNo);
 
                             //    测量标识
 
@@ -708,20 +697,15 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
 
     }
 
-    private OctExportDto CreatOCT(IVUS_OCTBaseDto task, string pNo, Dictionary<string, List<BasicDicSelectCopy>> translateDataList)
+    private OctExportDto CreatOCT(IVUS_OCTBaseDto task, string pNo)
     {
-
-        var isEn_US = CultureInfo.CurrentCulture.Name == StaticData.CultureInfo.en_US;
-
         var oct = _mapper.Map<OctExportDto>(task);
 
 
 
         //靶段
-
+        //靶段
-        var target = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegment).FirstOrDefault();
+        oct.TARGETV = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegment).FirstOrDefault()?.QuestionValue ?? string.Empty;
-
-        oct.TARGETV = translateDataList[target?.TranslateDicName].Where(t => t.Code.ToLower() == target?.QuestionValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
 
 
         var marks = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegmentRemarks).FirstOrDefault()?.QuestionValue ?? string.Empty;
@@ -738,44 +722,7 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
                        && t.LessionAnswerList.Any(t => t.QuestionMark == QuestionMark.PlaqueNumber && t.QuestionValue == pNo)).FirstOrDefault();
 
         //    斑块类型    
-        var undetermined = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.Undetermined).FirstOrDefault();
+        oct.PLATYPE = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.Undetermined).FirstOrDefault()?.QuestionValue ?? string.Empty;
-
-        if (undetermined?.OptionTypeEnum == OptionType.Multiple)
-        {
-            var qValue = undetermined?.QuestionValue;
-            int[] enumValues = new int[0];
-            // 1. 反序列化 JSON 数组 (字符串枚举)
-            if (!qValue.StartsWith("[") || !qValue.EndsWith("]"))
-            {
-                enumValues = new int[1] { int.Parse(qValue) };
-            }
-            else
-            {
-                enumValues = JsonConvert.DeserializeObject<int[]>(qValue) ?? new int[0];
-
-            }
-
-            // 2. 翻译每一项并输出逗号拼接字符串
-            var tValue = string.Join(",",
-                 enumValues.Select(code =>
-                     translateDataList[undetermined.TranslateDicName]
-                         .FirstOrDefault(t =>
-                            string.Equals(code.ToString(), t.Code, StringComparison.OrdinalIgnoreCase)
-                         ) is var r && r != null
-                             ? (isEn_US ? r.Value : r.ValueCN)
-                             : string.Empty
-                 ));
-
-            oct.PLATYPE = tValue;
-        }
-        else
-        {
-            oct.PLATYPE = translateDataList[undetermined?.TranslateDicName].Where(t => t.Code.ToLower() == undetermined?.QuestionValue?.ToLower()).Select(t => isEn_US ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
-
-        }
-
-
-
         //     匹配动脉段最小FCT 
         oct.MINFCT = findLession?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.MiniMumFCT).FirstOrDefault()?.QuestionValue ?? string.Empty;
         //    平均最小FCT