|
@@ -162,7 +162,7 @@ namespace WingAIDiagnosisService.Service
|
|
|
}
|
|
|
return new DiagnosisImageResult();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/// <summary>
|
|
|
/// 生成AI报告
|
|
|
/// </summary>
|
|
@@ -173,7 +173,7 @@ namespace WingAIDiagnosisService.Service
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- if (request.Organ == DiagnosisOrganEnum.CarotidArtery)
|
|
|
+ if (request.Organ == DiagnosisOrganEnum.CarotidArtery)
|
|
|
{
|
|
|
var result = await GetCarotidAIMeasureResult(request);
|
|
|
return result;
|
|
@@ -236,7 +236,7 @@ namespace WingAIDiagnosisService.Service
|
|
|
continue;
|
|
|
}
|
|
|
//leftItem.CarotidResult.MeasureResult = "{\"IntimaResult\":{\"IsSuccess\":true,\"AntIntima\":{\"IntimaThick\":0.0,\"IsSuccess\":false},\"PostIntima\":{\"IntimaThick\":0.75,\"IsSuccess\":true}},\"IsYImageSuccess\":false,\"PlaqueResult\":{\"PlaquePostion\":0,\"PlaqueCountType\":2,\"PlaqueType\":0,\"PlaqueWidth\":1.75,\"PlaqueHeight\":3.76,\"Stenosis\":10.37,\"IsSuccess\":true}}";
|
|
|
- var measureResult = JsonConvert.DeserializeObject<CarotidAIMeasureResult>(leftItem.CarotidResult.MeasureResult) ?? new CarotidAIMeasureResult();
|
|
|
+ var measureResult = JsonConvert.DeserializeObject<CarotidAIMeasureResult>(leftItem.CarotidResult.MeasureResult) ?? new CarotidAIMeasureResult();
|
|
|
if (measureResult.PlaqueResult?.PlaqueCountType != Carotid.Utilities.DetectPlaque.PlaqueCountType.NoPlaque)
|
|
|
{
|
|
|
leftData = leftItem;
|
|
@@ -244,7 +244,7 @@ namespace WingAIDiagnosisService.Service
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- if (leftData == null)
|
|
|
+ if (leftData == null)
|
|
|
{
|
|
|
leftData = leftExamDatas.First();
|
|
|
}
|
|
@@ -267,7 +267,7 @@ namespace WingAIDiagnosisService.Service
|
|
|
continue;
|
|
|
}
|
|
|
//rightItem.CarotidResult.MeasureResult = "{\"IntimaResult\":{\"IsSuccess\":true,\"AntIntima\":{\"IntimaThick\":0.0,\"IsSuccess\":false},\"PostIntima\":{\"IntimaThick\":0.75,\"IsSuccess\":true}},\"IsYImageSuccess\":false,\"PlaqueResult\":{\"PlaquePostion\":0,\"PlaqueCountType\":2,\"PlaqueType\":0,\"PlaqueWidth\":1.75,\"PlaqueHeight\":3.76,\"Stenosis\":10.37,\"IsSuccess\":true}}";
|
|
|
- var measureResult = JsonConvert.DeserializeObject<CarotidAIMeasureResult>(rightItem.CarotidResult.MeasureResult) ?? new CarotidAIMeasureResult();
|
|
|
+ var measureResult = JsonConvert.DeserializeObject<CarotidAIMeasureResult>(rightItem.CarotidResult.MeasureResult) ?? new CarotidAIMeasureResult();
|
|
|
if (measureResult.IntimaResult?.PostIntima?.IntimaThick > intimaThickStandard)
|
|
|
{
|
|
|
rightData = rightItem;
|
|
@@ -275,7 +275,7 @@ namespace WingAIDiagnosisService.Service
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- if (rightData == null)
|
|
|
+ if (rightData == null)
|
|
|
{
|
|
|
rightData = rightExamDatas.First();
|
|
|
}
|
|
@@ -284,7 +284,7 @@ namespace WingAIDiagnosisService.Service
|
|
|
{
|
|
|
result.CarotidResult.Add(rightData);
|
|
|
}
|
|
|
- Logger.WriteLineInfo($"AIDiagnosisService package carotidAIMeasureResult finished, CarotidLeftRemedicalCode:{ leftData?.RemedicalCode }, CarotidLeft:{ leftData?.CarotidResult?.MeasureResult }, CarotidRightRemedicalCode:{ rightData?.RemedicalCode }, CarotidRight:" + rightData?.CarotidResult?.MeasureResult);
|
|
|
+ Logger.WriteLineInfo($"AIDiagnosisService package carotidAIMeasureResult finished, CarotidLeftRemedicalCode:{leftData?.RemedicalCode}, CarotidLeft:{leftData?.CarotidResult?.MeasureResult}, CarotidRightRemedicalCode:{rightData?.RemedicalCode}, CarotidRight:" + rightData?.CarotidResult?.MeasureResult);
|
|
|
}
|
|
|
return result;
|
|
|
}
|
|
@@ -600,7 +600,7 @@ namespace WingAIDiagnosisService.Service
|
|
|
foreach (var diagnosisResult in imageResult.DiagResultsForEachOrgan)
|
|
|
{
|
|
|
var organName = Enum.GetName(typeof(DiagnosisOrganEnum), (int)diagnosisResult.Organ);
|
|
|
- if (!string.IsNullOrWhiteSpace(organName))
|
|
|
+ if (!string.IsNullOrWhiteSpace(organName) && diagnosisResult.DetectedObjects?.Any() == true)
|
|
|
{
|
|
|
diagnosisOrgans.Add((DiagnosisOrganEnum)diagnosisResult.Organ);
|
|
|
}
|