diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index a0a110f5..1f887b8c 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -282,9 +282,9 @@ namespace Myshipping.Application
                  .WhereIF(!string.IsNullOrWhiteSpace(input.VOYNO), u => u.VOYNO.Contains(input.VOYNO))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.VOYNOINNER), u => u.VOYNOINNER.Contains(input.VOYNOINNER))
                  .WhereIF(input.BETD != null, u => u.ETD >= input.BETD)
-                 .WhereIF(input.EETD != null, u => u.ETD <= input.EETD)
+                 .WhereIF(input.EETD != null, u => u.ETD <= input.EETD.Value.AddDays(1))
                  .WhereIF(input.BATD != null, u => u.ATD >= input.BATD)
-                 .WhereIF(input.EATD != null, u => u.ATD <= input.EATD)
+                 .WhereIF(input.EATD != null, u => u.ATD <= input.EATD.Value.AddDays(1))
                  .WhereIF(input.BCLOSINGDATE != null, u => u.CLOSINGDATE >= input.BCLOSINGDATE)
                  .WhereIF(input.ECLOSINGDATE != null, u => u.CLOSINGDATE <= input.ECLOSINGDATE)
                  .WhereIF(input.BCLOSEDOCDATE != null, u => u.CLOSEDOCDATE >= input.BCLOSEDOCDATE)
@@ -292,7 +292,7 @@ namespace Myshipping.Application
                  .WhereIF(input.BCLOSEVGMDATE != null, u => u.CLOSEVGMDATE >= input.BCLOSEVGMDATE)
                  .WhereIF(input.ECLOSEVGMDATE != null, u => u.CLOSEVGMDATE <= input.ECLOSEVGMDATE)
                  .WhereIF(input.BETA != null, u => u.ETA >= input.BETA)
-                 .WhereIF(input.EETA != null, u => u.ETA <= input.EETA)
+                 .WhereIF(input.EETA != null, u => u.ETA <= input.EETA.Value.AddDays(1))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.PLACERECEIPT), u => u.PLACERECEIPT.Contains(input.PLACERECEIPT))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.PORTLOAD), u => u.PORTLOAD.Contains(input.PORTLOAD))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.PORTLOADID), u => u.PORTLOADID == input.PORTLOADID)
@@ -306,7 +306,7 @@ namespace Myshipping.Application
                  .WhereIF(!string.IsNullOrWhiteSpace(input.COPYNOBILLL), u => u.COPYNOBILL == input.COPYNOBILLL)
                  .WhereIF(!string.IsNullOrWhiteSpace(input.ISSUETYPE), u => u.ISSUETYPE == input.ISSUETYPE)
                  .WhereIF(input.BISSUEDATE != null, u => u.ISSUEDATE >= input.BISSUEDATE)
-                 .WhereIF(input.EISSUEDATE != null, u => u.ISSUEDATE <= input.EISSUEDATE)
+                 .WhereIF(input.EISSUEDATE != null, u => u.ISSUEDATE <= input.EISSUEDATE.Value.AddDays(1))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.ISSUEPLACE), u => u.ISSUEPLACE.Contains(input.ISSUEPLACE))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.ISSUEPLACEID), u => u.ISSUEPLACEID == input.ISSUEPLACEID)
                  .WhereIF(!string.IsNullOrWhiteSpace(input.BLFRT), u => u.BLFRT == input.BLFRT)