From 2842791af429742560aad5165a257b91fff856ad Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 20 Mar 2023 17:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=84=E5=8A=A0=E8=AF=84?=
=?UTF-8?q?=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs | 2 ++
.../AdditionalEvaluate/SubjectCriteriaEvaluationService.cs | 3 +++
.../SubjectCriteriaEvaluationVisitStudyFilter.cs | 2 ++
3 files changed, 7 insertions(+)
diff --git a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs
index e9233a9d6..49ec90376 100644
--- a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/DTO/SubjectCriteriaEvaluationVisitFilterViewModel.cs
@@ -189,6 +189,8 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? SubjectVisitId { get; set; }
public bool? IsConfirmed { get; set; }
+
+ public bool? IsReading { get; set; }
}
}
diff --git a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs
index 30f0e9cf4..1316bbfd5 100644
--- a/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs
@@ -281,6 +281,7 @@ namespace IRaCIS.Core.Application.Service
///
///
///
+ [HttpPost]
public async Task> GetSubjectCriteriaEvaluationVisitFilterList(SubjectCriteriaEvaluationVisitFilterQuery inQuery)
{
@@ -321,6 +322,7 @@ namespace IRaCIS.Core.Application.Service
///
///
///
+ [HttpPost]
public async Task> GetHaveGeneratedTaskList(HaveGeneratedTaskQuery inQuery)
{
var list = await _repository.Where(t => t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId && t.SubjectId == inQuery.SubjectId && t.TaskState == TaskState.Effect)
@@ -397,6 +399,7 @@ namespace IRaCIS.Core.Application.Service
SubjectVisitId = series.SubjectVisitId,
TrialReadingCriterionId = inQuery.TrialReadingCriterionId,
+ IsReading=visitStudyFilter.IsReading,
Id = visitStudyFilter.Id,
CreateTime = visitStudyFilter.CreateTime,
IsConfirmed = visitStudyFilter.IsConfirmed,
diff --git a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs
index 1ad1efd2e..a2e6cfa9e 100644
--- a/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs
+++ b/IRaCIS.Core.Domain/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationVisitStudyFilter.cs
@@ -32,6 +32,8 @@ namespace IRaCIS.Core.Domain.Models
public bool IsConfirmed { get; set; }
+ public bool IsReading { get; set; }
+
public DateTime CreateTime { get; set; }