diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs
index 955c6ecbb..6071fad2e 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.DictionaryCode != null && x.DictionaryCode != string.Empty && x.DictionaryType != null && x.DictionaryType != string.Empty)) on u.Id equals p.ParentId
+                              join p in _dbContext.FrontAuditConfig.Where(x => x.Code != "AuditState" && x.EnumType=="Date") on u.Id equals p.ParentId
                               select new
                               {
                                   Key = p.Code,
@@ -944,7 +944,7 @@ namespace IRaCIS.Core.Infra.EFCore
         public async Task<DataInspection> SetDataInspectionDateType(DataInspection Data)
         {
             var list = await (from parent in _dbContext.FrontAuditConfig.AsQueryable().Where(x => x.Identification == Data.Identification)
-                              join child in _dbContext.FrontAuditConfig.AsQueryable().Where(x => x.DateType != null && x.DateType != string.Empty) on parent.Id equals child.ParentId
+                              join child in _dbContext.FrontAuditConfig.AsQueryable().Where(x => x.EnumType== "Date") on parent.Id equals child.ParentId
                               select new DateDto()
                               {
                                   Code = child.Code,