diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 90d0a9a78..0dc51e819 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -4725,6 +4725,12 @@
+
+
+ 测试肿瘤学评估
+
+
+
计算整体肿瘤评估 【测试】
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
index 96578b54e..f77ddf11c 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
@@ -291,6 +291,23 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public List SheetNames { get; set; }
}
+
+ public class TestOncologyDto
+ {
+
+ public Guid Id { get; set; }
+
+ public string TargetLesion { get; set; }
+
+
+ public string NonTargetLesions { get; set; }
+
+ public string NewLesion { get; set; }
+
+
+ public string OverallEfficacy { get; set; }
+ }
+
///
/// 阅片计算Dto
///
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
index 720b08306..e22735e3d 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
@@ -5,6 +5,7 @@ using IRaCIS.Core.Infra.EFCore.Common;
using IRaCIS.Core.Infrastructure;
using MassTransit;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
@@ -1120,6 +1121,35 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
return CalculationGetImgOncology(targetLesion, noTargetLesion, newLesions);
}
+ ///
+ /// 测试肿瘤学评估
+ ///
+ ///
+ public async Task> TestOncology()
+ {
+ var dataList = await _tumorAssessmentRepository.AsQueryable().ToListAsync();
+
+ List result = new List();
+
+ foreach (var item in dataList)
+ {
+ var data = CalculationGetImgOncology(item.TargetLesion.GetEnumInt(), item.NonTargetLesions.GetEnumInt(), item.NewLesion.GetEnumInt());
+
+ if (item.OverallEfficacy.GetEnumInt() != data)
+ {
+ result.Add(new TestOncologyDto()
+ {
+ Id = item.Id,
+ TargetLesion = item.TargetLesion.ToString(),
+ NewLesion = item.NewLesion.ToString(),
+ NonTargetLesions = item.NonTargetLesions.ToString(),
+ OverallEfficacy = item.OverallEfficacy.ToString(),
+ });
+ }
+ }
+ return result;
+
+ }
///