From 369d3238d2e273c916575ddf399afc9c1b822b8b Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Sun, 9 Oct 2022 17:19:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=98=85=E7=89=87=E6=A0=87?=
=?UTF-8?q?=E5=87=86=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 43 +++++++++++--------
.../DTO/TaskAllocationRuleViewModel.cs | 2 +-
.../Allocation/TaskAllocationRuleService.cs | 4 +-
.../Allocation/TaskConsistentRuleService.cs | 2 +-
.../Service/Allocation/VisitTaskService.cs | 7 ++-
5 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 9a9a16773..fb8381e88 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -220,7 +220,7 @@
-
+
阅片人维度 Subject统计表
@@ -275,13 +275,6 @@
-
-
- 自动一次性分配所有未分配的 Subject 给医生
-
-
-
-
访视任务
@@ -4026,6 +4019,13 @@
+
+
+ 获取报告是否存在疾病
+
+
+
+
验证访视提交
@@ -4173,6 +4173,13 @@
+
+
+ 获取最低方式
+
+
+
+
获取访视任务信息
@@ -6048,42 +6055,42 @@
修约小数点
-
+
- 项目ID
+ 项目标准ID
-
+
阅片工具
-
+
阅片平台
-
+
任务组织级别
-
+
影像是否有标注
-
+
IR阅片是否显示受试者信息
-
+
IR阅片是否显示既往结果
-
+
仲裁规则/对象
@@ -6732,7 +6739,7 @@
-
+
设置项目阅片信息
diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
index f9b73fe39..4bbda9b6e 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
@@ -173,7 +173,7 @@ namespace IRaCIS.Core.Application.ViewModel
{
public Guid TrialId { get; set; }
- public ReadingMethod ReadingType { get; set; }
+ //public ReadingMethod ReadingType { get; set; }
public Guid? DoctorUserId { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
index 45ef9e665..5e8cd46ed 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
@@ -163,7 +163,7 @@ namespace IRaCIS.Core.Application.Service
select new TrialDoctorUserSelectView()
{
TrialId = enroll.TrialId,
- ReadingType = enroll.Trial.ReadingType,
+ //ReadingType = enroll.Trial.ReadingType,
DoctorUserId = user.Id,
FullName = user.FullName,
UserCode = user.UserCode,
@@ -186,7 +186,7 @@ namespace IRaCIS.Core.Application.Service
select new TrialDoctorUserSelectView()
{
TrialId = allocationRule.TrialId,
- ReadingType = allocationRule.Trial.ReadingType,
+ //ReadingType = allocationRule.Trial.ReadingType,
DoctorUserId = user.Id,
FullName = user.FullName,
UserCode = user.UserCode,
diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
index b21605826..0796c6460 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskConsistentRuleService.cs
@@ -500,7 +500,7 @@ namespace IRaCIS.Core.Application.Service
var trialId = filterObj.TrialId;
var trialReadingCriterionId = filterObj.TrialReadingCriterionId;
- var trialConfig = (await _repository.Where(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.ReadingType, t.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
+ //var trialConfig = (await _repository.Where(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.ReadingType, t.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 18ca19d14..0af7b2c54 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -162,12 +162,15 @@ namespace IRaCIS.Core.Application.Service.Allocation
/// 阅片人维度 Subject统计表
///
///
+ ///
///
- public async Task> GetDoctorSubjectStat(Guid trialId)
+ public async Task<(List,object)> GetDoctorSubjectStat(Guid trialId, Guid trialReadingCriterionId )
{
var list = await _taskAllocationRuleRepository.Where(t => t.TrialId == trialId).ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
- return list;
+ var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == trialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder,x.ReadingType }).FirstOrDefaultAsync()).IfNullThrowException();
+
+ return (list, criterionConfig);
}