diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java
index f34e3a7c..db41b935 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananController.java
@@ -47,6 +47,7 @@ import com.jasamedika.medifirst2000.dao.StrukOrderDao;
 import com.jasamedika.medifirst2000.dto.EtiketPersetujuanUmum;
 import com.jasamedika.medifirst2000.dto.HasilLaboratoriumDto;
 import com.jasamedika.medifirst2000.dto.Antrian;
+import com.jasamedika.medifirst2000.dto.AntrianPasienDiperiksaDto;
 import com.jasamedika.medifirst2000.dto.OrderPelayananGiziDto;
 import com.jasamedika.medifirst2000.dto.SuratEligibilitasAsuransi;
 import com.jasamedika.medifirst2000.entities.Alamat;
@@ -741,12 +742,11 @@ public class RegistrasiPelayananController extends LocaleController {
 	@RequestMapping(value = "/get-antrian-pasien/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> getAntrianPasien(
 			@RequestParam(value = "noRec", required = false) String noRec) {
-		AntrianPasienDiPeriksa resultPageMap = (AntrianPasienDiPeriksa) antrianPasienDiperiksaService.findAntrian(noRec)
-				.get(0);
+		AntrianPasienDiperiksaDto resultPageMap = antrianPasienDiperiksaService.findAntrian(noRec).get(0);
 
 		try {
-			return RestUtil.getJsonResponse(resultPageMap.ToMap(), HttpStatus.OK, mapHeaderMessage);
-		} catch (IllegalArgumentException | IllegalAccessException e) {
+			return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK, mapHeaderMessage);
+		} catch (IllegalArgumentException e) {
 			e.printStackTrace();
 		}
 		return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage);