diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index e4360ebd4..257dbc73f 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1923,21 +1923,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public int? NumberOfFrames { get; set; } - public string FromMark { get; set; } = string.Empty; + public string? FromMark { get; set; } - public string ReportMark { get; set; } = string.Empty; + public string? ReportMark { get; set; } /// /// 标记工具 /// - public string MarkTool { get; set; } = string.Empty; + public string? MarkTool { get; set; } public decimal RowIndex { get; set; } /// /// 截图地址 /// - public string PicturePath { get; set; } = string.Empty; + public string? PicturePath { get; set; } /// /// 任务Id @@ -1949,9 +1949,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid TrialId { get; set; } - public string MeasureData { get; set; } = string.Empty; + public string? MeasureData { get; set; } - public string? OtherMeasureData { get; set; } = string.Empty; + public string? OtherMeasureData { get; set; } public Guid? SeriesId { get; set; } @@ -1969,7 +1969,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto } } - public bool IsCanEditPosition { get; set; } = false; + public bool? IsCanEditPosition { get; set; } public decimal FristAddTaskNum { get; set; } = 0; @@ -1977,7 +1977,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public decimal? WL { get; set; } - public string BlindName { get; set; } = string.Empty; + public string? BlindName { get; set; } public bool IsDicomReading { get; set; } = true; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 612abc05f..df466c762 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1902,12 +1902,12 @@ namespace IRaCIS.Application.Services if (targetlymphQuestion != null) { // 判断是否为淋巴结 - if (inDto.QuestionId == targetTablequestionList[0].ReadingQuestionId && inDto.AnswerList.Any(x => x.TableQuestionId == targetlymphQuestion.Id && x.Answer.EqEnum(ReadingYesOrNo.Yes))) + if (inDto.QuestionId == targetTablequestionList[0].ReadingQuestionId && inDto.AnswerList.Any(x => x.TableQuestionId == targetlymphQuestion.Id && x.Answer.EqEnum(ReadingYesOrNo.No))) { - if (await _readingTableQuestionAnswerRepository.CountAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == targetlymphQuestion.Id && x.Answer == ReadingYesOrNo.Yes.GetEnumInt() && x.RowId != inDto.RowId) >= 2) + if (await _readingTableQuestionAnswerRepository.CountAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == targetlymphQuestion.Id && x.Answer == ReadingYesOrNo.No.GetEnumInt() && x.RowId != inDto.RowId) >= 2) { - // 靶病灶只能添加两个淋巴结病灶 - throw new BusinessValidationFailedException(_localizer["ReadingImage_LuganoMaxTowTarget"]); + // 靶病灶只能添加两个非淋巴结病灶 + throw new BusinessValidationFailedException(_localizer["ReadingImage_LuganoMaxTowNoTarget"]); } } @@ -2094,8 +2094,8 @@ namespace IRaCIS.Application.Services else { - await _readingTableAnswerRowInfoRepository.NotUpdateEmptyAsync(inDto) ; - + await _readingTableAnswerRowInfoRepository.UpdateFromDTOAsync(inDto) ; + foreach (var item in inDto.AnswerList) {