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()); }