diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 21ba2f0ce..906800b7f 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1312,6 +1312,13 @@ + + + 获取阅片的计算数据 + + + + 将上一次的访视病灶添加到这一次 @@ -1352,6 +1359,13 @@ + + + 获取阅片的计算数据 + + + + 获取Sod的值 @@ -1725,6 +1739,13 @@ + + + 获取阅片的计算数据 + + + + 获取Sod的值 @@ -2177,6 +2198,13 @@ + + + 获取阅片的计算数据 + + + + 删除病灶获取起始病灶序号 @@ -2276,6 +2304,13 @@ + + + 获取阅片的计算数据 + + + + 获取Sod的值 @@ -2520,6 +2555,13 @@ + + + 获取阅片的计算数据 + + + + 获取Sod的值 @@ -2824,6 +2866,13 @@ + + + 获取阅片的计算数据 + + + + 删除病灶获取起始病灶序号 @@ -2908,6 +2957,13 @@ + + + 获取阅片的计算数据 + + + + 获取ReadingCalculateDto @@ -2980,6 +3036,13 @@ + + + 获取阅片的计算数据 + + + + SubjectCriteriaEvaluationService @@ -4979,6 +5042,11 @@ 任务Id + + + 任务Id + + 任务Id @@ -13368,6 +13436,13 @@ + + + 获取阅片的计算数据 + + + + 提交自定义标记 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index eea0729f1..a97afcfed 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -434,7 +434,15 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid VisitTaskId { get; set; } } - public class ReadingCustomTagDto + public class GetReadingCalculationDataInDto + { + /// + /// 任务Id + /// + public Guid VisitTaskId { get; set; } + } + + public class ReadingCustomTagDto { public Guid? Id { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 4a3d9b81d..8ee67f3ea 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -150,12 +150,27 @@ namespace IRaCIS.Application.Services this._trialEmailNoticeConfigService = trialEmailNoticeConfigService; } + #region 计算 + /// - /// 提交自定义标记 + /// 获取阅片的计算数据 /// /// /// [HttpPost] + public async Task GetReadingCalculationData(GetReadingCalculationDataInDto inDto) + { + return await _readingCalculateService.GetReadingCalculationData(inDto); + + } + #endregion + + /// + /// 提交自定义标记 + /// + /// + /// + [HttpPost] public async Task SubmitCustomTag(ReadingCustomTagDto inDto) { var entity = await _readingCustomTagRepository.InsertOrUpdateAsync(inDto, true); diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index 32c61ad1f..9939c4886 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -118,12 +118,26 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } - /// - /// 将上一次的访视病灶添加到这一次 - /// - /// - /// - public async Task AddTaskLesionAnswerFromLastTask(AddTaskLesionAnswerFromLastTaskInDto inDto) + /// + /// 获取阅片的计算数据 + /// + /// + /// + [HttpPost] + public async Task GetReadingCalculationData(GetReadingCalculationDataInDto inDto) + { + var service = await this.GetService(inDto.VisitTaskId); + + return await service.GetReadingCalculationData(inDto); + } + + + /// + /// 将上一次的访视病灶添加到这一次 + /// + /// + /// + public async Task AddTaskLesionAnswerFromLastTask(AddTaskLesionAnswerFromLastTaskInDto inDto) { var service = await this.GetService(inDto.VisitTaskId); var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 985a4a638..ac67e20f5 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -63,9 +63,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate this._logger = logger; } - #region 临时对象 单个请求的生命周期 避免重复查询数据库 + /// + /// 获取阅片的计算数据 + /// + /// + /// + public async Task GetReadingCalculationData(GetReadingCalculationDataInDto inDto) + { + return new + { + }; + } - private List visitTaskAnswerList; + #region 临时对象 单个请求的生命周期 避免重复查询数据库 + + private List visitTaskAnswerList; /// /// 获取Sod的值 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/ICriterionCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/ICriterionCalculateService.cs index 8405d7aeb..5961869b0 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/ICriterionCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/ICriterionCalculateService.cs @@ -1,5 +1,6 @@ using IRaCIS.Core.Application.Service.Reading.Dto; using IRaCIS.Core.Application.ViewModel; +using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; using System.Linq; @@ -52,6 +53,15 @@ namespace IRaCIS.Core.Application.Service /// Task GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto); + /// + /// 获取阅片的计算数据 + /// + /// + /// - } + Task GetReadingCalculationData(GetReadingCalculationDataInDto inDto); + + + + } } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IReadingCalculateService.cs index 0aad0c08c..f34bef539 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/Interface/IReadingCalculateService.cs @@ -51,5 +51,13 @@ namespace IRaCIS.Core.Application.Service /// /// Task GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto); - } + + /// + /// 获取阅片的计算数据 + /// + /// + /// + Task GetReadingCalculationData(GetReadingCalculationDataInDto inDto); + + } } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index 961e02b90..c687ad378 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -71,9 +71,31 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository; } - #region 临时对象 单个请求的生命周期 避免重复查询数据库 + /// + /// 获取阅片的计算数据 + /// + /// + /// + public async Task GetReadingCalculationData(GetReadingCalculationDataInDto inDto) + { + ReadingCalculateDto readingData = await _generalCalculateService.GetReadingCalculateDto(inDto.VisitTaskId); + var baseLinePET5PS = 0m; + if (!readingData.IsBaseLine) + { + var baseLineTaskId = await GetBaseLineTaskId(readingData); + baseLinePET5PS = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == baseLineTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.PET5PS).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0(); - private List visitTaskAnswerList; + } + return new + { + BaseLinePET5PS= baseLinePET5PS, + + }; + } + + #region 临时对象 单个请求的生命周期 避免重复查询数据库 + + private List visitTaskAnswerList; /// /// 获取Sod的值 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index 63aa8eaab..077e5c47a 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -63,13 +63,24 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate private List siteVisitForTumorList = new List(); + /// + /// 获取阅片的计算数据 + /// + /// + /// + public async Task GetReadingCalculationData(GetReadingCalculationDataInDto inDto) + { + return new + { + }; + } - #region 删除病灶获取起始病灶序号 - /// - /// 删除病灶获取起始病灶序号 - /// - /// - public async Task GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto) + #region 删除病灶获取起始病灶序号 + /// + /// 删除病灶获取起始病灶序号 + /// + /// + public async Task GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto) { var rowInfo = await _readingTableAnswerRowInfoRepository.Where(x => x.Id == inDto.RowId).Include(x => x.ReadingQuestionTrial).FirstNotNullAsync(); if (rowInfo.ReadingQuestionTrial.LesionType == LesionType.NewLesions) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index af8691ffa..60250e071 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -56,9 +56,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository; } - #region 临时对象 单个请求的生命周期 避免重复查询数据库 + /// + /// 获取阅片的计算数据 + /// + /// + /// + public async Task GetReadingCalculationData(GetReadingCalculationDataInDto inDto) + { + return new + { + }; + } - private List visitTaskAnswerList; + #region 临时对象 单个请求的生命周期 避免重复查询数据库 + + private List visitTaskAnswerList; /// /// 获取Sod的值 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs index 7b0cde97b..6ab26ada7 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs @@ -56,9 +56,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository; } - #region 临时对象 单个请求的生命周期 避免重复查询数据库 + /// + /// 获取阅片的计算数据 + /// + /// + /// + public async Task GetReadingCalculationData(GetReadingCalculationDataInDto inDto) + { + return new + { + }; + } - private List visitTaskAnswerList; + #region 临时对象 单个请求的生命周期 避免重复查询数据库 + + private List visitTaskAnswerList; /// /// 获取Sod的值 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs index 7166ecf13..e4458bebd 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/SelfDefineCalculateService.cs @@ -63,13 +63,24 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate private List siteVisitForTumorList = new List() ; + /// + /// 获取阅片的计算数据 + /// + /// + /// + public async Task GetReadingCalculationData(GetReadingCalculationDataInDto inDto) + { + return new + { + }; + } - #region 删除病灶获取起始病灶序号 - /// - /// 删除病灶获取起始病灶序号 - /// - /// - public async Task GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto) + #region 删除病灶获取起始病灶序号 + /// + /// 删除病灶获取起始病灶序号 + /// + /// + public async Task GetDeleteLesionStatrIndex(DeleteReadingRowAnswerInDto inDto) { return 1;