diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs index 51733f545..cc51931d6 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IVUSCalculateService.cs @@ -438,7 +438,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var data= JsonConvert.DeserializeObject>(targetSegmentAnswer); targetSegmentAnswer = string.Join(",", targetSegmentdic .Where(x => data.Contains(x.Code)) - .Select(x => x.Value)); + .Select(x => x.ValueCN)); } else { @@ -460,7 +460,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var data = JsonConvert.DeserializeObject>(plaqueTypeAnswer); plaqueTypeAnswer = string.Join(",", plaqueTypedic .Where(x => data.Contains(x.Code)) - .Select(x => x.Value)); + .Select(x => x.ValueCN)); } @@ -760,7 +760,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { var targetSegmentValues = targetSegmentAnswer.Replace(",", ",").Split(",").ToList(); var targetSegmentdic = await _dictionaryRepository.Where(x => x.Parent.Code == "TargetSegment").ToListAsync(); - targetSegmentAnswer = JsonConvert.SerializeObject(targetSegmentdic.Where(x => targetSegmentValues.Contains(x.Value)).Select(x => x.Code).ToList()); + targetSegmentAnswer = JsonConvert.SerializeObject(targetSegmentdic.Where(x => targetSegmentValues.Contains(x.ValueCN)).Select(x => x.Code).ToList()); } questionAnswers.Add(new ReadingTaskQuestionAnswer() @@ -813,7 +813,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var plaqueTypeAnswerValues = plaqueTypeAnswer.Replace(",", ",").Split(",").ToList(); var plaqueTypeAnswerdic = await _dictionaryRepository.Where(x => x.Parent.Code == "PlaqueType").ToListAsync(); plaqueTypeAnswer = JsonConvert.SerializeObject(plaqueTypeAnswerdic - .Where(x => plaqueTypeAnswerValues.Any(val => x.Value.Contains(val))) + .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.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 5f0d3c305..c10997fda 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs @@ -295,7 +295,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var data = JsonConvert.DeserializeObject>(targetSegmentAnswer); targetSegmentAnswer = string.Join(",", targetSegmentdic .Where(x => data.Contains(x.Code)) - .Select(x => x.Value)); + .Select(x => x.ValueCN)); } else { @@ -317,7 +317,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var data = JsonConvert.DeserializeObject>(plaqueTypeAnswer); plaqueTypeAnswer = string.Join(",", plaqueTypedic .Where(x => data.Contains(x.Code)) - .Select(x => x.Value)); + .Select(x => x.ValueCN)); } @@ -735,7 +735,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { var targetSegmentValues = targetSegmentAnswer.Replace(",", ",").Split(",").ToList(); var targetSegmentdic = await _dictionaryRepository.Where(x => x.Parent.Code == "TargetSegment").ToListAsync(); - targetSegmentAnswer = JsonConvert.SerializeObject(targetSegmentdic.Where(x => targetSegmentValues.Contains(x.Value)).Select(x => x.Code).ToList()); + targetSegmentAnswer = JsonConvert.SerializeObject(targetSegmentdic.Where(x => targetSegmentValues.Contains(x.ValueCN)).Select(x => x.Code).ToList()); } questionAnswers.Add(new ReadingTaskQuestionAnswer() @@ -777,7 +777,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var plaqueTypeAnswerValues = plaqueTypeAnswer.Replace(",", ",").Split(",").ToList(); var plaqueTypeAnswerdic = await _dictionaryRepository.Where(x => x.Parent.Code == "PlaqueType").ToListAsync(); plaqueTypeAnswer = JsonConvert.SerializeObject(plaqueTypeAnswerdic - .Where(x => plaqueTypeAnswerValues.Any(val => x.Value.Contains(val))) + .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Contains(val))) .Select(x => x.Code) .ToList()); }