From 79970daacb4c3df211cba46e702919401dc39599 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 20 Apr 2022 15:16:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=AE=A1=E6=8F=90=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/QC/QCOperationService.cs                   | 10 +++++-----
 IRaCIS.Core.Application/TestService.cs                 |  6 +++---
 IRaCIS.Core.Domain/Management/User.cs                  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
index 8dcf2d47..85d4a0b6 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 6a8ce286..3c4970d3 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<User>().Select(t => t.FullName).FirstOrDefault();
+            var d = _repository.Where<User>(/*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 e3da3923..aa514083 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}";
     }
 }