uat-ivus-增加标识-31

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

@@ -390,9 +390,17 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
                 {
                     var ivus = _mapper.Map<IvusExportDto>(task);
 
-                    //靶段
-                    ivus.TARGETV = task.QuestionAnswerList.Where(t => t.QuestionName == "靶段").FirstOrDefault()?.QuestionValue ?? string.Empty;
 
+                    //靶段
+                    ivus.TARGETV = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegment).FirstOrDefault()?.QuestionValue ?? string.Empty;
+
+
+                    var marks = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegmentRemarks).FirstOrDefault()?.QuestionValue ?? string.Empty;
+
+                    if (marks.IsNotNullOrEmpty())
+                    {
+                        ivus.TARGETV = ivus.TARGETV + "_" + marks;
+                    }
 
                     //斑块编号
                     ivus.PLAQUE = lesion.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.PlaqueNumber).FirstOrDefault()?.QuestionValue ?? string.Empty;
@@ -407,10 +415,10 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
 
 
                     //回撤中的图像帧数
-                    ivus.PFC = task.QuestionAnswerList.Where(t => t.QuestionName == "回撤中的图像帧数").FirstOrDefault()?.QuestionValue ?? string.Empty;
+                    ivus.PFC = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.PullbackFrameCount).FirstOrDefault()?.QuestionValue ?? string.Empty;
 
                     //分析图像帧数
-                    ivus.FC = task.QuestionAnswerList.Where(t => t.QuestionName == "分析图像帧数").FirstOrDefault()?.QuestionValue ?? string.Empty;
+                    ivus.FC = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.AnalysisFrameCount).FirstOrDefault()?.QuestionValue ?? string.Empty;
 
                     var findStatLession = task.LesionList.FirstOrDefault(t => t.LessionType == LesionType.PatchDataStatistics && t.LessionAnswerList.Any(t => t.QuestionMark == QuestionMark.PlaqueNumber && t.QuestionValue == ivus.PLAQUE));
                     var findPAVLession = task.LesionList.FirstOrDefault(t => t.LessionType == LesionType.PAV && t.LessionAnswerList.Any(t => t.QuestionMark == QuestionMark.PlaqueNumber && t.QuestionValue == ivus.PLAQUE));
@@ -451,9 +459,9 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
                     {
                         pNoIndex++;
 
-                        var findFct1= fctLesion?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.FirstFCT).FirstOrDefault();
+                        var findFct1 = fctLesion?.LessionAnswerList.Where(t => t.QuestionMark == QuestionMark.FirstFCT).FirstOrDefault();
 
-                        if (findFct1 != null) 
+                        if (findFct1 != null)
                         {
                             var oct = CreatOCT(task, pNo);
 
@@ -466,7 +474,7 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
                             oct.TESTCD = "FCTMV1";
 
                             //    测量参数值  
-                            oct.ORRES = findFct1?.QuestionValue??string.Empty;
+                            oct.ORRES = findFct1?.QuestionValue ?? string.Empty;
 
                             //     测量值单位
                             oct.ORRESU = translateDataList["ValueUnit"].Where(t => t.Code.ToLower() == ((int?)findFct1.Unit)?.ToString().ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
@@ -493,7 +501,7 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
 
                             //     测量值单位
                             oct.ORRESU = translateDataList["ValueUnit"].Where(t => t.Code.ToLower() == ((int?)findFct2.Unit)?.ToString().ToLower()).Select(t => isEn_Us ? t.Value : t.ValueCN).FirstOrDefault() ?? String.Empty;
-                           
+
                             octList.Add(oct);
                         }
 
@@ -632,7 +640,16 @@ public class IVUS_OCTExportService(IRepository<ReadingQuestionCriterionTrial> _r
 
 
         //靶段
-        oct.TARGETV = task.QuestionAnswerList.Where(t => t.QuestionName == "靶段").FirstOrDefault()?.QuestionValue ?? string.Empty;
+        //靶段
+        oct.TARGETV = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegment).FirstOrDefault()?.QuestionValue ?? string.Empty;
+
+
+        var marks = task.QuestionAnswerList.Where(t => t.QuestionType == QuestionType.TargetSegmentRemarks).FirstOrDefault()?.QuestionValue ?? string.Empty;
+
+        if (marks.IsNotNullOrEmpty())
+        {
+            oct.TARGETV = oct.TARGETV + "_" + marks;
+        }
 
         //斑块编号
         oct.PLAQUE = pNo;