From a13b1d08c45593cd987141d62f05c05a31f4ce63 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 16 Oct 2023 09:26:55 +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
---
.../Reading/ReadingImageTask/ReadingImageTaskService.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 612abc05f..113ddf174 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"]);
}
}
From 1f446ac60fb3beda38ca0fea5ad206968b9edde5 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 16 Oct 2023 11:44:42 +0800
Subject: [PATCH 2/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/Dto/ReadingImageTaskViewModel.cs | 18 +++++++++---------
.../ReadingImageTaskService.cs | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index e4360ebd4..b81af553f 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,9 +1977,9 @@ 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;
+ public bool? IsDicomReading { get; set; }
///
/// InstanceId
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 113ddf174..df466c762 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -2094,8 +2094,8 @@ namespace IRaCIS.Application.Services
else
{
- await _readingTableAnswerRowInfoRepository.NotUpdateEmptyAsync(inDto) ;
-
+ await _readingTableAnswerRowInfoRepository.UpdateFromDTOAsync(inDto) ;
+
foreach (var item in inDto.AnswerList)
{
From 75b5458c026c7e567266ebb482425b9fb7c3cfcf Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 16 Oct 2023 11:47:16 +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
---
.../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 4 ++--
1 file 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 b81af553f..257dbc73f 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -1977,9 +1977,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public decimal? WL { get; set; }
- public string? BlindName { get; set; }
+ public string? BlindName { get; set; }
- public bool? IsDicomReading { get; set; }
+ public bool IsDicomReading { get; set; } = true;
///
/// InstanceId