From d331fda704fcf9d77459b3723c760a1fbb8f1405 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 17 Nov 2022 17:00:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 30 +++++++++++++++++++
.../DTO/TaskMedicalReviewViewModel.cs | 6 ++++
.../Allocation/TaskMedicalReviewService.cs | 3 +-
3 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index cefe7600..288f1914 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -3680,6 +3680,11 @@
单位
+
+
+ 数据来源
+
+
字典code
@@ -3713,6 +3718,11 @@
数值类型
+
+
+ 数据来源
+
+
单位
@@ -4001,11 +4011,21 @@
自定义计算标记
+
+
+ 数据来源
+
+
数值类型
+
+
+ 数据来源
+
+
单位
@@ -4266,6 +4286,11 @@
数值类型
+
+
+ 数据来源
+
+
单位
@@ -4536,6 +4561,11 @@
数值类型
+
+
+ 数据来源
+
+
单位
diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
index fba86424..c6ad5cf5 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskMedicalReviewViewModel.cs
@@ -97,6 +97,12 @@ namespace IRaCIS.Core.Application.ViewModel
public bool? IsUrgent { get; set; }
public Guid? DoctorUserId { get; set; }
+
+ public TaskState? TaskState { get; set; }
+
+ public MedicalReviewAuditState? AuditState { get; set; }
+
+
public ReadingCategory? ReadingCategory { get; set; }
public ReadingTaskState? ReadingTaskState { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
index b39feff9..f631c343 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
@@ -61,7 +61,8 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(inQuery.DoctorUserId != null, t => t.VisitTask.DoctorUserId == inQuery.DoctorUserId)
.WhereIf(!string.IsNullOrEmpty(inQuery.TrialSiteCode), t => (t.VisitTask.BlindTrialSiteCode.Contains(inQuery.TrialSiteCode) && t.VisitTask.IsAnalysisCreate) || (t.VisitTask.Subject.TrialSite.TrialSiteCode.Contains(inQuery.TrialSiteCode) && t.VisitTask.IsAnalysisCreate == false))
.WhereIf(inQuery.ReadingCategory != null, t => t.VisitTask.ReadingCategory == inQuery.ReadingCategory)
- .WhereIf(inQuery.ReadingTaskState != null, t => t.VisitTask.ReadingTaskState == inQuery.ReadingTaskState)
+ .WhereIf(inQuery.TaskState != null, t => t.VisitTask.TaskState == inQuery.TaskState)
+ .WhereIf(inQuery.AuditState != null, t => t.AuditState == inQuery.AuditState)
.WhereIf(inQuery.TrialReadingCriterionId != null, t => t.VisitTask.TrialReadingCriterionId == inQuery.TrialReadingCriterionId)
.ProjectTo(_mapper.ConfigurationProvider);