From 621fab16a061786396cfdec7bdd826e8beaeef92 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 6 Aug 2026 09:34:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ReadingCalculate/IVUSCalculateService.cs | 8 ++++---- .../Service/ReadingCalculate/OCTCalculateService.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs index 4974f689e..3ddb148c2 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs @@ -768,9 +768,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (targetSegmentAnswer.IsNotNullOrEmpty()) { - var targetSegmentValues = targetSegmentAnswer.Replace("，", ",").Split(",").ToList(); + var targetSegmentValues = targetSegmentAnswer.Trim().Replace("，", ",").Split(",").ToList(); var targetSegmentdic = await _dictionaryRepository.Where(x => x.Parent.Code == "TargetSegment").ToListAsync(); - targetSegmentAnswer = JsonConvert.SerializeObject(targetSegmentdic.Where(x => targetSegmentValues.Contains(x.ValueCN)).Select(x => x.Code).ToList()); + targetSegmentAnswer = JsonConvert.SerializeObject(targetSegmentdic.Where(x => targetSegmentValues.Contains(x.ValueCN.Trim())).Select(x => x.Code).ToList()); } questionAnswers.Add(new ReadingTaskQuestionAnswer() @@ -820,10 +820,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (plaqueTypeAnswer.IsNotNullOrEmpty()) { - var plaqueTypeAnswerValues = plaqueTypeAnswer.Replace("，", ",").Split(",").ToList(); + var plaqueTypeAnswerValues = plaqueTypeAnswer.Trim().Replace("，", ",").Split(",").ToList(); var plaqueTypeAnswerdic = await _dictionaryRepository.Where(x => x.Parent.Code == "PlaqueType").ToListAsync(); plaqueTypeAnswer = JsonConvert.SerializeObject(plaqueTypeAnswerdic - .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Contains(val))) + .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Trim().Contains(val))) .Select(x => x.Code) .ToList()); } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs index 615623993..0fa613372 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs @@ -740,9 +740,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (targetSegmentAnswer.IsNotNullOrEmpty()) { - var targetSegmentValues = targetSegmentAnswer.Replace("，", ",").Split(",").ToList(); + var targetSegmentValues = targetSegmentAnswer.Trim().Replace("，", ",").Split(",").ToList(); var targetSegmentdic = await _dictionaryRepository.Where(x => x.Parent.Code == "TargetSegment").ToListAsync(); - targetSegmentAnswer = JsonConvert.SerializeObject(targetSegmentdic.Where(x => targetSegmentValues.Contains(x.ValueCN)).Select(x => x.Code).ToList()); + targetSegmentAnswer = JsonConvert.SerializeObject(targetSegmentdic.Where(x => targetSegmentValues.Contains(x.ValueCN.Trim())).Select(x => x.Code).ToList()); } questionAnswers.Add(new ReadingTaskQuestionAnswer() @@ -781,10 +781,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (plaqueTypeAnswer.IsNotNullOrEmpty()) { - var plaqueTypeAnswerValues = plaqueTypeAnswer.Replace("，", ",").Split(",").ToList(); + var plaqueTypeAnswerValues = plaqueTypeAnswer.Trim().Replace("，", ",").Split(",").ToList(); var plaqueTypeAnswerdic = await _dictionaryRepository.Where(x => x.Parent.Code == "PlaqueType").ToListAsync(); plaqueTypeAnswer = JsonConvert.SerializeObject(plaqueTypeAnswerdic - .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Contains(val))) + .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Trim().Contains(val))) .Select(x => x.Code) .ToList()); } From f94d1caa79885eccc5a6d76a36439c5227f28f41 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 6 Aug 2026 09:50:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=BF=BD=E7=95=A5?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ReadingCalculate/IVUSCalculateService.cs | 8 ++++---- .../Service/ReadingCalculate/OCTCalculateService.cs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs index 3ddb148c2..298154f5f 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs @@ -768,9 +768,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (targetSegmentAnswer.IsNotNullOrEmpty()) { - var targetSegmentValues = targetSegmentAnswer.Trim().Replace("，", ",").Split(",").ToList(); + var targetSegmentValues = targetSegmentAnswer.Replace(" ", "").Replace("，", ",").Split(",").ToList(); var targetSegmentdic = await _dictionaryRepository.Where(x => x.Parent.Code == "TargetSegment").ToListAsync(); - targetSegmentAnswer = JsonConvert.SerializeObject(targetSegmentdic.Where(x => targetSegmentValues.Contains(x.ValueCN.Trim())).Select(x => x.Code).ToList()); + targetSegmentAnswer = JsonConvert.SerializeObject(targetSegmentdic.Where(x => targetSegmentValues.Contains(x.ValueCN.Replace(" ", ""))).Select(x => x.Code).ToList()); } questionAnswers.Add(new ReadingTaskQuestionAnswer() @@ -820,10 +820,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (plaqueTypeAnswer.IsNotNullOrEmpty()) { - var plaqueTypeAnswerValues = plaqueTypeAnswer.Trim().Replace("，", ",").Split(",").ToList(); + var plaqueTypeAnswerValues = plaqueTypeAnswer.Replace(" ", "").Replace("，", ",").Split(",").ToList(); var plaqueTypeAnswerdic = await _dictionaryRepository.Where(x => x.Parent.Code == "PlaqueType").ToListAsync(); plaqueTypeAnswer = JsonConvert.SerializeObject(plaqueTypeAnswerdic - .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Trim().Contains(val))) + .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Replace(" ", "").Contains(val))) .Select(x => x.Code) .ToList()); } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs index 0fa613372..c7bde5a5c 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs @@ -740,9 +740,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (targetSegmentAnswer.IsNotNullOrEmpty()) { - var targetSegmentValues = targetSegmentAnswer.Trim().Replace("，", ",").Split(",").ToList(); + var targetSegmentValues = targetSegmentAnswer.Replace(" ", "").Replace("，", ",").Split(",").ToList(); var targetSegmentdic = await _dictionaryRepository.Where(x => x.Parent.Code == "TargetSegment").ToListAsync(); - targetSegmentAnswer = JsonConvert.SerializeObject(targetSegmentdic.Where(x => targetSegmentValues.Contains(x.ValueCN.Trim())).Select(x => x.Code).ToList()); + targetSegmentAnswer = JsonConvert.SerializeObject(targetSegmentdic.Where(x => targetSegmentValues.Contains(x.ValueCN.Replace(" ", ""))).Select(x => x.Code).ToList()); } questionAnswers.Add(new ReadingTaskQuestionAnswer() @@ -781,10 +781,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (plaqueTypeAnswer.IsNotNullOrEmpty()) { - var plaqueTypeAnswerValues = plaqueTypeAnswer.Trim().Replace("，", ",").Split(",").ToList(); + var plaqueTypeAnswerValues = plaqueTypeAnswer.Replace(" ", "").Replace("，", ",").Split(",").ToList(); var plaqueTypeAnswerdic = await _dictionaryRepository.Where(x => x.Parent.Code == "PlaqueType").ToListAsync(); plaqueTypeAnswer = JsonConvert.SerializeObject(plaqueTypeAnswerdic - .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Trim().Contains(val))) + .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Replace(" ", "").Contains(val))) .Select(x => x.Code) .ToList()); } From ff72c4aefc48b145fd36e221114eaad34f2b8a72 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 6 Aug 2026 14:06:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?sheet=E9=A1=B5=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Helper/FileDocProcess/ExcelExportHelper.cs | 6 +++--- .../Service/ReadingCalculate/IVUSCalculateService.cs | 2 +- .../Service/ReadingCalculate/OCTCalculateService.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs index 655aecafc..f1f07ff5d 100644 --- a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs +++ b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs @@ -930,8 +930,8 @@ public static class ExcelExportHelper int sheetCount = workbook.Worksheets.Count; - if (sheetCount == 2) - { + //if (sheetCount == 2) + //{ if (inDto.IsEnglish) { workbook.Worksheet(1).Delete(); // 删除第一个工作表 @@ -940,7 +940,7 @@ public static class ExcelExportHelper { workbook.Worksheet(2).Delete(); // 删除第二个工作表 } - } + //} #endregion diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs index 298154f5f..604bc582e 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs @@ -507,7 +507,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate List sheetNames = new List() { - "各匹配片段测量值","MeasuredValue" + "ROI测量值","ROI 测量值" }; if (sheetNames.Intersect(uploadInfo.SheetNames).Count() == 0) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs index c7bde5a5c..7f05e0469 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs @@ -361,7 +361,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate List sheetNames = new List() { - "FCT导入","FCT" + "ROI测量值","ROI 测量值" }; if (sheetNames.Intersect(uploadInfo.SheetNames).Count() == 0)