From 1a6410e881773efdc98380322b03a82218c75682 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 1 Aug 2025 17:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E4=B8=80=E4=B8=AA?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1bug5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 78 +++++++++++++++++++
.../Service/QC/QCOperationService.cs | 5 +-
2 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index e02a527cb..e2b0eea08 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -3056,6 +3056,12 @@
标准和服务对应
+
+
+ 阅片导入
+
+
+
获取Service
@@ -3124,6 +3130,12 @@
+
+
+ 阅片导入
+
+
+
获取阅片的计算数据
@@ -3504,6 +3516,12 @@
+
+
+ 阅片导入
+
+
+
获取阅片的计算数据
@@ -3633,6 +3651,12 @@
+
+
+ 阅片导入
+
+
+
获取阅片的计算数据
@@ -4161,6 +4185,12 @@
+
+
+ 阅片导入
+
+
+
获取阅片的计算数据
@@ -4689,6 +4719,12 @@
+
+
+ 阅片导入
+
+
+
获取阅片的计算数据
@@ -4974,6 +5010,12 @@
+
+
+ 阅片导入
+
+
+
获取阅片的计算数据
@@ -5044,6 +5086,12 @@
+
+
+ 阅片导入
+
+
+
获取阅片的计算数据
@@ -5215,6 +5263,12 @@
+
+
+ 阅片导入
+
+
+
获取阅片的计算数据
@@ -5321,6 +5375,12 @@
+
+
+ 阅片导入
+
+
+
获取阅片的计算数据
@@ -5572,6 +5632,12 @@
+
+
+ 阅片导入
+
+
+
获取阅片的计算数据
@@ -5883,6 +5949,12 @@
+
+
+ 阅片导入
+
+
+
获取阅片的计算数据
@@ -5940,6 +6012,12 @@
+
+
+ 阅片导入
+
+
+
验证访视提交
diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
index e60a2ceb3..08b304e74 100644
--- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
@@ -1415,11 +1415,10 @@ namespace IRaCIS.Core.Application.Image.QA
.WhereIf(isDistinguishType, t => isSecondReview == true ? t.SecondReviewState == SecondReviewState.WaitAudit : t.SecondReviewState == SecondReviewState.None)
.WhereIf(isDistinguishType, t => ishaveQCChallenge == true ? t.QCChallengeList.Any() : !t.QCChallengeList.Any())
//区分类型，当前做的不是复核任务
- .WhereIf(isDistinguishType && isSecondReview == false, t => t.AuditState != AuditStateEnum.QCPassed)
- .WhereIf(isDistinguishType && isSecondReview == false, t => t.AuditState >= AuditStateEnum.PrimaryQCPassed ? t.PreliminaryAuditUserId != _userInfo.UserRoleId : true)
+ .WhereIf(isDistinguishType && isSecondReview == false, t => t.AuditState != AuditStateEnum.QCPassed && t.PreliminaryAuditUserId != _userInfo.UserRoleId)
//不区分任务类型， 当前做完的任何类型都要默认满足下面条件
- .WhereIf(isDistinguishType == false, t => (t.SecondReviewState == SecondReviewState.WaitAudit && t.AuditState == AuditStateEnum.QCPassed) || (t.AuditState != AuditStateEnum.QCPassed))
+ .WhereIf(isDistinguishType == false, t => (t.SecondReviewState == SecondReviewState.WaitAudit && t.AuditState == AuditStateEnum.QCPassed) || (t.AuditState != AuditStateEnum.QCPassed && t.PreliminaryAuditUserId != _userInfo.UserRoleId))
.Where(x => !x.SubjectVisitImageBackRecordList.Any(t => t.ImageBackState == ImageBackStateEnum.None))