diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 3773a0b8c..7d2f67686 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -402,7 +402,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto { public Guid VisitTaskId { get; set; } - public Guid QuestionId { get; set; } + public Guid QuestionId { get; set; } = default(Guid); public Guid RowId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 98aa91843..9de00eeca 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1395,6 +1395,8 @@ namespace IRaCIS.Application.Services return ResponseOutput.Ok(true); } + inDto.QuestionId = deleteRowInfo.QuestionId; + if (await _readingTableAnswerRowInfoRepository.AnyAsync(x => x.SplitRowId == deleteRowInfo.Id && x.MergeRowId == deleteRowInfo.Id)) { throw new BusinessValidationFailedException(_localizer["ReadingImage_DeleteError"]); diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs index 96d3eb29c..952d6eee3 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/Dto/CriterionCalculateDto.cs @@ -50,6 +50,92 @@ namespace IRaCIS.Core.Application.ViewModel public class IRECISTTargetLesionDto { - + /// + /// 基线未选择任何靶病灶 + /// + public bool ExistsTargetLesion { get; set; } + + /// + /// 上一访视评估为iCPD + /// + public bool LastTaskIsICPD { get; set; } + + /// + /// 满足RECISTPD + /// + public bool MeetRECISTPD { get; set; } + + + + } + + /// + /// 新靶病灶评估Dto + /// + public class IRECISTNewTargetLesionDto + { + /// + /// 存在新靶病灶 + /// + public bool ExistsNewTargetLesion { get; set; } + + /// + /// 所有状态为消失 + /// + public bool AllVanish { get; set; } + + /// + /// 上一访视新靶病灶评估为“iUPD” + /// + public bool LastTaskIsiUPD { get; set; } + + /// + /// SOD增加5mm以上 + /// + public bool ISODAdd5mm { get; set; } + + /// + /// 有"存在"状态的新靶病灶 + /// + public bool HaveExixtsState { get; set; } + + /// + /// 至少有一个新靶病无法评估 + /// + public bool ExixtsUnevaluableState { get; set; } + } + + public class IRECISTNewNoTargetLesionDto + { + /// + /// 存在新非靶病灶 + /// + public bool ExistsNewNoTargetLesion { get; set; } + + /// + /// 所有状态为消失 + /// + public bool AllVanish { get; set; } + + + /// + /// 上一访视新靶病灶评估为“iUPD” + /// + public bool LastTaskIsiUPD { get; set; } + + /// + /// 任一新非靶病灶状态为“增大” + /// + public bool ExixtsEnlargementState { get; set; } + + /// + /// 有"存在"状态的病灶 + /// + public bool HaveExixtsState { get; set; } + + /// + /// 至少有一个病灶无法评估 + /// + public bool ExixtsUnevaluableState { get; set; } } }