From 3dc5d97ff650c0f8539ae095ee51d66101d3737e Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Wed, 31 Aug 2022 13:44:19 +0800
Subject: [PATCH] =?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.API/IRaCIS.Core.API.xml | 7 +++++++
IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 7 +++++++
.../Service/Reading/ReadingImageTaskService.cs | 4 ++--
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml
index 465b8c92b..2731afbfe 100644
--- a/IRaCIS.Core.API/IRaCIS.Core.API.xml
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml
@@ -97,6 +97,13 @@
+
+
+ 提交Diocm阅片
+
+
+
+
提交全局阅片任务
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 7bf001a6a..67cab3347 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -7262,6 +7262,13 @@
+
+
+ 提交Dicom阅片信息
+
+
+
+
提交裁判问题
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index ebfe37bad..1ced56eb2 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -121,8 +121,8 @@ namespace IRaCIS.Application.Services
var visitTaskInfo = await _visitTaskRepository.Where(x => x.Id == indto.VisitTaskId).FirstNotNullAsync();
- var taskInfoList = await _visitTaskRepository.Where(x => x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect
- && x.ReadingCategory == ReadingCategory.Visit && !x.IsAnalysisCreate && x.ReadingTaskState == ReadingTaskState.HaveSigned
+ var taskInfoList = await _visitTaskRepository.Where(x => (x.SubjectId == visitTaskInfo.SubjectId && x.TaskState == TaskState.Effect
+ && x.ReadingCategory == ReadingCategory.Visit && !x.IsAnalysisCreate && x.ReadingTaskState == ReadingTaskState.HaveSigned)||x.Id== indto.VisitTaskId
).OrderBy(x => x.VisitTaskNum).Select(x => new VisitTaskInfo()
{
VisitTaskId = x.Id,