From fbf86ab7e3b31f64620d4977a5e593af11989831 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 13 Oct 2023 13:39:02 +0800
Subject: [PATCH 1/4] =?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
---
.../ReadingImageTaskService.cs | 27 ++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index b61698266..2bd5ba96a 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1747,7 +1747,7 @@ namespace IRaCIS.Application.Services
///
- /// 提交表格问题答案 病灶
+ /// 提交表格问题答案 提交病灶
///
///
///
@@ -1892,6 +1892,31 @@ namespace IRaCIS.Application.Services
}
}
+ break;
+ case CriterionType.Lugano2014:
+
+ var targetTablequestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == taskinfo.TrialReadingCriterionId && x.ReadingQuestionTrial.LesionType == LesionType.TargetLesion).ToListAsync();
+
+ var lymphQuestion = targetTablequestionList.Where(x => x.QuestionMark == QuestionMark.IsLymph).FirstOrDefault();
+
+ // 判断是否存在淋巴结问题
+ if (lymphQuestion != null)
+ {
+ // 判断是否为淋巴结
+ if (inDto.QuestionId == targetTablequestionList[0].ReadingQuestionId && inDto.AnswerList.Any(x => x.TableQuestionId == lymphQuestion.Id && x.Answer.EqEnum(ReadingYesOrNo.Yes)))
+ {
+ if (await _readingTableQuestionAnswerRepository.CountAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == lymphQuestion.Id && x.Answer == ReadingYesOrNo.Yes.GetEnumInt() && x.RowId != inDto.RowId) >= 2)
+ {
+ // 靶病灶只能添加两个淋巴结病灶
+ throw new BusinessValidationFailedException(_localizer["ReadingImage_LuganoMaxTowTarget"]);
+ }
+
+ }
+ }
+
+
+
+
break;
}
From 45de42fc71f9a526fa220a77b0ea4109d8378079 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 13 Oct 2023 13:40:45 +0800
Subject: [PATCH 2/4] =?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 2bd5ba96a..5902e2b2d 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -1897,15 +1897,15 @@ namespace IRaCIS.Application.Services
var targetTablequestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == taskinfo.TrialReadingCriterionId && x.ReadingQuestionTrial.LesionType == LesionType.TargetLesion).ToListAsync();
- var lymphQuestion = targetTablequestionList.Where(x => x.QuestionMark == QuestionMark.IsLymph).FirstOrDefault();
+ var targetlymphQuestion = targetTablequestionList.Where(x => x.QuestionMark == QuestionMark.IsLymph).FirstOrDefault();
// 判断是否存在淋巴结问题
- if (lymphQuestion != null)
+ if (targetlymphQuestion != null)
{
// 判断是否为淋巴结
- if (inDto.QuestionId == targetTablequestionList[0].ReadingQuestionId && inDto.AnswerList.Any(x => x.TableQuestionId == lymphQuestion.Id && x.Answer.EqEnum(ReadingYesOrNo.Yes)))
+ if (inDto.QuestionId == targetTablequestionList[0].ReadingQuestionId && inDto.AnswerList.Any(x => x.TableQuestionId == targetlymphQuestion.Id && x.Answer.EqEnum(ReadingYesOrNo.Yes)))
{
- if (await _readingTableQuestionAnswerRepository.CountAsync(x => x.VisitTaskId == inDto.VisitTaskId && x.TableQuestionId == lymphQuestion.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.Yes.GetEnumInt() && x.RowId != inDto.RowId) >= 2)
{
// 靶病灶只能添加两个淋巴结病灶
throw new BusinessValidationFailedException(_localizer["ReadingImage_LuganoMaxTowTarget"]);
From f29bdcab3f4a39783b4293bd2bccc9b68706f40e Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 13 Oct 2023 14:20:35 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Domain/Allocation/VisitTask.cs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index e0568cebd..c88184eaf 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -325,14 +325,14 @@ namespace IRaCIS.Core.Domain.Models
[NotMapped]
[JsonIgnore]
- public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask|| Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId
- && t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null
- && t.TaskState == TaskState.Effect
- && t.VisitTaskNum < VisitTaskNum
- && t.IsSelfAnalysis == IsSelfAnalysis
- && t.ArmEnum == ArmEnum
- ).Any();
-
+ //public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask|| Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId
+ // && t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null
+ // && t.TaskState == TaskState.Effect
+ // && t.VisitTaskNum < VisitTaskNum
+ // && t.IsSelfAnalysis == IsSelfAnalysis
+ // && t.ArmEnum == ArmEnum
+ // ).Any();
+ public bool IsConvertedTask => false;
///
/// 是否修改了整体肿瘤评估
From 7b8189dae252a43ba3671a234bc03c39014dab1c Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 13 Oct 2023 14:25:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Domain/Allocation/VisitTask.cs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
index c88184eaf..e0568cebd 100644
--- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs
+++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs
@@ -325,14 +325,14 @@ namespace IRaCIS.Core.Domain.Models
[NotMapped]
[JsonIgnore]
- //public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask|| Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId
- // && t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null
- // && t.TaskState == TaskState.Effect
- // && t.VisitTaskNum < VisitTaskNum
- // && t.IsSelfAnalysis == IsSelfAnalysis
- // && t.ArmEnum == ArmEnum
- // ).Any();
- public bool IsConvertedTask => false;
+ public bool IsConvertedTask => BeforeConvertedTaskId != null || IsHistoryConvertedTask|| Subject.SubjectVisitTaskList.Where(t => t.TrialReadingCriterionId == TrialReadingCriterionId
+ && t.DoctorUserId == DoctorUserId && t.BeforeConvertedTaskId != null
+ && t.TaskState == TaskState.Effect
+ && t.VisitTaskNum < VisitTaskNum
+ && t.IsSelfAnalysis == IsSelfAnalysis
+ && t.ArmEnum == ArmEnum
+ ).Any();
+
///
/// 是否修改了整体肿瘤评估