diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 6241f27c7..808077184 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -6033,6 +6033,34 @@
+
+
+ 获取巨噬细胞浸润测量
+
+
+
+
+
+
+ 巨噬细胞浸润角度测量
+
+
+
+
+
+
+ 获取微通道汇总
+
+
+
+
+
+
+ 获取胆固醇结晶汇总
+
+
+
+
验证访视提交
@@ -16834,17 +16862,17 @@
- 质疑
+ ����
- 一致性核查
+ һ���Ժ˲�
- 复制
+ ����
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
index 65dd50dec..9e6c67a0e 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
@@ -336,6 +336,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
List measuredValueList = new List();
var errorRow = new List { };
+ string getNone(string value)
+ {
+ if (value == string.Empty || value == null)
+ {
+ return "无";
+ }
+ else
+ {
+ return value;
+ }
+ }
for (int i = 3; i < dataTable.Rows.Count; i++)
{
try
@@ -346,11 +357,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
FirstData = getdecimalData(dataTable.Rows[i]["A"].ToString()),
SecondData = getdecimalData(dataTable.Rows[i]["B"].ToString()),
ThirdData = getdecimalData(dataTable.Rows[i]["C"].ToString()),
- MacrophageInfiltrationMeasurement = dataTable.Rows[i]["D"].ToString() ?? string.Empty,
+ MacrophageInfiltrationMeasurement = getNone(dataTable.Rows[i]["D"].ToString()),
MacrophageInfiltrationAngle = getdecimalEmptyData(dataTable.Rows[i]["E"].ToString() ?? string.Empty),
- MicrochannelMeasurement =dataTable.Rows[i]["F"].ToString() ?? string.Empty,
- CholesterolCrystalMeasurement = dataTable.Rows[i]["G"].ToString() ?? string.Empty,
- LumenAreaMeasurement = getdecimalEmptyData(dataTable.Rows[i]["H"].ToString() ?? string.Empty),
+ MicrochannelMeasurement = getNone(dataTable.Rows[i]["F"].ToString()),
+ CholesterolCrystalMeasurement = getNone(dataTable.Rows[i]["G"].ToString()),
+ LumenAreaMeasurement = getdecimalData(dataTable.Rows[i]["H"].ToString()),
LipidAngle = getdecimalEmptyData(dataTable.Rows[i]["I"].ToString() ?? string.Empty),
});
}