diff --git a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
index 90d13d8..607e27a 100644
--- a/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
@@ -120,6 +120,19 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
 
     fun findByDeletedFalseAndPlanStartBetweenOrderByIdAsc(planStartStart: LocalDateTime, planStartEnd: LocalDateTime): List<JobOrder>
 
+    @Query(
+        """
+        SELECT jo FROM JobOrder jo
+        WHERE jo.deleted = false
+        AND jo.planStart >= :planStartFrom
+        AND jo.planStart < :planStartToExclusive
+        ORDER BY jo.id ASC
+        """
+    )
+    fun findByDeletedFalseAndPlanStartFromBeforeExclusiveOrderByIdAsc(
+        planStartFrom: LocalDateTime,
+        planStartToExclusive: LocalDateTime,
+    ): List<JobOrder>
 
     @Query("""
     SELECT jo FROM JobOrder jo 
diff --git a/src/main/java/com/ffii/fpsms/py/PyController.kt b/src/main/java/com/ffii/fpsms/py/PyController.kt
index 18bae40..dd8d988 100644
--- a/src/main/java/com/ffii/fpsms/py/PyController.kt
+++ b/src/main/java/com/ffii/fpsms/py/PyController.kt
@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 import java.time.LocalDate
 import java.time.LocalDateTime
-import java.time.LocalTime
 
 /**
  * Public API for Python clients. No login required.
@@ -34,8 +33,8 @@ open class PyController(
     ): ResponseEntity<List<PyJobOrderListItem>> {
         val date = planStart ?: LocalDate.now()
         val dayStart = date.atStartOfDay()
-        val dayEnd = date.atTime(LocalTime.MAX)
-        val orders = jobOrderRepository.findByDeletedFalseAndPlanStartBetweenOrderByIdAsc(dayStart, dayEnd)
+        val dayEndExclusive = date.plusDays(1).atStartOfDay()
+        val orders = jobOrderRepository.findByDeletedFalseAndPlanStartFromBeforeExclusiveOrderByIdAsc(dayStart, dayEndExclusive)
         val list = orders.map { jo -> toListItem(jo) }
         return ResponseEntity.ok(list)
     }