From 37773dac6ba7007eee7239e4beb09d55136d749e Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 27 Feb 2023 14:53:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Reading/ReadingImageTask/ReadingGlobalTaskService.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
index 83db23a6e..4f94fe613 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
@@ -335,7 +335,7 @@ namespace IRaCIS.Application.Services
{
var agreeOrNotAnswer = globalReadingQuestion.Where(y => y.TaskId == x.VisitTaskId && y.GlobalAnswerType == GlobalAnswerType.AgreeOrNot).Select(x => x.Answer).FirstOrDefault() ?? string.Empty;
- if (agreeOrNotAnswer.IsNullOrEmpty()&& lastGlobalTask.RelatedVisitTaskIdList.Contains(x.VisitTaskId))
+ if (agreeOrNotAnswer.IsNullOrEmpty()&& lastGlobalTask!=null&& lastGlobalTask.RelatedVisitTaskIdList.Contains(x.VisitTaskId))
{
agreeOrNotAnswer = "1";
}
From cfe076f6c56ef1ce8808378b26d2f0a86757c0e8 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 27 Feb 2023 17:23:23 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E4=B8=8B=E4=B8=80=E4=B8=AAqc=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Service/QC/DTO/QCListViewModel.cs | 7 ++++++
.../Service/QC/QCListService.cs | 22 +++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index ad813749c..6a914a8f0 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -31,11 +31,18 @@ namespace IRaCIS.Core.Application.Contracts
}
+ public class GetNextQCInfoInDto
+ {
+ public Guid TrialId { get; set; }
+ }
+
public class QCVisitSearchDTO : PageInput
{
//public AuditStateEnum? AuditState { get; set; }
+ public Guid? CurrentActionUserId { get; set; }
+
public AuditStateEnum[]? AuditStateArray { get; set; }
public ChallengeStateEnum? ChallengeState { get; set; }
diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs
index 430b5120d..bb6b585f0 100644
--- a/IRaCIS.Core.Application/Service/QC/QCListService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs
@@ -237,6 +237,27 @@ namespace IRaCIS.Core.Application.Image.QA
return (pageList, config);
}
+
+ ///
+ /// 获取下一个Qc信息
+ ///
+ ///
+ ///
+ [HttpPost]
+ public async Task GetNextQCInfo(GetNextQCInfoInDto inDto)
+ {
+ var result= await GetQCVisitList(new QCVisitSearchDTO()
+ {
+
+ TrialId = inDto.TrialId,
+ CurrentActionUserId=_userInfo.Id,
+ PageIndex=1,
+ PageSize=1,
+ });
+
+ return result.Item1.CurrentPageData.Count > 0 ? result.Item1.CurrentPageData[1] : null;
+ }
+
///
/// QC 访视列表
///
@@ -406,6 +427,7 @@ namespace IRaCIS.Core.Application.Image.QA
var svExpression = QCCommon.GetSubjectVisitFilter(visitSearchDTO.VisitPlanArray);
var query = _subjectVisitRepository.Where(x => x.TrialId == visitSearchDTO.TrialId)
+ .WhereIf(visitSearchDTO.CurrentActionUserId != null, t => t.CurrentActionUserId == visitSearchDTO.CurrentActionUserId)
.WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState)
.WhereIf(visitSearchDTO.SiteId != null, t => t.SiteId == visitSearchDTO.SiteId)
.WhereIf(visitSearchDTO.SubjectId != null, t => t.Subject.Id == visitSearchDTO.SubjectId)
From 6bbf0a09840b93561f17e62f0efdf9ce01ff8817 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 27 Feb 2023 17:46:16 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 16c5b2608..335c47f04 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -8000,6 +8000,13 @@
+
+
+ 获取下一个Qc信息
+
+
+
+
QC 访视列表
From 9ed80154afe8390c10463a3a733e0a6c3fa830e9 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 27 Feb 2023 17:59:44 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Application/Service/QC/QCListService.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs
index bb6b585f0..7e4ccac35 100644
--- a/IRaCIS.Core.Application/Service/QC/QCListService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs
@@ -255,7 +255,7 @@ namespace IRaCIS.Core.Application.Image.QA
PageSize=1,
});
- return result.Item1.CurrentPageData.Count > 0 ? result.Item1.CurrentPageData[1] : null;
+ return result.Item1.CurrentPageData.Count > 0 ? result.Item1.CurrentPageData[0] : null;
}
///