diff --git a/DOAN.Model/MES/dev/Dto/DeviceUptimeQueryDto.cs b/DOAN.Model/MES/dev/Dto/DeviceUptimeQueryDto.cs
index 3b67385..1b7160f 100644
--- a/DOAN.Model/MES/dev/Dto/DeviceUptimeQueryDto.cs
+++ b/DOAN.Model/MES/dev/Dto/DeviceUptimeQueryDto.cs
@@ -11,6 +11,24 @@ namespace DOAN.Model.MES.dev.Dto
     /// </summary>
     public class DeviceUptimeQueryDto : PagerInfo
     {
+        public string Id { get; set; }
+
+        public string targetValue { get; set; }
+
+        public string ActualValue { get; set; }
+
+        public string Workshop { get; set; }
+
+        public string FillTime { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+        public string Type { get; set; }
     }
 
     /// <summary>
diff --git a/DOAN.Service/MES/dev/DeviceUptimeService.cs b/DOAN.Service/MES/dev/DeviceUptimeService.cs
index 3163e8a..68cdae9 100644
--- a/DOAN.Service/MES/dev/DeviceUptimeService.cs
+++ b/DOAN.Service/MES/dev/DeviceUptimeService.cs
@@ -32,8 +32,6 @@ namespace DOAN.Service.MES.dev
                 .AndIF(!string.IsNullOrEmpty(parm.Workshop), it => parm.Workshop == it.Workshop);
 
             var response = Queryable()
-                .WhereIF(!string.IsNullOrEmpty(parm.Workshop),x=>x.Workshop==parm.Workshop)
-                .WhereIF(!string.IsNullOrEmpty(parm.Type),x=>x.Type==parm.Type)
                 .Where(predicate.ToExpression())
                 .ToPage<DeviceUptime, DeviceUptimeDto>(parm);