diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs index c587a14b1..eb366f87b 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs @@ -656,7 +656,7 @@ namespace IRaCIS.Core.Application.Service var targetLesion = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.TargetLesion).Select(x => x.Answer).FirstOrDefault(); var noTargetLesion = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NoTargetLesion).Select(x => x.Answer).FirstOrDefault(); var newLesions = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesions).Select(x => x.Answer).FirstOrDefault(); - var result = await _tumorAssessmentRepository.Where(x => x.TargetLesion == targetLesion && x.NonTargetLesions == noTargetLesion && x.NewLesion == newLesions).Select(x => x.OverallEfficacy).FirstOrDefaultAsync(); + var result = await _tumorAssessmentRepository.Where(x => x.TargetLesion.GetEnumInt() == targetLesion && x.NonTargetLesions.GetEnumInt() == noTargetLesion && x.NewLesion.GetEnumInt() == newLesions).Select(x => x.OverallEfficacy).FirstOrDefaultAsync(); return result ?? string.Empty; diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 7e57d047c..ba99180a0 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -830,167 +830,5 @@ namespace IRaCIS.Core.Domain.Share } - #region 疗效评估 - - /// - /// 非靶病灶评估 - /// - public enum NoTargetAssessment - { - - /// - /// PD - /// - PD = 0, - - /// - /// CR - /// - CR = 1, - - /// - /// NE - /// - NE = 2, - - /// - /// ND - /// - ND = 3, - - /// - /// NN - /// - NN = 4, - - /// - /// NA - /// - NA = 5 - } - - /// - /// 靶病灶评估 - /// - public enum TargetAssessment - { - - /// - /// CR - /// - CR = 0, - - /// - /// PR - /// - PR = 1, - - /// - /// SD - /// - SD = 2, - - /// - /// PD - /// - PD = 3, - - /// - /// NE - /// - NE = 4, - - /// - /// ND - /// - ND = 5, - - /// - /// NA - /// - NA = 6 - } - - /// - /// 新病灶评估 - /// - public enum NewLesionAssessment - { - - /// - /// 是 - /// - Yes = 0, - - /// - /// 疑似 - /// - Suspected = 1, - - /// - /// NE - /// - NE = 2, - - /// - /// 否 - /// - No = 3, - - /// - /// NA - /// - NA = 4 - } - - /// - /// 整体肿瘤评估 - /// - public enum OverallAssessment - { - - /// - /// CR - /// - CR = 0, - - /// - /// ND - /// - ND = 1, - - /// - /// NE - /// - NE = 2, - - /// - /// NN - /// - NN = 3, - - /// - /// PD - /// - PD = 4, - - /// - /// PR - /// - PR = 5, - - /// - /// SD - /// - SD = 6, - - /// - /// NA - /// - NA = 7 - } - - - #endregion }