XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net10' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net10
continuous-integration/drone/push Build is running Details

Test_IRC_Net10
hang 2026-08-07 14:56:37 +08:00
parent 540de91485 ff72c4aefc
commit 21136f1238
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs
View File

@ -930,8 +930,8 @@ public static class ExcelExportHelper
int sheetCount = workbook.Worksheets.Count; int sheetCount = workbook.Worksheets.Count;
if (sheetCount == 2) //if (sheetCount == 2)
{ //{
if (inDto.IsEnglish) if (inDto.IsEnglish)
{ {
workbook.Worksheet(1).Delete(); // 删除第一个工作表 workbook.Worksheet(1).Delete(); // 删除第一个工作表
@ -940,7 +940,7 @@ public static class ExcelExportHelper
{ {
workbook.Worksheet(2).Delete(); // 删除第二个工作表 workbook.Worksheet(2).Delete(); // 删除第二个工作表
} }
} //}
#endregion #endregion

10
IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs
View File

@ -507,7 +507,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
List<string> sheetNames = new List<string>() List<string> sheetNames = new List<string>()
{ {
"各匹配片段测量值","MeasuredValue" "ROI测量值","ROI 测量值"
}; };
if (sheetNames.Intersect(uploadInfo.SheetNames).Count() == 0) if (sheetNames.Intersect(uploadInfo.SheetNames).Count() == 0)
@ -768,9 +768,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (targetSegmentAnswer.IsNotNullOrEmpty()) if (targetSegmentAnswer.IsNotNullOrEmpty())
{ {
var targetSegmentValues = targetSegmentAnswer.Replace("，", ",").Split(",").ToList(); var targetSegmentValues = targetSegmentAnswer.Replace(" ", "").Replace("，", ",").Split(",").ToList();
var targetSegmentdic = await _dictionaryRepository.Where(x => x.Parent.Code == "TargetSegment").ToListAsync(); 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.Replace(" ", ""))).Select(x => x.Code).ToList());
} }
questionAnswers.Add(new ReadingTaskQuestionAnswer() questionAnswers.Add(new ReadingTaskQuestionAnswer()
@ -820,10 +820,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (plaqueTypeAnswer.IsNotNullOrEmpty()) if (plaqueTypeAnswer.IsNotNullOrEmpty())
{ {
var plaqueTypeAnswerValues = plaqueTypeAnswer.Replace("，", ",").Split(",").ToList(); var plaqueTypeAnswerValues = plaqueTypeAnswer.Replace(" ", "").Replace("，", ",").Split(",").ToList();
var plaqueTypeAnswerdic = await _dictionaryRepository.Where(x => x.Parent.Code == "PlaqueType").ToListAsync(); var plaqueTypeAnswerdic = await _dictionaryRepository.Where(x => x.Parent.Code == "PlaqueType").ToListAsync();
plaqueTypeAnswer = JsonConvert.SerializeObject(plaqueTypeAnswerdic plaqueTypeAnswer = JsonConvert.SerializeObject(plaqueTypeAnswerdic
.Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Contains(val))) .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Replace(" ", "").Contains(val)))
.Select(x => x.Code) .Select(x => x.Code)
.ToList()); .ToList());
} }

10
IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
View File

@ -361,7 +361,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
List<string> sheetNames = new List<string>() List<string> sheetNames = new List<string>()
{ {
"FCT导入","FCT" "ROI测量值","ROI 测量值"
}; };
if (sheetNames.Intersect(uploadInfo.SheetNames).Count() == 0) if (sheetNames.Intersect(uploadInfo.SheetNames).Count() == 0)
@ -740,9 +740,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (targetSegmentAnswer.IsNotNullOrEmpty()) if (targetSegmentAnswer.IsNotNullOrEmpty())
{ {
var targetSegmentValues = targetSegmentAnswer.Replace("，", ",").Split(",").ToList(); var targetSegmentValues = targetSegmentAnswer.Replace(" ", "").Replace("，", ",").Split(",").ToList();
var targetSegmentdic = await _dictionaryRepository.Where(x => x.Parent.Code == "TargetSegment").ToListAsync(); 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.Replace(" ", ""))).Select(x => x.Code).ToList());
} }
questionAnswers.Add(new ReadingTaskQuestionAnswer() questionAnswers.Add(new ReadingTaskQuestionAnswer()
@ -781,10 +781,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (plaqueTypeAnswer.IsNotNullOrEmpty()) if (plaqueTypeAnswer.IsNotNullOrEmpty())
{ {
var plaqueTypeAnswerValues = plaqueTypeAnswer.Replace("，", ",").Split(",").ToList(); var plaqueTypeAnswerValues = plaqueTypeAnswer.Replace(" ", "").Replace("，", ",").Split(",").ToList();
var plaqueTypeAnswerdic = await _dictionaryRepository.Where(x => x.Parent.Code == "PlaqueType").ToListAsync(); var plaqueTypeAnswerdic = await _dictionaryRepository.Where(x => x.Parent.Code == "PlaqueType").ToListAsync();
plaqueTypeAnswer = JsonConvert.SerializeObject(plaqueTypeAnswerdic plaqueTypeAnswer = JsonConvert.SerializeObject(plaqueTypeAnswerdic
.Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Contains(val))) .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Replace(" ", "").Contains(val)))
.Select(x => x.Code) .Select(x => x.Code)
.ToList()); .ToList());
} }