From 01aabd5454f624446dfa89a3b4fdd8682affa06e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 21 Jul 2022 15:01:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.API/IRaCIS.Core.API.xml | 7 +++
.../IRaCIS.Core.Application.xml | 43 ++++++++++++++++++-
.../Service/Allocation/VisitTaskService.cs | 39 +++++++++--------
3 files changed, 70 insertions(+), 19 deletions(-)
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index b8e6bcbcc..bf3440224 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -90,6 +90,13 @@
+
+
+ 提交全局阅片任务
+
+
+
+
项目阅片信息签名
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index b876da844..54119fa7c 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1444,6 +1444,26 @@
文件路径
+
+
+ 当新答案为空的时候 是否是有原数据
+
+
+
+
+ 答案分组
+
+
+
+
+ 答案组合
+
+
+
+
+ 裁判类型
+
+
类型值
@@ -5770,13 +5790,20 @@
-
+
提交全局阅片结果
+
+
+ 签名提交任务修改状态
+
+
+
+
完成阅片修改状态
@@ -5789,6 +5816,13 @@
+
+
+ 全局阅片裁判触发
+
+
+
+
触发裁判任务(新)
@@ -5796,6 +5830,13 @@
+
+
+ 计算返回的结果 为True表示不相等
+
+
+
+
添加裁判任务
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 9a970866a..2de8b4b48 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -1187,15 +1187,15 @@ namespace IRaCIS.Core.Application.Service.Allocation
if (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Agree)
{
- //有序 如果先同意访视2 再同意访视3 把访视3改为同意
- if (trialConfig.IsReadingTaskViewInOrder)
- {
- await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.OriginalReReadingTask.SubjectId == visitTaskReReadingAppply.OriginalReReadingTask.SubjectId && t.OriginalReReadingTask.VisitTaskNum > origenalTask.VisitTaskNum, u => new VisitTaskReReading()
- {
- RequestReReadingConfirmUserId = _userInfo.Id,
- RequestReReadingResultEnum = RequestReReadingResult.Agree,
- });
- }
+ ////有序 如果先同意访视2 再同意访视3 把访视3改为同意
+ //if (trialConfig.IsReadingTaskViewInOrder)
+ //{
+ // await _visitTaskReReadingRepository.BatchUpdateNoTrackingAsync(t => t.OriginalReReadingTask.SubjectId == visitTaskReReadingAppply.OriginalReReadingTask.SubjectId && t.OriginalReReadingTask.VisitTaskNum > origenalTask.VisitTaskNum, u => new VisitTaskReReading()
+ // {
+ // RequestReReadingConfirmUserId = _userInfo.Id,
+ // RequestReReadingResultEnum = RequestReReadingResult.Agree,
+ // });
+ //}
//PM申请 SPM / CPM审批 回退访视，在此不生成访视任务
if (visitTaskReReadingAppply.RequestReReadingType == RequestReReadingType.TrialGroupApply && (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM))
@@ -1797,6 +1797,17 @@ namespace IRaCIS.Core.Application.Service.Allocation
foreach (var influenceTask in influenceTaskList)
{
+ //同意的访视
+ if (influenceTask.Id == task.Id)
+ {
+ influenceTaskList.ForEach(t =>
+ {
+ //记录实际影像的任务
+
+ influenceTask.TaskInfluenceList.Add(new TaskInfluence() { InfluenceTaskId = t.Id });
+ });
+ }
+
//申请的访视 要不是重阅重置，要不就是失效 不会存在取消分配
if (influenceTask.ReadingCategory == ReadingCategory.Visit && influenceTask.VisitTaskNum != task.VisitTaskNum)
{
@@ -1829,15 +1840,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
{
influenceTask.TaskState = TaskState.Adbandon;
}
-
- influenceTaskList.ForEach(t =>
- {
- //记录实际影像的任务
-
- influenceTask.TaskInfluenceList.Add(new TaskInfluence() { InfluenceTaskId = t.Id });
- });
-
-
+
}
}