From 1923b0eee73fded57c4f711c95f5a515a8f196b9 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 17 Oct 2022 15:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=86=E7=B1=BB=E7=AE=80?=
=?UTF-8?q?=E5=8D=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 226 +++++++++---------
.../Allocation/DTO/VisitTaskViewModel.cs | 2 +
.../Service/Allocation/VisitTaskService.cs | 1 +
3 files changed, 110 insertions(+), 119 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 08411c292..d746a8065 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -4137,102 +4137,6 @@
是否是系统数据
-
-
- 器官服务层
-
-
-
-
- 获取标准病灶类型
-
-
-
-
-
-
- 获取标准病灶器官关系信息
-
-
-
-
-
-
- 新增修改标准病灶器官关系信息
-
-
-
-
-
-
- 删除病灶病灶器官关系信息
-
-
-
-
-
-
- 获取系统器官信息
-
-
-
-
-
-
- 获取系统器官分页信息
-
-
-
-
-
-
- 新增或修改系统器官数据
-
-
-
-
-
-
- 删除系统器官
-
-
-
-
-
-
- 批量添加项目器官
-
-
-
-
-
-
- 删除系统器官
-
-
-
-
-
-
- 获取项目器官信息
-
-
-
-
-
-
- 同步系统器官到项目
-
-
-
-
-
-
- 设置项目器官是否生效
-
-
-
-
阅片医学审核
@@ -4339,27 +4243,7 @@
-
-
- 获取项目的医学审核问题
-
-
-
-
-
-
- 获取预览问题信息
-
-
-
-
-
-
- 新增或修改项目医学审核问题
-
-
-
-
+
获取项目的其他医学审核问题
@@ -4367,9 +4251,10 @@
-
+
+
- 从系统里面选择问题添加到项目里面
+ 新增或修改项目医学审核问题
@@ -4395,6 +4280,109 @@
+
+
+ 从系统里面选择问题添加到项目里面
+
+
+
+
+
+
+ 器官服务层
+
+
+
+
+ 获取系统器官信息
+
+
+
+
+
+
+ 获取系统器官分页信息
+
+
+
+
+
+
+ 新增或修改系统器官数据
+
+
+
+
+
+
+ 删除系统器官
+
+
+
+
+
+
+ 获取项目器官信息
+
+
+
+
+
+
+ 批量添加项目器官
+
+
+
+
+
+
+ 删除系统器官
+
+
+
+
+
+
+ 设置项目器官是否生效
+
+
+
+
+
+
+ 获取标准病灶类型
+
+
+
+
+
+
+ 获取标准病灶器官关系信息
+
+
+
+
+
+
+ 新增修改标准病灶器官关系信息
+
+
+
+
+
+
+ 删除病灶病灶器官关系信息
+
+
+
+
+
+
+ 同步系统器官到项目
+
+
+
+
项目外部人员 录入流程相关
diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
index 3285a1cee..fcf7dc846 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs
@@ -350,6 +350,8 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? SubjectId { get; set; }
+ public Guid? DoctorUserId { get; set; }
+
public string SubjectCode { get; set; } = String.Empty;
diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
index b07f238f5..c1c052aad 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@@ -85,6 +85,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
var subjectQuery = _subjectRepository.Where(t => t.TrialId == querySubjectAssign.TrialId && t.SubjectVisitTaskList.Any())
.WhereIf(querySubjectAssign.SiteId != null, t => t.SiteId == querySubjectAssign.SiteId)
.WhereIf(querySubjectAssign.SubjectId != null, t => t.Id == querySubjectAssign.SubjectId)
+ .WhereIf(querySubjectAssign.DoctorUserId != null, t => t.SubjectDoctorList.Any(t=>t.DoctorUserId==querySubjectAssign.DoctorUserId && t.TrialReadingCriterionId==querySubjectAssign.TrialReadingCriterionId))
.WhereIf(!string.IsNullOrEmpty(querySubjectAssign.SubjectCode), t => t.Code.Contains(querySubjectAssign.SubjectCode))
.ProjectTo(_mapper.ConfigurationProvider,new { trialReadingCriterionId=querySubjectAssign.TrialReadingCriterionId });