diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 738a2f15a..461c2f746 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -3939,6 +3939,32 @@
+
+
+ 获取OCT-FCT模板
+
+
+
+
+
+
+ 导入OCT-FCT数据
+
+
+
+
+
+ 获取OCT-脂质角度模板
+
+
+
+
+
+
+ 导入OCT-脂质角度数据
+
+
+
自动计算
@@ -3954,6 +3980,27 @@
+
+
+ 斑块1-匹配动脉段最小FCT
+
+
+
+
+
+
+ 斑块2-匹配动脉段最小FCT
+
+
+
+
+
+
+ 斑块3-匹配动脉段最小FCT
+
+
+
+
验证访视提交
@@ -6482,6 +6529,36 @@
外弹力膜面积- 管腔面积
+
+
+ 斑块编号
+
+
+
+
+ 第一次
+
+
+
+
+ 第二次
+
+
+
+
+ 第三次
+
+
+
+
+ 斑块编号
+
+
+
+
+ 值
+
+
阅片计算Dto
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
index ba5225d8d..0435cd531 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
@@ -509,7 +509,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
List tableAnsweRowInfos = new List();
List tableAnswers = new List();
- var maxnum = _readingTableAnswerRowInfoRepository.Where(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id).MaxOrDefault(x => x.RowIndex);
+ var maxnum = 0;
foreach (var item in measuredValueList)
@@ -683,7 +683,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
List tableAnsweRowInfos = new List();
List tableAnswers = new List();
- var maxnum = _readingTableAnswerRowInfoRepository.Where(x => x.QuestionId == questionInfo.Id && x.VisitTaskId == taskinfo.Id).MaxOrDefault(x => x.RowIndex);
+ var maxnum = 0;
foreach (var item in measuredValueList)
@@ -977,7 +977,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 匹配动脉段最小FCT
tableAnswers.Add(new ReadingTableQuestionAnswer()
{
- Answer = GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).MinOrDefault(x => x.Data).ToString()),
+ Answer = oCTFCTInfos.Count()==0?"0": GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).MinOrDefault(x => x.Data).ToString()),
Id = NewId.NextGuid(),
QuestionId = patchDataStatisticsInfo.Id,
TrialId = inDto.TrialId,
@@ -990,7 +990,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 平均最小FCT
tableAnswers.Add(new ReadingTableQuestionAnswer()
{
- Answer = GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()),
+ Answer = oCTFCTInfos.Count() == 0 ? "0" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()),
Id = NewId.NextGuid(),
QuestionId = patchDataStatisticsInfo.Id,
TrialId = inDto.TrialId,
@@ -1003,7 +1003,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 脂质角度平均值
tableAnswers.Add(new ReadingTableQuestionAnswer()
{
- Answer = GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()),
+ Answer = lipidAngleInfos.Count() == 0 ? "0" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()),
Id = NewId.NextGuid(),
QuestionId = patchDataStatisticsInfo.Id,
TrialId = inDto.TrialId,
@@ -1016,7 +1016,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 脂质角度最大值
tableAnswers.Add(new ReadingTableQuestionAnswer()
{
- Answer = GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).MaxOrDefault(x => x.Data).ToString()),
+ Answer = lipidAngleInfos.Count() == 0 ? "0" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).MaxOrDefault(x => x.Data).ToString()),
Id = NewId.NextGuid(),
QuestionId = patchDataStatisticsInfo.Id,
TrialId = inDto.TrialId,