From a313f977362f0b5d1fd5dce769517e552874f729 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 17 Oct 2023 11:06:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 2 +- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 257dbc73f..bb26b4704 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1923,7 +1923,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public int? NumberOfFrames { get; set; } - public string? FromMark { get; set; } + public string? FromMark { get; set; } public string? ReportMark { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 5063f47bb..68cf6034e 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -2071,7 +2071,7 @@ namespace IRaCIS.Application.Services rowInfo.FristAddTaskId = inDto.RowId == null ? inDto.VisitTaskId : rowInfo.FristAddTaskId; if (inDto.RowId == null) { - + rowInfo.FromMark = inDto.FromMark == null ? string.Empty : inDto.FromMark.Value; //await _readingTableAnswerRowInfoRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == inDto.RowIndex && x.QuestionId == inDto.QuestionId); List answerList = inDto.AnswerList.Select(x => new ReadingTableQuestionAnswer() From a0880719144d3a95e8e2bbaa8ea2a269d8c82174 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 17 Oct 2023 11:07:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 68cf6034e..c8a2307a1 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -2071,7 +2071,7 @@ namespace IRaCIS.Application.Services rowInfo.FristAddTaskId = inDto.RowId == null ? inDto.VisitTaskId : rowInfo.FristAddTaskId; if (inDto.RowId == null) { - rowInfo.FromMark = inDto.FromMark == null ? string.Empty : inDto.FromMark.Value; + rowInfo.FromMark = inDto.FromMark ?? string.Empty; //await _readingTableAnswerRowInfoRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == inDto.RowIndex && x.QuestionId == inDto.QuestionId); List answerList = inDto.AnswerList.Select(x => new ReadingTableQuestionAnswer() From 08f592a9cb396aa6c20950d2b2870ef997000cb2 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 17 Oct 2023 11:17:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/ReadingImageTask/ReadingImageTaskService.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index c8a2307a1..495dbc433 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -2072,6 +2072,10 @@ namespace IRaCIS.Application.Services if (inDto.RowId == null) { rowInfo.FromMark = inDto.FromMark ?? string.Empty; + rowInfo.ReportMark = inDto.ReportMark ?? string.Empty; + rowInfo.MarkTool = inDto.MarkTool ?? string.Empty; + rowInfo.PicturePath = inDto.PicturePath ?? string.Empty; + rowInfo.MeasureData = inDto.MeasureData ?? string.Empty; //await _readingTableAnswerRowInfoRepository.BatchDeleteNoTrackingAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == inDto.RowIndex && x.QuestionId == inDto.QuestionId); List answerList = inDto.AnswerList.Select(x => new ReadingTableQuestionAnswer()