diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 8dcf2d47c..85d4a0b69 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -1502,15 +1502,15 @@ namespace IRaCIS.Core.Application.Image.QA } else if (trialConfig.QCProcessEnum == TrialQCProcess.SingleAudit) { - - if (dbSubjectVisit.AuditState == AuditStateEnum.InPrimaryQC) + // 单审 + if (dbSubjectVisit.AuditState == AuditStateEnum.ToAudit) { - // 单审 - dbSubjectVisit.AuditState = AuditStateEnum.QCFailed; + dbSubjectVisit.AuditState = AuditStateEnum.QCFailed; + } else { - return ResponseOutput.NotOk("项目配置为单审 当前审核状态不为 InPrimaryQC,不能变更到 QCFailed"); + return ResponseOutput.NotOk("项目配置为单审 当前审核状态不为 ToAudit,不能变更到 QCFailed"); } } else if (trialConfig.QCProcessEnum == TrialQCProcess.DoubleAudit) diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index 6a8ce2864..3c4970d34 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -23,7 +23,7 @@ namespace IRaCIS.Application.Services public string Get(testModel testModel) { - //var d = _repository.Where().Select(t => t.FullName).FirstOrDefault(); + var d = _repository.Where(/*t=>t.FullName.Contains("cc")*/).Select(t => t.FullName).FirstOrDefault(); var c = _dicRepository.Where(t => t.ParentId != null).Select(t => t.MappedValue).First(); CultureInfo culture = CultureInfo.CurrentUICulture; @@ -38,8 +38,8 @@ namespace IRaCIS.Application.Services // u => new Dictionary() { /*ParentId = null,*/ Code = "test" }).Result; - var aaaaa= _trialRepository.BatchUpdateAsync(t => t.Id == Guid.Empty, - u => new SubjectVisit() { CurrentActionUserId = null }).Result; + //var aaaaa= _trialRepository.BatchUpdateAsync(t => t.Id == Guid.Empty, + // u => new SubjectVisit() { CurrentActionUserId = null }).Result; //var d = _dicRepository.UpdateFromDTOAsync(new AddOrEditBasicDic() { Id = Guid.Parse("60d86683-c33b-4349-b672-08da1e91b622"), ParentId = null, ChildGroup = null, Code = null }, true, true).Result; diff --git a/IRaCIS.Core.Domain/Management/User.cs b/IRaCIS.Core.Domain/Management/User.cs index e3da39230..aa5140839 100644 --- a/IRaCIS.Core.Domain/Management/User.cs +++ b/IRaCIS.Core.Domain/Management/User.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using EntityFrameworkCore.Projectables; using IRaCIS.Core.Domain.Share; namespace IRaCIS.Core.Domain.Models @@ -68,7 +69,6 @@ namespace IRaCIS.Core.Domain.Models public bool IsFirstAdd { get; set; } = true; - //[NotMapped] - //public string FullName { get; set; } + [Projectable] public string FullName => $"{LastName} / {FirstName}"; } }