From c5e0ddde03068b0fcf7f51788e2df13ab35f628a Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Sun, 9 Oct 2022 11:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE=E7=AD=BE?=
=?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 60 +++++++++++++++++++
.../Service/Allocation/VisitTaskService.cs | 33 +---------
.../Service/Reading/ReadModuleService.cs | 7 +++
3 files changed, 68 insertions(+), 32 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index f12165325..9a9a16773 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -2985,6 +2985,16 @@
表格问题类型
+
+
+ 数值类型
+
+
+
+
+ 单位
+
+
字典code
@@ -3013,6 +3023,16 @@
ReadingTableQuestionSystemAddOrEdit 列表查询参数模型
+
+
+ 数值类型
+
+
+
+
+ 单位
+
+
字典code
@@ -3261,6 +3281,26 @@
序号标记
+
+
+ 数值类型
+
+
+
+
+ 单位
+
+
+
+
+ 数值类型
+
+
+
+
+ 单位
+
+
Id
@@ -3501,6 +3541,16 @@
图片数量
+
+
+ 数值类型
+
+
+
+
+ 单位
+
+
分组
@@ -3741,6 +3791,16 @@
序号标记
+
+
+ 数值类型
+
+
+
+
+ 单位
+
+
返回的对象
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 9ca75207a..ae5f2e055 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1863,15 +1863,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
if (influenceTask.Id == origenalTask.Id)
{
ReReadingTaskTrackingDeal(influenceTask, agreeReReadingCommand);
-
- //influenceTaskList.ForEach(t =>
- //{
- // //记录实际影像的任务
-
- // influenceTask.TaskInfluenceList.Add(new TaskInfluence() { InfluenceTaskId = t.Id });
- //});
-
-
+
await SetMedicalReviewInvalidAsync(influenceTaskList, false);
trakingOrigenalTask?.TaskInfluenceList.Add(new TaskInfluence() { InfluenceTaskId = influenceTask.Id, OptType = ReReadingOrBackOptType.Return });
@@ -1894,29 +1886,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
}
- #region Old
- ////访视任务产生了裁判
- //if (origenalTask.ReadingCategory == ReadingCategory.Visit && origenalTask.JudgeVisitTaskId != null)
- //{
-
- // //裁判任务是否已阅片完成
- // var judgeTask = await _visitTaskRepository.FirstOrDefaultAsync(t => t.Id == origenalTask.JudgeVisitTaskId);
-
- // if (judgeTask.ReadingTaskState == ReadingTaskState.HaveSigned)
- // {
- // judgeTask.TaskState = TaskState.HaveReturned;
- // }
- // //裁判任务未完
- // else
- // {
- // judgeTask.TaskState = TaskState.Adbandon;
- // }
- //}
- #endregion
-
-
-
-
}
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
index 09d63efa5..6ee76557f 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs
@@ -365,6 +365,13 @@ namespace IRaCIS.Application.Services
{
var readModule = await _readModuleRepository.Where(x => x.Id == readModuleId).FirstNotNullAsync();
+
+
+ if(await _repository.Where(t => t.ReadingId == readModuleId).AnyAsync(t => t.ReadingClinicalDataState == ReadingClinicalDataStatus.HaveSigned))
+ {
+ return ResponseOutput.NotOk("临床资料已签名，不允许删除");
+ }
+
//增加标准
if (readModule.ModuleType==ModuleTypeEnum.Global&&(await _readModuleRepository.AnyAsync(x=>x.ModuleType==ModuleTypeEnum.Oncology&&x.SubjectVisitId== readModule.SubjectVisitId && x.TrialReadingCriterionId==readModule.TrialReadingCriterionId)))
{