From bbd7a1381da16ca9389f5a66964b15c1afed54ff Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 12 Oct 2022 12:02:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=BF=94=E5=9B=9E=E6=A0=87?=
=?UTF-8?q?=E5=87=86=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 46 +++++++++++++++++++
.../Service/Allocation/VisitTaskService.cs | 16 ++++---
2 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 6d52bd05f..9ce2bd195 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -233,6 +233,7 @@
获取Subject 分配医生情况
+
@@ -4821,6 +4822,21 @@
器官类型
+
+
+ 部位 英文
+
+
+
+
+ TULOC 英文
+
+
+
+
+ 位置 英文
+
+
病灶类型
@@ -4846,6 +4862,21 @@
是否是淋巴结
+
+
+ 部位 英文
+
+
+
+
+ TULOC 英文
+
+
+
+
+ 位置 英文
+
+
OrganInfoQuery 列表查询参数模型
@@ -4887,6 +4918,21 @@
标准 病灶类型
+
+
+ 部位 英文
+
+
+
+
+ TULOC 英文
+
+
+
+
+ 位置 英文
+
+
类型
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index 6f5952bf3..f0ae826a4 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -80,7 +80,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
///
///
[HttpPost]
- public async Task/*, object?)*/> GetSubjectAssignAndTaskStatList(SubjectAssignStatQuery querySubjectAssign)
+ public async Task<(PageOutput, object?)> GetSubjectAssignAndTaskStatList(SubjectAssignStatQuery querySubjectAssign)
{
var subjectQuery = _subjectRepository.Where(t => t.TrialId == querySubjectAssign.TrialId && t.SubjectVisitTaskList.Any())
.WhereIf(querySubjectAssign.SiteId != null, t => t.SiteId == querySubjectAssign.SiteId)
@@ -92,9 +92,11 @@ namespace IRaCIS.Core.Application.Service.Allocation
var pageList = await subjectQuery.ToPagedListAsync(querySubjectAssign.PageIndex, querySubjectAssign.PageSize, string.IsNullOrWhiteSpace(querySubjectAssign.SortField) ? nameof(querySubjectAssign.SubjectId) : querySubjectAssign.SortField, querySubjectAssign.Asc);
- //var trialTaskConfig = _trialReadingCriterionRepository.Where(t => t.Id == querySubjectAssign.TrialId && t.Id==querySubjectAssign.TrialReadingCriterionId).ProjectTo(_mapper.ConfigurationProvider).FirstOrDefault();
- return pageList;
+
+ var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == querySubjectAssign.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder, x.ReadingType }).FirstOrDefaultAsync()).IfNullThrowException();
+
+ return (pageList, criterionConfig);
}
///
@@ -186,13 +188,15 @@ namespace IRaCIS.Core.Application.Service.Allocation
/// 获取Subject 分配医生情况
///
///
-
+ ///
///
- public async Task> GetSubjectAssignedDoctorList(Guid subjectId, Guid trialReadingCriterionId)
+ public async Task<(List,object)> GetSubjectAssignedDoctorList(Guid subjectId, Guid trialReadingCriterionId)
{
var list = await _subjectUserRepository.Where(t => t.SubjectId == subjectId && t.OrignalSubjectUserId == null && t.IsConfirmed && t.TrialReadingCriterionId==trialReadingCriterionId).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);
}