From 4e28f4224185fd2b9ae192f3e68a8bac2e464e5f Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Tue, 18 Oct 2022 15:24:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 171 +++++++++---------
.../Service/Allocation/VisitTaskService.cs | 4 +-
2 files changed, 87 insertions(+), 88 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 13dd1861e..9182aecf6 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -8047,6 +8047,9 @@
肿瘤学
+
+ 问题
+
@@ -8081,6 +8084,39 @@
+
+
+ 添加阅片期任务
+
+
+
+
+
+ 根据任务ID获取ReadingTool
+
+
+
+
+
+
+ 获取关联的阅片任务
+
+
+
+
+
+
+ 获取既往任务名称和编号
+
+
+
+
+
+ 获取阅片的受试者信息
+
+
+
+
验证是否为基线访视任务
@@ -8089,12 +8125,13 @@
-
+
- 根据任务ID获取ReadingTool
+ 验证任务是否签名
-
+
+
@@ -8149,13 +8186,6 @@
-
-
- 获取关联的阅片任务
-
-
-
-
获取下一个阅片任务
@@ -8170,63 +8200,6 @@
-
-
- 获取项目已确认的标准
-
-
-
-
-
-
- 获取项目的阅片问题ECRF预览
-
-
- SinglePage 单页
-
- MultiPage 多页
-
- PublicPage 公共
-
-
-
-
-
-
- 或者阅片答案预览
-
-
-
-
-
-
-
- 获取系统的阅片问题
-
-
-
-
-
-
- 获取系统
-
-
-
-
-
-
-
- 获取阅片的受试者信息
-
-
-
-
-
-
- 获取既往结果
-
-
-
找子问题
@@ -8277,26 +8250,6 @@
-
-
- 添加阅片期任务
-
-
-
-
-
- 验证任务是否签名
-
-
-
-
-
-
-
- 完成阅片修改状态
-
-
-
获取项目标准的裁判问题
@@ -8379,6 +8332,50 @@
+
+
+ 获取项目已确认的标准
+
+
+
+
+
+
+ 获取项目的阅片问题ECRF预览
+
+
+ SinglePage 单页
+
+ MultiPage 多页
+
+ PublicPage 公共
+
+
+
+
+
+
+ 或者阅片答案预览
+
+
+
+
+
+
+
+ 获取系统的阅片问题
+
+
+
+
+
+
+ 获取系统
+
+
+
+
+
阅片期配置
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index c1c052aad..aa2d6a09b 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -64,7 +64,9 @@ namespace IRaCIS.Core.Application.Service.Allocation
public async Task> GetTrialCriterionList(Guid trialId)
{
- var list= await _repository.Where(t => t.TrialId == trialId && t.IsConfirm).Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName }).ToListAsync();
+ var list= await _repository.Where(t => t.TrialId == trialId && t.IsConfirm).OrderBy(t=>t.ShowOrder)
+ .Select(t => new TrialReadingCriterionDto() { TrialReadingCriterionId = t.Id, TrialReadingCriterionName = t.CriterionName })
+ .ToListAsync();
if (list.Count == 0)
{