From d1d35ee89c95fdde70f5eb6d712d0862c98c5a41 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Thu, 5 May 2022 16:38:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Inspection/DTO/InspectionModel.cs                  | 3 +++
 .../Service/Inspection/InspectionService.cs                    | 3 ++-
 IRaCIS.Core.Infra.EFCore/Repository/Repository.cs              | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
index bb3ccb315..4c0f8ddc7 100644
--- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
@@ -365,6 +365,9 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
 
         public decimal? VisitNum { get; set; }
 
+        public string OptTypeName { get; set; } = string.Empty;
+        
+
         /// <summary>
 		/// 父标识
 		/// </summary>
diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
index 6bf22b47e..00e00396e 100644
--- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
@@ -140,7 +140,8 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             ParentIdentification = leftparent.Identification,
                             OptType = leftOptType.Id,
                             VisitNum=leftsubjectVisit.VisitNum,
-                            IsFrontAdd=data.IsFrontAdd
+                            IsFrontAdd=data.IsFrontAdd,
+                            OptTypeName = leftOptType.Value,
 
                         };
 
diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
index 8b0e1b5d2..2c99cadc8 100644
--- a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
+++ b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
@@ -647,7 +647,7 @@ namespace IRaCIS.Core.Infra.EFCore
         public async Task<string> SetEnum(Guid trilaid, string identification, string json)
         {
             var list = await (from u in _dbContext.FrontAuditConfig.Where(x => x.Identification == identification)
-                              join p in _dbContext.FrontAuditConfig.Where(x => x.Code != "AuditState" && x.EnumType == "Date") on u.Id equals p.ParentId
+                              join p in _dbContext.FrontAuditConfig.Where(x => x.Code != "AuditState" && x.EnumType == "Dictionary") on u.Id equals p.ParentId
                               select new
                               {
                                   Key = p.Code,