diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AgamaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AgamaController.java
index 94c581a4..ed6d9947 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AgamaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AgamaController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.AgamaService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.AgamaVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -95,7 +94,7 @@ public class AgamaController extends LocaleController<AgamaVO> {
 	}
 
 	@RequestMapping(value = "/search-agama", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getAllVOWithQueryString(
+	public ResponseEntity<Collection<AgamaVO>> getAllVOWithQueryString(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BobotIndikatorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BobotIndikatorController.java
index 8497181d..e0ec8b54 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BobotIndikatorController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BobotIndikatorController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.entities.BobotIndikator;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.BobotIndikatorService;
 import com.jasamedika.medifirst2000.vo.BobotIndikatorVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 import org.slf4j.Logger;
@@ -44,7 +43,7 @@ public class BobotIndikatorController extends LocaleController<BobotIndikatorVO>
 	private BobotIndikatorService bobotService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<BobotIndikatorVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DampakResikoController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DampakResikoController.java
index 091ab41b..24bf70aa 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DampakResikoController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DampakResikoController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.entities.DampakResiko;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DampakResikoService;
 import com.jasamedika.medifirst2000.vo.DampakResikoVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 import org.slf4j.Logger;
@@ -44,7 +43,7 @@ public class DampakResikoController extends LocaleController<DampakResikoVO> {
 	private DampakResikoService dampakResikoService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<DampakResikoVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DokumenInternalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DokumenInternalController.java
index 6f39c542..e2cdbe9e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DokumenInternalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DokumenInternalController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DokumenInternalService;
 import com.jasamedika.medifirst2000.vo.DokumenInternalVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.SuratMasukInternalVO;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +29,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
 @RestController
 @RequestMapping("/dokumen-internal")
-public class DokumenInternalController extends LocaleController<SuratMasukInternalVO> {
+public class DokumenInternalController extends LocaleController<DokumenInternalVO> {
 
 	private static final Logger LOGGER = getLogger(DokumenInternalController.class);
 
@@ -77,7 +76,7 @@ public class DokumenInternalController extends LocaleController<SuratMasukIntern
 
 	@RequestMapping(value = "/get-dokumen")
 	@ResponseBody
-	public ResponseEntity<Collection<PasienVO>> findDokumenInternalByTanggalAndNama(
+	public ResponseEntity<Collection<DokumenInternalVO>> findDokumenInternalByTanggalAndNama(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "10") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DraftSuratController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DraftSuratController.java
index 98fc0d88..456d6219 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DraftSuratController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DraftSuratController.java
@@ -5,8 +5,8 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.DraftSuratRuangan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DraftSuratService;
+import com.jasamedika.medifirst2000.vo.DraftSuratRuanganVO;
 import com.jasamedika.medifirst2000.vo.DraftSuratVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.DateBetween;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 import org.slf4j.Logger;
@@ -34,7 +34,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
 @RestController
 @RequestMapping("/draft-surat")
-public class DraftSuratController extends LocaleController<DraftSuratVO> {
+public class DraftSuratController extends LocaleController<DraftSuratRuanganVO> {
 
 	private static final Logger LOGGER = getLogger(DraftSuratController.class);
 
@@ -80,7 +80,7 @@ public class DraftSuratController extends LocaleController<DraftSuratVO> {
 
 	@RequestMapping(value = "/grid-draft-surat")
 	@ResponseBody
-	public ResponseEntity<Collection<PasienVO>> andCondition(
+	public ResponseEntity<Collection<DraftSuratRuanganVO>> andCondition(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "10") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IndikatorRensarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IndikatorRensarController.java
index e8e58cdf..e0c3cf4b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IndikatorRensarController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IndikatorRensarController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.entities.IndikatorRensar;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.IndikatorRensarService;
 import com.jasamedika.medifirst2000.vo.IndikatorRensarVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 import org.slf4j.Logger;
@@ -45,7 +44,7 @@ public class IndikatorRensarController extends LocaleController<IndikatorRensarV
 	private IndikatorRensarService indikatorRensarService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<IndikatorRensarVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisDietController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisDietController.java
index 2b6e6166..8b05c107 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisDietController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisDietController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.entities.JenisDiet;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.JenisDietService;
 import com.jasamedika.medifirst2000.vo.JenisDietVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 import org.slf4j.Logger;
@@ -61,7 +60,7 @@ public class JenisDietController extends LocaleController<JenisDietVO> {
 	}
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<JenisDietVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisWaktuController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisWaktuController.java
index 12c9b51e..053109aa 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisWaktuController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisWaktuController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.entities.JenisWaktu;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.JenisWaktuService;
 import com.jasamedika.medifirst2000.vo.JenisWaktuVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 import org.slf4j.Logger;
@@ -44,7 +43,7 @@ public class JenisWaktuController extends LocaleController<JenisWaktuVO> {
 	private JenisWaktuService jenisWaktuService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<JenisWaktuVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KajianEvaluasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KajianEvaluasiController.java
index 92e60358..1d4b6674 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KajianEvaluasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KajianEvaluasiController.java
@@ -9,7 +9,6 @@ import com.jasamedika.medifirst2000.service.DetailKajianEvaluasiService;
 import com.jasamedika.medifirst2000.service.KajianEvaluasiService;
 import com.jasamedika.medifirst2000.vo.DetailKajianEvaluasiVO;
 import com.jasamedika.medifirst2000.vo.KajianEvaluasiVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.DateBetween;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
@@ -52,7 +51,7 @@ public class KajianEvaluasiController extends LocaleController<KajianEvaluasiVO>
 	private DetailKajianEvaluasiService detailService;
 
 	@RequestMapping(value = "/find-all/", method = GET)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<KajianEvaluasiVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "20") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
@@ -67,7 +66,7 @@ public class KajianEvaluasiController extends LocaleController<KajianEvaluasiVO>
 	}
 
 	@RequestMapping(value = "/find-all-by-jabatan/", method = GET)
-	public ResponseEntity<Collection<PasienVO>> findAllByJabatan(
+	public ResponseEntity<Collection<KajianEvaluasiVO>> findAllByJabatan(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "20") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KamusIndikatorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KamusIndikatorController.java
index 92b78581..172f6fbd 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KamusIndikatorController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KamusIndikatorController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.entities.KamusIndikator;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KamusIndikatorService;
 import com.jasamedika.medifirst2000.vo.KamusIndikatorVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 import org.slf4j.Logger;
@@ -45,7 +44,7 @@ public class KamusIndikatorController extends LocaleController<KamusIndikatorVO>
 	private KamusIndikatorService kamusIndikatorService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<KamusIndikatorVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
@@ -58,7 +57,7 @@ public class KamusIndikatorController extends LocaleController<KamusIndikatorVO>
 	}
 
 	@RequestMapping(value = "/detail-indikator/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<KamusIndikatorVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KemungkinanResikoTerjadiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KemungkinanResikoTerjadiController.java
index a5204e98..3503d549 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KemungkinanResikoTerjadiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KemungkinanResikoTerjadiController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.entities.KemungkinanResikoTerjadi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KemungkinanResikoTerjadiService;
 import com.jasamedika.medifirst2000.vo.KemungkinanResikoTerjadiVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 import org.slf4j.Logger;
@@ -44,7 +43,7 @@ public class KemungkinanResikoTerjadiController extends LocaleController<Kemungk
 	private KemungkinanResikoTerjadiService kemungkinanService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<KemungkinanResikoTerjadiVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java
index 70d45354..94b08b48 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java
@@ -8,8 +8,8 @@ import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KonsultasiService;
 import com.jasamedika.medifirst2000.service.RegistrasiPelayananService;
+import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
 import com.jasamedika.medifirst2000.vo.KonsultasiVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -41,7 +41,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RestController
 @RequestMapping("/konsultasi")
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class KonsultasiController extends LocaleController<KonsultasiVO> {
+public class KonsultasiController extends LocaleController<AntrianPasienDiPeriksaVO> {
 
 	private static final Logger LOGGER = getLogger(KonsultasiController.class);
 
@@ -75,7 +75,7 @@ public class KonsultasiController extends LocaleController<KonsultasiVO> {
 	}
 
 	@RequestMapping(value = "/antrian-pasien-list-konsul/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getAllVOWithQueryString(
+	public ResponseEntity<Collection<AntrianPasienDiPeriksaVO>> getAllVOWithQueryString(
 			@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
 			@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakKinerjaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakKinerjaController.java
index 7163c0ec..500fe01c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakKinerjaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakKinerjaController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.entities.KontrakKinerja;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KontrakKinerjaService;
 import com.jasamedika.medifirst2000.vo.KontrakKinerjaVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 import org.slf4j.Logger;
@@ -46,7 +45,7 @@ public class KontrakKinerjaController extends LocaleController<KontrakKinerjaVO>
 	private KontrakKinerjaService kontrakKinerjaService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<KontrakKinerjaVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapProdukMenuToBahanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapProdukMenuToBahanController.java
index c642414c..fbd85ad2 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapProdukMenuToBahanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapProdukMenuToBahanController.java
@@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.service.MapProdukMenuToBahanService;
 import com.jasamedika.medifirst2000.vo.MapProdukMenuToBahanVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,7 +28,7 @@ public class MapProdukMenuToBahanController extends LocaleController<MapProdukMe
 	private MapProdukMenuToBahanService mapService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<MapProdukMenuToBahanVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingJenisRisikoSasaranStrategisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingJenisRisikoSasaranStrategisController.java
index 6ed228f5..3f93cf9f 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingJenisRisikoSasaranStrategisController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingJenisRisikoSasaranStrategisController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.entities.MappingJenisRisikoSasaranStrategis;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.MappingJenisRisikoSasaranStrategisService;
 import com.jasamedika.medifirst2000.vo.MappingJenisRisikoSasaranStrategisVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 import org.slf4j.Logger;
@@ -46,7 +45,7 @@ public class MappingJenisRisikoSasaranStrategisController
 	private MappingJenisRisikoSasaranStrategisService mappingService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<MappingJenisRisikoSasaranStrategisVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasterProgramKerjaStrategisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasterProgramKerjaStrategisController.java
index 7f15db4f..ce081e39 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasterProgramKerjaStrategisController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasterProgramKerjaStrategisController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.entities.MasterProgramKerjaStrategis;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.MasterProgramKerjaStrategisService;
 import com.jasamedika.medifirst2000.vo.MasterProgramKerjaStrategisVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 import org.slf4j.Logger;
@@ -44,7 +43,7 @@ public class MasterProgramKerjaStrategisController extends LocaleController<Mast
 	private MasterProgramKerjaStrategisService programService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<MasterProgramKerjaStrategisVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MatriksIndikatorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MatriksIndikatorController.java
index c0f87eed..0673f7bf 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MatriksIndikatorController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MatriksIndikatorController.java
@@ -4,7 +4,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.KamusIndikator;
 import com.jasamedika.medifirst2000.service.MatriksIndikatorService;
 import com.jasamedika.medifirst2000.vo.KontrakKinerjaVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +27,7 @@ public class MatriksIndikatorController extends LocaleController<KontrakKinerjaV
 	private MatriksIndikatorService matriksService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<KontrakKinerjaVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java
index 8142608d..b9e954bd 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiController.java
@@ -95,7 +95,7 @@ public class PegawaiController extends LocaleController<PegawaiVO> {
 	}
 
 	@RequestMapping(value = "/get-all-pegawai", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getAllPegawai(
+	public ResponseEntity<Collection<PegawaiVO>> getAllPegawai(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "20") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianAirBersihController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianAirBersihController.java
index 51172b2c..29f0d701 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianAirBersihController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianAirBersihController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.PemakaianAirBersih;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PemakaianAirBersihService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.PemakaianAirBersihVO;
 import net.kaczmarzyk.spring.data.jpa.domain.DateBetween;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
@@ -79,7 +78,7 @@ public class PemakaianAirBersihController extends LocaleController<PemakaianAirB
 
 	@RequestMapping(value = "/find-by-periode/")
 	@ResponseBody
-	public ResponseEntity<Collection<PasienVO>> findByPeriode(
+	public ResponseEntity<Collection<PemakaianAirBersihVO>> findByPeriode(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "10") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianMesinController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianMesinController.java
index 7cc00bd1..a8b6a100 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianMesinController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianMesinController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.PemakaianMesin;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PemakaianMesinService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.PemakaianMesinVO;
 import net.kaczmarzyk.spring.data.jpa.domain.DateBetween;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
@@ -96,7 +95,7 @@ public class PemakaianMesinController extends LocaleController<PemakaianMesinVO>
 
 	@RequestMapping(value = "/find-by-periode")
 	@ResponseBody
-	public ResponseEntity<Collection<PasienVO>> findByPeriode(
+	public ResponseEntity<Collection<PemakaianMesinVO>> findByPeriode(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "tanggal") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranController.java
index 15ec51c4..2ecea2a6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.Peran;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PeranService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.PeranVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
@@ -40,7 +39,7 @@ public class PeranController extends LocaleController<PeranVO> {
 	private PeranService peranService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<PeranVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeriodePelaporanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeriodePelaporanController.java
index 63b2b999..742756eb 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeriodePelaporanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeriodePelaporanController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.PeriodePelaporan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PeriodePelaporanService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.PeriodePelaporanVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
@@ -44,7 +43,7 @@ public class PeriodePelaporanController extends LocaleController<PeriodePelapora
 	private PeriodePelaporanService pelaporanService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<PeriodePelaporanVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PerspektifController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PerspektifController.java
index 8baee37a..dc6ea384 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PerspektifController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PerspektifController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.Perspektif;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PerspektifService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.PerspektifVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
@@ -45,7 +44,7 @@ public class PerspektifController extends LocaleController<PerspektifVO> {
 	private PerspektifService perspektifService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<PerspektifVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramKerjaStrategisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramKerjaStrategisController.java
index b74963ee..95bce316 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramKerjaStrategisController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramKerjaStrategisController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.ProgramKerjaStrategis;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.ProgramKerjaStrategisService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.ProgramKerjaStrategisVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
@@ -44,7 +43,7 @@ public class ProgramKerjaStrategisController extends LocaleController<ProgramKer
 	private ProgramKerjaStrategisService programService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<ProgramKerjaStrategisVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "periode") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienOnlineController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienOnlineController.java
index 64340628..00dc1113 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienOnlineController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienOnlineController.java
@@ -8,7 +8,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RegistrasiPasienOnlineService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -126,7 +125,7 @@ public class RegistrasiPasienOnlineController extends LocaleController<AntrianPa
 	}
 
 	@RequestMapping(value = "/antrian-pasien-list/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getAllVOWithQueryString(
+	public ResponseEntity<Collection<AntrianPasienRegistrasiVO>> getAllVOWithQueryString(
 			@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
 			@RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
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 6d5b54a2..c3b8c281 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
@@ -45,7 +45,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
  */
 @RestController
 @RequestMapping("/registrasi-pelayanan")
-public class RegistrasiPelayananController extends LocaleController<RegistrasiPelayananVO> {
+public class RegistrasiPelayananController extends LocaleController<AntrianPasienRegistrasiVO> {
 
 	private static final Logger LOGGER = getLogger(RegistrasiPelayananController.class);
 
@@ -816,7 +816,7 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 	}
 
 	@RequestMapping(value = "/antrian-pasien-baru-list/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getAllNewVOWithQueryString(
+	public ResponseEntity<Collection<AntrianPasienRegistrasiVO>> getAllNewVOWithQueryString(
 			@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
 			@RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
@@ -920,7 +920,7 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 	}
 
 	@RequestMapping(value = "/antrian-pasien-list-radiologi/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getAllRadiologiVOWithQueryString(
+	public ResponseEntity<Collection<AntrianPasienRegistrasiVO>> getAllRadiologiVOWithQueryString(
 			@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
 			@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
@@ -948,7 +948,7 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 	}
 
 	@RequestMapping(value = "/antrian-pasien-penunjang-list/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getAllVOPenunjangWithQueryString(
+	public ResponseEntity<Collection<AntrianPasienRegistrasiVO>> getAllVOPenunjangWithQueryString(
 			@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
 			@RequestParam(value = "limit", required = false, defaultValue = "1000") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
@@ -992,7 +992,7 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 	}
 
 	@RequestMapping(value = "/antrian-bpjs-list/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getBpjsWithQueryString(
+	public ResponseEntity<Collection<AntrianPasienRegistrasiVO>> getBpjsWithQueryString(
 			@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
 			@RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
@@ -1242,7 +1242,7 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 	}
 
 	@RequestMapping(value = "/antrian-pasien-pulang-list/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getAllAntrianPasienPulangList(
+	public ResponseEntity<Collection<AntrianPasienRegistrasiVO>> getAllAntrianPasienPulangList(
 			@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
 			@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
@@ -1258,7 +1258,7 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 	}
 
 	@RequestMapping(value = "/antrian-pasien-list-rawat-jalan/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getAllVOWithQueryStringRawatJalan(
+	public ResponseEntity<Collection<AntrianPasienRegistrasiVO>> getAllVOWithQueryStringRawatJalan(
 			@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
 			@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
@@ -1274,7 +1274,7 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 	}
 
 	@RequestMapping(value = "/antrian-pasien-list-rawat-inap/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getAllVOWithQueryStringRawatInap(
+	public ResponseEntity<Collection<AntrianPasienRegistrasiVO>> getAllVOWithQueryStringRawatInap(
 			@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
 			@RequestParam(value = "limit", required = false, defaultValue = "500") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
@@ -1964,7 +1964,7 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 	}
 
 	@RequestMapping(value = "/antrian-pasien-list-radiologi-new/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getAllRadiologiVONewWithQueryString(
+	public ResponseEntity<Collection<AntrianPasienRegistrasiVO>> getAllRadiologiVONewWithQueryString(
 			@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
 			@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaKinerjaTahunanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaKinerjaTahunanController.java
index f147c138..b38042f5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaKinerjaTahunanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaKinerjaTahunanController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.RencanaKinerjaTahunan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RencanaKinerjaTahunanService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.RencanaKinerjaOperasionalVO;
 import com.jasamedika.medifirst2000.vo.RencanaKinerjaTahunanVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
@@ -62,7 +61,7 @@ public class RencanaKinerjaTahunanController extends LocaleController<RencanaKin
 	}
 
 	@RequestMapping(value = "/find-all/", method = RequestMethod.GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<RencanaKinerjaTahunanVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaMitigasiRisikoController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaMitigasiRisikoController.java
index 31741448..e9712a31 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaMitigasiRisikoController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaMitigasiRisikoController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.RencanaMitigasiRisiko;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RencanaMitigasiRisikoService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.RencanaMitigasiRisikoVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
@@ -45,7 +44,7 @@ public class RencanaMitigasiRisikoController extends LocaleController<RencanaMit
 	private RencanaMitigasiRisikoService rencanaService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<RencanaMitigasiRisikoVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoController.java
index 1394ef58..19748b2a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.Risiko;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RisikoService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.RisikoVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
@@ -40,7 +39,7 @@ public class RisikoController extends LocaleController<RisikoVO> {
 	private RisikoService risikoService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<RisikoVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RuanganController.java
index 6dfb9321..8e98a91f 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RuanganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RuanganController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.Ruangan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RuanganService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.RuanganVO;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -101,7 +100,7 @@ public class RuanganController extends LocaleController<RuanganVO> {
 	}
 
 	@RequestMapping(value = "/search-ruangan-by-name", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> getAllVOWithQueryString(
+	public ResponseEntity<Collection<RuanganVO>> getAllVOWithQueryString(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SWOTController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SWOTController.java
index 4afc5939..118fbd77 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SWOTController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SWOTController.java
@@ -6,8 +6,6 @@ import com.jasamedika.medifirst2000.entities.DetailSWOT;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DetailSWOTService;
 import com.jasamedika.medifirst2000.vo.DetailSWOTVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
-import com.jasamedika.medifirst2000.vo.SWOTVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.domain.GreaterThanOrEqual;
 import net.kaczmarzyk.spring.data.jpa.domain.LessThanOrEqual;
@@ -39,7 +37,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
 @RestController
 @RequestMapping("/swot")
-public class SWOTController extends LocaleController<SWOTVO> {
+public class SWOTController extends LocaleController<DetailSWOTVO> {
 
 	private static final Logger LOGGER = getLogger(SWOTController.class);
 
@@ -47,7 +45,7 @@ public class SWOTController extends LocaleController<SWOTVO> {
 	private DetailSWOTService detailSWOTService;
 
 	@RequestMapping(value = "/find-detail-faktor/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findDetailFaktor(
+	public ResponseEntity<Collection<DetailSWOTVO>> findDetailFaktor(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SasaranStrategisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SasaranStrategisController.java
index 8ecfab3c..7bc1226e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SasaranStrategisController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SasaranStrategisController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.SasaranStrategis;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.SasaranStrategisService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.SasaranStrategisVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.domain.GreaterThanOrEqual;
@@ -84,7 +83,7 @@ public class SasaranStrategisController extends LocaleController<SasaranStrategi
 	}
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<SasaranStrategisVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SatuanIndikatorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SatuanIndikatorController.java
index 16208742..1cfdcfe3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SatuanIndikatorController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SatuanIndikatorController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.SatuanIndikator;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.SatuanIndikatorService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.SatuanIndikatorVO;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
@@ -44,7 +43,7 @@ public class SatuanIndikatorController extends LocaleController<SatuanIndikatorV
 	private SatuanIndikatorService satuanService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<PasienVO>> findAll(
+	public ResponseEntity<Collection<SatuanIndikatorVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "100") Integer take,
 			@RequestParam(value = "sort", required = false, defaultValue = "id") String sort,