diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index f04876b8f..e933add62 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -501,7 +501,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate new ReadingCalculateData (){QuestionType=QuestionType.UptakeChange,GetStringFun=GetFDGPETOverallAssessment}, // 影像学整体肿瘤评估 - new ReadingCalculateData (){QuestionType=QuestionType.UptakeChange,GetStringFun=GetFDGPETOverallAssessment}, + new ReadingCalculateData (){QuestionType=QuestionType.ImgOncology,GetStringFun=GetFDGPETOverallAssessment}, ////靶病灶径线之和(SOD) //new ReadingCalculateData (){QuestionType=QuestionType.SOD,GetDecimalNullFun=GetSODData}, @@ -1895,6 +1895,101 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate .FirstOrDefault(); return resultdata ?? string.Empty; } + + #endregion + + #region 影像学整体肿瘤评估 + //public async Task GetImgOncology(ReadingCalculateDto inDto) + //{ + // if (inDto.IsBaseLine) + // { + // return ImagingOverallAssessment_Lugano.NA.GetEnumInt(); + // } + + // // CTandMRI + // var CTandMRIData = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.CTandMRI).Select(x => x.Answer).FirstOrDefault(); + + // // FDGPET + // var FDGPETData = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.FDGPET).Select(x => x.Answer).FirstOrDefault(); + + // var baseLineTaskId = await GetBaseLineTaskId(inDto); + // // lastFDGPET + // var lastFDGPETData = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == baseLineTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.EvidenceFocalFDG).Select(x => x.Answer).FirstOrDefaultAsync(); + + // List data = new List() { + + // //ND NE NE ND + // new CalculationDto(){ + // Column1=ReadingCommon.EnumToString(new List() { CTMRIOverallAssessment.ND }), + // Column2=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE }), + // Column3=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE}), + // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.ND }), + // }, + // //ND/PD/CR/NE/PR/SD PMD PMD/CMR/PMR/NMR/NE PMD/PD + // new CalculationDto(){ + // Column1=ReadingCommon.EnumToString(new List() { CTMRIOverallAssessment.ND }), + // Column2=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE }), + // Column3=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE}), + // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.ND }), + // }, + // //ND NE NE ND + // new CalculationDto(){ + // Column1=ReadingCommon.EnumToString(new List() { CTMRIOverallAssessment.ND }), + // Column2=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE }), + // Column3=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE}), + // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.ND }), + // }, + // //ND NE NE ND + // new CalculationDto(){ + // Column1=ReadingCommon.EnumToString(new List() { CTMRIOverallAssessment.ND }), + // Column2=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE }), + // Column3=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE}), + // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.ND }), + // }, + // //ND NE NE ND + // new CalculationDto(){ + // Column1=ReadingCommon.EnumToString(new List() { CTMRIOverallAssessment.ND }), + // Column2=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE }), + // Column3=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE}), + // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.ND }), + // }, + // //ND NE NE ND + // new CalculationDto(){ + // Column1=ReadingCommon.EnumToString(new List() { CTMRIOverallAssessment.ND }), + // Column2=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE }), + // Column3=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE}), + // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.ND }), + // }, + // //ND NE NE ND + // new CalculationDto(){ + // Column1=ReadingCommon.EnumToString(new List() { CTMRIOverallAssessment.ND }), + // Column2=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE }), + // Column3=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE}), + // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.ND }), + // }, + // //ND NE NE ND + // new CalculationDto(){ + // Column1=ReadingCommon.EnumToString(new List() { CTMRIOverallAssessment.ND }), + // Column2=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE }), + // Column3=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE}), + // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.ND }), + // }, + // //ND NE NE ND + // new CalculationDto(){ + // Column1=ReadingCommon.EnumToString(new List() { CTMRIOverallAssessment.ND }), + // Column2=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE }), + // Column3=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE}), + // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.ND }), + // }, + // //ND NE NE ND + // new CalculationDto(){ + // Column1=ReadingCommon.EnumToString(new List() { CTMRIOverallAssessment.ND }), + // Column2=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE }), + // Column3=ReadingCommon.EnumToString(new List() { FDGPETOverallAssessment.NE}), + // Column4=ReadingCommon.EnumToString(new List() { ImagingOverallAssessment_Lugano.ND }), + // }, + // } + //} #endregion diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 2ed68212c..2942612de 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -925,6 +925,69 @@ namespace IRaCIS.Core.Domain.Share NotEvaluable = 5, } + + /// + /// Lugano影像学整体肿瘤评估 + /// + public enum ImagingOverallAssessment_Lugano + { + /// + /// NA + /// + NA = -1, + + /// + /// CMR + /// + CMR = 0, + + /// + /// CR + /// + CR = 1, + + /// + /// PMR + /// + PMR = 2, + + /// + /// PR + /// + PR = 3, + + /// + /// NMR + /// + NMR = 4, + + /// + /// SD + /// + SD = 5, + + /// + /// PMD + /// + PMD = 6, + + /// + /// PD + /// + PD = 7, + + /// + /// NE + /// + NE = 8, + + /// + /// ND + /// + ND = 9, + + } + /// /// FDG-PET总体评估 ///