diff --git a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java
index bc32af97..7be7c14e 100644
--- a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java
+++ b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java
@@ -735,4 +735,11 @@ public class BridgingDaftarOnlineController {
 		String noantrean = antrianService.currentAntrian(idRuangan);
 		return new ResponseEntity<>(noantrean, HttpStatus.OK);
 	}
+
+	@RequestMapping(value = "/bpjs/antrian/sisa/{idRuangan}/{estimasiDilayani}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<Integer> getSisaAntrian(@PathVariable Integer idRuangan,
+			@PathVariable Long estimasiDilayani) {
+		Integer countantrean = antrianService.countSisaAntrian(idRuangan, estimasiDilayani);
+		return new ResponseEntity<>(countantrean, HttpStatus.OK);
+	}
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AntrianPasienDiPeriksaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AntrianPasienDiPeriksaDao.java
index f342c63e..f4736d1f 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AntrianPasienDiPeriksaDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AntrianPasienDiPeriksaDao.java
@@ -201,4 +201,10 @@ public interface AntrianPasienDiPeriksaDao extends PagingAndSortingRepository<An
 			+ "ORDER BY apd.tgldipanggildokter DESC LIMIT 1", nativeQuery = true)
 	String currentAntrian(@Param("ruanganId") Integer ruanganId, @Param("start") Date start, @Param("end") Date end,
 			@Param("tanggal") Date tanggal);
+
+	@Query(value = "SELECT COUNT(apd) FROM antrianpasiendiperiksa_t apd " + "WHERE apd.objectruanganfk = :ruanganId "
+			+ "AND (apd.tglmasuk BETWEEN :start AND :end " + "OR apd.tglkeluar BETWEEN :start AND :end) "
+			+ "AND tgldipanggildokter IS NULL AND apd.tglregistrasi < :estimasiDilayani", nativeQuery = true)
+	Integer countSisaAntrian(@Param("ruanganId") Integer ruanganId, @Param("start") Date start, @Param("end") Date end,
+			@Param("estimasiDilayani") Date estimasiDilayani);
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/AntrianPasienDiPeriksaService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/AntrianPasienDiPeriksaService.java
index 4b4e1bc1..27301489 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/AntrianPasienDiPeriksaService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/AntrianPasienDiPeriksaService.java
@@ -34,6 +34,8 @@ public interface AntrianPasienDiPeriksaService
 	Integer getFormatNumberByMonthYearBilik(Integer idRuangan);
 
 	Map<String, Object> getAntreanByRuangan(LocalDate tglMasuk, Integer ruanganId);
-	
+
 	String currentAntrian(Integer idRuangan);
+
+	Integer countSisaAntrian(Integer idRuangan, Long estimasiDilayani);
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AntrianPasienDiPeriksaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AntrianPasienDiPeriksaServiceImpl.java
index 99398a16..5f7ac56f 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AntrianPasienDiPeriksaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AntrianPasienDiPeriksaServiceImpl.java
@@ -315,4 +315,14 @@ public class AntrianPasienDiPeriksaServiceImpl extends BaseVoServiceImpl impleme
 		Date tglAkhir = Date.from(end.atZone(ZoneId.systemDefault()).toInstant());
 		return antrianPasienDiPeriksaDao.currentAntrian(idRuangan, tglAwal, tglAkhir, tgl);
 	}
+
+	@Override
+	public Integer countSisaAntrian(Integer idRuangan, Long estimasiDilayani) {
+		LocalDate dateNow = LocalDate.now();
+		LocalDateTime start = LocalDateTime.of(dateNow, LocalTime.MIN);
+		Date tglAwal = Date.from(start.atZone(ZoneId.systemDefault()).toInstant());
+		LocalDateTime end = LocalDateTime.of(dateNow, LocalTime.MAX);
+		Date tglAkhir = Date.from(end.atZone(ZoneId.systemDefault()).toInstant());
+		return antrianPasienDiPeriksaDao.countSisaAntrian(idRuangan, tglAwal, tglAkhir, new Date(estimasiDilayani));
+	}
 }