diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index da57a955b..fb3f4d549 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -15367,7 +15367,7 @@
-
+
分割
@@ -15390,6 +15390,27 @@
+
+
+ 添加新版本
+
+
+
+
+
+
+ 获取分割组历史版本
+
+
+
+
+
+
+ 恢复分割组历史版本
+
+
+
+
删除分割组
@@ -17295,17 +17316,17 @@
- 质疑
+ ����
- 一致性核查
+ һ���Ժ˲�
- 复制
+ ����
@@ -18103,6 +18124,11 @@
是否保存
+
+
+ 文件大小,单位字节
+
+
是否锁定
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
index 4f536da8e..46931c9cb 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
@@ -55,6 +55,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{CriterionType.IVUS,typeof(IVUSCalculateService) },
{CriterionType.OCT,typeof(OCTCalculateService) },
{CriterionType.MRIPDFF,typeof(MRIPDFFCalculateService) },
+ {CriterionType.MRIPDFFAdvance,typeof(MRIPDFFAdvanceCalculateService) },
{CriterionType.mRECISTHCC,typeof(MRECISTHCCCalculateService) },
};
diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFAdvanceCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFAdvanceCalculateService.cs
new file mode 100644
index 000000000..2ab179580
--- /dev/null
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFAdvanceCalculateService.cs
@@ -0,0 +1,561 @@
+using DocumentFormat.OpenXml.EMMA;
+using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Application.ViewModel;
+using IRaCIS.Core.Domain.Models;
+using IRaCIS.Core.Domain.Share;
+using IRaCIS.Core.Infra.EFCore.Common;
+using IRaCIS.Core.Infrastructure;
+using MassTransit;
+using Microsoft.AspNetCore.Mvc;
+using System.Linq;
+
+namespace IRaCIS.Core.Application.Service.ReadingCalculate
+{
+ [ApiExplorerSettings(GroupName = "Reading")]
+ public class MRIPDFFAdvanceCalculateService(IRepository _readingTableQuestionAnswerRepository,
+ IRepository _visitTaskRepository,
+ IRepository _readingQuestionCriterionTrialRepository,
+ IRepository _readingTableQuestionTrialRepository,
+ IRepository _readingTableAnswerRowInfoRepository,
+ IRepository _readingGlobalTaskInfoRepository,
+ IRepository _readingQuestionTrialRepository,
+ IRepository _subjectVisitRepository,
+ IRepository _organInfoRepository,
+ IRepository _dictionaryRepository,
+ IRepository _readingTaskQuestionMarkRepository,
+ IRepository _dicomStudyRepository,
+ IRepository _noneDicomStudyRepository,
+ IRepository _tumorAssessmentRepository,
+ IGeneralCalculateService _generalCalculateService,
+ IRepository _readingTaskQuestionAnswerRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ICriterionCalculateService
+ {
+
+
+ private List siteVisitForTumorList = new List();
+
+ ///
+ /// 阅片导入
+ ///
+ ///
+ public async Task ReadingImport()
+ {
+ }
+
+
+ ///
+ /// 获取阅片的计算数据
+ ///
+ ///
+ ///
+ public async Task
MRIPDFF = 21,
+
+ ///
+ /// MRIPDFFAdvance
+ ///
+
+ MRIPDFFAdvance = 22,
}
@@ -2519,6 +2525,11 @@ namespace IRaCIS.Core.Domain.Share
/// 肝脏分段
///
liverSegmentation = 1106,
+
+ ///
+ /// 第四次测量
+ ///
+ FourthMeasurement = 1107,
}
///