diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index c28bfbb0..8f085635 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -3275,6 +3275,11 @@ 是否是当前用户 + + + 图片路径 + + 阅片人是否认同 @@ -3290,11 +3295,6 @@ 是否申请重阅 - - - 图片路径 - - 是否有问题 diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index 9de5f6c6..77177805 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -715,13 +715,18 @@ namespace IRaCIS.Core.Application.Service // 添加单双审 var trialtype = await _trialRepository.AsQueryable().Where(x => x.Id == trialId).Select(x => x.QCProcessEnum).FirstOrDefaultAsync(); - list.Add(new + if (!list.Any(x => x.Key == "AuditState")) { + list.Add(new + { - Key = "AuditState", - Code = trialtype == TrialQCProcess.SingleAudit ? "AuditStatePE" : "AuditStateRC", - Type = "Code", - }); + Key = "AuditState", + Code = trialtype == TrialQCProcess.SingleAudit ? "AuditStatePE" : "AuditStateRC", + Type = "Code", + }); + } + + list = list.GroupBy(x => new { x.Key }, (key, lst) => new