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

字典修改
continuous-integration/drone/push Build is passing Details

Test_IRC_Net10
he 2026-08-04 14:15:13 +08:00
parent 5c8ccdf434
commit 739f610d4e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -438,7 +438,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var data= JsonConvert.DeserializeObject<List<string>>(targetSegmentAnswer); var data= JsonConvert.DeserializeObject<List<string>>(targetSegmentAnswer);
targetSegmentAnswer = string.Join(",", targetSegmentdic targetSegmentAnswer = string.Join(",", targetSegmentdic
.Where(x => data.Contains(x.Code)) .Where(x => data.Contains(x.Code))
.Select(x => x.Value)); .Select(x => x.ValueCN));
} }
else else
{ {
@ -460,7 +460,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var data = JsonConvert.DeserializeObject<List<string>>(plaqueTypeAnswer); var data = JsonConvert.DeserializeObject<List<string>>(plaqueTypeAnswer);
plaqueTypeAnswer = string.Join(",", plaqueTypedic plaqueTypeAnswer = string.Join(",", plaqueTypedic
.Where(x => data.Contains(x.Code)) .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 targetSegmentValues = targetSegmentAnswer.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.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() questionAnswers.Add(new ReadingTaskQuestionAnswer()
@ -813,7 +813,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var plaqueTypeAnswerValues = plaqueTypeAnswer.Replace("，", ",").Split(",").ToList(); var plaqueTypeAnswerValues = plaqueTypeAnswer.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.Value.Contains(val))) .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Contains(val)))
.Select(x => x.Code) .Select(x => x.Code)
.ToList()); .ToList());
} }

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

@ -295,7 +295,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var data = JsonConvert.DeserializeObject<List<string>>(targetSegmentAnswer); var data = JsonConvert.DeserializeObject<List<string>>(targetSegmentAnswer);
targetSegmentAnswer = string.Join(",", targetSegmentdic targetSegmentAnswer = string.Join(",", targetSegmentdic
.Where(x => data.Contains(x.Code)) .Where(x => data.Contains(x.Code))
.Select(x => x.Value)); .Select(x => x.ValueCN));
} }
else else
{ {
@ -317,7 +317,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var data = JsonConvert.DeserializeObject<List<string>>(plaqueTypeAnswer); var data = JsonConvert.DeserializeObject<List<string>>(plaqueTypeAnswer);
plaqueTypeAnswer = string.Join(",", plaqueTypedic plaqueTypeAnswer = string.Join(",", plaqueTypedic
.Where(x => data.Contains(x.Code)) .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 targetSegmentValues = targetSegmentAnswer.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.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() questionAnswers.Add(new ReadingTaskQuestionAnswer()
@ -777,7 +777,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var plaqueTypeAnswerValues = plaqueTypeAnswer.Replace("，", ",").Split(",").ToList(); var plaqueTypeAnswerValues = plaqueTypeAnswer.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.Value.Contains(val))) .Where(x => plaqueTypeAnswerValues.Any(val => x.ValueCN.Contains(val)))
.Select(x => x.Code) .Select(x => x.Code)
.ToList()); .ToList());
} }