diff --git a/jasamedika-web/pom.xml b/jasamedika-web/pom.xml
index f146fd9d..410d61c9 100644
--- a/jasamedika-web/pom.xml
+++ b/jasamedika-web/pom.xml
@@ -293,6 +293,14 @@
 			<version>2.9.9</version>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>${project.lombok.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
 	</dependencies>
 	<build>
 		<finalName>jasamedika-web</finalName>
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdmisiRencanaPindahRuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdmisiRencanaPindahRuanganController.java
index 4c1763bf..010f699f 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdmisiRencanaPindahRuanganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdmisiRencanaPindahRuanganController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.AdmisiRencanaPindahRuanganService;
 import com.jasamedika.medifirst2000.vo.AdmisiRencanaPindahRuanganVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,11 +32,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/admisi-rencana-pasien")
 public class AdmisiRencanaPindahRuanganController extends LocaleController<AdmisiRencanaPindahRuanganVO> {
 
+	private static final Logger LOGGER = getLogger(AdmisiRencanaPindahRuanganController.class);
+
 	@Autowired
 	private AdmisiRencanaPindahRuanganService service;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AdmisiRencanaPindahRuanganController.class);
-
 	@RequestMapping(value = "/save-admisi-rencana", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> saveAdmisiRencana(@Valid @RequestBody AdmisiRencanaPindahRuanganVO vo,
 			HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdvokasiHukumMedicolegalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdvokasiHukumMedicolegalController.java
index 03f565bf..0fa5ab66 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdvokasiHukumMedicolegalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AdvokasiHukumMedicolegalController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.AdvokasiHukumMedicolegalService;
 import com.jasamedika.medifirst2000.vo.UsulanEvaluasiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/advokasi-hukum-medicolegal")
 public class AdvokasiHukumMedicolegalController extends LocaleController<UsulanEvaluasiVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AdvokasiHukumMedicolegalController.class);
+	private static final Logger LOGGER = getLogger(AdvokasiHukumMedicolegalController.class);
 
 	@Autowired
 	private AdvokasiHukumMedicolegalService advokasiHukumMedicolegalService;
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 be302959..94c581a4 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
@@ -9,7 +9,6 @@ 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.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -27,6 +26,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -36,11 +36,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/agama")
 public class AgamaController extends LocaleController<AgamaVO> {
 
+	private static final Logger LOGGER = getLogger(AgamaController.class);
+
 	@Autowired
 	private AgamaService<Agama> agamaService;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AgamaController.class);
-
 	@RequestMapping(value = "/save-agama/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<String> addVO(@Valid @RequestBody AgamaVO vo, HttpServletRequest request) {
 		try {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java
index 8e36ef1c..41904fd3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java
@@ -8,7 +8,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.AlatService;
 import com.jasamedika.medifirst2000.vo.AlatVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -25,6 +24,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -34,11 +34,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/alat")
 public class AlatController extends LocaleController<AlatVO> {
 
+	private static final Logger LOGGER = getLogger(AlatController.class);
+
 	@Autowired
 	private AlatService<Alat> alatService;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AlatController.class);
-
 	@RequestMapping(value = "/find-all-alat/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> getAllVO(HttpServletRequest request) {
 		try {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnamnesisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnamnesisController.java
index e21be4bf..dd5941cf 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnamnesisController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnamnesisController.java
@@ -7,12 +7,14 @@ import com.jasamedika.medifirst2000.service.AnamnesisService;
 import com.jasamedika.medifirst2000.vo.AnamnesisVO;
 import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -23,6 +25,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -37,11 +40,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/anamnesis")
 public class AnamnesisController extends LocaleController<RegistrasiPelayananVO> {
 
+	private static final Logger LOGGER = getLogger(AnamnesisController.class);
+
 	@Autowired
 	private AnamnesisService service;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AnamnesisController.class);
-
 	@RequestMapping(value = "/save-anamnesis", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> saveAnamnesis(@Valid @RequestBody AnamnesisVO vo,
 			HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnggaranController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnggaranController.java
index 5893a34b..6c649de5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnggaranController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AnggaranController.java
@@ -10,7 +10,6 @@ import com.jasamedika.medifirst2000.service.DetailAnggaranService;
 import com.jasamedika.medifirst2000.vo.HeadAnggaranVO;
 import com.jasamedika.medifirst2000.vo.VerifikasiSpekAnggaranVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,14 +33,14 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/anggaran")
 public class AnggaranController extends LocaleController<HeadAnggaranVO> {
 
+	private static final Logger LOGGER = getLogger(AnggaranController.class);
+
 	@Autowired
 	private AnggaranService service;
 
 	@Autowired
 	private DetailAnggaranService detailAnggaranService;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AnggaranController.class);
-
 	@RequestMapping(value = "/grid-detail-anggaran")
 	@ResponseBody
 	public Map<String, Object> andCondition(
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApiError.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApiError.java
index f68178da..f6f82ff9 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApiError.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApiError.java
@@ -1,27 +1,24 @@
 package com.jasamedika.medifirst2000.controller;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.springframework.http.HttpStatus;
 
 import java.util.Collections;
 import java.util.List;
 
+@Setter
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
 public class ApiError {
 
 	private HttpStatus status;
 	private String message;
 	private List<String> errors;
 
-	public ApiError() {
-		super();
-	}
-
-	public ApiError(final HttpStatus status, final String message, final List<String> errors) {
-		super();
-		this.status = status;
-		this.message = message;
-		this.errors = errors;
-	}
-
 	public ApiError(final HttpStatus status, final String message, final String error) {
 		super();
 		this.status = status;
@@ -29,31 +26,7 @@ public class ApiError {
 		errors = Collections.singletonList(error);
 	}
 
-	public HttpStatus getStatus() {
-		return status;
-	}
-
-	public void setStatus(final HttpStatus status) {
-		this.status = status;
-	}
-
-	public String getMessage() {
-		return message;
-	}
-
-	public void setMessage(final String message) {
-		this.message = message;
-	}
-
-	public List<String> getErrors() {
-		return errors;
-	}
-
-	public void setErrors(final List<String> errors) {
-		this.errors = errors;
-	}
-
-	public void setError(final String error) {
+    public void setError(final String error) {
 		errors = Collections.singletonList(error);
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java
index 59141275..3474d56a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.ApresiasiAtasLayananService;
 import com.jasamedika.medifirst2000.vo.ApresiasiAtasLayananVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,11 +33,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/apresiasi-atas-layanan")
 public class ApresiasiAtasLayananController extends LocaleController<ApresiasiAtasLayananVO> {
 
+	private static final Logger LOGGER = getLogger(ApresiasiAtasLayananController.class);
+
 	@Autowired
 	private ApresiasiAtasLayananService apresiasiAtasLayananService;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(ApresiasiAtasLayananController.class);
-
 	@RequestMapping(value = "/save-apresiasi-atas-layanan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody ApresiasiAtasLayananVO vo,
 			HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsesmenGiziAwalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsesmenGiziAwalController.java
index 1c83a3dc..52663f7a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsesmenGiziAwalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsesmenGiziAwalController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.service.AsesmenGiziAwalService;
 import com.jasamedika.medifirst2000.vo.AsesmenGiziAwalVO;
 import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
@@ -36,11 +36,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/asesmen-gizi-awal")
 public class AsesmenGiziAwalController extends LocaleController<RegistrasiPelayananVO> {
 
+	private static final Logger LOGGER = getLogger(AsesmenGiziAwalController.class);
+
 	@Autowired
 	private AsesmenGiziAwalService asesmenGiziAwalService;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AsesmenGiziAwalController.class);
-
 	@RequestMapping(value = "/save-asesmen-gizi-awal", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> saveAsesmenGiziAwal(@Valid @RequestBody AsesmenGiziAwalVO vo,
 			HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsesmenGiziLanjutController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsesmenGiziLanjutController.java
index b4a99ad2..bb31ecde 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsesmenGiziLanjutController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsesmenGiziLanjutController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.service.AsesmenGiziLanjutService;
 import com.jasamedika.medifirst2000.vo.AsesmenGiziLanjutVO;
 import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
@@ -31,11 +31,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/asesmen-gizi-lanjut")
 public class AsesmenGiziLanjutController extends LocaleController<RegistrasiPelayananVO> {
 
+	private static final Logger LOGGER = getLogger(AsesmenGiziLanjutController.class);
+
 	@Autowired
 	private AsesmenGiziLanjutService asesmenGiziLanjutService;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AsesmenGiziLanjutController.class);
-
 	@RequestMapping(value = "/save-asesmen-gizi-lanjut", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> saveAsesmenGiziLanjut(@Valid @RequestBody AsesmenGiziLanjutVO vo,
 			HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuhanKeperawatanPeriOperasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuhanKeperawatanPeriOperasiController.java
index d1a0c990..a6860e86 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuhanKeperawatanPeriOperasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuhanKeperawatanPeriOperasiController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.AsuhanKeperawatanPeriOperatifService;
 import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperatifVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -20,6 +19,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -28,7 +28,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 @RequestMapping("/asuhan-keperawatan-master")
 public class AsuhanKeperawatanPeriOperasiController extends LocaleController<AsuhanKeperawatanPeriOperatifVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AsuhanKeperawatanPeriOperasiController.class);
+	private static final Logger LOGGER = getLogger(AsuhanKeperawatanPeriOperasiController.class);
 
 	@Autowired
 	private AsuhanKeperawatanPeriOperatifService asuhanKeperawatanPeriOperatifService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuhanKeperawatanPeriOperasiHeaderController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuhanKeperawatanPeriOperasiHeaderController.java
index 7b1e8c4e..59196e09 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuhanKeperawatanPeriOperasiHeaderController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuhanKeperawatanPeriOperasiHeaderController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.AsuhanKeperawatanPeriOperasiHeaderService;
 import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperasiHeaderVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 public class AsuhanKeperawatanPeriOperasiHeaderController
 		extends LocaleController<AsuhanKeperawatanPeriOperasiHeaderVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AsuhanKeperawatanPeriOperasiHeaderController.class);
+	private static final Logger LOGGER = getLogger(AsuhanKeperawatanPeriOperasiHeaderController.class);
 
 	@Autowired
 	private AsuhanKeperawatanPeriOperasiHeaderService asuhanKeperawatanPeriOperasiHeaderService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuransiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuransiController.java
index 7c7e1480..230fa661 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuransiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuransiController.java
@@ -8,7 +8,6 @@ import com.jasamedika.medifirst2000.service.BridgingBpjs;
 import com.jasamedika.medifirst2000.service.PemakaianAsuransiService;
 import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -31,6 +30,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -40,17 +40,14 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/asuransi")
 public class AsuransiController extends LocaleController<PemakaianAsuransiVO> {
 
+	private static final Logger LOGGER = getLogger(AsuransiController.class);
+
 	@Autowired
 	private BridgingBpjs bridgingBpjs;
 
 	@Autowired
 	private PemakaianAsuransiService pemakaianAsuransiService;
 
-	public AsuransiController() {
-	}
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(AsuransiController.class);
-
 	@RequestMapping(value = "/save-pemakaian-asuransi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> savePemakaianAsuransi(@Valid @RequestBody PemakaianAsuransiVO vo,
 			HttpServletRequest request) throws ParseException {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AuthenticateController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AuthenticateController.java
index 0ac4844f..0cca96a2 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AuthenticateController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AuthenticateController.java
@@ -16,7 +16,6 @@ import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.LoginUserVO;
 import com.jasamedika.medifirst2000.vo.custom.AuthVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -32,6 +31,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
 /**
  * Controller class for Authenticate Business
  * 
@@ -41,7 +42,7 @@ import java.util.Map;
 @RequestMapping("/auth")
 public class AuthenticateController {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticateController.class);
+	private static final Logger LOGGER = getLogger(AuthenticateController.class);
 
 	protected Map<String, String> mapHeaderMessage = new HashMap<>();
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/B3RuanganInputDataController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/B3RuanganInputDataController.java
index 0d90c341..fc541213 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/B3RuanganInputDataController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/B3RuanganInputDataController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.B3RuanganInputDataService;
 import com.jasamedika.medifirst2000.vo.B3RuanganInputDataVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,11 +32,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/b3-Ruangan-Input-Data")
 public class B3RuanganInputDataController extends LocaleController<B3RuanganInputDataVO> {
 
+	private static final Logger LOGGER = getLogger(B3RuanganInputDataController.class);
+
 	@Autowired
 	private B3RuanganInputDataService service;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(B3RuanganInputDataController.class);
-
 	@RequestMapping(value = "/get-login-petugas", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> getLoginUser(HttpServletRequest request) {
 		try {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BakuMutuController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BakuMutuController.java
index 38f3f458..8fb703ec 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BakuMutuController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BakuMutuController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.BakuMutuService;
 import com.jasamedika.medifirst2000.vo.BakuMutuVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,11 +33,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/baku-mutu")
 public class BakuMutuController extends LocaleController<BakuMutuVO> {
 
+	private static final Logger LOGGER = getLogger(BakuMutuController.class);
+
 	@Autowired
 	private BakuMutuService<BakuMutu> bakuMutuService;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(BakuMutuController.class);
-
 	@RequestMapping(value = "/save-baku-mutu/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody BakuMutuVO vo, HttpServletRequest request) {
 		try {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java
index 7103fdd4..e355726e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BatalRegistrasiController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.BatalRegistrasiService;
 import com.jasamedika.medifirst2000.vo.BatalRegistrasiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -26,6 +25,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -35,11 +35,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/batalRegistrasi")
 public class BatalRegistrasiController extends LocaleController<BatalRegistrasiVO> {
 
+	private static final Logger LOGGER = getLogger(BatalRegistrasiController.class);
+
 	@Autowired
 	private BatalRegistrasiService batalRegistrasiService;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(BatalRegistrasiController.class);
-
 	@RequestMapping(value = "/save-pembatalan-registrasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> savePembatalanRegistrasi(@Valid @RequestBody BatalRegistrasiVO vo,
 			HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BentukProdukController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BentukProdukController.java
index 8cb1ef91..7ad032e6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BentukProdukController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BentukProdukController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.BentukProdukService;
 import com.jasamedika.medifirst2000.vo.BentukProdukVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -22,6 +21,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -31,11 +31,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping(value = "/bentuk-produk")
 public class BentukProdukController extends LocaleController<BentukProdukVO> {
 
+	private static final Logger LOGGER = getLogger(BentukProdukController.class);
+
 	@Autowired
 	private BentukProdukService bentukProdukService;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(BentukProdukController.class);
-
 	@RequestMapping(value = "/save/", method = POST, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody BentukProdukVO vo, HttpServletRequest request) {
 		try {
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 6649cf76..8497181d 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
@@ -10,7 +10,6 @@ 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;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
@@ -29,6 +28,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -38,11 +38,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/bobot-indikator")
 public class BobotIndikatorController extends LocaleController<BobotIndikatorVO> {
 
+	private static final Logger LOGGER = getLogger(BobotIndikatorController.class);
+
 	@Autowired
 	private BobotIndikatorService bobotService;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(BobotIndikatorController.class);
-
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Collection<PasienVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CekListGedungBangunanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CekListGedungBangunanController.java
index a75f6196..d466f11f 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CekListGedungBangunanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CekListGedungBangunanController.java
@@ -8,7 +8,6 @@ import com.jasamedika.medifirst2000.service.CekListGedungBangunanHeaderService;
 import com.jasamedika.medifirst2000.service.CekListGedungBangunanService;
 import com.jasamedika.medifirst2000.vo.CekListGedungBangunanHeaderVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -27,6 +26,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -36,7 +36,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/ceklistgedungbangunan")
 public class CekListGedungBangunanController extends LocaleController<BaseModelVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CekListGedungBangunanController.class);
+	private static final Logger LOGGER = getLogger(CekListGedungBangunanController.class);
 
 	@Autowired
 	private CekListGedungBangunanService cekListGedungBangunanService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CetakPengantarSuratController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CetakPengantarSuratController.java
index 09e0daf4..baee8f67 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CetakPengantarSuratController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CetakPengantarSuratController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CetakPengantarSuratService;
 import com.jasamedika.medifirst2000.vo.CetakPengantarSuratVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -22,6 +21,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
@@ -30,7 +30,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/pengantar-surat")
 public class CetakPengantarSuratController extends LocaleController<CetakPengantarSuratVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CetakPengantarSuratController.class);
+	private static final Logger LOGGER = getLogger(CetakPengantarSuratController.class);
 
 	@Autowired
 	private CetakPengantarSuratService pengantarSuratService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CheckInController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CheckInController.java
index e2486e3a..70727ead 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CheckInController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CheckInController.java
@@ -8,7 +8,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CheckInService;
 import com.jasamedika.medifirst2000.vo.CheckInVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -25,6 +24,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -35,7 +35,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class CheckInController extends LocaleController<CheckInVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CheckInController.class);
+	private static final Logger LOGGER = getLogger(CheckInController.class);
 
 	@Autowired
 	private CheckInService<CheckIn> checkInService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdBmhpController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdBmhpController.java
index 654567e8..69fa3438 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdBmhpController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdBmhpController.java
@@ -9,7 +9,6 @@ import com.jasamedika.medifirst2000.vo.CssdBmhpHeaderVO;
 import com.jasamedika.medifirst2000.vo.CssdBmhpVO;
 import com.jasamedika.medifirst2000.vo.CssdProduksiBmhpHeaderVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/cssd-bmhp")
 public class CssdBmhpController extends LocaleController<CssdBmhpVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CssdBmhpController.class);
+	private static final Logger LOGGER = getLogger(CssdBmhpController.class);
 
 	@Autowired
 	private CssdBmhpService cssdBmhpService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDecontaminasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDecontaminasiController.java
index 2490a8ae..ce259516 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDecontaminasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDecontaminasiController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CssdDecontaminasiService;
 import com.jasamedika.medifirst2000.vo.CssdDecontaminasiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/cssd-decontaminasi")
 public class CssdDecontaminasiController extends LocaleController<CssdDecontaminasiVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CssdDecontaminasiController.class);
+	private static final Logger LOGGER = getLogger(CssdDecontaminasiController.class);
 
 	@Autowired
 	private CssdDecontaminasiService cssdDecontaminasiService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDistribusiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDistribusiController.java
index bfcedf23..0c0ad169 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDistribusiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdDistribusiController.java
@@ -6,11 +6,13 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CssdDistribusiService;
 import com.jasamedika.medifirst2000.vo.CssdDistribusiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -22,6 +24,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -31,7 +34,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/cssd-distribusi")
 public class CssdDistribusiController extends LocaleController<CssdDistribusiVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CssdDistribusiController.class);
+	private static final Logger LOGGER = getLogger(CssdDistribusiController.class);
 
 	@Autowired
 	private CssdDistribusiService cssdDistribusiService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringEoController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringEoController.java
index 7c0aace4..6e47100f 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringEoController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringEoController.java
@@ -6,11 +6,13 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CssdMonitoringEoService;
 import com.jasamedika.medifirst2000.vo.CssdMonitoringEoVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -21,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/cssd-monitoring-eo")
 public class CssdMonitoringEoController extends LocaleController<CssdMonitoringEoVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CssdMonitoringEoController.class);
+	private static final Logger LOGGER = getLogger(CssdMonitoringEoController.class);
 
 	@Autowired
 	private CssdMonitoringEoService cssdMonitoringEoService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringSteamController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringSteamController.java
index 374cf5d2..25dd6da6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringSteamController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdMonitoringSteamController.java
@@ -6,11 +6,13 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CssdMonitoringSteamService;
 import com.jasamedika.medifirst2000.vo.CssdMonitoringSteamVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -21,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/cssd-monitoring-steam")
 public class CssdMonitoringSteamController extends LocaleController<CssdMonitoringSteamVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CssdMonitoringSteamController.class);
+	private static final Logger LOGGER = getLogger(CssdMonitoringSteamController.class);
 
 	@Autowired
 	private CssdMonitoringSteamService cssdMonitoringSteamService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPengemasanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPengemasanController.java
index 5f0ad6b0..7b0ddeda 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPengemasanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPengemasanController.java
@@ -6,11 +6,13 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CssdPengemasanService;
 import com.jasamedika.medifirst2000.vo.CssdPengemasanVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -21,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/cssd-pengemasan")
 public class CssdPengemasanController extends LocaleController<CssdPengemasanVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CssdPengemasanController.class);
+	private static final Logger LOGGER = getLogger(CssdPengemasanController.class);
 
 	@Autowired
 	private CssdPengemasanService cssdPengemasanService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPenyimpananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPenyimpananController.java
index 1e8dd2b6..f5e15fa5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPenyimpananController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdPenyimpananController.java
@@ -6,11 +6,13 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CssdPenyimpananService;
 import com.jasamedika.medifirst2000.vo.CssdPenyimpananVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -21,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/cssd-penyimpanan")
 public class CssdPenyimpananController extends LocaleController<CssdPenyimpananVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CssdPenyimpananController.class);
+	private static final Logger LOGGER = getLogger(CssdPenyimpananController.class);
 
 	@Autowired
 	private CssdPenyimpananService cssdPenyimpananService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdReturController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdReturController.java
index b45bea33..e098afb2 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdReturController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdReturController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.service.CssdReturService;
 import com.jasamedika.medifirst2000.vo.ReturCssdVO;
 import com.jasamedika.medifirst2000.vo.StrukPelayananDetailVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -21,6 +20,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +30,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/retur-cssd")
 public class CssdReturController extends LocaleController<StrukPelayananDetailVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CssdReturController.class);
+	private static final Logger LOGGER = getLogger(CssdReturController.class);
 
 	@Autowired
 	private CssdReturService cssdReturService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilController.java
index b6fad484..1178914b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilController.java
@@ -6,11 +6,13 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CssdSterilService;
 import com.jasamedika.medifirst2000.vo.CssdSterilVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -21,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/cssd-steril")
 public class CssdSterilController extends LocaleController<CssdSterilVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CssdSterilController.class);
+	private static final Logger LOGGER = getLogger(CssdSterilController.class);
 
 	@Autowired
 	private CssdSterilService cssdSterilService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilisasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilisasiController.java
index 4de4bdf0..49550fd9 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilisasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdSterilisasiController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CssdSterilisasiService;
 import com.jasamedika.medifirst2000.vo.CssdSterilisasiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/cssd-sterilisasi")
 public class CssdSterilisasiController extends LocaleController<CssdSterilisasiVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CssdSterilisasiController.class);
+	private static final Logger LOGGER = getLogger(CssdSterilisasiController.class);
 
 	@Autowired
 	private CssdSterilisasiService cssdSterilisasiService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdUjiSwapController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdUjiSwapController.java
index 84343cd0..2855900f 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdUjiSwapController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CssdUjiSwapController.java
@@ -6,11 +6,13 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CssdUjiSwapService;
 import com.jasamedika.medifirst2000.vo.CssdUjiSwapVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -21,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/cssd-uji-swap")
 public class CssdUjiSwapController extends LocaleController<CssdUjiSwapVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CssdUjiSwapController.class);
+	private static final Logger LOGGER = getLogger(CssdUjiSwapController.class);
 
 	@Autowired
 	private CssdUjiSwapService cssdUjiSwapService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CustomRestExceptionHandler.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CustomRestExceptionHandler.java
index 4c68eb8e..c0462fae 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CustomRestExceptionHandler.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CustomRestExceptionHandler.java
@@ -1,13 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-
 import org.springframework.beans.TypeMismatchException;
-import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -26,145 +19,122 @@ import org.springframework.web.multipart.support.MissingServletRequestPartExcept
 import org.springframework.web.servlet.NoHandlerFoundException;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.springframework.http.HttpStatus.*;
+
 @ControllerAdvice
-@Order(2) // Kedua masuk
+@Order(2)
 public class CustomRestExceptionHandler extends ResponseEntityExceptionHandler {
 
+	@Override
+	protected ResponseEntity<Object> handleMethodArgumentNotValid(final MethodArgumentNotValidException ex,
+			final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
+		logger.info(ex.getClass().getName());
 
-    @Override
-    protected ResponseEntity<Object> handleMethodArgumentNotValid(final MethodArgumentNotValidException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
-        logger.info(ex.getClass().getName());
-        //
-        final List<String> errors = new ArrayList<String>();
-        for (final FieldError error : ex.getBindingResult().getFieldErrors()) {
-            errors.add(error.getField() + ": " + error.getDefaultMessage());
-        }
-        for (final ObjectError error : ex.getBindingResult().getGlobalErrors()) {
-            errors.add(error.getObjectName() + ": " + error.getDefaultMessage());
-        }
-        
-        // Alter Syamsu agar lebih jelas penyebab Value Object gagal diconvert dari Json Object
-        errors.add( ex.getMessage());
-        // Alter Syamsu agar lebih jelas penyebab Value Object gagal diconvert dari Json Object
-        
-        final ApiError apiError = new ApiError(HttpStatus.BAD_REQUEST, ex.getLocalizedMessage(), errors);
-        
-        return handleExceptionInternal(ex, apiError, headers, apiError.getStatus(), request);
-    }
+		final List<String> errors = new ArrayList<>();
+		for (final FieldError error : ex.getBindingResult().getFieldErrors())
+			errors.add(error.getField() + ": " + error.getDefaultMessage());
+		for (final ObjectError error : ex.getBindingResult().getGlobalErrors())
+			errors.add(error.getObjectName() + ": " + error.getDefaultMessage());
+		errors.add(ex.getMessage());
+		final ApiError apiError = new ApiError(BAD_REQUEST, ex.getLocalizedMessage(), errors);
+		return handleExceptionInternal(ex, apiError, headers, apiError.getStatus(), request);
+	}
 
-    @Override
-    protected ResponseEntity<Object> handleBindException(final BindException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
-        logger.info(ex.getClass().getName());
-        //
-        final List<String> errors = new ArrayList<String>();
-        for (final FieldError error : ex.getBindingResult().getFieldErrors()) {
-            errors.add(error.getField() + ": " + error.getDefaultMessage());
-        }
-        for (final ObjectError error : ex.getBindingResult().getGlobalErrors()) {
-            errors.add(error.getObjectName() + ": " + error.getDefaultMessage());
-        }
-        final ApiError apiError = new ApiError(HttpStatus.BAD_REQUEST, ex.getLocalizedMessage(), errors);
-        return handleExceptionInternal(ex, apiError, headers, apiError.getStatus(), request);
-    }
+	@Override
+	protected ResponseEntity<Object> handleBindException(final BindException ex, final HttpHeaders headers,
+			final HttpStatus status, final WebRequest request) {
+		logger.info(ex.getClass().getName());
 
-    @Override
-    protected ResponseEntity<Object> handleTypeMismatch(final TypeMismatchException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
-        logger.info(ex.getClass().getName());
-        //
-        final String error = ex.getValue() + " value for " + ex.getPropertyName() + " should be of type " + ex.getRequiredType()
-        // Alter Syamsu agar lebih jelas penyebab Value Object gagal diconvert dari Json Object
-        + "  " + ex.getMessage();
-        // Alter Syamsu agar lebih jelas penyebab Value Object gagal diconvert dari Json Object
-        
-        final ApiError apiError = new ApiError(HttpStatus.BAD_REQUEST, ex.getLocalizedMessage(), error);
-        return new ResponseEntity<Object>(apiError, new HttpHeaders(), apiError.getStatus());
-    }
+		final List<String> errors = new ArrayList<>();
+		for (final FieldError error : ex.getBindingResult().getFieldErrors())
+			errors.add(error.getField() + ": " + error.getDefaultMessage());
+		for (final ObjectError error : ex.getBindingResult().getGlobalErrors())
+			errors.add(error.getObjectName() + ": " + error.getDefaultMessage());
+		final ApiError apiError = new ApiError(BAD_REQUEST, ex.getLocalizedMessage(), errors);
+		return handleExceptionInternal(ex, apiError, headers, apiError.getStatus(), request);
+	}
 
-    @Override
-    protected ResponseEntity<Object> handleMissingServletRequestPart(final MissingServletRequestPartException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
-        logger.info(ex.getClass().getName());
-        //
-        final String error = ex.getRequestPartName() + " part is missing";
-        final ApiError apiError = new ApiError(HttpStatus.BAD_REQUEST, ex.getLocalizedMessage(), error);
-        return new ResponseEntity<Object>(apiError, new HttpHeaders(), apiError.getStatus());
-    }
+	@Override
+	protected ResponseEntity<Object> handleTypeMismatch(final TypeMismatchException ex, final HttpHeaders headers,
+			final HttpStatus status, final WebRequest request) {
+		logger.info(ex.getClass().getName());
 
-    @Override
-    protected ResponseEntity<Object> handleMissingServletRequestParameter(final MissingServletRequestParameterException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
-        logger.info(ex.getClass().getName());
-        //
-        final String error = ex.getParameterName() + " parameter is missing";
-        final ApiError apiError = new ApiError(HttpStatus.BAD_REQUEST, ex.getLocalizedMessage(), error);
-        return new ResponseEntity<Object>(apiError, new HttpHeaders(), apiError.getStatus());
-    }
+		final String error = ex.getValue() + " value for " + ex.getPropertyName() + " should be of type "
+				+ ex.getRequiredType() + "  " + ex.getMessage();
+		final ApiError apiError = new ApiError(BAD_REQUEST, ex.getLocalizedMessage(), error);
+		return new ResponseEntity<>(apiError, new HttpHeaders(), apiError.getStatus());
+	}
 
- 
+	@Override
+	protected ResponseEntity<Object> handleMissingServletRequestPart(final MissingServletRequestPartException ex,
+			final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
+		logger.info(ex.getClass().getName());
 
-    @ExceptionHandler({ ConstraintViolationException.class })
-    public ResponseEntity<Object> handleConstraintViolation(final ConstraintViolationException ex, final WebRequest request) {
-        logger.info(ex.getClass().getName());
-        //
-        final List<String> errors = new ArrayList<String>();
-        for (final ConstraintViolation<?> violation : ex.getConstraintViolations()) {
-            errors.add(violation.getRootBeanClass().getName() + " " + violation.getPropertyPath() + ": " + violation.getMessage());
-        }
+		final String error = ex.getRequestPartName() + " part is missing";
+		final ApiError apiError = new ApiError(BAD_REQUEST, ex.getLocalizedMessage(), error);
+		return new ResponseEntity<>(apiError, new HttpHeaders(), apiError.getStatus());
+	}
 
-        final ApiError apiError = new ApiError(HttpStatus.BAD_REQUEST, ex.getLocalizedMessage(), errors);
-        return new ResponseEntity<Object>(apiError, new HttpHeaders(), apiError.getStatus());
-    }
+	@Override
+	protected ResponseEntity<Object> handleMissingServletRequestParameter(
+			final MissingServletRequestParameterException ex, final HttpHeaders headers, final HttpStatus status,
+			final WebRequest request) {
+		logger.info(ex.getClass().getName());
 
-    // 404
+		final String error = ex.getParameterName() + " parameter is missing";
+		final ApiError apiError = new ApiError(BAD_REQUEST, ex.getLocalizedMessage(), error);
+		return new ResponseEntity<>(apiError, new HttpHeaders(), apiError.getStatus());
+	}
 
-    @Override
-    protected ResponseEntity<Object> handleNoHandlerFoundException(final NoHandlerFoundException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
-        logger.info(ex.getClass().getName());
-        //
-        final String error = "No handler found for " + ex.getHttpMethod() + " " + ex.getRequestURL();
+	@ExceptionHandler({ ConstraintViolationException.class })
+	public ResponseEntity<Object> handleConstraintViolation(final ConstraintViolationException ex) {
+		logger.info(ex.getClass().getName());
 
-        final ApiError apiError = new ApiError(HttpStatus.NOT_FOUND, ex.getLocalizedMessage(), error);
-        return new ResponseEntity<Object>(apiError, new HttpHeaders(), apiError.getStatus());
-    }
+		final List<String> errors = new ArrayList<>();
+		for (final ConstraintViolation<?> violation : ex.getConstraintViolations())
+			errors.add(violation.getRootBeanClass().getName() + " " + violation.getPropertyPath() + ": "
+					+ violation.getMessage());
+		final ApiError apiError = new ApiError(BAD_REQUEST, ex.getLocalizedMessage(), errors);
+		return new ResponseEntity<>(apiError, new HttpHeaders(), apiError.getStatus());
+	}
 
-    // 405
+	@Override
+	protected ResponseEntity<Object> handleNoHandlerFoundException(final NoHandlerFoundException ex,
+			final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
+		logger.info(ex.getClass().getName());
 
-    @Override
-    protected ResponseEntity<Object> handleHttpRequestMethodNotSupported(final HttpRequestMethodNotSupportedException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
-        logger.info(ex.getClass().getName());
-        //
-        final StringBuilder builder = new StringBuilder();
-        builder.append(ex.getMethod());
-        builder.append(" method is not supported for this request. Supported methods are ");
-        //ex.getSupportedHttpMethods().forEach(t -> builder.append(t + " "));
+		final String error = "No handler found for " + ex.getHttpMethod() + " " + ex.getRequestURL();
+		final ApiError apiError = new ApiError(NOT_FOUND, ex.getLocalizedMessage(), error);
+		return new ResponseEntity<>(apiError, new HttpHeaders(), apiError.getStatus());
+	}
 
-        final ApiError apiError = new ApiError(HttpStatus.METHOD_NOT_ALLOWED, ex.getLocalizedMessage(), builder.toString());
-        return new ResponseEntity<Object>(apiError, new HttpHeaders(), apiError.getStatus());
-    }
+	@Override
+	protected ResponseEntity<Object> handleHttpRequestMethodNotSupported(
+			final HttpRequestMethodNotSupportedException ex, final HttpHeaders headers, final HttpStatus status,
+			final WebRequest request) {
+		logger.info(ex.getClass().getName());
 
-    // 415
+		String builder = ex.getMethod() + " method is not supported for this request. Supported methods are ";
+		final ApiError apiError = new ApiError(METHOD_NOT_ALLOWED, ex.getLocalizedMessage(), builder);
+		return new ResponseEntity<>(apiError, new HttpHeaders(), apiError.getStatus());
+	}
 
-    @Override
-    protected ResponseEntity<Object> handleHttpMediaTypeNotSupported(final HttpMediaTypeNotSupportedException ex, final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
-        logger.info(ex.getClass().getName());
-        //
-        final StringBuilder builder = new StringBuilder();
-        builder.append(ex.getContentType());
-        builder.append(" media type is not supported. Supported media types are ");
-        //ex.getSupportedMediaTypes().forEach(t -> builder.append(t + " "));
+	@Override
+	protected ResponseEntity<Object> handleHttpMediaTypeNotSupported(final HttpMediaTypeNotSupportedException ex,
+			final HttpHeaders headers, final HttpStatus status, final WebRequest request) {
+		logger.info(ex.getClass().getName());
 
-        final ApiError apiError = new ApiError(HttpStatus.UNSUPPORTED_MEDIA_TYPE, ex.getLocalizedMessage(), builder.substring(0, builder.length() - 2));
-        return new ResponseEntity<Object>(apiError, new HttpHeaders(), apiError.getStatus());
-    }
-    
+		final StringBuilder builder = new StringBuilder();
+		builder.append(ex.getContentType());
+		builder.append(" media type is not supported. Supported media types are ");
+		final ApiError apiError = new ApiError(UNSUPPORTED_MEDIA_TYPE, ex.getLocalizedMessage(),
+				builder.substring(0, builder.length() - 2));
+		return new ResponseEntity<>(apiError, new HttpHeaders(), apiError.getStatus());
+	}
 
- 
-/*
-    @ExceptionHandler({ Exception.class })
-    public ResponseEntity<Object> handleAll(final Exception ex, final WebRequest request) {
-    	final StringBuilder builder = new StringBuilder();
-        builder.append(ex.toString());
-        //
-        final ApiError apiError = new ApiError(HttpStatus.INTERNAL_SERVER_ERROR, ex.getLocalizedMessage(), builder.toString());
-        return new ResponseEntity<Object>(apiError, new HttpHeaders(), apiError.getStatus());
-    }
-*/
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java
index bc749ca1..6f4058dd 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.UnitCostService;
 import com.jasamedika.medifirst2000.vo.UnitCostVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -21,6 +20,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
@@ -28,7 +28,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 @RequestMapping("/unit-cost")
 public class DaftarKegiatanController extends LocaleController<UnitCostVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DaftarKegiatanController.class);
+	private static final Logger LOGGER = getLogger(DaftarKegiatanController.class);
 
 	@Autowired
 	private UnitCostService<UnitCostVO> unitCostService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKendaraanDinasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKendaraanDinasController.java
index 48c653d5..54d2e3d8 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKendaraanDinasController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKendaraanDinasController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DaftarKendaraanDinasService;
 import com.jasamedika.medifirst2000.vo.OrderKendaraanDinasVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -22,6 +21,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +30,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 @RequestMapping("/daftar-kendaraan-dinas")
 public class DaftarKendaraanDinasController extends LocaleController<OrderKendaraanDinasVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DaftarKendaraanDinasController.class);
+	private static final Logger LOGGER = getLogger(DaftarKendaraanDinasController.class);
 
 	@Autowired
 	private DaftarKendaraanDinasService daftarKendaraanDinasService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderAmbulanceController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderAmbulanceController.java
index e8e95405..e5096dfb 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderAmbulanceController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderAmbulanceController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DaftarOrderAmbulanceService;
 import com.jasamedika.medifirst2000.vo.OrderPelayananVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -22,6 +21,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +30,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 @RequestMapping("/daftar-order-ambulance")
 public class DaftarOrderAmbulanceController extends LocaleController<OrderPelayananVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DaftarOrderAmbulanceController.class);
+	private static final Logger LOGGER = getLogger(DaftarOrderAmbulanceController.class);
 
 	@Autowired
 	private DaftarOrderAmbulanceService daftarOrderAmbulanceService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderPemakaianRuangRapatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderPemakaianRuangRapatController.java
index cc27f1e3..c9216b1c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderPemakaianRuangRapatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarOrderPemakaianRuangRapatController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DaftarOrderPemakaianRuangRapatService;
 import com.jasamedika.medifirst2000.vo.OrderPemakaianRuangRapatVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/daftar-order-pemakaian-ruang-rapat")
 public class DaftarOrderPemakaianRuangRapatController extends LocaleController<OrderPemakaianRuangRapatVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DaftarOrderPemakaianRuangRapatController.class);
+	private static final Logger LOGGER = getLogger(DaftarOrderPemakaianRuangRapatController.class);
 
 	@Autowired
 	private DaftarOrderPemakaianRuangRapatService daftarOrderPemakaianRuangRapatService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemakaianRumahDukaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemakaianRumahDukaController.java
index e656b7b9..d8479ea9 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemakaianRumahDukaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemakaianRumahDukaController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DaftarPemakaianRumahDukaService;
 import com.jasamedika.medifirst2000.vo.PemakaianRumahDukaVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/daftar-pemakaian-rumah-duka")
 public class DaftarPemakaianRumahDukaController extends LocaleController<PemakaianRumahDukaVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DaftarPemakaianRumahDukaController.class);
+	private static final Logger LOGGER = getLogger(DaftarPemakaianRumahDukaController.class);
 
 	@Autowired
 	private DaftarPemakaianRumahDukaService daftarPemakaianRumahDukaService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemulasaraanJenazahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemulasaraanJenazahController.java
index a7d6f486..5e70b025 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemulasaraanJenazahController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPemulasaraanJenazahController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DaftarPemulasaraanJenazahService;
 import com.jasamedika.medifirst2000.vo.OrderPelayananVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -22,6 +21,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +30,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 @RequestMapping("/daftar-pemulasaraan-jenazah")
 public class DaftarPemulasaraanJenazahController extends LocaleController<OrderPelayananVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DaftarPemulasaraanJenazahController.class);
+	private static final Logger LOGGER = getLogger(DaftarPemulasaraanJenazahController.class);
 
 	@Autowired
 	private DaftarPemulasaraanJenazahService daftarPemulasaraanJenazahService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPenerimaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPenerimaanController.java
index e65e536d..bae68a2e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPenerimaanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPenerimaanController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.service.DaftarPenerimaanService;
 import com.jasamedika.medifirst2000.vo.MappingKirimDokumenPasienVO;
 import com.jasamedika.medifirst2000.vo.StrukBuktiPenerimaanCaraBayarVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/daftar-penerimaan")
 public class DaftarPenerimaanController extends LocaleController<StrukBuktiPenerimaanCaraBayarVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DaftarPenerimaanController.class);
+	private static final Logger LOGGER = getLogger(DaftarPenerimaanController.class);
 
 	@Autowired
 	private DaftarPenerimaanService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPesanAmbulanceController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPesanAmbulanceController.java
index 4db8a26a..16b74008 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPesanAmbulanceController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarPesanAmbulanceController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DaftarPesanAmbulanceService;
 import com.jasamedika.medifirst2000.vo.OrderAmbulanceVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -22,6 +21,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -31,7 +31,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/daftar-pesan-ambulance")
 public class DaftarPesanAmbulanceController extends LocaleController<OrderAmbulanceVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DaftarPesanAmbulanceController.class);
+	private static final Logger LOGGER = getLogger(DaftarPesanAmbulanceController.class);
 
 	@Autowired
 	private DaftarPesanAmbulanceService daftarPesanAmbulanceService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarSewaAsramaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarSewaAsramaController.java
index 3c2b2999..d282c413 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarSewaAsramaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarSewaAsramaController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DaftarSewaAsramaService;
 import com.jasamedika.medifirst2000.vo.SewaAsramaVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/daftar-sewa-asrama")
 public class DaftarSewaAsramaController extends LocaleController<SewaAsramaVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DaftarSewaAsramaController.class);
+	private static final Logger LOGGER = getLogger(DaftarSewaAsramaController.class);
 
 	@Autowired
 	private DaftarSewaAsramaService daftarSewaAsramaService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarSewaLahanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarSewaLahanController.java
index 67e751ab..de5e9db1 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarSewaLahanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarSewaLahanController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DaftarSewaLahanService;
 import com.jasamedika.medifirst2000.vo.SewaLahanVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/daftar-sewa-lahan")
 public class DaftarSewaLahanController extends LocaleController<SewaLahanVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DaftarSewaLahanController.class);
+	private static final Logger LOGGER = getLogger(DaftarSewaLahanController.class);
 
 	@Autowired
 	private DaftarSewaLahanService daftarSewaLahanService;
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 b064c09a..091ab41b 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
@@ -10,7 +10,6 @@ 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;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
@@ -29,6 +28,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -38,7 +38,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/dampak-resiko")
 public class DampakResikoController extends LocaleController<DampakResikoVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DampakResikoController.class);
+	private static final Logger LOGGER = getLogger(DampakResikoController.class);
 
 	@Autowired
 	private DampakResikoService dampakResikoService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DataPerusahaanYangBekerjaSamaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DataPerusahaanYangBekerjaSamaController.java
index 2ddeade2..966afc13 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DataPerusahaanYangBekerjaSamaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DataPerusahaanYangBekerjaSamaController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DataPerusahaanYangBekerjaSamaService;
 import com.jasamedika.medifirst2000.vo.DataPerusahaanYangBekerjaSamaVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/data-perusahaan-yang-bekerjasama")
 public class DataPerusahaanYangBekerjaSamaController extends LocaleController<DataPerusahaanYangBekerjaSamaVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DataPerusahaanYangBekerjaSamaController.class);
+	private static final Logger LOGGER = getLogger(DataPerusahaanYangBekerjaSamaController.class);
 
 	@Autowired
 	private DataPerusahaanYangBekerjaSamaService dataPerusahaanYangBekerjaSamaService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DataPesertaPerusahanYangBekerjaSamaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DataPesertaPerusahanYangBekerjaSamaController.java
index bf544ca0..ca94892c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DataPesertaPerusahanYangBekerjaSamaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DataPesertaPerusahanYangBekerjaSamaController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DataPesertaPerusahanYangBekerjaSamaService;
 import com.jasamedika.medifirst2000.vo.DataPesertaPerusahanYangBekerjaSamaVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -34,7 +34,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 public class DataPesertaPerusahanYangBekerjaSamaController
 		extends LocaleController<DataPesertaPerusahanYangBekerjaSamaVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DataPesertaPerusahanYangBekerjaSamaController.class);
+	private static final Logger LOGGER = getLogger(DataPesertaPerusahanYangBekerjaSamaController.class);
 
 	@Autowired
 	private DataPesertaPerusahanYangBekerjaSamaService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DepartemenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DepartemenController.java
index 4da899b3..00781a80 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DepartemenController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DepartemenController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DepartemenService;
 import com.jasamedika.medifirst2000.vo.DepartemenVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/departemen")
 public class DepartemenController extends LocaleController<DepartemenVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DepartemenController.class);
+	private static final Logger LOGGER = getLogger(DepartemenController.class);
 
 	@Autowired
 	private DepartemenService<Departemen> departemenService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DetailRupController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DetailRupController.java
index 916a4c80..a4cdf562 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DetailRupController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DetailRupController.java
@@ -7,11 +7,13 @@ import com.jasamedika.medifirst2000.service.DetailRupService;
 import com.jasamedika.medifirst2000.vo.DetailRupCustomVO;
 import com.jasamedika.medifirst2000.vo.HeadAnggaranVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -21,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/detail-rup")
 public class DetailRupController extends LocaleController<HeadAnggaranVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DetailRupController.class);
+	private static final Logger LOGGER = getLogger(DetailRupController.class);
 
 	@Autowired
 	private DetailRupService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaKeperawatanTransaksiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaKeperawatanTransaksiController.java
index 205487cf..d8557175 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaKeperawatanTransaksiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaKeperawatanTransaksiController.java
@@ -8,7 +8,6 @@ import com.jasamedika.medifirst2000.service.DiagnosaKeperawatanTransaksiService;
 import com.jasamedika.medifirst2000.vo.DiagnosaKeperawatanTransaksiVO;
 import com.jasamedika.medifirst2000.vo.DiagnosaKeperawatanVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
@@ -31,7 +31,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/diagnosa-keperawatan")
 public class DiagnosaKeperawatanTransaksiController extends LocaleController<DiagnosaKeperawatanVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DiagnosaKeperawatanTransaksiController.class);
+	private static final Logger LOGGER = getLogger(DiagnosaKeperawatanTransaksiController.class);
 
 	@Autowired
 	private DiagnosaKeperawatanTransaksiService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaPasienController.java
index 6592f705..8250d8d7 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaPasienController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaPasienController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.service.DiagnosaPasienService;
 import com.jasamedika.medifirst2000.vo.DiagnosaPasienVO;
 import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -25,6 +24,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -39,7 +39,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/diagnosa-pasien")
 public class DiagnosaPasienController extends LocaleController<RegistrasiPelayananVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DiagnosaPasienController.class);
+	private static final Logger LOGGER = getLogger(DiagnosaPasienController.class);
 
 	@Autowired
 	private DiagnosaPasienService diagnosaPasienService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaTindakanPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaTindakanPasienController.java
index 0cc7df4a..5ae35d23 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaTindakanPasienController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DiagnosaTindakanPasienController.java
@@ -10,7 +10,6 @@ import com.jasamedika.medifirst2000.service.DiagnosaTindakanPasienService;
 import com.jasamedika.medifirst2000.vo.DiagnosaTindakanPasienVO;
 import com.jasamedika.medifirst2000.vo.PegawaiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -32,6 +31,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.security.service.TokenAuthenticationService.tokenHandler;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -46,7 +46,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/diagnosa-tindakan-pasien")
 public class DiagnosaTindakanPasienController extends LocaleController<DiagnosaTindakanPasienVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DiagnosaTindakanPasienController.class);
+	private static final Logger LOGGER = getLogger(DiagnosaTindakanPasienController.class);
 
 	@Autowired
 	private LoginUserDao loginUserDao;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DistribusiAsetController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DistribusiAsetController.java
index 6b19305e..098cafa2 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DistribusiAsetController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DistribusiAsetController.java
@@ -9,7 +9,6 @@ import com.jasamedika.medifirst2000.vo.DistribusiAsetVO;
 import com.jasamedika.medifirst2000.vo.KonfirmasiAsetVO;
 import com.jasamedika.medifirst2000.vo.PenerimaanBarangVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -28,6 +27,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
 import static java.net.URLDecoder.decode;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -37,7 +37,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/distribusi-aset")
 public class DistribusiAsetController extends LocaleController<PenerimaanBarangVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DistribusiAsetController.class);
+	private static final Logger LOGGER = getLogger(DistribusiAsetController.class);
 
 	@Autowired
 	private DistribusiAsetService distribusiAsetService;
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 adc608a5..6f39c542 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
@@ -8,7 +8,6 @@ import com.jasamedika.medifirst2000.vo.DokumenInternalVO;
 import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.SuratMasukInternalVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/dokumen-internal")
 public class DokumenInternalController extends LocaleController<SuratMasukInternalVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DokumenInternalController.class);
+	private static final Logger LOGGER = getLogger(DokumenInternalController.class);
 
 	@Autowired
 	private DokumenInternalService dokumenInternalService;
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 7265acd7..98fc0d88 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
@@ -10,7 +10,6 @@ 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;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
@@ -27,6 +26,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -36,7 +36,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/draft-surat")
 public class DraftSuratController extends LocaleController<DraftSuratVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DraftSuratController.class);
+	private static final Logger LOGGER = getLogger(DraftSuratController.class);
 
 	@Autowired
 	private DraftSuratService draftSuratService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EdukasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EdukasiController.java
index 83e1cbab..0779292e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EdukasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EdukasiController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.EdukasiService;
 import com.jasamedika.medifirst2000.vo.EdukasiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/edukasi")
 public class EdukasiController extends LocaleController<EdukasiVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(EdukasiController.class);
+	private static final Logger LOGGER = getLogger(EdukasiController.class);
 
 	@Autowired
 	private EdukasiService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EkstensionNoTeleponController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EkstensionNoTeleponController.java
index bb343017..f9bb1c05 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EkstensionNoTeleponController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EkstensionNoTeleponController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.EkstensionNoTeleponService;
 import com.jasamedika.medifirst2000.vo.EkstensionNoTeleponVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/ekstension-no-telepon")
 public class EkstensionNoTeleponController extends LocaleController<EkstensionNoTeleponVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(EkstensionNoTeleponController.class);
+	private static final Logger LOGGER = getLogger(EkstensionNoTeleponController.class);
 
 	@Autowired
 	private EkstensionNoTeleponService ekstensionNoTeleponService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EvaluasiRekananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EvaluasiRekananController.java
index 4659f972..f5c469cf 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EvaluasiRekananController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/EvaluasiRekananController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.EvaluasiRekananService;
 import com.jasamedika.medifirst2000.vo.UsulanEvaluasiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -38,7 +38,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/evaluasi-rekanan")
 public class EvaluasiRekananController extends LocaleController<UsulanEvaluasiVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(EvaluasiRekananController.class);
+	private static final Logger LOGGER = getLogger(EvaluasiRekananController.class);
 
 	@Autowired
 	private EvaluasiRekananService evaluasiRekananService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FasilitasMController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FasilitasMController.java
index d7ba5d80..45bd46a5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FasilitasMController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FasilitasMController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.FasilitasMService;
 import com.jasamedika.medifirst2000.vo.FasilitasMVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/fasilitas")
 public class FasilitasMController extends LocaleController<FasilitasMVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(FasilitasMController.class);
+	private static final Logger LOGGER = getLogger(FasilitasMController.class);
 
 	@Autowired
 	private FasilitasMService fasilitasMService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FeeForServiceController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FeeForServiceController.java
index 38e45222..726a0079 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FeeForServiceController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FeeForServiceController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.dao.custom.PelayananPasienDaoCustom;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.vo.PelayananPasienVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -22,13 +21,14 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS_OK;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 
 @RestController
 @RequestMapping("/fee-for-service")
 public class FeeForServiceController extends LocaleController<PelayananPasienVO> {
 
-	private static final Logger LOG = LoggerFactory.getLogger(FeeForServiceController.class);
+	private static final Logger LOG = getLogger(FeeForServiceController.class);
 
 	@Autowired
 	private PelayananPasienDaoCustom pelayananPasienDao;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FisisPemeriksaanDokterController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FisisPemeriksaanDokterController.java
index 8eeb7579..b0ad2deb 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FisisPemeriksaanDokterController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FisisPemeriksaanDokterController.java
@@ -8,7 +8,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.FisisPemeriksaanDokterService;
 import com.jasamedika.medifirst2000.vo.FisisPemeriksaanDokterVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -25,6 +24,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
@@ -39,7 +39,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class FisisPemeriksaanDokterController extends LocaleController<FisisPemeriksaanDokterVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(FisisPemeriksaanDokterController.class);
+	private static final Logger LOGGER = getLogger(FisisPemeriksaanDokterController.class);
 
 	@Autowired
 	private FisisPemeriksaanDokterService<FisisPemeriksaanDokter> fisisPemeriksaanDokterService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GajiPegawaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GajiPegawaiController.java
index 5f615f9d..7e842060 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GajiPegawaiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GajiPegawaiController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.GajiPegawaiService;
 import com.jasamedika.medifirst2000.vo.PegawaiHistoriRekapGajiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -21,6 +20,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +30,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/gaji-pegawai")
 public class GajiPegawaiController extends LocaleController<PegawaiHistoriRekapGajiVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(GajiPegawaiController.class);
+	private static final Logger LOGGER = getLogger(GajiPegawaiController.class);
 
 	@Autowired
 	private GajiPegawaiService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GawatDaruratController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GawatDaruratController.java
index 96019f90..acd62043 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GawatDaruratController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GawatDaruratController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.service.GawatDaruratService;
 import com.jasamedika.medifirst2000.vo.GawatDaruratVO;
 import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -25,6 +24,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -34,7 +34,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/gawat-darurat")
 public class GawatDaruratController extends LocaleController<RegistrasiPelayananVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(GawatDaruratController.class);
+	private static final Logger LOGGER = getLogger(GawatDaruratController.class);
 
 	@Autowired
 	private GawatDaruratService gawatDaruratService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GeneratedMasterController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GeneratedMasterController.java
index de1eb63e..de8ea09a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GeneratedMasterController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GeneratedMasterController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.security.model.AppPermission;
 import com.jasamedika.medifirst2000.service.GeneratedMasterService;
 import com.jasamedika.medifirst2000.vo.IpsrsPemeliharaanVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -25,6 +24,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.security.model.AppPermission.*;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -34,7 +34,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/generated_master")
 public class GeneratedMasterController extends LocaleController<IpsrsPemeliharaanVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(GeneratedMasterController.class);
+	private static final Logger LOGGER = getLogger(GeneratedMasterController.class);
 
 	@Autowired
 	private GeneratedMasterService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HVAController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HVAController.java
index 504a6a9c..4fd1b6b1 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HVAController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HVAController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.HVAService;
 import com.jasamedika.medifirst2000.vo.HVAVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/hva")
 public class HVAController extends LocaleController<HVAVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(HVAController.class);
+	private static final Logger LOGGER = getLogger(HVAController.class);
 
 	@Autowired
 	private HVAService hvaService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanSwaPantauLimbahCairController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanSwaPantauLimbahCairController.java
index 4e0f44aa..92bdac1b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanSwaPantauLimbahCairController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanSwaPantauLimbahCairController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.HasilPemeriksaanSwaPantauLimbahCairService;
 import com.jasamedika.medifirst2000.vo.HasilPemeriksaanSwaPantauLimbahCairVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -22,6 +21,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 public class HasilPemeriksaanSwaPantauLimbahCairController
 		extends LocaleController<HasilPemeriksaanSwaPantauLimbahCairVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(HasilPemeriksaanSwaPantauLimbahCairController.class);
+	private static final Logger LOGGER = getLogger(HasilPemeriksaanSwaPantauLimbahCairController.class);
 
 	@Autowired
 	private HasilPemeriksaanSwaPantauLimbahCairService<HasilPemeriksaanSwaPantauLimbahCair> hasilPemeriksaanSwaPantauLimbahCairService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HistoriPelayananCsController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HistoriPelayananCsController.java
index 05fd9b14..7b30f31b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HistoriPelayananCsController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HistoriPelayananCsController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.HistoriPelayananCsService;
 import com.jasamedika.medifirst2000.vo.HistoriPelayananCsVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -20,6 +19,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -29,7 +29,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/historiPelayananCs")
 public class HistoriPelayananCsController extends LocaleController<HistoriPelayananCsVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(HistoriPelayananCsController.class);
+	private static final Logger LOGGER = getLogger(HistoriPelayananCsController.class);
 
 	@Autowired
 	private HistoriPelayananCsService historiPelayananCsService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java
index 7a4c4b7a..9f5ec145 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java
@@ -8,7 +8,6 @@ import com.jasamedika.medifirst2000.vo.IkiDanRemunerasiVO;
 import com.jasamedika.medifirst2000.vo.SettingPirSdmVO;
 import com.jasamedika.medifirst2000.vo.StrukHistoriVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/iki-remunerasi")
 public class IkiDanRemunerasiController extends LocaleController<IkiDanRemunerasiVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IkiDanRemunerasiController.class);
+	private static final Logger LOGGER = getLogger(IkiDanRemunerasiController.class);
 
 	@Autowired
 	private IkiDanRemunerasiService service;
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 42eb00bc..e8e58cdf 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
@@ -1,14 +1,15 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
+import com.jasamedika.medifirst2000.constants.MessageResource;
+import com.jasamedika.medifirst2000.controller.base.LocaleController;
+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;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.domain.Specifications;
@@ -19,20 +20,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-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 net.kaczmarzyk.spring.data.jpa.domain.Equal;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.Map;
 
 import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE;
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -42,11 +39,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/indikator-rensar")
 public class IndikatorRensarController extends LocaleController<IndikatorRensarVO> {
 
+	private static final Logger LOGGER = getLogger(IndikatorRensarController.class);
+
 	@Autowired
 	private IndikatorRensarService indikatorRensarService;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IndikatorRensarController.class);
-
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Collection<PasienVO>> findAll(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/InstruksiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/InstruksiController.java
index 33a9252c..bc66f4c0 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/InstruksiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/InstruksiController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.InstruksiService;
 import com.jasamedika.medifirst2000.vo.InstruksiCustomVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,11 +33,11 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/instruksi")
 public class InstruksiController extends LocaleController<InstruksiCustomVO> {
 
+	private static final Logger LOGGER = getLogger(InstruksiController.class);
+
 	@Autowired
 	private InstruksiService service;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(InstruksiController.class);
-
 	@RequestMapping(value = "/save-instruksi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> saveInstruksi(@Valid @RequestBody InstruksiCustomVO vo,
 			HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IntraOperasiAnestesiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IntraOperasiAnestesiController.java
index c3e213a9..6491ea05 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IntraOperasiAnestesiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IntraOperasiAnestesiController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.IntraOperasiAnestesiService;
 import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperasiHeaderVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/intra-operasi-anestesi")
 public class IntraOperasiAnestesiController extends LocaleController<AsuhanKeperawatanPeriOperasiHeaderVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IntraOperasiAnestesiController.class);
+	private static final Logger LOGGER = getLogger(IntraOperasiAnestesiController.class);
 
 	@Autowired
 	private IntraOperasiAnestesiService intraOperasiAnestesiService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IntraOperasiPerawatBedahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IntraOperasiPerawatBedahController.java
index c02988de..be9c0621 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IntraOperasiPerawatBedahController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IntraOperasiPerawatBedahController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.IntraOperasiPerawatBedahService;
 import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperasiHeaderVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/intra-operasi-perawat-bedah")
 public class IntraOperasiPerawatBedahController extends LocaleController<AsuhanKeperawatanPeriOperasiHeaderVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IntraOperasiPerawatBedahController.class);
+	private static final Logger LOGGER = getLogger(IntraOperasiPerawatBedahController.class);
 
 	@Autowired
 	private IntraOperasiPerawatBedahService intraOperasiPerawatBedahService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsDataAlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsDataAlatController.java
index e4eebe58..3e35f2a6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsDataAlatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsDataAlatController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.IpsrsDataAlatService;
 import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -21,6 +20,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -29,7 +29,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 @RequestMapping("/ipsrs-data-alat")
 public class IpsrsDataAlatController extends LocaleController<RegistrasiAsetVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IpsrsDataAlatController.class);
+	private static final Logger LOGGER = getLogger(IpsrsDataAlatController.class);
 
 	@Autowired
 	private IpsrsDataAlatService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsMaintenanceController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsMaintenanceController.java
index ddf7023e..4a0bcc92 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsMaintenanceController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsMaintenanceController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.IpsrsMaintenanceService;
 import com.jasamedika.medifirst2000.vo.IpsrsPemeliharaanVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -20,6 +19,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -28,7 +28,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 @RequestMapping("/ipsrs-maintenance")
 public class IpsrsMaintenanceController extends LocaleController<IpsrsPemeliharaanVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IpsrsMaintenanceController.class);
+	private static final Logger LOGGER = getLogger(IpsrsMaintenanceController.class);
 
 	@Autowired
 	private IpsrsMaintenanceService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPemakaianMesinController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPemakaianMesinController.java
index b1ed0837..2087dc6e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPemakaianMesinController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPemakaianMesinController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.IpsrsPemakaianMesinService;
 import com.jasamedika.medifirst2000.vo.IpsrsPemakaianMesinVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/ipsrs-pemakaian-mesin")
 public class IpsrsPemakaianMesinController extends LocaleController<IpsrsPemakaianMesinVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IpsrsPemakaianMesinController.class);
+	private static final Logger LOGGER = getLogger(IpsrsPemakaianMesinController.class);
 
 	@Autowired
 	private IpsrsPemakaianMesinService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPemakaianRuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPemakaianRuanganController.java
index 554f9e53..3fa15884 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPemakaianRuanganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPemakaianRuanganController.java
@@ -6,12 +6,14 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.IpsrsPemakaianRuanganService;
 import com.jasamedika.medifirst2000.vo.IpsrsPemakaianRuanganVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -21,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -30,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/ipsrs-pemakaian-ruangan")
 public class IpsrsPemakaianRuanganController extends LocaleController<IpsrsPemakaianRuanganVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IpsrsPemakaianRuanganController.class);
+	private static final Logger LOGGER = getLogger(IpsrsPemakaianRuanganController.class);
 
 	@Autowired
 	private IpsrsPemakaianRuanganService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPeminjamanAlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPeminjamanAlatController.java
index b1bd7b50..514fa9e3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPeminjamanAlatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPeminjamanAlatController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.IpsrsPeminjamanAlatService;
 import com.jasamedika.medifirst2000.vo.IpsrsPeminjamanAlatVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/ipsrs-peminjaman-alat")
 public class IpsrsPeminjamanAlatController extends LocaleController<IpsrsPeminjamanAlatVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IpsrsPeminjamanAlatController.class);
+	private static final Logger LOGGER = getLogger(IpsrsPeminjamanAlatController.class);
 
 	@Autowired
 	private IpsrsPeminjamanAlatService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPerbaikanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPerbaikanController.java
index bc388622..9c991037 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPerbaikanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPerbaikanController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.service.IpsrsPerbaikanService;
 import com.jasamedika.medifirst2000.vo.IpsrsPelaksanaanPerbaikanVO;
 import com.jasamedika.medifirst2000.vo.IpsrsPerbaikanVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/ipsrs-perbaikan")
 public class IpsrsPerbaikanController extends LocaleController<IpsrsPerbaikanVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IpsrsPerbaikanController.class);
+	private static final Logger LOGGER = getLogger(IpsrsPerbaikanController.class);
 
 	@Autowired
 	private IpsrsPerbaikanService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPreventiveMaintenanceController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPreventiveMaintenanceController.java
index 4f9bb91b..d41e60ca 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPreventiveMaintenanceController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsPreventiveMaintenanceController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.service.IpsrsPreventiveMaintenanceService;
 import com.jasamedika.medifirst2000.vo.IpsrsPemeliharaanVO;
 import com.jasamedika.medifirst2000.vo.IpsrsPreventiveMaintenanceVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/ipsrs-preventive-maintenance")
 public class IpsrsPreventiveMaintenanceController extends LocaleController<IpsrsPemeliharaanVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IpsrsPreventiveMaintenanceController.class);
+	private static final Logger LOGGER = getLogger(IpsrsPreventiveMaintenanceController.class);
 
 	@Autowired
 	private IpsrsPreventiveMaintenanceService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsTagihanBusinessCenterController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsTagihanBusinessCenterController.java
index 70ca0e6a..1ef3c825 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsTagihanBusinessCenterController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/IpsrsTagihanBusinessCenterController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.IpsrsTagihanBusinessCenterService;
 import com.jasamedika.medifirst2000.vo.IpsrsTagihanBusinessCenterVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/ipsrs-tagihan-business-center")
 public class IpsrsTagihanBusinessCenterController extends LocaleController<IpsrsTagihanBusinessCenterVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(IpsrsTagihanBusinessCenterController.class);
+	private static final Logger LOGGER = getLogger(IpsrsTagihanBusinessCenterController.class);
 
 	@Autowired
 	private IpsrsTagihanBusinessCenterService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ItPerbaikanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ItPerbaikanController.java
index 7372cbc7..ace4cb2a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ItPerbaikanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ItPerbaikanController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.service.ItPerbaikanService;
 import com.jasamedika.medifirst2000.vo.ItPelaksanaanPerbaikanVO;
 import com.jasamedika.medifirst2000.vo.ItPerbaikanVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -25,6 +24,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -34,7 +34,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/it-perbaikan")
 public class ItPerbaikanController extends LocaleController<ItPerbaikanVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(ItPerbaikanController.class);
+	private static final Logger LOGGER = getLogger(ItPerbaikanController.class);
 
 	@Autowired
 	private ItPerbaikanService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java
index 369947bd..93d48fb2 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JabatanController.java
@@ -6,11 +6,13 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.JabatanService;
 import com.jasamedika.medifirst2000.vo.JabatanVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -20,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -29,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/jabatan")
 public class JabatanController extends LocaleController<JabatanVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(JabatanController.class);
+	private static final Logger LOGGER = getLogger(JabatanController.class);
 
 	@Autowired
 	private JabatanService jabatanService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDokterController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDokterController.java
index 58f90d6d..726a1fbb 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDokterController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDokterController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.JadwalDokterService;
 import com.jasamedika.medifirst2000.vo.JadwalDokter_VO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.util.DateUtil.toDate;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/jadwalDokter")
 public class JadwalDokterController extends LocaleController<JadwalDokter_VO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(JadwalDokterController.class);
+	private static final Logger LOGGER = getLogger(JadwalDokterController.class);
 
 	@Autowired
 	private JadwalDokterService jadwalDokterService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDpjpRawatInapController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDpjpRawatInapController.java
index c6747a5d..724a31db 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDpjpRawatInapController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalDpjpRawatInapController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.JadwalDpjpRawatInapService;
 import com.jasamedika.medifirst2000.vo.JadwalDpjpRawatInapVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -21,6 +20,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
@@ -29,7 +29,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/jadwal-dpjp")
 public class JadwalDpjpRawatInapController extends LocaleController<JadwalDpjpRawatInapVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(JadwalDpjpRawatInapController.class);
+	private static final Logger LOGGER = getLogger(JadwalDpjpRawatInapController.class);
 
 	@Autowired
 	private JadwalDpjpRawatInapService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalRencanaPemeriksaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalRencanaPemeriksaanController.java
index e8adf260..9bc17706 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalRencanaPemeriksaanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JadwalRencanaPemeriksaanController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.JadwalRencanaPemeriksaanService;
 import com.jasamedika.medifirst2000.vo.JadwalRencanaPemeriksaanVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/jadwal-rencana-pemeriksaan")
 public class JadwalRencanaPemeriksaanController extends LocaleController<JadwalRencanaPemeriksaanVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(JadwalRencanaPemeriksaanController.class);
+	private static final Logger LOGGER = getLogger(JadwalRencanaPemeriksaanController.class);
 
 	@Autowired
 	private JadwalRencanaPemeriksaanService rencanaPemeriksaanService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisBahanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisBahanController.java
index 45077ec2..975833bd 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisBahanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisBahanController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.JenisBahanService;
 import com.jasamedika.medifirst2000.vo.JenisBahanVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -22,6 +21,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -31,7 +31,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/jenis-bahan/")
 public class JenisBahanController extends LocaleController<JenisBahanVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(JenisBahanController.class);
+	private static final Logger LOGGER = getLogger(JenisBahanController.class);
 
 	@Autowired
 	private JenisBahanService jenisBahanService;
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 2adfa154..2b6e6166 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
@@ -10,7 +10,6 @@ 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;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
@@ -29,6 +28,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -38,7 +38,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping(value = "/jenis-diet")
 public class JenisDietController extends LocaleController<JenisDietVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(JenisDietController.class);
+	private static final Logger LOGGER = getLogger(JenisDietController.class);
 
 	@Autowired
 	private JenisDietService jenisDietService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLimbahB3MasukController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLimbahB3MasukController.java
index 02d0fa5c..e22c4ae7 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLimbahB3MasukController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLimbahB3MasukController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.JenisLimbahB3MasukService;
 import com.jasamedika.medifirst2000.vo.JenisLimbahB3MasukVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -24,6 +23,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/jenis-limbah-b3-masuk")
 public class JenisLimbahB3MasukController extends LocaleController<JenisLimbahB3MasukVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(JenisLimbahB3MasukController.class);
+	private static final Logger LOGGER = getLogger(JenisLimbahB3MasukController.class);
 
 	@Autowired
 	private JenisLimbahB3MasukService<JenisLimbahB3Masuk> jenisLimbahB3MasukService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLinenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLinenController.java
index 6ab07adf..a6ff6299 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLinenController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLinenController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.JenisLinenService;
 import com.jasamedika.medifirst2000.vo.JenisLinenVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/jenis-linen")
 public class JenisLinenController extends LocaleController<JenisLinenVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(JenisLinenController.class);
+	private static final Logger LOGGER = getLogger(JenisLinenController.class);
 
 	@Autowired
 	private JenisLinenService jenisLinenService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisResponController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisResponController.java
index c2565751..a6013e32 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisResponController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisResponController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.JenisResponService;
 import com.jasamedika.medifirst2000.vo.JenisResponVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -22,6 +21,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
@@ -30,7 +30,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/jenisRespon")
 public class JenisResponController extends LocaleController<JenisResponVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(JenisResponController.class);
+	private static final Logger LOGGER = getLogger(JenisResponController.class);
 
 	@Autowired
 	private JenisResponService service;
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 0de1ef53..12c9b51e 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
@@ -10,7 +10,6 @@ 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;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
@@ -29,6 +28,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -38,7 +38,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping(value = "/jenis-waktu")
 public class JenisWaktuController extends LocaleController<JenisWaktuVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(JenisWaktuController.class);
+	private static final Logger LOGGER = getLogger(JenisWaktuController.class);
 
 	@Autowired
 	private JenisWaktuService jenisWaktuService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/K3CheckListFacillitySefetyController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/K3CheckListFacillitySefetyController.java
index eb95af2a..c9f3d94c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/K3CheckListFacillitySefetyController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/K3CheckListFacillitySefetyController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.K3CheckListFacillitySefetyService;
 import com.jasamedika.medifirst2000.vo.K3CheckListFacillitySefetyVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/k3-checklist-facillity-sefety")
 public class K3CheckListFacillitySefetyController extends LocaleController<K3CheckListFacillitySefetyVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(K3CheckListFacillitySefetyController.class);
+	private static final Logger LOGGER = getLogger(K3CheckListFacillitySefetyController.class);
 
 	@Autowired
 	private K3CheckListFacillitySefetyService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/K3LaporanKecelakaanKerjaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/K3LaporanKecelakaanKerjaController.java
index 2368bb01..f34c67c8 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/K3LaporanKecelakaanKerjaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/K3LaporanKecelakaanKerjaController.java
@@ -9,7 +9,6 @@ import com.jasamedika.medifirst2000.vo.LkkIdentifikasiKejadianVO;
 import com.jasamedika.medifirst2000.vo.LkkIdentifikasiKorbanVO;
 import com.jasamedika.medifirst2000.vo.LkkSaksiKejadianVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -26,6 +25,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -35,7 +35,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/k3-laporan-kecelakaan-kerja")
 public class K3LaporanKecelakaanKerjaController extends LocaleController<K3LaporanKecelakaanKerjaVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(K3LaporanKecelakaanKerjaController.class);
+	private static final Logger LOGGER = getLogger(K3LaporanKecelakaanKerjaController.class);
 
 	@Autowired
 	private K3LaporanKecelakaanKerjaService service;
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 b426ed0c..92e60358 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
@@ -14,7 +14,6 @@ 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;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.domain.Specifications;
@@ -35,6 +34,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 import static org.springframework.web.bind.annotation.RequestMethod.POST;
@@ -43,7 +43,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/kajian-evaluasi")
 public class KajianEvaluasiController extends LocaleController<KajianEvaluasiVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(KajianEvaluasiController.class);
+	private static final Logger LOGGER = getLogger(KajianEvaluasiController.class);
 
 	@Autowired
 	private KajianEvaluasiService evaluasiService;
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 54ffe4b0..92b78581 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
@@ -10,7 +10,6 @@ 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;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.domain.Specifications;
@@ -30,6 +29,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -39,7 +39,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/kamus-indikator")
 public class KamusIndikatorController extends LocaleController<KamusIndikatorVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(KamusIndikatorController.class);
+	private static final Logger LOGGER = getLogger(KamusIndikatorController.class);
 
 	@Autowired
 	private KamusIndikatorService kamusIndikatorService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KartuPengendaliController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KartuPengendaliController.java
index b704c841..b69e70db 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KartuPengendaliController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KartuPengendaliController.java
@@ -8,7 +8,6 @@ import com.jasamedika.medifirst2000.service.DetailAnggaranService;
 import com.jasamedika.medifirst2000.service.KartuPengendaliService;
 import com.jasamedika.medifirst2000.vo.*;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -29,6 +28,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -38,7 +38,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/kartu-pengendali")
 public class KartuPengendaliController extends LocaleController<KartuPengendaliVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(KartuPengendaliController.class);
+	private static final Logger LOGGER = getLogger(KartuPengendaliController.class);
 
 	@Autowired
 	private KartuPengendaliService service;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KategoryProdukController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KategoryProdukController.java
index ab341c05..da5badc4 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KategoryProdukController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KategoryProdukController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KategoryProdukService;
 import com.jasamedika.medifirst2000.vo.KategoryProdukVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -20,6 +19,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -28,7 +28,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 @RequestMapping(value = "/kategory-produk")
 public class KategoryProdukController extends LocaleController<KategoryProdukVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(KategoryProdukController.class);
+	private static final Logger LOGGER = getLogger(KategoryProdukController.class);
 
 	@Autowired
 	private KategoryProdukService kategoryProdukService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KebutuhanDasarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KebutuhanDasarController.java
index a4b10d51..dc4532be 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KebutuhanDasarController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KebutuhanDasarController.java
@@ -8,7 +8,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KebutuhanDasarService;
 import com.jasamedika.medifirst2000.vo.KebutuhanDasarVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -26,6 +25,7 @@ import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -41,7 +41,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class KebutuhanDasarController extends LocaleController<KebutuhanDasarVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(KebutuhanDasarController.class);
+	private static final Logger LOGGER = getLogger(KebutuhanDasarController.class);
 
 	@Autowired
 	private KebutuhanDasarService<KebutuhanDasar> kebutuhanDasarService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KelasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KelasController.java
index d3b47c3d..69959daf 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KelasController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KelasController.java
@@ -7,7 +7,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KelasService;
 import com.jasamedika.medifirst2000.vo.KelasVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.http.ResponseEntity;
@@ -25,6 +24,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -34,7 +34,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/kelas")
 public class KelasController extends LocaleController<KelasVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(KelasController.class);
+	private static final Logger LOGGER = getLogger(KelasController.class);
 
 	@Autowired
 	private KelasService<Kelas> kelasService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeluargaPegawaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeluargaPegawaiController.java
index 1468397d..7a1a97cd 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeluargaPegawaiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeluargaPegawaiController.java
@@ -5,7 +5,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KeluargaPegawaiService;
 import com.jasamedika.medifirst2000.vo.KeluargaPegawaiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -19,6 +18,7 @@ import javax.validation.Valid;
 import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -35,7 +35,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/keluarga-pegawai")
 public class KeluargaPegawaiController extends LocaleController<KeluargaPegawaiVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(KeluargaPegawaiController.class);
+	private static final Logger LOGGER = getLogger(KeluargaPegawaiController.class);
 
 	@Autowired
 	private KeluargaPegawaiService keluargaPegawaiService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeluhanPelangganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeluhanPelangganController.java
index c0943ae4..5f9cbb56 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeluhanPelangganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeluhanPelangganController.java
@@ -6,7 +6,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KeluhanPelangganService;
 import com.jasamedika.medifirst2000.vo.KeluhanPelangganVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
@@ -23,6 +22,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -32,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/keluhan-pelanggan")
 public class KeluhanPelangganController extends LocaleController<KeluhanPelangganVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(KeluhanPelangganController.class);
+	private static final Logger LOGGER = getLogger(KeluhanPelangganController.class);
 
 	@Autowired
 	private KeluhanPelangganService keluhanPelangganService;
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 a168d6ac..a5204e98 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
@@ -10,7 +10,6 @@ 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;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
@@ -29,6 +28,7 @@ import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR
 import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
@@ -38,7 +38,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.POST;
 @RequestMapping("/kemungkinan-resiko-terjadi")
 public class KemungkinanResikoTerjadiController extends LocaleController<KemungkinanResikoTerjadiVO> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(KemungkinanResikoTerjadiController.class);
+	private static final Logger LOGGER = getLogger(KemungkinanResikoTerjadiController.class);
 
 	@Autowired
 	private KemungkinanResikoTerjadiService kemungkinanService;
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeteranganSurveyController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeteranganSurveyController.java
index e5c39c02..a4572611 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeteranganSurveyController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KeteranganSurveyController.java
@@ -1,163 +1,78 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
+import com.jasamedika.medifirst2000.constants.MessageResource;
+import com.jasamedika.medifirst2000.controller.base.LocaleController;
+import com.jasamedika.medifirst2000.exception.ServiceVOException;
+import com.jasamedika.medifirst2000.service.KeteranganSurveyService;
+import com.jasamedika.medifirst2000.vo.KeteranganSurveyVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.KeteranganSurveyService;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.KeteranganSurveyVO;
-import com.jasamedika.medifirst2000.vo.SasaranStrategisVO;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.Map;
+
+import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE;
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR;
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
+import static org.springframework.http.HttpStatus.*;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
 @RestController
 @RequestMapping("keteranganSurvey")
-public class KeteranganSurveyController extends LocaleController<KeteranganSurveyVO> implements IBaseRestController<KeteranganSurveyVO>{
-	
+public class KeteranganSurveyController extends LocaleController<KeteranganSurveyVO> {
+
+	private static final Logger LOGGER = getLogger(KeteranganSurveyController.class);
+
 	@Autowired
 	private KeteranganSurveyService keteranganSurveyService;
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(KeteranganSurveyController.class);
-	
-	@RequestMapping(value = "/save-keterangan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> addVO(@Valid @RequestBody KeteranganSurveyVO vo, HttpServletRequest request) {
-		
+
+	@RequestMapping(value = "/save-keterangan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody KeteranganSurveyVO vo,
+			HttpServletRequest request) {
 		try {
-			Map<String,Object> result=keteranganSurveyService.addKeterangan(vo);
+			Map<String, Object> result = keteranganSurveyService.addKeterangan(vo);
 			if (null != result)
-			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+			return getJsonResponse(result, CREATED, mapHeaderMessage);
 		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when add keteranganSurvey", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
-					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
-					mapHeaderMessage);
+			LOGGER.error("Got ServiceVOException {} when addKeterangan", e.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when add keteranganSurvey", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
-					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
-					mapHeaderMessage);
+			LOGGER.error("Got JpaSystemException {} when addKeterangan", jse.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
-	
-	@RequestMapping(value = "/update-keterangan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> updateVO(@Valid @RequestBody KeteranganSurveyVO vo, HttpServletRequest request) {
-		
+
+	@RequestMapping(value = "/delete-keterangan/{id}", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> getAllInformasiKetersediaanKamar(@PathVariable("id") Integer id,
+			HttpServletRequest request) {
 		try {
-			Map<String,Object> result=keteranganSurveyService.updateKeterangan(vo);
-			if (null != result)
-			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
-		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when update keteranganSurvey", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
-					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
-					mapHeaderMessage);
-		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when update keteranganSurvey", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
-					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
-					mapHeaderMessage);
-		}
-	}
-	
-	@RequestMapping(value = "/find-all/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> getAllVO(HttpServletRequest request) {
-		
-		try {
-			Map<String,Object> result=keteranganSurveyService.findAllKeterangan();
-			if (null != result)
-			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
-		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when get all KeteranganSurvey", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
-					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
-					mapHeaderMessage);
-		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when get all KeteranganSurvey", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
-					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
-					mapHeaderMessage);
-		}
-	}
-	
-	@RequestMapping(value = "/delete-keterangan/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> getAllInformasiKetersediaanKamar(@PathVariable("id") Integer id,HttpServletRequest request) {
-		Map<String, Object> result = null;
-		try{
-			result = keteranganSurveyService.deleteKeterangan(id);
-			Boolean status=new Boolean((boolean) result.get("status"));
-			
-			if(status){
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
+			Map<String, Object> result = keteranganSurveyService.deleteKeterangan(id);
+			boolean status = (boolean) result.get("status");
+
+			if (status) {
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+			} else {
+				mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request));
 			}
-			else{
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
-			}
-		}catch (Exception e){
-			e.printStackTrace();
+			return getJsonResponse(result, OK);
+		} catch (Exception e) {
+			throw new ServiceVOException(e.getMessage());
 		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
-	}
-	
-	@Override
-	public ResponseEntity<Collection<KeteranganSurveyVO>> getAllVOWithQueryString(HttpServletRequest request,
-			Integer page, Integer limit, String sort, String dir) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<KeteranganSurveyVO> getVO(Integer id) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> addVO(KeteranganSurveyVO vo) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> editVO(KeteranganSurveyVO vo) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> deleteVO(Integer id) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<List<KeteranganSurveyVO>> getAllVO() {
-		return null;
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KetersediaanTempatTidurController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KetersediaanTempatTidurController.java
index 702df29e..2b0de28a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KetersediaanTempatTidurController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KetersediaanTempatTidurController.java
@@ -1,167 +1,97 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
+import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KetersediaanTempatTidurService;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.TempatTidurVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR;
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.springframework.http.HttpStatus.OK;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
 @RestController
 @RequestMapping("/ketersediaan-tempat-tidur")
 public class KetersediaanTempatTidurController extends LocaleController<TempatTidurVO> {
-	
+
 	@Autowired
 	private KetersediaanTempatTidurService ketersediaanTempatTidurService;
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(KetersediaanTempatTidurController.class);
-	
-	@RequestMapping(value = "/find-ketersediaan-tempat-tidur/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+
+	@RequestMapping(value = "/find-ketersediaan-tempat-tidur/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> findKetersediaanTempatTidur(HttpServletRequest request) {
-		Map<String, Object> result = null;
-		try{
-			result = ketersediaanTempatTidurService.countDataKetersediaanTempatTidur();
-			Boolean dataFound=new Boolean((boolean) result.get("dataFound"));
-			
-			if(dataFound){
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
+		try {
+			Map<String, Object> result = ketersediaanTempatTidurService.countDataKetersediaanTempatTidur();
+			boolean dataFound = (boolean) result.get("dataFound");
+			if (dataFound) {
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+			} else {
+				mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request));
 			}
-			else{
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
-			}
-		}catch (Exception e){
-			e.printStackTrace();
+			return getJsonResponse(result, OK);
+		} catch (Exception e) {
+			throw new ServiceVOException(e.getMessage());
 		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
 	}
-	
-	@RequestMapping(value = "/find-tempat-tidur-by-kelas-and-kamar/{idKamar}/{idKelas}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> findTempatTidurByKelasAndKamar(@PathVariable("idKamar") Integer idKamar,@PathVariable("idKelas") Integer idKelas, HttpServletRequest request) {
-		Map<String, Object> result = null;
-		try{
-			result = ketersediaanTempatTidurService.getTempatTidurByKamarAndKelas(idKamar, idKelas);
-			Boolean dataFound=new Boolean((boolean) result.get("dataFound"));
-			
-			if(dataFound){
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			}
-			else{
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
-			}
-		}catch (Exception e){
-			e.printStackTrace();
-		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
-	}
-	
-	@RequestMapping(value = "/count-tempat-tidur-by-kelas-and-kamar/{idKamar}/{idKelas}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> countTempatTidurByKelasAndKamar(@PathVariable("idKamar") Integer idKamar,@PathVariable("idKelas") Integer idKelas, HttpServletRequest request) {
-		Map<String, Object> result = null;
-		try{
-			result = ketersediaanTempatTidurService.countTempatTidurByKamarAndKelas(idKamar, idKelas);
-			Boolean dataFound=new Boolean((boolean) result.get("dataFound"));
-			
-			if(dataFound){
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			}
-			else{
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
-			}
-		}catch (Exception e){
-			e.printStackTrace();
-		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
-	}
-	
-	@RequestMapping(value = "/get-ruangan-rawat-inap/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+
+	@RequestMapping(value = "/get-ruangan-rawat-inap/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> countTempatTidurByKelasAndKamar(HttpServletRequest request) {
-		Map<String, Object> result = null;
-		try{
-			result = ketersediaanTempatTidurService.getRuanganRawatInap();
-			Boolean dataFound=new Boolean((boolean) result.get("dataFound"));
-			
-			if(dataFound){
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
+		try {
+			Map<String, Object> result = ketersediaanTempatTidurService.getRuanganRawatInap();
+			boolean dataFound = (boolean) result.get("dataFound");
+			if (dataFound) {
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+			} else {
+				mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request));
 			}
-			else{
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
-			}
-		}catch (Exception e){
-			e.printStackTrace();
+			return getJsonResponse(result, OK);
+		} catch (Exception e) {
+			throw new ServiceVOException(e.getMessage());
 		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
 	}
-	
-	@RequestMapping(value = "/find-kamar-by-ruangan-and-kelas/{idRuangan}/{idKelas}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> findKamarByRuanganAndKelas(@PathVariable("idRuangan") Integer idRuangan,@PathVariable("idKelas") Integer idKelas, HttpServletRequest request) {
-		Map<String, Object> result = null;
-		try{
-			result = ketersediaanTempatTidurService.getKamarByRuanganAndKelas(idRuangan, idKelas);
-			Boolean dataFound=new Boolean((boolean) result.get("dataFound"));
-			
-			if(dataFound){
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
+
+	@RequestMapping(value = "/find-kamar-by-ruangan-and-kelas/{idRuangan}/{idKelas}", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> findKamarByRuanganAndKelas(@PathVariable("idRuangan") Integer idRuangan,
+			@PathVariable("idKelas") Integer idKelas, HttpServletRequest request) {
+		try {
+			Map<String, Object> result = ketersediaanTempatTidurService.getKamarByRuanganAndKelas(idRuangan, idKelas);
+			boolean dataFound = (boolean) result.get("dataFound");
+			if (dataFound) {
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+			} else {
+				mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request));
 			}
-			else{
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
-			}
-		}catch (Exception e){
-			e.printStackTrace();
+			return getJsonResponse(result, OK);
+		} catch (Exception e) {
+			throw new ServiceVOException(e.getMessage());
 		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
 	}
-	
-	@RequestMapping(value = "/get-all-informasi-ketersediaan-kamar/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> getAllInformasiKetersediaanKamar(HttpServletRequest request) {
-		Map<String, Object> result = null;
-		try{
-			result = ketersediaanTempatTidurService.getAllInformasiKetersediaanKamar();
-			Boolean dataFound=new Boolean((boolean) result.get("dataFound"));
-			
-			if(dataFound){
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
+
+	@RequestMapping(value = "/get-kelas-by-ruangan/{idRuangan}/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> getKelasByRuangan(@PathVariable("idRuangan") Integer idRuangan,
+			HttpServletRequest request) {
+		try {
+			Map<String, Object> result = ketersediaanTempatTidurService.getKelasByRuangan(idRuangan);
+			boolean dataFound = (boolean) result.get("dataFound");
+			if (dataFound) {
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+			} else {
+				mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request));
 			}
-			else{
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
-			}
-		}catch (Exception e){
-			e.printStackTrace();
+			return getJsonResponse(result, OK);
+		} catch (Exception e) {
+			throw new ServiceVOException(e.getMessage());
 		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
-	}
-	
-	@RequestMapping(value = "/get-kelas-by-ruangan/{idRuangan}/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> getKelasByRuangan(@PathVariable("idRuangan") Integer idRuangan, HttpServletRequest request) {
-		Map<String, Object> result = null;
-		try{
-			result = ketersediaanTempatTidurService.getKelasByRuangan(idRuangan);
-			Boolean dataFound=new Boolean((boolean) result.get("dataFound"));
-			
-			if(dataFound){
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			}
-			else{
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
-			}
-		}catch (Exception e){
-			e.printStackTrace();
-		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
 	}
+
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimBarangController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimBarangController.java
deleted file mode 100644
index 49f54390..00000000
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimBarangController.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.jasamedika.medifirst2000.controller;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.KirimBarangService;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.KirimBarangVO;
-
-@RestController
-@RequestMapping("/kirim-barang")
-public class KirimBarangController extends LocaleController<KirimBarangVO> {
-
-	@Autowired
-	private KirimBarangService kirimBarangService;
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(KirimBarangController.class);
-
-	@RequestMapping(value = "/save-kirim-barang", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> saveKirimBarang(@Valid @RequestBody KirimBarangVO vo,
-			HttpServletRequest request) {
-		try {
-			Map<String, Object> result = kirimBarangService.saveKirimBarang(vo);
-			if (null != result)
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-						getMessage(MessageResource.LABEL_SUCCESS, request));
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
-		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when save Kirim Barang", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
-		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when save Kirim Barang", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
-		}
-
-	}
-
-	@RequestMapping(value = "/save-kirim-barang-baru", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> saveKirimBarangBaru(@Valid @RequestBody KirimBarangVO vo,
-			HttpServletRequest request) {
-		try {
-			Map<String, Object> result = kirimBarangService.saveKirimBarangBaru(vo);
-			if (null != result)
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-						getMessage(MessageResource.LABEL_SUCCESS, request));
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
-		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when save Kirim Barang", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
-		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when save Kirim Barang", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
-		}
-
-	}
-
-}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimDokumenPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimDokumenPasienController.java
index 33aea814..98065d2c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimDokumenPasienController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimDokumenPasienController.java
@@ -1,107 +1,59 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Map;
+import com.jasamedika.medifirst2000.constants.MessageResource;
+import com.jasamedika.medifirst2000.controller.base.LocaleController;
+import com.jasamedika.medifirst2000.exception.ServiceVOException;
+import com.jasamedika.medifirst2000.service.KirimDokumenPasienService;
+import com.jasamedika.medifirst2000.vo.MappingKirimDokumenPasienVO;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.orm.jpa.JpaSystemException;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.KirimDokumenPasienService;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.MappingKirimDokumenPasienVO;
+import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE;
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
+import static org.springframework.http.HttpStatus.*;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
 @RestController
 @RequestMapping("/kirim-dokumen-pasien")
 public class KirimDokumenPasienController extends LocaleController<MappingKirimDokumenPasienVO> {
 
+	private static final Logger LOGGER = getLogger(KirimDokumenPasienController.class);
+
 	@Autowired
 	private KirimDokumenPasienService service;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(KirimDokumenPasienController.class);
-
-	@RequestMapping(value = "/save-kirim-dokumen-pasien", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "/save-kirim-dokumen-pasien", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> saveKirimDokumenPasien(
 			@Valid @RequestBody MappingKirimDokumenPasienVO vo, HttpServletRequest request) {
 		try {
 			Map<String, Object> result = service.saveKirimDokumenPasien(vo);
 			if (null != result)
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-						getMessage(MessageResource.LABEL_SUCCESS, request));
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+			return getJsonResponse(result, CREATED, mapHeaderMessage);
 		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when saveKirimDokumenPasien", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			LOGGER.error("Got ServiceVOException {} when saveKirimDokumenPasien", e.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when saveKirimDokumenPasien", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			LOGGER.error("Got JpaSystemException {} when saveKirimDokumenPasien", jse.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
-
 	}
 
-	@RequestMapping(value = "/save-terima-dokumen-pasien", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> saveTerimaDokumenPasien(
-			@Valid @RequestBody MappingKirimDokumenPasienVO vo,
-			@RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) {
-		try {
-			Map<String, Object> result = service.saveTerimaDokumenPasien(vo, noRec);
-			if (null != result)
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-						getMessage(MessageResource.LABEL_SUCCESS, request));
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
-		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when saveTerimaDokumenPasien", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
-		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when saveTerimaDokumenPasien", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
-		}
-
-	}
-
-	@RequestMapping(value = "/save-kirim-balik-dokumen-pasien", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> saveKirimBalikDokumenPasien(
-			@Valid @RequestBody MappingKirimDokumenPasienVO vo,
-			@RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) {
-		try {
-			Map<String, Object> result = service.saveKirimBalikDokumenPasien(vo, noRec);
-			if (null != result)
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-						getMessage(MessageResource.LABEL_SUCCESS, request));
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
-		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when saveKirimBalikDokumenPasien", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
-		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when saveKirimBalikDokumenPasien", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
-		}
-
-	}
-
-	@RequestMapping(value = "/daftar-dokumen-rekam-medis-pasien", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "/daftar-dokumen-rekam-medis-pasien", method = GET, produces = APPLICATION_JSON_VALUE)
 	public Map<String, Object> getDaftarDokumenRekamMedisPasien(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "200") Integer limit,
@@ -118,14 +70,12 @@ public class KirimDokumenPasienController extends LocaleController<MappingKirimD
 			@RequestParam(value = "namaPasien", required = false) String namaPasien,
 			@RequestParam(value = "noCm", required = false) String noCm,
 			@RequestParam(value = "ruanganPasien", required = false) String ruanganPasien) {
-		Map<String, Object> resultPageMap = service.getDaftarDokumenRekamMedisPasien(page, limit, sort, dir,
-				dateStartMasuk, dateEndMasuk, dateStartPulang, dateEndPulang, ruanganPelayanan, idRuangan, idPasien,
-				namaPasien, noCm, ruanganPasien);
-
-		return resultPageMap;
+        return service.getDaftarDokumenRekamMedisPasien(page, limit, sort, dir,
+                dateStartMasuk, dateEndMasuk, dateStartPulang, dateEndPulang, ruanganPelayanan, idRuangan, idPasien,
+                namaPasien, noCm, ruanganPasien);
 	}
-	
-	@RequestMapping(value = "/daftar-dokumen-rekam-medis-pasien-terima", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+
+	@RequestMapping(value = "/daftar-dokumen-rekam-medis-pasien-terima", method = GET, produces = APPLICATION_JSON_VALUE)
 	public Map<String, Object> getDaftarDokumenRekamMedisPasienTerima(
 			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
 			@RequestParam(value = "take", required = false, defaultValue = "200") Integer limit,
@@ -142,37 +92,9 @@ public class KirimDokumenPasienController extends LocaleController<MappingKirimD
 			@RequestParam(value = "namaPasien", required = false) String namaPasien,
 			@RequestParam(value = "noCm", required = false) String noCm,
 			@RequestParam(value = "ruanganPasien", required = false) String ruanganPasien) {
-		Map<String, Object> resultPageMap = service.getDaftarDokumenRekamMedisPasienTerima(page, limit, sort, dir,
-				dateStartMasuk, dateEndMasuk, dateStartPulang, dateEndPulang, ruanganPelayanan, idRuangan, idPasien,
-				namaPasien, noCm, ruanganPasien);
-
-		return resultPageMap;
-	}
-
-	@RequestMapping(value = "/daftar-kirim-dokumen-rekam-medis-pasien", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public Map<String, Object> getDaftarKirimDokumenRekamMedisPasien(
-			@RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
-			@RequestParam(value = "take", required = false, defaultValue = "200") Integer limit,
-			@RequestParam(value = "sort", required = false, defaultValue = "namaPasien") String sort,
-			@RequestParam(value = "dir", required = false, defaultValue = "asc") String dir,
-			@RequestParam(value = "dateStartMasuk", required = false) String dateStartMasuk,
-			@RequestParam(value = "dateEndMasuk", required = false) String dateEndMasuk,
-			@RequestParam(value = "dateStartPulang", required = false) String dateStartPulang,
-			@RequestParam(value = "dateEndPulang", required = false) String dateEndPulang,
-			@RequestParam(value = "dateStartKirim", required = false) String dateStartKirim,
-			@RequestParam(value = "dateEndKirim", required = false) String dateEndKirim,
-			@RequestParam(value = "ruanganPelayanan", required = false) String ruanganPelayanan,
-			@RequestParam(value = "ruanganAsal", required = false) String ruanganAsal,
-			@RequestParam(value = "idRuangan", required = false) Integer idRuangan,
-			@RequestParam(value = "idPasien", required = false) Integer idPasien,
-			@RequestParam(value = "namaPasien", required = false) String namaPasien,
-			@RequestParam(value = "noCm", required = false) String noCm,
-			@RequestParam(value = "ruanganPasien", required = false) String ruanganPasien) {
-		Map<String, Object> resultPageMap = service.getDaftarKirimDokumenRekamMedisPasien(page, limit, sort, dir,
-				dateStartMasuk, dateEndMasuk, dateStartPulang, dateEndPulang, dateStartKirim, dateEndKirim,
-				ruanganPelayanan, ruanganAsal, idRuangan, idPasien, namaPasien, noCm, ruanganPasien);
-
-		return resultPageMap;
+        return service.getDaftarDokumenRekamMedisPasienTerima(page, limit, sort, dir,
+                dateStartMasuk, dateEndMasuk, dateStartPulang, dateEndPulang, ruanganPelayanan, idRuangan, idPasien,
+                namaPasien, noCm, ruanganPasien);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimPesananBarangController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimPesananBarangController.java
deleted file mode 100644
index 2568b8cd..00000000
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimPesananBarangController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*package com.jasamedika.medifirst2000.controller;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.StrukPelayananDetailService;
-import com.jasamedika.medifirst2000.service.StrukPelayananService;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.KirimPesananBarangVO;
-import com.jasamedika.medifirst2000.vo.PenerimaanBarangVO;
-
-@RestController
-@RequestMapping("/kirim-pesanan-barang")
-public class KirimPesananBarangController extends LocaleController<PenerimaanBarangVO> {
-
-	@Autowired
-	private StrukPelayananService strukPelayananService;
-	
-	@Autowired
-	private StrukPelayananDetailService strukPelayananDetailService;
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(KirimPesananBarangController.class);
-
-	@RequestMapping(value = "/save-kirim-pesanan-barang/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> savePenerimaanBarang(@Valid @RequestBody KirimPesananBarangVO vo,HttpServletRequest request,HttpServletResponse response) {
-		
-		try {
-			Map<String, Object> result = strukPelayananService.saveKirimPesananBarang(vo);
-			if (null != result)
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-						getMessage(MessageResource.LABEL_SUCCESS, request));
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
-		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when save Penerimaan Barang", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
-		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when save Penerimaan Barang", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
-		}
-
-	}
-	
-	
-
-}
-*/
\ No newline at end of file
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimProdukController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimProdukController.java
deleted file mode 100644
index 79d1757d..00000000
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KirimProdukController.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.jasamedika.medifirst2000.controller;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.KirimProdukService;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.KirimProdukVO;
-import com.jasamedika.medifirst2000.vo.KirimPesananBarangVO;
-
-@RestController
-@RequestMapping("/kirim-produk")
-public class KirimProdukController extends LocaleController<KirimPesananBarangVO> {
-
-	@Autowired
-	private KirimProdukService kirimProdukService;
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(KirimProdukController.class);
-
-	@RequestMapping(value = "/save-kirim-produk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> saveKirimProduk(@Valid @RequestBody KirimPesananBarangVO vo,
-			HttpServletRequest request) {
-		try {
-			Map<String, Object> result = kirimProdukService.saveKirimProduk(vo);
-			if (null != result)
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-						getMessage(MessageResource.LABEL_SUCCESS, request));
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
-		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when save Kirim Produk", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
-		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when save Kirim Produk", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
-		}
-
-	}
-
-
-
-}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KomponenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KomponenController.java
index d2a3a156..cb46783e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KomponenController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KomponenController.java
@@ -1,77 +1,46 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KomponenService;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.KomponenVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR;
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.springframework.http.HttpStatus.OK;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
 @RestController
 @RequestMapping("/komponen")
-public class KomponenController extends LocaleController<KomponenVO>{
-	
+public class KomponenController extends LocaleController<KomponenVO> {
+
 	@Autowired
 	private KomponenService komponenService;
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(KomponenController.class);
-	
-	@RequestMapping(value = "/save-komponen", 
-			method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> saveKomponen(@Valid @RequestBody KomponenVO vo, HttpServletRequest request) {
-		try {
-			Map<String,Object> result = komponenService.saveKomponen(vo);
-			if (null != result)
-			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request));
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
 
-		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when saveKomponen", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
-		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when saveKomponen", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
-		}
-	}
-	
-	@RequestMapping(value = "/find-all-komponen", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "/find-all-komponen", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> findAllKomponen(HttpServletRequest request) {
-		Map<String, Object> result=null;
 		try {
-			result = komponenService.findAllKomponen();
-			Boolean dataFound = new Boolean((boolean) result.get("dataFound"));
-			
+			Map<String, Object> result = komponenService.findAllKomponen();
+			boolean dataFound = (boolean) result.get("dataFound");
 			if (dataFound) {
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			} else {
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request));
+				mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request));
 			}
-		}catch(Exception ex){
-			ex.printStackTrace();
+			return getJsonResponse(result, OK);
+		} catch (Exception ex) {
+			throw new ServiceVOException(ex.getMessage());
 		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KomponenEvaluasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KomponenEvaluasiController.java
index 22c9bf48..7dfcdf6d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KomponenEvaluasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KomponenEvaluasiController.java
@@ -1,134 +1,63 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
+import com.jasamedika.medifirst2000.constants.MessageResource;
+import com.jasamedika.medifirst2000.controller.base.LocaleController;
+import com.jasamedika.medifirst2000.exception.ServiceVOException;
+import com.jasamedika.medifirst2000.service.KomponenEvaluasiService;
+import com.jasamedika.medifirst2000.vo.KomponenEvaluasiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.KomponenEvaluasi;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.KomponenEvaluasiService;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.KomponenEvaluasiVO;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE;
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
+import static org.springframework.http.HttpStatus.*;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
 @RestController
 @RequestMapping("/komponen-evaluasi")
-public class KomponenEvaluasiController extends LocaleController<KomponenEvaluasiVO>    {
-	
+public class KomponenEvaluasiController extends LocaleController<KomponenEvaluasiVO> {
+
+	private static final Logger LOGGER = getLogger(KomponenEvaluasiController.class);
+
 	@Autowired
 	private KomponenEvaluasiService komponenEvaluasiService;
-	
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(KomponenEvaluasiController.class);
 
- 
-	@RequestMapping(value = "/save/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<String> addVO(@RequestBody KomponenEvaluasiVO vo,HttpServletRequest request) {
+	@RequestMapping(value = "/save/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
+	public ResponseEntity<String> addVO(@RequestBody KomponenEvaluasiVO vo, HttpServletRequest request) {
 		try {
-			KomponenEvaluasiVO result = (KomponenEvaluasiVO) komponenEvaluasiService.add(vo); 
-
-			if (null != result)				
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-				return RestUtil.getJsonResponse("", HttpStatus.CREATED,mapHeaderMessage);
-		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when add KomponenEvaluasi", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
-					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
-					mapHeaderMessage);
-		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when add KomponenEvaluasi", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
-					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
-					mapHeaderMessage);
-		}
-		
-	}
-
-	@RequestMapping(value = "/update/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<String> editVO(@Valid @RequestBody KomponenEvaluasiVO vo) {
-		try {
-			KomponenEvaluasiVO result = (KomponenEvaluasiVO) komponenEvaluasiService.update(vo);
-
+			KomponenEvaluasiVO result = komponenEvaluasiService.add(vo);
 			if (null != result)
-				return RestUtil.getJsonResponse("", HttpStatus.OK);
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+			return getJsonResponse("", CREATED, mapHeaderMessage);
 		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when update KomponenEvaluasi", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
-					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
-					mapHeaderMessage);
+			LOGGER.error("Got ServiceVOException {} when add", e.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when update KomponenEvaluasi",
-					jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
-					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
-					mapHeaderMessage);
+			LOGGER.error("Got JpaSystemException {} when add", jse.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
-
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
-	@RequestMapping(value = "/delete/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<String> deleteVO(Integer id) {
-		try {
-			if (komponenEvaluasiService.delete(id) == true)
-				return RestUtil.getJsonResponse("", HttpStatus.CREATED);
-
-		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when delete KomponenEvaluasi", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
-					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
-					mapHeaderMessage);
-		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when delete KomponenEvaluasi", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
-					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
-					mapHeaderMessage);
-		}
-
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+	@RequestMapping(value = "/get-all", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<List<Map<String, Object>>> getAllVO() {
+		List<Map<String, Object>> result = komponenEvaluasiService.findAll();
+		return getJsonResponse(result, OK);
 	}
 
-	@RequestMapping(value = "/get-all", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<List<Map<String,Object>>> getAllVO() {
-		List<Map<String,Object>> result = komponenEvaluasiService.findAll();
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
-	}
-
-	
-	 
-	@SuppressWarnings("unchecked")
-	@RequestMapping(value = "/find-by-id", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<KomponenEvaluasi> getAllVOWithQueryString(@RequestParam(value = "id", required = true) Integer id){
-		KomponenEvaluasi result=komponenEvaluasiService.findById(id);
-
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
-	}
-	
-
-	 
-
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KomunikasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KomunikasiController.java
index 837e91b2..3ad04158 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KomunikasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KomunikasiController.java
@@ -1,58 +1,57 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
+import com.jasamedika.medifirst2000.constants.MessageResource;
+import com.jasamedika.medifirst2000.controller.base.LocaleController;
+import com.jasamedika.medifirst2000.exception.ServiceVOException;
+import com.jasamedika.medifirst2000.service.KomunikasiService;
+import com.jasamedika.medifirst2000.vo.KomunikasiVO;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.KomunikasiService;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.KomunikasiVO;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.Map;
+
+import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE;
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
+import static org.springframework.http.HttpStatus.*;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
 @RestController
 @RequestMapping("/komunikasi")
-public class KomunikasiController  extends LocaleController<KomunikasiVO> {
-	
-	@Autowired
-	private KomunikasiService service;	
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(KomunikasiController.class);
-	
-	@RequestMapping(value = "/save-komunikasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> saveKomunikasi(@Valid @RequestBody KomunikasiVO vo,HttpServletRequest request) {
-		try {
-			Map<String,Object> result = service.saveKomunikasi(vo);
-			if (null != result)
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request));
-				return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
+public class KomunikasiController extends LocaleController<KomunikasiVO> {
 
+	private static final Logger LOGGER = getLogger(KomunikasiController.class);
+
+	@Autowired
+	private KomunikasiService service;
+
+	@RequestMapping(value = "/save-komunikasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> saveKomunikasi(@Valid @RequestBody KomunikasiVO vo,
+			HttpServletRequest request) {
+		try {
+			Map<String, Object> result = service.saveKomunikasi(vo);
+			if (null != result)
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+			return getJsonResponse(result, CREATED, mapHeaderMessage);
 		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when saveKomunikasi", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			LOGGER.error("Got ServiceVOException {} when saveKomunikasi", e.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when saveKomunikasi", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			LOGGER.error("Got JpaSystemException {} when saveKomunikasi", jse.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
-
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsepDiriController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsepDiriController.java
index 595bacac..b88d0291 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsepDiriController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsepDiriController.java
@@ -1,37 +1,33 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.jasamedika.medifirst2000.constants.MessageResource;
+import com.jasamedika.medifirst2000.controller.base.LocaleController;
+import com.jasamedika.medifirst2000.entities.KonsepDiri;
+import com.jasamedika.medifirst2000.exception.ServiceVOException;
+import com.jasamedika.medifirst2000.service.KonsepDiriService;
+import com.jasamedika.medifirst2000.vo.KonsepDiriVO;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.orm.jpa.JpaSystemException;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
+import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.KonsepDiriService;
-import com.jasamedika.medifirst2000.util.DateUtil;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.KonsepDiriVO;
+import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE;
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR;
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
+import static org.springframework.http.HttpStatus.*;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
 /**
  * Controller class for KonsepDiriController
@@ -40,70 +36,34 @@ import com.jasamedika.medifirst2000.vo.KonsepDiriVO;
  */
 @RestController
 @RequestMapping("/konsep-diri")
-@JsonIgnoreProperties(ignoreUnknown = true) 
-public class KonsepDiriController extends LocaleController<KonsepDiriVO> implements
-		IBaseRestController<KonsepDiriVO> {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(KonsepDiriController.class);
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class KonsepDiriController extends LocaleController<KonsepDiriVO> {
+
+	private static final Logger LOGGER = getLogger(KonsepDiriController.class);
 
 	@Autowired
-	private KonsepDiriService konsepDiriService;
+	private KonsepDiriService<KonsepDiri> konsepDiriService;
 
-	@RequestMapping(value = "/save-konsep-diri", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> save(@Valid @RequestBody KonsepDiriVO vo,HttpServletRequest request) {
+	@RequestMapping(value = "/save-konsep-diri", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody KonsepDiriVO vo, HttpServletRequest request) {
 		try {
-			Map<String,Object> result = konsepDiriService.addKonsepDiri(vo);
-
-			if (null != result){
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			}else{
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
+			Map<String, Object> result = konsepDiriService.addKonsepDiri(vo);
+			if (null != result) {
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+			} else {
+				mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request));
 			}
-			SaveLog("Konsep Diri", "Pemeriksaan",request);
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
-
+			SaveLog("Konsep Diri", "Pemeriksaan", request);
+			return getJsonResponse(result, CREATED, mapHeaderMessage);
 		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			LOGGER.error("Got ServiceVOException {} when addKonsepDiri", e.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			LOGGER.error("Got JpaSystemException {} when addKonsepDiri", jse.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
-
 	}
 
-	@Override
-	public ResponseEntity<Collection<KonsepDiriVO>> getAllVOWithQueryString(HttpServletRequest request,
-			Integer page, Integer limit, String sort, String dir) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<KonsepDiriVO> getVO(Integer id) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> addVO(KonsepDiriVO vo) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> editVO(KonsepDiriVO vo) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> deleteVO(Integer id) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<List<KonsepDiriVO>> getAllVO() {
-		return null;
-	}
-
-	
 }
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 304df597..70d45354 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
@@ -1,38 +1,37 @@
 package com.jasamedika.medifirst2000.controller;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.jasamedika.medifirst2000.constants.MessageResource;
+import com.jasamedika.medifirst2000.controller.base.LocaleController;
+import com.jasamedika.medifirst2000.entities.Konsultasi;
+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.KonsultasiVO;
+import com.jasamedika.medifirst2000.vo.PasienVO;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.orm.jpa.JpaSystemException;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.KonsultasiService;
-import com.jasamedika.medifirst2000.service.RegistrasiPelayananService;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.GridAntrianPasienDiPeriksaVO;
-import com.jasamedika.medifirst2000.vo.KonsultasiVO;
+import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE;
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR;
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.slf4j.LoggerFactory.getLogger;
+import static org.springframework.http.HttpStatus.*;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.POST;
 
 /**
  * Controller class for KonsultasiController
@@ -41,46 +40,42 @@ import com.jasamedika.medifirst2000.vo.KonsultasiVO;
  */
 @RestController
 @RequestMapping("/konsultasi")
-@JsonIgnoreProperties(ignoreUnknown = true) 
-public class KonsultasiController extends LocaleController<KonsultasiVO> implements
-		IBaseRestController<KonsultasiVO> {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(KonsultasiController.class);
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class KonsultasiController extends LocaleController<KonsultasiVO> {
+
+	private static final Logger LOGGER = getLogger(KonsultasiController.class);
 
 	@Autowired
-	private KonsultasiService konsultasiService;
+	private KonsultasiService<Konsultasi> konsultasiService;
 
 	@Autowired
-	private RegistrasiPelayananService registrasiPelayananService;
+	private RegistrasiPelayananService<RegistrasiPelayananPasien> registrasiPelayananService;
 
-	@RequestMapping(value = "/save-konsultasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> save(@Valid @RequestBody KonsultasiVO vo,HttpServletRequest request) {
+	@RequestMapping(value = "/save-konsultasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody KonsultasiVO vo, HttpServletRequest request) {
 		try {
-			Map<String,Object> result = konsultasiService.addKonsultasi2(vo);
-			if (null != result){
-				mapHeaderMessage.clear();
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			}else{
-				mapHeaderMessage.clear();
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
+			Map<String, Object> result = konsultasiService.addKonsultasi2(vo);
+			mapHeaderMessage.clear();
+			if (null != result) {
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+			} else {
+				mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request));
 			}
-			SaveLog("Konsultasi", "Dokter",request);
-			return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
-
+			SaveLog("Konsultasi", "Dokter", request);
+			return getJsonResponse(result, CREATED, mapHeaderMessage);
 		} catch (ServiceVOException e) {
-			LOGGER.error("Got exception {} when add kebutuhan dasar", e.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			LOGGER.error("Got ServiceVOException {} when addKonsultasi2", e.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
-			LOGGER.error("Got exception {} when add kebutuhan dasar", jse.getMessage());
-			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			LOGGER.error("Got JpaSystemException {} when addKonsultasi2", jse.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
-
 	}
-	
-	@RequestMapping(value = "/antrian-pasien-list-konsul/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<GridAntrianPasienDiPeriksaVO>> getAllVOWithQueryString(
+
+	@RequestMapping(value = "/antrian-pasien-list-konsul/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Collection<PasienVO>> 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,
@@ -90,56 +85,22 @@ public class KonsultasiController extends LocaleController<KonsultasiVO> impleme
 			@RequestParam(value = "dateEnd", required = false) String dateEnd,
 			@RequestParam(value = "noCm", required = false) String noCm,
 			@RequestParam(value = "pegawaiId", required = false) Integer pegawaiId) {
-		Map<String, Object> resultPageMap = registrasiPelayananService.findAllAntrianPagingKonsultasi(page, limit, sort, dir,
-				ruanganId, dateStart, dateEnd, noCm, pegawaiId);
-
+		Map<String, Object> resultPageMap = registrasiPelayananService.findAllAntrianPagingKonsultasi(page, limit, sort,
+				dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId);
 		return constructListPageResult(resultPageMap);
 	}
 
-	@Override
-	public ResponseEntity<Collection<KonsultasiVO>> getAllVOWithQueryString(HttpServletRequest request,
-			Integer page, Integer limit, String sort, String dir) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<KonsultasiVO> getVO(Integer id) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> addVO(KonsultasiVO vo) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> editVO(KonsultasiVO vo) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> deleteVO(Integer id) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<List<KonsultasiVO>> getAllVO() {
-		return null;
-	}
-	
-	@RequestMapping(value = "/get-riwayat-konsultasi/{noCm}/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<List<Map<String, Object>>> getRiwayatKonsultasi(@PathVariable("noCm") String noCm,@PathVariable("startDate") String startDate,
-			@PathVariable("endDate") String endDate,HttpServletRequest request) {
-		List<Map<String, Object>> result = null;
+	@RequestMapping(value = "/get-riwayat-konsultasi/{noCm}/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<List<Map<String, Object>>> getRiwayatKonsultasi(@PathVariable("noCm") String noCm,
+			@PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate,
+			HttpServletRequest request) {
 		try {
-			
-			result = konsultasiService.getRiwayatKonsultasi(noCm, startDate, endDate);
-
-			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-					getMessage(MessageResource.LABEL_SUCCESS, request));
+			List<Map<String, Object>> result = konsultasiService.getRiwayatKonsultasi(noCm, startDate, endDate);
+			mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+			return getJsonResponse(result, OK);
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
 	}
+
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakController.java
index f6683345..7a2ba69b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KontrakController.java
@@ -50,11 +50,11 @@ public class KontrakController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save kontrak", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save kontrak", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -71,11 +71,11 @@ public class KontrakController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save kontrak", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save kontrak", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
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 cda80911..5433b474 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
@@ -29,12 +29,10 @@ import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.entities.KontrakKinerja;
-import com.jasamedika.medifirst2000.entities.MappingJenisRisikoSasaranStrategis;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KontrakKinerjaService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.KontrakKinerjaVO;
-import com.jasamedika.medifirst2000.vo.MappingJenisRisikoSasaranStrategisVO;
 
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
@@ -61,13 +59,13 @@ public class KontrakKinerjaController extends LocaleController<KontrakKinerjaVO>
 			LOGGER.error("Got exception {} when add Kontrak Kinerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Kontrak Kinerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -84,13 +82,13 @@ public class KontrakKinerjaController extends LocaleController<KontrakKinerjaVO>
 			LOGGER.error("Got exception {} when update Kontrak Kinerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Kontrak Kinerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -107,13 +105,13 @@ public class KontrakKinerjaController extends LocaleController<KontrakKinerjaVO>
 			LOGGER.error("Got exception {} when get all Kontrak Kinerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all Kontrak Kinerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -177,14 +175,14 @@ public class KontrakKinerjaController extends LocaleController<KontrakKinerjaVO>
 			LOGGER.error("Got exception {} when add/update Kontrak Kinerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update Kontrak Kinerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonversiSatuanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonversiSatuanController.java
index 59f9ff3e..6940d3a0 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonversiSatuanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonversiSatuanController.java
@@ -64,7 +64,7 @@ public class KonversiSatuanController extends LocaleController<KonversiSatuanVO>
 		if (result.get("data") != null) {			
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.NOT_FOUND);
+			return RestUtil.getJsonHttpStatus(HttpStatus.NOT_FOUND);
 		}
 	}
 	
@@ -121,7 +121,7 @@ public class KonversiSatuanController extends LocaleController<KonversiSatuanVO>
 		if (result.get("noRec") != null) {			
 			return ResponseEntity.ok().body(result);
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.NOT_FOUND);
+			return RestUtil.getJsonHttpStatus(HttpStatus.NOT_FOUND);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java
index fa0c1d47..81544321 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java
@@ -14,11 +14,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -29,7 +27,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KopingService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.KopingVO;
 
@@ -65,11 +62,11 @@ public class KopingController extends LocaleController<KopingVO> implements
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaboratoriumController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaboratoriumController.java
index a457d6c1..e3e54371 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaboratoriumController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaboratoriumController.java
@@ -1,39 +1,27 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.entities.LisOrderSysmex;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PelayananLaboratoriumService;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO;
-import com.jasamedika.medifirst2000.vo.SuratPermintaanMasukVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.springframework.http.HttpStatus.NOT_FOUND;
+import static org.springframework.http.HttpStatus.OK;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
 /**
  * Controller
@@ -46,99 +34,68 @@ public class LaboratoriumController extends LocaleController<AntrianPasienRegist
 	@Autowired
 	private PelayananLaboratoriumService pelayananLaboratoriumService;
 
-	@RequestMapping(value = "/get-result-detail-laboratorium/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "/get-result-detail-laboratorium/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<Map<String, Object>>> getResultLaboratorium(
 			@RequestParam(value = "noOrder", required = false) String noOrder, HttpServletRequest request) {
-		List<Map<String, Object>> result = null;
 		try {
-			result = pelayananLaboratoriumService.getResultOnly(noOrder);
+			List<Map<String, Object>> result = pelayananLaboratoriumService.getResultOnly(noOrder);
 			if (null != result) {
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-						getMessage(MessageResource.LABEL_SUCCESS, request));
-				return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+				return getJsonResponse(result, OK, mapHeaderMessage);
 			} else {
-				return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage);
+				return getJsonResponse(null, NOT_FOUND, mapHeaderMessage);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
 	}
 
-	@RequestMapping(value = "/get-result-detail-laboratorium-history/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "/get-result-detail-laboratorium-history/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> getResultLaboratoriumHistory(
 			@RequestParam(value = "noOrder", required = false) String noOrder, HttpServletRequest request) {
-		Map<String, Object> result = null;
 		try {
-			result = pelayananLaboratoriumService.getResultWithHistory(noOrder);
+			Map<String, Object> result = pelayananLaboratoriumService.getResultWithHistory(noOrder);
 			if (null != result) {
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-						getMessage(MessageResource.LABEL_SUCCESS, request));
-				return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+				return getJsonResponse(result, OK, mapHeaderMessage);
 			} else {
-				return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage);
+				return getJsonResponse(null, NOT_FOUND, mapHeaderMessage);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
 	}
 
-	@RequestMapping(value = "/order-sysmex", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	@RequestMapping(value = "/order-sysmex", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<LisOrderSysmex> OrderSysmex(@RequestParam(value = "noOrder", required = false) String noOrder,
 			HttpServletRequest request) {
-		LisOrderSysmex result = new LisOrderSysmex();
 		try {
-			result = pelayananLaboratoriumService.SaveOrderToLisOrder(noOrder);
+			LisOrderSysmex result = pelayananLaboratoriumService.SaveOrderToLisOrder(noOrder);
 			if (null != result) {
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-						getMessage(MessageResource.LABEL_SUCCESS, request));
-				return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+				return getJsonResponse(result, OK, mapHeaderMessage);
 			} else {
-				return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage);
+				return getJsonResponse(null, NOT_FOUND, mapHeaderMessage);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
 	}
 
-	@RequestMapping(value = "/order-hasil", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> sysmexToHasil(
-			@RequestParam(value = "noOrder", required = false) String noOrder, HttpServletRequest request) {
-		Map<String, Object> result = new HashMap<>();
+	@RequestMapping(value = "/get-hd-lab", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> getHd(@RequestParam(value = "noOrder", required = false) String noOrder,
+			HttpServletRequest request) {
 		try {
-			result = pelayananLaboratoriumService.SaveResdtToHasilPemeriksaan(noOrder);
+			Map<String, Object> result = pelayananLaboratoriumService.cekDataResDt(noOrder);
 			if (null != result) {
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-						getMessage(MessageResource.LABEL_SUCCESS, request));
-				return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
+				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+				return getJsonResponse(result, OK, mapHeaderMessage);
 			} else {
-				return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage);
+				return getJsonResponse(null, NOT_FOUND, mapHeaderMessage);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
-	}
-	
-	
-	@RequestMapping(value = "/get-hd-lab", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> getHd(
-			@RequestParam(value = "noOrder", required = false) String noOrder, HttpServletRequest request) {
-		Map<String, Object> result = new HashMap<>();
-		try {
-			result = pelayananLaboratoriumService.cekDataResDt(noOrder);
-			if (null != result) {
-				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
-						getMessage(MessageResource.LABEL_SUCCESS, request));
-				return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
-			} else {
-				return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return RestUtil.getJsonResponse(result, HttpStatus.OK);
 	}
+
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LapPembedahanDanInstruksiPascaBedahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LapPembedahanDanInstruksiPascaBedahController.java
index 067eb88f..4e08b365 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LapPembedahanDanInstruksiPascaBedahController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LapPembedahanDanInstruksiPascaBedahController.java
@@ -117,13 +117,13 @@ public class LapPembedahanDanInstruksiPascaBedahController extends LocaleControl
 
 			LOGGER.error("Got exception {} when savePascaBedah", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePascaBedah", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	
@@ -148,12 +148,12 @@ public class LapPembedahanDanInstruksiPascaBedahController extends LocaleControl
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataByNoTrans", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataByNoTrans", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -178,12 +178,12 @@ public class LapPembedahanDanInstruksiPascaBedahController extends LocaleControl
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPasienDaftarOperasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPasienDaftarOperasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -207,12 +207,12 @@ public class LapPembedahanDanInstruksiPascaBedahController extends LocaleControl
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getMacamInfus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getMacamInfus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java
index 3828a253..e638de58 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java
@@ -1,6 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -9,7 +8,6 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -18,7 +16,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.Constants;
@@ -26,16 +23,11 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.dao.LaporanUjiHasilDao;
-import com.jasamedika.medifirst2000.entities.Rekanan;
-import com.jasamedika.medifirst2000.entities.Ruangan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.LaporanUjiHasilService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.LaporanUjiHasilVO;
 
-import net.kaczmarzyk.spring.data.jpa.domain.LessThanOrEqual;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
-
 @RestController
 @RequestMapping("/laporan-uji-hasil")
 public class LaporanUjiHasilController extends LocaleController<LaporanUjiHasilVO> {
@@ -61,14 +53,14 @@ public class LaporanUjiHasilController extends LocaleController<LaporanUjiHasilV
 			LOGGER.error("Got exception {} when add laporan uji hasil", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add laporan uji hasil", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -109,11 +101,11 @@ public class LaporanUjiHasilController extends LocaleController<LaporanUjiHasilV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaundryController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaundryController.java
index 0d50827f..51211e20 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaundryController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaundryController.java
@@ -7,9 +7,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.repository.query.Param;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -56,7 +54,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	//savePermintaanLaundryInternal
 	@RequestMapping(value="/save-penerimaan-linen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -68,7 +66,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/generate-no-struk", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -79,7 +77,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -90,7 +88,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-satuan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -101,7 +99,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-all-penerimaan-linen-filter", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -117,7 +115,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	private String changeTimeEndPeriode(String endPeriode) {
@@ -144,7 +142,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-kapasitas-bahan-mesin", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -157,7 +155,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-bahan-from-mesin-proses", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -171,7 +169,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/save-proses-cuci", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -183,7 +181,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pencucian", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -199,7 +197,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/send-cuci-bilas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -211,7 +209,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-proses-bilas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -224,7 +222,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-pembilasan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -236,7 +234,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pembilasan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -257,7 +255,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-pengeringan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -269,7 +267,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pengeringan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -286,7 +284,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-produk-pelipatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -298,7 +296,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-pelipatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -310,7 +308,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pelipatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -327,7 +325,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/cek-stok-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -339,7 +337,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/cek-produk-pelipatan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -351,7 +349,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-produk-penerimaan-linen-external", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -363,7 +361,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-detail-penerimaan-linen-external", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -376,7 +374,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-penerimaan-linen-external", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -388,7 +386,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/send-pengeringan-to-pelipatan-external", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -400,7 +398,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-satuan-potong", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -411,7 +409,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pembilasan-to-pengeringan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -425,7 +423,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pengeringan-to-pelipatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -439,7 +437,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-struk-order-laundry-eksternal", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -452,7 +450,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-all-pengambilan-eksternal", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -470,7 +468,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-pengambilan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -482,7 +480,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/retur-laundry", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -494,7 +492,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-retur-linen", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -508,7 +506,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-retur-linen", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -523,7 +521,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-no-cm-laundry", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -535,7 +533,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	
@@ -550,7 +548,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	//sesuai dengan meeting tgl.11.07.2018
@@ -566,7 +564,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	
@@ -584,7 +582,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	//digunakan untuk getData Pengambilan linen Kotor dari Ruangan
@@ -673,7 +671,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/save-proses-cuci-internal", 
@@ -687,7 +685,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/save-proses-cuci-external", 
@@ -701,7 +699,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-proses-cuci",
@@ -750,7 +748,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/save-proses-pengeringan-external", 
@@ -763,7 +761,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-proses-pengeringan",
@@ -812,7 +810,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/save-proses-pelipatan-external", 
@@ -825,7 +823,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-proses-pelipatan",
@@ -878,7 +876,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/save-proses-rollpress-external", 
@@ -891,7 +889,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-proses-rollpress",
@@ -960,7 +958,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-distribusi-linen-bersih", 
@@ -993,7 +991,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	
@@ -1059,7 +1057,7 @@ public class LaundryController extends LocaleController<KirimProdukVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-jenis-linen", 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LembarKonsultasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LembarKonsultasiController.java
index f6c58e97..26574b08 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LembarKonsultasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LembarKonsultasiController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -15,7 +14,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -29,7 +27,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.LembarKonsultasiService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.LembarKonsultasiVO;
 
@@ -65,13 +62,13 @@ IBaseRestController<LembarKonsultasiVO>{
 			LOGGER.error("Got exception {} when add Lembar Konsultasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Lembar Konsultasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -87,13 +84,13 @@ IBaseRestController<LembarKonsultasiVO>{
 			LOGGER.error("Got exception {} when update Lembar Konsultasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Lembar Konsultasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LevelTingkatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LevelTingkatController.java
index 0904678d..6d103059 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LevelTingkatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LevelTingkatController.java
@@ -38,7 +38,7 @@ public class LevelTingkatController extends LocaleController<PegawaiSKGajiVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-level-tingkat", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -51,7 +51,7 @@ public class LevelTingkatController extends LocaleController<PegawaiSKGajiVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-level-tingkat", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -63,7 +63,7 @@ public class LevelTingkatController extends LocaleController<PegawaiSKGajiVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-departemen", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -75,7 +75,7 @@ public class LevelTingkatController extends LocaleController<PegawaiSKGajiVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java
index 17a30878..ba348924 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java
@@ -1,6 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -54,14 +53,14 @@ public class LimbahB3KeluarController extends LocaleController<LimbahB3KeluarVO>
 			LOGGER.error("Got exception {} when add limbah b3 keluar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add limbah b3 keluar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -78,14 +77,14 @@ public class LimbahB3KeluarController extends LocaleController<LimbahB3KeluarVO>
 			LOGGER.error("Got exception {} when add limbah b3 keluar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add limbah b3 keluar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -102,13 +101,13 @@ public class LimbahB3KeluarController extends LocaleController<LimbahB3KeluarVO>
 			   LOGGER.error("Got exception {} when get all limbah b3 keluar", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get all limbah b3 keluar", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
@@ -124,17 +123,17 @@ public class LimbahB3KeluarController extends LocaleController<LimbahB3KeluarVO>
 			LOGGER.error("Got exception {} when delete Limbah b3 keluar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when delete Limbah b3 keluar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 	
 	@RequestMapping(value = "/find-by-periode", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -197,13 +196,13 @@ public class LimbahB3KeluarController extends LocaleController<LimbahB3KeluarVO>
 			   LOGGER.error("Got exception {} when get total LimbahB3Masuk", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get total LimbahB3Masuk", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
@@ -223,13 +222,13 @@ public class LimbahB3KeluarController extends LocaleController<LimbahB3KeluarVO>
 			   LOGGER.error("Got exception {} when get total LimbahB3Masuk", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get total LimbahB3Masuk", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LoginUserController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LoginUserController.java
index 4ab54133..89bed1cc 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LoginUserController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LoginUserController.java
@@ -86,30 +86,30 @@ public class LoginUserController extends LocaleController<LoginUserVO> {
 					} else {
 						LOGGER.error("Got exception {} when update password User failed");
 						addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "update password User failed");
-						return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+						return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 					}
 				}else{
 					LOGGER.error("Got exception {} when update Pegawai, password invalid");
 					addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Invalid Password");
-					return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+					return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 				}
 			} else {
 				LOGGER.error("Got exception {} when update Pegawai");
 				addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "User is unauthorized");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when update password User", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update password User", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} catch (Exception ex) {
 			LOGGER.error("Got exception {} when update password User", ex.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, ex.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 //		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
@@ -126,14 +126,14 @@ public class LoginUserController extends LocaleController<LoginUserVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when update User", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update User", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 	@SuppressWarnings("unchecked")
@@ -223,11 +223,11 @@ public class LoginUserController extends LocaleController<LoginUserVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadData", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadData", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -246,11 +246,11 @@ public class LoginUserController extends LocaleController<LoginUserVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveLoginUser", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveLoginUser", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManagementController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManagementController.java
index 047a769c..85c72cf4 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManagementController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManagementController.java
@@ -52,11 +52,11 @@ public class ManagementController extends LocaleController<AkunVO> {
 			} catch (ServiceVOException e) {
 				LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 				addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			} catch (JpaSystemException jse) {
 				LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 				addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-				return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			}
 
 		}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManajemenPromosiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManajemenPromosiController.java
index ed968678..754ad59a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManajemenPromosiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ManajemenPromosiController.java
@@ -51,13 +51,13 @@ public class ManajemenPromosiController extends LocaleController<ManajemenPromos
 			LOGGER.error("Got exception {} when add ManajemenPromosi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add ManajemenPromosi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -74,13 +74,13 @@ public class ManajemenPromosiController extends LocaleController<ManajemenPromos
 			LOGGER.error("Got exception {} when update ManajemenPromosi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update ManajemenPromosi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -97,13 +97,13 @@ public class ManajemenPromosiController extends LocaleController<ManajemenPromos
 			LOGGER.error("Got exception {} when get all sasaran strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all sasaran strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapJenisDietToProdukController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapJenisDietToProdukController.java
index c6348928..75a9fcab 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapJenisDietToProdukController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapJenisDietToProdukController.java
@@ -12,14 +12,12 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.dto.MapJenisDietToProdukDto;
-import com.jasamedika.medifirst2000.dto.PenerimaanLinenExternalDto;
 import com.jasamedika.medifirst2000.service.MapJenisDietToProdukService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 
@@ -47,7 +45,7 @@ public class MapJenisDietToProdukController extends LocaleController{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-produk-gizi/", 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapKebutuhanSaranaToKamarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapKebutuhanSaranaToKamarController.java
index ddcfc489..d70f6af5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapKebutuhanSaranaToKamarController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapKebutuhanSaranaToKamarController.java
@@ -1,6 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -50,11 +49,11 @@ public class MapKebutuhanSaranaToKamarController extends LocaleController<BaseMo
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapObjekModulToKelompokUserController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapObjekModulToKelompokUserController.java
index eaf3a86d..00918744 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapObjekModulToKelompokUserController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapObjekModulToKelompokUserController.java
@@ -49,14 +49,14 @@ public class MapObjekModulToKelompokUserController extends LocaleController<MapO
 			LOGGER.error("Got exception {} when add mapObjekModulToKelompokUser", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add mapObjekModulToKelompokUser", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -73,14 +73,14 @@ public class MapObjekModulToKelompokUserController extends LocaleController<MapO
 			LOGGER.error("Got exception {} when update mapObjekModulToKelompokUser", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update mapObjekModulToKelompokUser", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiIpsrsController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiIpsrsController.java
index 9bd1dab9..c7ba9139 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiIpsrsController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiIpsrsController.java
@@ -55,13 +55,13 @@ private static final Logger LOGGER = LoggerFactory.getLogger(MapPegawaiIpsrsCont
 
 			LOGGER.error("Got exception {} when saveMapPegawaiIpsrs", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when saveMapPegawaiIpsrs", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	
@@ -86,12 +86,12 @@ private static final Logger LOGGER = LoggerFactory.getLogger(MapPegawaiIpsrsCont
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataByNoTrans", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataByNoTrans", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -116,12 +116,12 @@ private static final Logger LOGGER = LoggerFactory.getLogger(MapPegawaiIpsrsCont
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getGroupPegawaiIpsrs", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getGroupPegawaiIpsrs", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiJabatanToUnitKerjaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiJabatanToUnitKerjaController.java
index ed0bf920..f531d3f0 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiJabatanToUnitKerjaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiJabatanToUnitKerjaController.java
@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.Constants;
@@ -54,11 +53,11 @@ public class MapPegawaiJabatanToUnitKerjaController extends LocaleController<Map
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Map", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Map", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiLaboratRadiologiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiLaboratRadiologiController.java
index 8c440707..102c0fbb 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiLaboratRadiologiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiLaboratRadiologiController.java
@@ -52,11 +52,11 @@ public class MapPegawaiLaboratRadiologiController extends LocaleController<MapPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Map", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Map", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
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 871d4cd3..0f6ad177 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
@@ -11,8 +11,6 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.domain.Specifications;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -34,9 +32,6 @@ import com.jasamedika.medifirst2000.service.MapProdukMenuToBahanService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.MapProdukMenuToBahanVO;
 
-import net.kaczmarzyk.spring.data.jpa.domain.Equal;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
-
 @RestController
 @RequestMapping(value="/menu-to-bahan")
 public class MapProdukMenuToBahanController extends LocaleController<MapProdukMenuToBahanVO>
@@ -97,14 +92,14 @@ implements IBaseRestController<MapProdukMenuToBahanVO>{
 			LOGGER.error("Got exception {} when add/update Menu To Bahan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update Menu To Bahan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapRuanganToKelasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapRuanganToKelasController.java
index 92f8d231..7aebe066 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapRuanganToKelasController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapRuanganToKelasController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -21,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
@@ -32,7 +30,6 @@ import com.jasamedika.medifirst2000.util.rest.RestUtil;
 
 import com.jasamedika.medifirst2000.service.MapRuanganToKelasService;
 import com.jasamedika.medifirst2000.vo.MapRuanganToKelasVO_;
-import com.jasamedika.medifirst2000.vo.RuanganVO;
 
 @RestController
 @RequestMapping("/mapRuanganToKelas")
@@ -68,11 +65,11 @@ IBaseRestController<MapRuanganToKelasVO_>  {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Map Ruangan to Kelas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Map Ruangan to Kelas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -83,17 +80,17 @@ IBaseRestController<MapRuanganToKelasVO_>  {
 
 			if (null != result)
 				addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "");
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("", HttpStatus.CREATED);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when update Map Ruangan to Kelas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Map Ruangan to Kelas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -121,17 +118,17 @@ IBaseRestController<MapRuanganToKelasVO_>  {
 			LOGGER.error("Got exception {} when delete MapRuanganToKelas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when delete MapRuanganToKelas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 	@Override
@@ -159,11 +156,11 @@ IBaseRestController<MapRuanganToKelasVO_>  {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getRuanganByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getRuanganByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -181,11 +178,11 @@ IBaseRestController<MapRuanganToKelasVO_>  {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getKelasByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getKelasByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -204,11 +201,11 @@ IBaseRestController<MapRuanganToKelasVO_>  {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getKamarByKelas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getKamarByKelas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingAlatToBundleController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingAlatToBundleController.java
index 2ddcff98..1c535db8 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingAlatToBundleController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingAlatToBundleController.java
@@ -52,13 +52,13 @@ public class MappingAlatToBundleController extends LocaleController<MappingAlatT
 			LOGGER.error("Got exception {} when add Mapping Alat To Bundle", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Mapping Alat To Bundle", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -75,13 +75,13 @@ public class MappingAlatToBundleController extends LocaleController<MappingAlatT
 			LOGGER.error("Got exception {} when add Mapping Alat To Bundle", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Mapping Alat To Bundle", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -98,13 +98,13 @@ public class MappingAlatToBundleController extends LocaleController<MappingAlatT
 			LOGGER.error("Got exception {} when get all Mapping Alat To Bundle", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all Mapping Alat To Bundle", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -121,13 +121,13 @@ public class MappingAlatToBundleController extends LocaleController<MappingAlatT
 			LOGGER.error("Got exception {} when add all Jadwal Supir Ambulance", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add all Jadwal Supir Ambulance", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingBahanToMesinController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingBahanToMesinController.java
index 91f6ac1b..f187120b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingBahanToMesinController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingBahanToMesinController.java
@@ -37,7 +37,7 @@ public class MappingBahanToMesinController extends LocaleController<MapAlatToPro
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -50,7 +50,7 @@ public class MappingBahanToMesinController extends LocaleController<MapAlatToPro
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -62,7 +62,7 @@ public class MappingBahanToMesinController extends LocaleController<MapAlatToPro
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-mesin-cuci", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -74,7 +74,7 @@ public class MappingBahanToMesinController extends LocaleController<MapAlatToPro
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-proses-cuci", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -86,7 +86,7 @@ public class MappingBahanToMesinController extends LocaleController<MapAlatToPro
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-kapasitas-mesin-cuci", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -99,7 +99,7 @@ public class MappingBahanToMesinController extends LocaleController<MapAlatToPro
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-bahan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -111,7 +111,7 @@ public class MappingBahanToMesinController extends LocaleController<MapAlatToPro
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-satuan-bahan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -123,7 +123,7 @@ public class MappingBahanToMesinController extends LocaleController<MapAlatToPro
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-all-proses-cuci-cuci", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -135,7 +135,7 @@ public class MappingBahanToMesinController extends LocaleController<MapAlatToPro
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-proses-cuci-bilas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -147,7 +147,7 @@ public class MappingBahanToMesinController extends LocaleController<MapAlatToPro
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-all-proses-cuci-kering", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -159,7 +159,7 @@ public class MappingBahanToMesinController extends LocaleController<MapAlatToPro
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingBmhpToSetAlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingBmhpToSetAlatController.java
index d511feeb..aa996e7d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingBmhpToSetAlatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingBmhpToSetAlatController.java
@@ -50,14 +50,14 @@ public class MappingBmhpToSetAlatController extends LocaleController<MappingBmhp
 			LOGGER.error("Got exception {} when add MappingBmhpToSetAlat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add MappingBmhpToSetAlat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -74,14 +74,14 @@ public class MappingBmhpToSetAlatController extends LocaleController<MappingBmhp
 			LOGGER.error("Got exception {} when add MappingBmhpToSetAlat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add MappingBmhpToSetAlat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -98,14 +98,14 @@ public class MappingBmhpToSetAlatController extends LocaleController<MappingBmhp
 			LOGGER.error("Got exception {} when update MappingBmhpToSetAlat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update MappingBmhpToSetAlat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -122,14 +122,14 @@ public class MappingBmhpToSetAlatController extends LocaleController<MappingBmhp
 			LOGGER.error("Got exception {} when update MappingBmhpToSetAlat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update MappingBmhpToSetAlat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -146,13 +146,13 @@ public class MappingBmhpToSetAlatController extends LocaleController<MappingBmhp
 			   LOGGER.error("Got exception {} when get all mapping bmhp to set alat", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get mapping bmhp to set alat", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingCycleController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingCycleController.java
index 24af28a6..68e7d76c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingCycleController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingCycleController.java
@@ -1,8 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -61,11 +58,11 @@ public class MappingCycleController extends LocaleController<MappingCycleVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Mapping Cycle", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Mapping Cycle", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -80,11 +77,11 @@ public class MappingCycleController extends LocaleController<MappingCycleVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Nama Bahan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Nama Bahan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -99,11 +96,11 @@ public class MappingCycleController extends LocaleController<MappingCycleVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Mesin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Mesin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -133,11 +130,11 @@ public class MappingCycleController extends LocaleController<MappingCycleVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Mesin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Mesin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -152,11 +149,11 @@ public class MappingCycleController extends LocaleController<MappingCycleVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Mesin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Mesin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingDiagnosaKeperawatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingDiagnosaKeperawatanController.java
index 17a047fa..f3bc868b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingDiagnosaKeperawatanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingDiagnosaKeperawatanController.java
@@ -47,11 +47,11 @@ public class MappingDiagnosaKeperawatanController extends LocaleController<Renca
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveRencana", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveRencana", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingJenisLinenToProdukController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingJenisLinenToProdukController.java
index 57d77d7f..9e536228 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingJenisLinenToProdukController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingJenisLinenToProdukController.java
@@ -44,7 +44,7 @@ implements IBaseRestController<RegistrasiPelayananVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 	}
 	
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 06686f4d..dd0cc0ad 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
@@ -103,14 +103,14 @@ implements IBaseRestController<MappingJenisRisikoSasaranStrategisVO>{
 			LOGGER.error("Got exception {} when add/update Risiko", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update Risiko", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingPertanyaanToKeteranganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingPertanyaanToKeteranganController.java
index a98af62c..7232a56e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingPertanyaanToKeteranganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingPertanyaanToKeteranganController.java
@@ -51,13 +51,13 @@ public class MappingPertanyaanToKeteranganController extends LocaleController<Ma
 			LOGGER.error("Got exception {} when add Sasaran Strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Sasaran Strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -74,13 +74,13 @@ public class MappingPertanyaanToKeteranganController extends LocaleController<Ma
 			LOGGER.error("Got exception {} when add Sasaran Strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Sasaran Strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -97,13 +97,13 @@ public class MappingPertanyaanToKeteranganController extends LocaleController<Ma
 			LOGGER.error("Got exception {} when add Sasaran Strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Sasaran Strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasalahKeperawatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasalahKeperawatanController.java
index a78e3ec2..d7c33a03 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasalahKeperawatanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasalahKeperawatanController.java
@@ -1,7 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -22,22 +20,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.DetailTriaseService;
-import com.jasamedika.medifirst2000.service.HasilTriaseService;
-import com.jasamedika.medifirst2000.service.KategoriHasilTriaseService;
 import com.jasamedika.medifirst2000.service.MasalahKeperawatanService;
-import com.jasamedika.medifirst2000.service.PemeriksaanTriageService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.DetailTriaseVO;
-import com.jasamedika.medifirst2000.vo.HasilTriaseVO;
-import com.jasamedika.medifirst2000.vo.KategoriHasilTriaseVO;
 import com.jasamedika.medifirst2000.vo.MasalahKeperawatanVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
-import com.jasamedika.medifirst2000.vo.PemeriksaanTriageVO;
 import com.jasamedika.medifirst2000.vo.TriaseVO;
 
 
@@ -60,17 +48,17 @@ public class MasalahKeperawatanController extends LocaleController<TriaseVO>{
 			Map<String,Object> result = masalahKeperawatanService.saveMasalahKeperawatanService(vo);
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-				RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+				RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			SaveLog("Masalah Keperawatan", "Pemeriksaan",request);	
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save masalah keperawatan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update masalah keperawatan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
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 f9798c92..d4f64d2d 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
@@ -103,14 +103,14 @@ implements IBaseRestController<MasterProgramKerjaStrategisVO>{
 			LOGGER.error("Got exception {} when add/update programKerjaStrategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update programKerjaStrategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasukKamarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasukKamarController.java
index 54ebad4f..bc43131a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasukKamarController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MasukKamarController.java
@@ -55,11 +55,11 @@ public class MasukKamarController extends LocaleController<MasukKamarVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Masuk Kamar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Masuk kamar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
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 628685f2..fc674992 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
@@ -1,17 +1,14 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+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;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.domain.Specifications;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,69 +16,25 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.dto.MatriksIndikatorDTO;
-import com.jasamedika.medifirst2000.entities.KamusIndikator;
-import com.jasamedika.medifirst2000.entities.KontrakKinerja;
-import com.jasamedika.medifirst2000.service.MatriksIndikatorService;
-import com.jasamedika.medifirst2000.vo.KontrakKinerjaVO;
-
-import net.kaczmarzyk.spring.data.jpa.domain.Equal;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
+import java.util.Collection;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/matriks-indikator")
-public class MatriksIndikatorController extends LocaleController<KontrakKinerjaVO>
-implements IBaseRestController<KontrakKinerjaVO>{
+public class MatriksIndikatorController extends LocaleController<KontrakKinerjaVO> {
 
 	@Autowired
 	private MatriksIndikatorService matriksService;
-	
-	private static final Logger LOGGER = LoggerFactory
-	.getLogger(MatriksIndikatorController.class);
-	
-	@RequestMapping(value="/find-all/", method= RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Collection<MatriksIndikatorDTO>> findAll(
+
+	@RequestMapping(value = "/find-all/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<Collection<PasienVO>> 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,
 			@RequestParam(value = "dir", required = false, defaultValue = "asc") String dir,
-			@Spec(path = "id", params = "id", spec = Equal.class) Specification<KamusIndikator> spec)
-	{
-			Map<String, Object> result = new HashMap<String, Object>();
-			result = matriksService.findAll(page, take, sort,dir, spec);
-			return constructListPageResult(result);
+			@Spec(path = "id", params = "id", spec = Equal.class) Specification<KamusIndikator> spec) {
+		Map<String, Object> result = matriksService.findAll(page, take, sort, dir, spec);
+		return constructListPageResult(result);
 	}
 
-	@Override
-	public ResponseEntity<Collection<KontrakKinerjaVO>> getAllVOWithQueryString(HttpServletRequest request,
-			Integer page, Integer limit, String sort, String dir) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<KontrakKinerjaVO> getVO(Integer id) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> addVO(KontrakKinerjaVO vo) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> editVO(KontrakKinerjaVO vo) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> deleteVO(Integer id) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<List<KontrakKinerjaVO>> getAllVO() {
-		return null;
-	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuController.java
index 2e2d5268..e3f4fcf2 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuController.java
@@ -18,7 +18,6 @@ import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.Constants;
@@ -99,14 +98,14 @@ implements IBaseRestController<ProdukVO>{
 			LOGGER.error("Got exception {} when save Menu", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Menu", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuDinamicController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuDinamicController.java
index f7adc989..803b1da2 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuDinamicController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MenuDinamicController.java
@@ -38,7 +38,6 @@ import com.jasamedika.medifirst2000.vo.MapPegawaiToModulAplikasiVO;
 import com.jasamedika.medifirst2000.vo.ModulAplikasiSVO;
 import com.jasamedika.medifirst2000.vo.ModulAplikasiVO;
 import com.jasamedika.medifirst2000.vo.ObjekModulAplikasiVO;
-import com.jasamedika.medifirst2000.vo.PegawaiVO;
 
 /**
 * Controller class for menu modul 
@@ -93,7 +92,7 @@ public class MenuDinamicController extends LocaleController<ModulAplikasiSVO> im
 		}catch(Exception e){
 			LOGGER.info("Got exception {} in get objek modul aplikasi", e);
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Gagal pilih ruangan.");
-			return RestUtil.getJsonHttptatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage);
 		}
 	}
 	
@@ -111,7 +110,7 @@ public class MenuDinamicController extends LocaleController<ModulAplikasiSVO> im
 		}catch(Exception e){
 			LOGGER.info("Got exception {} in get objek modul aplikasi", e);
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Gagal pilih ruangan.");
-			return RestUtil.getJsonHttptatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage);
 		}
 	}
 
@@ -140,7 +139,7 @@ public class MenuDinamicController extends LocaleController<ModulAplikasiSVO> im
 			
 			if (CommonUtil.isNullOrEmpty(lVO)) {
 				addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Anda tidak punya izin akses");
-				return RestUtil.getJsonHttptatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage);				
+				return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage);
 			}
 			
 			return RestUtil.defaultJsonResponse(objekModulAplikasiService.findAllModulAplikasi(kdModulAplikasi));
@@ -148,7 +147,7 @@ public class MenuDinamicController extends LocaleController<ModulAplikasiSVO> im
 		}catch(Exception e){
 			LOGGER.info("Got exception {} in get objek modul aplikasi", e);
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Anda tidak punya izin akses");
-			return RestUtil.getJsonHttptatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage);
 		}
 	}
 	
@@ -164,14 +163,14 @@ public class MenuDinamicController extends LocaleController<ModulAplikasiSVO> im
 		
 			if (CommonUtil.isNullOrEmpty(ruangannya)){
 				addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Anda tidak punya izin akses");
-				return RestUtil.getJsonHttptatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage);
 			}
 		
 			return RestUtil.defaultJsonResponse(ruangannya);
 		}catch(Exception e){
 			LOGGER.info("Got exception {} in get objek modul aplikasi", e);
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Anda tidak punya izin akses");
-			return RestUtil.getJsonHttptatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.UNAUTHORIZED, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MesinController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MesinController.java
index 8f2e01e6..95a68f04 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MesinController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MesinController.java
@@ -49,11 +49,11 @@ public class MesinController extends LocaleController<MesinVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Mesin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Mesin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -70,11 +70,11 @@ public class MesinController extends LocaleController<MesinVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get All Mesin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get All Mesin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -89,14 +89,14 @@ public class MesinController extends LocaleController<MesinVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when delete Mesin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when delete Mesin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 	@RequestMapping(value = "/find-mesin/", method = RequestMethod.GET)
@@ -109,11 +109,11 @@ public class MesinController extends LocaleController<MesinVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Mesin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Mesin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -131,11 +131,11 @@ public class MesinController extends LocaleController<MesinVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getMesinLaundry", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getMesinLaundry", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -150,11 +150,11 @@ public class MesinController extends LocaleController<MesinVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Satuan Standar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Satuan Standar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringAlatSterilController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringAlatSterilController.java
index 3cfe52ad..89f4877d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringAlatSterilController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringAlatSterilController.java
@@ -37,7 +37,7 @@ public class MonitoringAlatSterilController extends LocaleController {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-monitoringalatsteril", 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringEvaluasiPerundanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringEvaluasiPerundanganController.java
index 2e62a147..d4c3eaab 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringEvaluasiPerundanganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringEvaluasiPerundanganController.java
@@ -56,13 +56,13 @@ public class MonitoringEvaluasiPerundanganController extends LocaleController<Us
 
 			LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	@RequestMapping(value = "/get-no-evaluasi", method = RequestMethod.GET)
@@ -79,13 +79,13 @@ public class MonitoringEvaluasiPerundanganController extends LocaleController<Us
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -108,13 +108,13 @@ public class MonitoringEvaluasiPerundanganController extends LocaleController<Us
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -136,13 +136,13 @@ public class MonitoringEvaluasiPerundanganController extends LocaleController<Us
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -168,13 +168,13 @@ public class MonitoringEvaluasiPerundanganController extends LocaleController<Us
 
 			LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringMesinAutoClaveBowidickController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringMesinAutoClaveBowidickController.java
index 4776520e..8bb13021 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringMesinAutoClaveBowidickController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringMesinAutoClaveBowidickController.java
@@ -37,7 +37,7 @@ public class MonitoringMesinAutoClaveBowidickController extends LocaleController
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-monitoring-mesin-clave-bowidick", 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestEntylenOxideController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestEntylenOxideController.java
index 88d2c5b6..62622c44 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestEntylenOxideController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestEntylenOxideController.java
@@ -37,7 +37,7 @@ public class MonitoringTestEntylenOxideController extends LocaleController{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-monitoring-test-entylen-oxide", 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestMesinAutoClaveController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestMesinAutoClaveController.java
index 54d88e19..3e160f14 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestMesinAutoClaveController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MonitoringTestMesinAutoClaveController.java
@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.dto.MonitoringAlatSterilDto;
 import com.jasamedika.medifirst2000.dto.MonitoringTestMesinAutoclaveDto;
 import com.jasamedika.medifirst2000.service.MonitoringTestmesinAutoClaveService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
@@ -38,7 +37,7 @@ public class MonitoringTestMesinAutoClaveController extends LocaleController{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-monitoring-test-mesin-clave", 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java
index 282d49c6..d9827707 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java
@@ -48,13 +48,13 @@ public class NeracaLimbahController extends LocaleController<NeracaLimbahVO> {
 			LOGGER.error("Got exception {} when add NeracaLimbah", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add NeracaLimbah", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -71,13 +71,13 @@ public class NeracaLimbahController extends LocaleController<NeracaLimbahVO> {
 			LOGGER.error("Got exception {} when update NeracaLimbah", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update NeracaLimbah", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -94,13 +94,13 @@ public class NeracaLimbahController extends LocaleController<NeracaLimbahVO> {
 			LOGGER.error("Got exception {} when get all sasaran strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all sasaran strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -140,11 +140,11 @@ public class NeracaLimbahController extends LocaleController<NeracaLimbahVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all pengendali", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NilaiNilaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NilaiNilaiController.java
index 01d7bbd2..f4247afe 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NilaiNilaiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NilaiNilaiController.java
@@ -14,11 +14,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -29,7 +27,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.NilaiNilaiService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.NilaiNilaiVO;
 
@@ -65,11 +62,11 @@ public class NilaiNilaiController extends LocaleController<NilaiNilaiVO> impleme
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NotaDinasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NotaDinasController.java
index d62ce38c..7537e24d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NotaDinasController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NotaDinasController.java
@@ -59,13 +59,13 @@ public class NotaDinasController extends LocaleController<NotaDinasVO> implement
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -85,13 +85,13 @@ public class NotaDinasController extends LocaleController<NotaDinasVO> implement
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -167,13 +167,13 @@ public class NotaDinasController extends LocaleController<NotaDinasVO> implement
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObjekModulAplikasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObjekModulAplikasiController.java
index 357bdf6d..b8b50eef 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObjekModulAplikasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObjekModulAplikasiController.java
@@ -48,14 +48,14 @@ public class ObjekModulAplikasiController extends LocaleController<ObjekModulApl
 			LOGGER.error("Got exception {} when add ObjekModulAplikasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add ObjekModulAplikasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -72,14 +72,14 @@ public class ObjekModulAplikasiController extends LocaleController<ObjekModulApl
 			LOGGER.error("Got exception {} when update ObjekModulAplikasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update ObjekModulAplikasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiController.java
index 53b59232..75b914c9 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiController.java
@@ -25,11 +25,9 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.ObservasiTransaksiService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.ObservasiCustomVO;
 import com.jasamedika.medifirst2000.vo.ObservasiVO;
-import com.jasamedika.medifirst2000.vo.PengkajianAwalBaruVO;
 
 @RestController
 @RequestMapping("/observasi")
@@ -51,11 +49,11 @@ public class ObservasiController extends LocaleController<ObservasiVO>{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengkajian", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengkajian", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiIGDController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiIGDController.java
index 66c0c089..da215dbc 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiIGDController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiIGDController.java
@@ -17,7 +17,6 @@ import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.Constants;
@@ -29,7 +28,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.LayananService;
 import com.jasamedika.medifirst2000.service.ObservasiIGDService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.LayananVO;
 import com.jasamedika.medifirst2000.vo.LayananVOCustom;
 import com.jasamedika.medifirst2000.vo.ObservasiIGDVO;
 import com.jasamedika.medifirst2000.vo.ObservasiIGDVOCustom;
@@ -90,13 +88,13 @@ public class ObservasiIGDController extends LocaleController<ObservasiIGDVO> imp
 			LOGGER.error("Got exception {} when add Observasi IGD", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add  Observasi IGD", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -113,13 +111,13 @@ public class ObservasiIGDController extends LocaleController<ObservasiIGDVO> imp
 			LOGGER.error("Got exception {} when add Layanan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add  Layanan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -136,13 +134,13 @@ public class ObservasiIGDController extends LocaleController<ObservasiIGDVO> imp
 			LOGGER.error("Got exception {} when update Observasi IGD", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update  Observasi IGD", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiTerintegrasiPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiTerintegrasiPasienController.java
index ac3269c8..8a25743c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiTerintegrasiPasienController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ObservasiTerintegrasiPasienController.java
@@ -55,11 +55,11 @@ public class ObservasiTerintegrasiPasienController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveObservasiTerintegrasiPasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveObservasiTerintegrasiPasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -73,11 +73,11 @@ public class ObservasiTerintegrasiPasienController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when updateKonfirmasiPerawat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when updateKonfirmasiPerawat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -91,11 +91,11 @@ public class ObservasiTerintegrasiPasienController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when updateKonfirmasiDokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when updateKonfirmasiDokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OperationController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OperationController.java
index 34640cbe..35b5bfa4 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OperationController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OperationController.java
@@ -1,7 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -23,17 +21,13 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CheckOutOperationService;
-import com.jasamedika.medifirst2000.service.SignInOperationService;
 import com.jasamedika.medifirst2000.service.SignOutOperationService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.CheckOutOperationVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
-import com.jasamedika.medifirst2000.vo.SignInOperationVO;
 import com.jasamedika.medifirst2000.vo.SignOutOperationVO;
 
 
@@ -61,16 +55,16 @@ public class OperationController extends LocaleController<SignOutOperationVO>
 			Map<String,Object> result = signOutOperationService.saveSignOutOperationService(vo);
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-				RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+				RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save SignOutOperation1", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update SignOutOperation2", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -80,16 +74,16 @@ public class OperationController extends LocaleController<SignOutOperationVO>
 			Map<String,Object> result = checkOutOperationService.saveCheckOutOperationService(vo);
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-				RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+				RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save CheckOutOperation1", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update CheckOutOperation2", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -113,12 +107,12 @@ public class OperationController extends LocaleController<SignOutOperationVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getKesadaranCheckOut", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getKesadaranCheckOut", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
@@ -144,12 +138,12 @@ public class OperationController extends LocaleController<SignOutOperationVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getKelengkapanCheckOut", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getKelengkapanCheckOut", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
@@ -175,12 +169,12 @@ public class OperationController extends LocaleController<SignOutOperationVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getCheckOutByNoRec", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getCheckOutByNoRec", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
@@ -206,12 +200,12 @@ public class OperationController extends LocaleController<SignOutOperationVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getCheckOutByNoRecAntrian", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getCheckOutByNoRecAntrian", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderAmbulanceController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderAmbulanceController.java
index f27b9299..02216a6d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderAmbulanceController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderAmbulanceController.java
@@ -54,11 +54,11 @@ public class OrderAmbulanceController extends LocaleController<OrderAmbulanceVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Order Ambulance", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Order Ambulance", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -89,11 +89,11 @@ public class OrderAmbulanceController extends LocaleController<OrderAmbulanceVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Order Ambulance", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Order Ambulance", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -108,11 +108,11 @@ public class OrderAmbulanceController extends LocaleController<OrderAmbulanceVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Aset Ambulance", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Aset Ambulance", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -127,11 +127,11 @@ public class OrderAmbulanceController extends LocaleController<OrderAmbulanceVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get All Supir Ambulance", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get All Supir Ambulance", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderGiziController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderGiziController.java
index f150dbe0..854b0603 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderGiziController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderGiziController.java
@@ -73,11 +73,11 @@ public class OrderGiziController extends LocaleController<MapProdukMenuToBahanVO
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Penerimaan Barang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Penerimaan Barang", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -116,11 +116,11 @@ public class OrderGiziController extends LocaleController<MapProdukMenuToBahanVO
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Produksi Order", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Produksi Order", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderKendaraanDinasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderKendaraanDinasController.java
index 1886c384..9437619d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderKendaraanDinasController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderKendaraanDinasController.java
@@ -49,11 +49,11 @@ public class OrderKendaraanDinasController extends LocaleController<OrderKendara
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Order Kendaraan Dinas & Pejabat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Order Kendaraan Dinas & Pejabat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderPelayananSistemController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderPelayananSistemController.java
index 8991ae7b..23f61a99 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderPelayananSistemController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderPelayananSistemController.java
@@ -26,7 +26,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.OrderPelayananSistemService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.OrderPelayananSistemVO;
-import com.jasamedika.medifirst2000.vo.StrukOrderVO;
 
 @RestController
 @RequestMapping("/orderpelayanansistem")
@@ -55,13 +54,13 @@ public class OrderPelayananSistemController extends LocaleController<OrderPelaya
 
 			LOGGER.error("Got exception {} when saveOrderPelayananSistem", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when saveOrderPelayananSistem", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	
@@ -86,12 +85,12 @@ public class OrderPelayananSistemController extends LocaleController<OrderPelaya
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataByNoOrder", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataByNoOrder", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -116,12 +115,12 @@ public class OrderPelayananSistemController extends LocaleController<OrderPelaya
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataSI", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataSI", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -146,12 +145,12 @@ public class OrderPelayananSistemController extends LocaleController<OrderPelaya
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadData", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadData", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -176,12 +175,12 @@ public class OrderPelayananSistemController extends LocaleController<OrderPelaya
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadProduk", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadProduk", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -206,12 +205,12 @@ public class OrderPelayananSistemController extends LocaleController<OrderPelaya
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadRuangTujuan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadRuangTujuan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -236,12 +235,12 @@ public class OrderPelayananSistemController extends LocaleController<OrderPelaya
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadJenisDok", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadJenisDok", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderPemakaianRuangRapatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderPemakaianRuangRapatController.java
index 843cb788..7f44968a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderPemakaianRuangRapatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OrderPemakaianRuangRapatController.java
@@ -58,11 +58,11 @@ public class OrderPemakaianRuangRapatController extends LocaleController<OrderPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Order Pemakaian Ruang Rapat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Order Pemakaian Ruang Rapat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -93,11 +93,11 @@ public class OrderPemakaianRuangRapatController extends LocaleController<OrderPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Ruang Rapat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Ruang Rapat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -116,11 +116,11 @@ public class OrderPemakaianRuangRapatController extends LocaleController<OrderPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Ruang Rapat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Ruang Rapat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OutputController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OutputController.java
index e9c7504d..1c289a95 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OutputController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/OutputController.java
@@ -22,10 +22,8 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.KemenLembService;
 import com.jasamedika.medifirst2000.service.OutputService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.KemenLembVO;
 import com.jasamedika.medifirst2000.vo.OutputVO;
 
 @RestController
@@ -50,11 +48,11 @@ public class OutputController extends LocaleController<OutputVO>{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveOutput", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveOutput", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PMAnamnesisUmumController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PMAnamnesisUmumController.java
index 1f7f766b..957c6de3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PMAnamnesisUmumController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PMAnamnesisUmumController.java
@@ -50,17 +50,17 @@ public class PMAnamnesisUmumController extends LocaleController<PMAnamnesisUmumV
 			PMAnamnesisUmumVO result = pMAnamnesisUmumService.add(vo);
 			if (null != result)
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Status Keluarga", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Status Keluarga", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PMDiagnosisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PMDiagnosisController.java
index fef35e29..6c800bfb 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PMDiagnosisController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PMDiagnosisController.java
@@ -50,17 +50,17 @@ public class PMDiagnosisController extends LocaleController<PMDiagnosisVO> imple
 			PMDiagnosisVO result = pMDiagnosisService.add(vo);
 			if (null != result)
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Status Keluarga", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Status Keluarga", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAlergiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAlergiController.java
index 72e8d6d3..96f79541 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAlergiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAlergiController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapAlergiService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapAlergiVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +66,11 @@ public class PapAlergiController extends LocaleController<PapAlergiVO> implement
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -94,11 +92,11 @@ public class PapAlergiController extends LocaleController<PapAlergiVO> implement
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAnamesisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAnamesisController.java
index 67cab457..d606cafb 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAnamesisController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAnamesisController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapAnamesisService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapAnamesisVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +66,11 @@ public class PapAnamesisController extends LocaleController<PapAnamesisVO> imple
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -94,11 +92,11 @@ public class PapAnamesisController extends LocaleController<PapAnamesisVO> imple
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAssesmentGiziController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAssesmentGiziController.java
index ce80a82c..18c599de 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAssesmentGiziController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAssesmentGiziController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapAssesmentGiziService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapAssesmentGiziVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +66,11 @@ public class PapAssesmentGiziController extends LocaleController<PapAssesmentGiz
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -94,11 +92,11 @@ public class PapAssesmentGiziController extends LocaleController<PapAssesmentGiz
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapBedahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapBedahController.java
index 29ecdb69..8f1f7ab5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapBedahController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapBedahController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapBedahService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapBedahVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -67,11 +65,11 @@ public class PapBedahController extends LocaleController<PapBedahVO> implements
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -93,11 +91,11 @@ public class PapBedahController extends LocaleController<PapBedahVO> implements
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapCatatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapCatatanController.java
index e7728953..83745fe1 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapCatatanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapCatatanController.java
@@ -1,6 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -15,7 +14,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -25,18 +23,12 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.PapCatatan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapCatatanService;
-import com.jasamedika.medifirst2000.service.ThtService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapCatatanVO;
-import com.jasamedika.medifirst2000.vo.ThtVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +60,11 @@ public class PapCatatanController extends LocaleController<PapCatatanVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -91,11 +83,11 @@ public class PapCatatanController extends LocaleController<PapCatatanVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getCatatan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getCatatan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapDiagnosisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapDiagnosisController.java
index fa058458..f73b60ee 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapDiagnosisController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapDiagnosisController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapDiagnosisService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapDiagnosisVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -67,11 +65,11 @@ public class PapDiagnosisController extends LocaleController<PapDiagnosisVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -93,11 +91,11 @@ public class PapDiagnosisController extends LocaleController<PapDiagnosisVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapEliminasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapEliminasiController.java
index cdb79683..8dcb732a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapEliminasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapEliminasiController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapEliminasiService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapEliminasiVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +66,11 @@ public class PapEliminasiController extends LocaleController<PapEliminasiVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -94,11 +92,11 @@ public class PapEliminasiController extends LocaleController<PapEliminasiVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGastrointestinalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGastrointestinalController.java
index 5e84b5a8..6934614b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGastrointestinalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGastrointestinalController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapGastrointestinalService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapGastrointestinalVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +66,11 @@ public class PapGastrointestinalController extends LocaleController<PapGastroint
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -94,11 +92,11 @@ public class PapGastrointestinalController extends LocaleController<PapGastroint
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenataliaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenataliaController.java
index c09b1e92..cf47e986 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenataliaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenataliaController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapGenataliaService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapGenataliaVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +66,11 @@ public class PapGenataliaController extends LocaleController<PapGenataliaVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -94,11 +92,11 @@ public class PapGenataliaController extends LocaleController<PapGenataliaVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenericController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenericController.java
index 5dd91ff3..cf936fc6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenericController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenericController.java
@@ -1,42 +1,27 @@
 
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.jasamedika.medifirst2000.controller.base.LocaleController;
+import com.jasamedika.medifirst2000.dao.PapAlergiDao;
+import com.jasamedika.medifirst2000.entities.GenericView;
+import com.jasamedika.medifirst2000.service.GenericViewService;
+import com.jasamedika.medifirst2000.vo.PapAlergiVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.dao.PapAlergiDao;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.GenericViewService;
-import com.jasamedika.medifirst2000.service.PapAlergiService;
-import com.jasamedika.medifirst2000.util.DateUtil;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.PapAlergiVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.jasamedika.medifirst2000.util.DateUtil.toDate;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.springframework.http.HttpStatus.OK;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -45,143 +30,102 @@ import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
  */
 @RestController
 @RequestMapping("/papgeneric")
-@JsonIgnoreProperties(ignoreUnknown = true) 
-public class PapGenericController extends LocaleController<PapAlergiVO> implements
-		IBaseRestController<PapAlergiVO> {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(PapGenericController.class);
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class PapGenericController extends LocaleController<PapAlergiVO> {
 
 	@Autowired
-	private GenericViewService genericViewService;
+	private GenericViewService<GenericView> genericViewService;
 
 	@Autowired
 	private PapAlergiDao papAlergiDao;
-	
-	@RequestMapping(value = "/find-medical-record-noRec/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> findMedicalRecordByNoRec(@RequestParam(value = "i", required = false) String i,@RequestParam(value = "noRec", required = false) String noRec,
-			HttpServletRequest request) {
-		Map<String,Object> result = genericViewService.findMedicalRecordByNoRec(i,noRec);
-		Integer data =papAlergiDao.findByCountAntrian(noRec);
-		return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage);
-	}
-	@RequestMapping(value = "/check-input-pasien/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> cekInputPasien(@RequestParam(value = "noRec", required = false) String noRec,
-			HttpServletRequest request) {
-		Map<String,Object> result = new HashMap<>();
-		/*result.put("Alergi", genericViewService.findByCountAntrian("PapAlergi",noRec));
-		result.put("RiwayatKesehatan", genericViewService.findByCountAntrian("RiwayatKesehatan",noRec));
-		//result.put("RiwayatPemeriksaan", genericViewService.findByCountAntrian("PapTandaVital",noRec));
-		//result.put("SkriningNyeri", genericViewService.findByCountAntrian("PapSkriningNyeri",noRec));
-		result.put("KebutuhanEdukasi", genericViewService.findByCountAntrian("PapKebutuhanEdukasi",noRec));
-		result.put("MasalahKeperawatan", genericViewService.findByCountAntrian("MasalahKeperawatan",noRec));
-		result.put("RiwayatPsikososial", genericViewService.findByCountAntrian("PapRiwayatPsikososial",noRec));
-		result.put("RiwayatKelahiran", genericViewService.findByCountAntrian("PapRiwayatKelahiran",noRec));
-		result.put("KeluhanUtama", genericViewService.findByCountAntrian("PapRiwayatKelahiran",noRec));*/
-		
-		return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage);
-	}
-	
-	
-	@RequestMapping(value = "/find-medical-record-noCm-and-tglInput/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> findMedicalRecordByNoCmAndTglInput(@RequestParam(value = "i", required = false) String i,@RequestParam(value = "noCm", required = false) String noCm,
-			@RequestParam(value = "tglInput", required = false) String tglInput,HttpServletRequest request) {
-		Map<String,Object> result = genericViewService.findMedicalRecordByNoCmAndTglInput(i,noCm, DateUtil.toDate(tglInput));
 
-		return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage);
-	}
-	@RequestMapping(value = "/find-medical-record-tglInput/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> findMedicalRecordByTglInput(@RequestParam(value = "i", required = false) String i,
-			@RequestParam(value = "from", required = false) String from,@RequestParam(value = "until", required = false) String until,
-			@RequestParam(value = "key", required = false) String key,HttpServletRequest request) {
-		Map<String,Object> result ;
-		if(key!=null)
-		{
-			result=genericViewService.findMedicalRecordByTglInput(i, DateUtil.toDate(from), DateUtil.toDate(until),key);	
-		}
-		else
-		result=genericViewService.findMedicalRecordByTglInput(i, DateUtil.toDate(from), DateUtil.toDate(until));
-
-		return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage);
-	}
-	
-	
-	@RequestMapping(value = "/find-noCm-and-tglInput/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> findByNoCmAndTglInput(@RequestParam(value = "i", required = false) String i,@RequestParam(value = "noCm", required = false) String noCm,
-			@RequestParam(value = "tglInput", required = false) String tglInput,HttpServletRequest request) {
-		Map<String,Object> result = genericViewService.findByNoCmAndTglInput(i,noCm, DateUtil.toDate(tglInput));
-	
-
-		return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage);
-	}
-	@RequestMapping(value = "/find-noCm/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> findByNoCm(@RequestParam(value = "i", required = false) String i,@RequestParam(value = "noCm", required = false) String noCm,
-			HttpServletRequest request) {
-		Map<String,Object> result = genericViewService.findByNoCmAnd(i,noCm);
-	
-
-		return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage);
-	}
-	@RequestMapping(value = "/find-medical-record-noRec-and-tglinput/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> findMedicalRecordByNoRecAndTglInput(@RequestParam(value = "i", required = false) String i,@RequestParam(value = "noRec", required = false) String noRec,
-			@RequestParam(value = "tglInput", required = false) String tglInput,
-			HttpServletRequest request) {
-		Map<String,Object> result = genericViewService.findMedicalRecordByNoRecAndTglInput(i,noRec,DateUtil.toDate(tglInput));
-		return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage);
+	@RequestMapping(value = "/find-medical-record-noRec/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> findMedicalRecordByNoRec(
+			@RequestParam(value = "i", required = false) String i,
+			@RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) {
+		Map<String, Object> result = genericViewService.findMedicalRecordByNoRec(i, noRec);
+		return getJsonResponse(result, OK, mapHeaderMessage);
 	}
 
-	@RequestMapping(value = "/find-medical-record-noRec-and-tglinput-pasien/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> findMedicalRecordByNoRecAndTglInputPasien(@RequestParam(value = "i", required = false) String i,@RequestParam(value = "noRec", required = false) String noRec,
-			@RequestParam(value = "tglInput", required = false) String tglInput,
-			HttpServletRequest request) {
-		Map<String,Object> result = genericViewService.findMedicalRecordByNoRecAndTglInputPasien(i,noRec,DateUtil.toDate(tglInput));
-		return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage);
+	@RequestMapping(value = "/check-input-pasien/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> cekInputPasien(
+			@RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) {
+		Map<String, Object> result = new HashMap<>();
+		return getJsonResponse(result, OK, mapHeaderMessage);
 	}
 
-	@RequestMapping(value = "/find-medical-record-noRec-antrian-pasien-diperiksa/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> findMedicalRecordByNoRecAntrianPasienDiPeriksa(@RequestParam(value = "i", required = false) String i,@RequestParam(value = "noRec", required = false) String noRec,
-			HttpServletRequest request) {
-		Map<String,Object> result = genericViewService.findMedicalRecordByNoRecAntrianPasienDiPeriksa(i,noRec);
-		Integer data =papAlergiDao.findByCountAntrian(noRec);
-		return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage);
+	@RequestMapping(value = "/find-medical-record-noCm-and-tglInput/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> findMedicalRecordByNoCmAndTglInput(
+			@RequestParam(value = "i", required = false) String i,
+			@RequestParam(value = "noCm", required = false) String noCm,
+			@RequestParam(value = "tglInput", required = false) String tglInput, HttpServletRequest request) {
+		Map<String, Object> result = genericViewService.findMedicalRecordByNoCmAndTglInput(i, noCm, toDate(tglInput));
+		return getJsonResponse(result, OK, mapHeaderMessage);
 	}
 
-	@RequestMapping(value = "/find-medical-record-noRec-pasien-antrian-pasien-diperiksa/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> findMedicalRecordByNoRecPasienAntrianPasienDiPeriksa(@RequestParam(value = "i", required = false) String i,@RequestParam(value = "noRec", required = false) String noRec,
-			HttpServletRequest request) {
-		Map<String,Object> result = genericViewService.findMedicalRecordByNoRecPasienAntrianPasienDiPeriksa(i,noRec);
-		Integer data =papAlergiDao.findByCountAntrian(noRec);
-		return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage);
+	@RequestMapping(value = "/find-medical-record-tglInput/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> findMedicalRecordByTglInput(
+			@RequestParam(value = "i", required = false) String i,
+			@RequestParam(value = "from", required = false) String from,
+			@RequestParam(value = "until", required = false) String until,
+			@RequestParam(value = "key", required = false) String key, HttpServletRequest request) {
+		Map<String, Object> result;
+		if (key != null) {
+			result = genericViewService.findMedicalRecordByTglInput(i, toDate(from), toDate(until), key);
+		} else
+			result = genericViewService.findMedicalRecordByTglInput(i, toDate(from), toDate(until));
+		return getJsonResponse(result, OK, mapHeaderMessage);
 	}
 
-	@Override
-	public ResponseEntity<Collection<PapAlergiVO>> getAllVOWithQueryString(HttpServletRequest request,
-			Integer page, Integer limit, String sort, String dir) {
-		return null;
+	@RequestMapping(value = "/find-noCm-and-tglInput/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> findByNoCmAndTglInput(
+			@RequestParam(value = "i", required = false) String i,
+			@RequestParam(value = "noCm", required = false) String noCm,
+			@RequestParam(value = "tglInput", required = false) String tglInput, HttpServletRequest request) {
+		Map<String, Object> result = genericViewService.findByNoCmAndTglInput(i, noCm, toDate(tglInput));
+		return getJsonResponse(result, OK, mapHeaderMessage);
 	}
 
-	@Override
-	public ResponseEntity<PapAlergiVO> getVO(Integer id) {
-		return null;
+	@RequestMapping(value = "/find-noCm/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> findByNoCm(@RequestParam(value = "i", required = false) String i,
+			@RequestParam(value = "noCm", required = false) String noCm, HttpServletRequest request) {
+		Map<String, Object> result = genericViewService.findByNoCmAnd(i, noCm);
+		return getJsonResponse(result, OK, mapHeaderMessage);
 	}
 
-	@Override
-	public ResponseEntity<String> addVO(PapAlergiVO vo) {
-		return null;
+	@RequestMapping(value = "/find-medical-record-noRec-and-tglinput/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> findMedicalRecordByNoRecAndTglInput(
+			@RequestParam(value = "i", required = false) String i,
+			@RequestParam(value = "noRec", required = false) String noRec,
+			@RequestParam(value = "tglInput", required = false) String tglInput, HttpServletRequest request) {
+		Map<String, Object> result = genericViewService.findMedicalRecordByNoRecAndTglInput(i, noRec, toDate(tglInput));
+		return getJsonResponse(result, OK, mapHeaderMessage);
 	}
 
-	@Override
-	public ResponseEntity<String> editVO(PapAlergiVO vo) {
-		return null;
+	@RequestMapping(value = "/find-medical-record-noRec-and-tglinput-pasien/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> findMedicalRecordByNoRecAndTglInputPasien(
+			@RequestParam(value = "i", required = false) String i,
+			@RequestParam(value = "noRec", required = false) String noRec,
+			@RequestParam(value = "tglInput", required = false) String tglInput, HttpServletRequest request) {
+		Map<String, Object> result = genericViewService.findMedicalRecordByNoRecAndTglInputPasien(i, noRec,
+				toDate(tglInput));
+		return getJsonResponse(result, OK, mapHeaderMessage);
 	}
 
-	@Override
-	public ResponseEntity<String> deleteVO(Integer id) {
-		return null;
+	@RequestMapping(value = "/find-medical-record-noRec-antrian-pasien-diperiksa/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> findMedicalRecordByNoRecAntrianPasienDiPeriksa(
+			@RequestParam(value = "i", required = false) String i,
+			@RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) {
+		Map<String, Object> result = genericViewService.findMedicalRecordByNoRecAntrianPasienDiPeriksa(i, noRec);
+		return getJsonResponse(result, OK, mapHeaderMessage);
 	}
 
-	@Override
-	public ResponseEntity<List<PapAlergiVO>> getAllVO() {
-		return null;
+	@RequestMapping(value = "/find-medical-record-noRec-pasien-antrian-pasien-diperiksa/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> findMedicalRecordByNoRecPasienAntrianPasienDiPeriksa(
+			@RequestParam(value = "i", required = false) String i,
+			@RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) {
+		Map<String, Object> result = genericViewService.findMedicalRecordByNoRecPasienAntrianPasienDiPeriksa(i, noRec);
+		return getJsonResponse(result, OK, mapHeaderMessage);
 	}
-	
+
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGigiMulutController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGigiMulutController.java
index 439487cb..04a60dce 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGigiMulutController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGigiMulutController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapGigiMulutService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapGigiMulutVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +66,11 @@ public class PapGigiMulutController extends LocaleController<PapGigiMulutVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -94,11 +92,11 @@ public class PapGigiMulutController extends LocaleController<PapGigiMulutVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGinekologiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGinekologiController.java
index 61853046..f8888059 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGinekologiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGinekologiController.java
@@ -32,7 +32,6 @@ import com.jasamedika.medifirst2000.service.PapGinekologiService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapGinekologiVO;
-import com.jasamedika.medifirst2000.vo.PapGinekologiVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -65,11 +64,11 @@ public class PapGinekologiController extends LocaleController<PapGinekologiVO> i
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -89,11 +88,11 @@ public class PapGinekologiController extends LocaleController<PapGinekologiVO> i
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiPerjanjianController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiPerjanjianController.java
index 106a4d61..5461ff23 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiPerjanjianController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiPerjanjianController.java
@@ -32,9 +32,7 @@ import com.jasamedika.medifirst2000.service.PapInstruksiPerjanjianService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapInstruksiPerjanjianVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 import com.jasamedika.medifirst2000.vo.PasienInstruksiPerjanjianVO;
-import com.jasamedika.medifirst2000.vo.PegawaiVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -70,11 +68,11 @@ public class PapInstruksiPerjanjianController extends LocaleController<PapInstru
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -97,11 +95,11 @@ public class PapInstruksiPerjanjianController extends LocaleController<PapInstru
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -123,11 +121,11 @@ public class PapInstruksiPerjanjianController extends LocaleController<PapInstru
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -156,11 +154,11 @@ public class PapInstruksiPerjanjianController extends LocaleController<PapInstru
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiPulangController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiPulangController.java
index 925bfeb1..3c3df94e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiPulangController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiPulangController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapInstruksiPulangService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapInstruksiPulangVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -67,11 +65,11 @@ public class PapInstruksiPulangController extends LocaleController<PapInstruksiP
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -93,11 +91,11 @@ public class PapInstruksiPulangController extends LocaleController<PapInstruksiP
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiRanapController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiRanapController.java
index 12c048d3..e98cf9f0 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiRanapController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapInstruksiRanapController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapInstruksiRanapService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapInstruksiRanapVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -67,11 +65,11 @@ public class PapInstruksiRanapController extends LocaleController<PapInstruksiRa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -93,11 +91,11 @@ public class PapInstruksiRanapController extends LocaleController<PapInstruksiRa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapIntegumenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapIntegumenController.java
index 0d08ea46..34569fa7 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapIntegumenController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapIntegumenController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapIntegumenService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapIntegumenVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +66,11 @@ public class PapIntegumenController extends LocaleController<PapIntegumenVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -94,11 +92,11 @@ public class PapIntegumenController extends LocaleController<PapIntegumenVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKebutuhanEdukasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKebutuhanEdukasiController.java
index 70c113f1..3d1e9a05 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKebutuhanEdukasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKebutuhanEdukasiController.java
@@ -86,13 +86,13 @@ public class PapKebutuhanEdukasiController extends LocaleController<PapKebutuhan
 			LOGGER.error("Got exception {} when add Kebutuhan Edukasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Kebutuhan Edukasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -114,11 +114,11 @@ public class PapKebutuhanEdukasiController extends LocaleController<PapKebutuhan
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanTambahanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanTambahanController.java
index b78dacfb..7e4a509d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanTambahanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanTambahanController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -15,7 +14,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -63,18 +61,18 @@ public class PapKeluhanTambahanController extends LocaleController<PapKeluhanTam
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
 				result.put("message", "Gagal");
 			}
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			SaveLog("Keluhan Tambahan", "Pemeriksaan",request);
 			return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -92,17 +90,17 @@ public class PapKeluhanTambahanController extends LocaleController<PapKeluhanTam
 				result.put("message", "Gagal");
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
 			}
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanUtamaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanUtamaController.java
index e510e726..ba81fbb6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanUtamaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanUtamaController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -15,7 +14,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.security.core.userdetails.User;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,15 +29,11 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.dao.LoginUserDao;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.security.model.UserAuthentication;
-import com.jasamedika.medifirst2000.security.service.TokenAuthenticationService;
 import com.jasamedika.medifirst2000.service.ActivityPegawaiService;
 import com.jasamedika.medifirst2000.service.PapKeluhanUtamaService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapKeluhanUtamaVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
-import com.jasamedika.medifirst2000.vo.PegawaiVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -80,11 +74,11 @@ public class PapKeluhanUtamaController extends LocaleController<PapKeluhanUtamaV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -106,11 +100,11 @@ public class PapKeluhanUtamaController extends LocaleController<PapKeluhanUtamaV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMataController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMataController.java
index 3fa2ad70..7b4cb31f 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMataController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMataController.java
@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -33,8 +32,6 @@ import com.jasamedika.medifirst2000.service.PapMataService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapMataVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
-import com.jasamedika.medifirst2000.vo.ProgramPengajaranVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -67,11 +64,11 @@ public class PapMataController extends LocaleController<PapMataVO> implements
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -93,11 +90,11 @@ public class PapMataController extends LocaleController<PapMataVO> implements
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMuskuloskeletalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMuskuloskeletalController.java
index bdc73019..8b2aab57 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMuskuloskeletalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMuskuloskeletalController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapMuskuloskeletalService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapMuskuloskeletalVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +66,11 @@ public class PapMuskuloskeletalController extends LocaleController<PapMuskuloske
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -94,11 +92,11 @@ public class PapMuskuloskeletalController extends LocaleController<PapMuskuloske
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapNeurologiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapNeurologiController.java
index 28babb54..d0d9527c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapNeurologiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapNeurologiController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapNeurologiService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapNeurologiVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +66,11 @@ public class PapNeurologiController extends LocaleController<PapNeurologiVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -94,11 +92,11 @@ public class PapNeurologiController extends LocaleController<PapNeurologiVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapObstetriController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapObstetriController.java
index c05ac5dd..b8901bc4 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapObstetriController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapObstetriController.java
@@ -63,11 +63,11 @@ public class PapObstetriController extends LocaleController<PapObstetriVO> imple
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapOpstetriController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapOpstetriController.java
index 964726d5..11efa809 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapOpstetriController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapOpstetriController.java
@@ -25,8 +25,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapObstetriService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapObstetriVO;
-import com.jasamedika.medifirst2000.vo.PapObstetriVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
 
 /**
  * Controller class for Registrasi Pasien Business
@@ -54,11 +52,11 @@ public class PapOpstetriController extends LocaleController<PapObstetriVO>{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePapObstetri", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePapObstetri", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPengambilanSpesimenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPengambilanSpesimenController.java
index 9a3fa118..2fad61d5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPengambilanSpesimenController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPengambilanSpesimenController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -87,13 +86,13 @@ public class PapPengambilanSpesimenController extends LocaleController<PapPengam
 			LOGGER.error("Got exception {} when add Pengambilan Spesimen", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add  Pengambilan Spesimen", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -110,13 +109,13 @@ public class PapPengambilanSpesimenController extends LocaleController<PapPengam
 			LOGGER.error("Got exception {} when update Pengambilan Spesimen", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update  Pengambilan Spesimen", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -135,13 +134,13 @@ public class PapPengambilanSpesimenController extends LocaleController<PapPengam
 			LOGGER.error("Got exception {} when update Pengambilan Spesimen", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update  Pengambilan Spesimen", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPernapasanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPernapasanController.java
index 925c653f..a15a92e6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPernapasanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPernapasanController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -28,13 +27,11 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.GenericView;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapPernapasanService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapPernapasanVO;
-import com.jasamedika.medifirst2000.vo.PapPernapasanVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -70,11 +67,11 @@ public class PapPernapasanController extends LocaleController<PapPernapasanVO> i
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -96,11 +93,11 @@ public class PapPernapasanController extends LocaleController<PapPernapasanVO> i
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRehabilitasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRehabilitasiController.java
index 7ceb0782..1bec4b1b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRehabilitasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRehabilitasiController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapRehabilitasiService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapRehabilitasiVO;
-import com.jasamedika.medifirst2000.vo.PapRehabilitasiVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -66,11 +64,11 @@ public class PapRehabilitasiController extends LocaleController<PapRehabilitasiV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -90,11 +88,11 @@ public class PapRehabilitasiController extends LocaleController<PapRehabilitasiV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaKonsultasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaKonsultasiController.java
index 8958d9a7..d039216d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaKonsultasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaKonsultasiController.java
@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -21,7 +20,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -35,7 +33,6 @@ import com.jasamedika.medifirst2000.service.PapRencanaKonsultasiService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapRencanaKonsultasiVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -77,11 +74,11 @@ public class PapRencanaKonsultasiController extends LocaleController<PapRencanaK
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -103,11 +100,11 @@ public class PapRencanaKonsultasiController extends LocaleController<PapRencanaK
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaOrderFarmasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaOrderFarmasiController.java
index ed3b052a..7af0b6ca 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaOrderFarmasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaOrderFarmasiController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapRencanaOrderFarmasiService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapRencanaOrderFarmasiVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -67,11 +65,11 @@ public class PapRencanaOrderFarmasiController extends LocaleController<PapRencan
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -93,11 +91,11 @@ public class PapRencanaOrderFarmasiController extends LocaleController<PapRencan
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaOrderLaboratoriumController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaOrderLaboratoriumController.java
index 115c2448..3f0b4856 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaOrderLaboratoriumController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaOrderLaboratoriumController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapRencanaOrderLaboratoriumService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapRencanaOrderLaboratoriumVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -67,11 +65,11 @@ public class PapRencanaOrderLaboratoriumController extends LocaleController<PapR
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -93,11 +91,11 @@ public class PapRencanaOrderLaboratoriumController extends LocaleController<PapR
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaOrderRadiologiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaOrderRadiologiController.java
index de2efa5e..f63462e1 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaOrderRadiologiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaOrderRadiologiController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -31,9 +30,7 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapRencanaOrderRadiologiService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.InputRencanaOrderRadiologiVO;
 import com.jasamedika.medifirst2000.vo.PapRencanaOrderRadiologiVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +65,11 @@ public class PapRencanaOrderRadiologiController extends LocaleController<PapRenc
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -120,11 +117,11 @@ public class PapRencanaOrderRadiologiController extends LocaleController<PapRenc
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaTindakanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaTindakanController.java
index 4ac7e7ca..de0f93a1 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaTindakanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRencanaTindakanController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapRencanaTindakanService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapRencanaTindakanVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -67,11 +65,11 @@ public class PapRencanaTindakanController extends LocaleController<PapRencanaTin
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -93,11 +91,11 @@ public class PapRencanaTindakanController extends LocaleController<PapRencanaTin
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatImunisasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatImunisasiController.java
index af59615c..a2b1de53 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatImunisasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatImunisasiController.java
@@ -65,11 +65,11 @@ public class PapRiwayatImunisasiController extends LocaleController<PapRiwayatIm
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatKelahiranController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatKelahiranController.java
index 4649b321..d6806ab1 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatKelahiranController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatKelahiranController.java
@@ -49,13 +49,13 @@ public class PapRiwayatKelahiranController extends LocaleController<PapRiwayatKe
 			LOGGER.error("Got exception {} when add PapRiwayatKelahiran", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add PapRiwayatKelahiran", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatKeluargaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatKeluargaController.java
index 9b87361b..c42b57fe 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatKeluargaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatKeluargaController.java
@@ -14,11 +14,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -30,11 +28,8 @@ import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapRiwayatKeluargaService;
 import com.jasamedika.medifirst2000.service.ThtService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapRiwayatKeluargaVO;
-import com.jasamedika.medifirst2000.vo.ThtVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -72,11 +67,11 @@ public class PapRiwayatKeluargaController extends LocaleController<PapRiwayatKel
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatPsikososialController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatPsikososialController.java
index 962f788c..bb99e635 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatPsikososialController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatPsikososialController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapRiwayatPsikososialService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapRiwayatPsikososialVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +66,11 @@ public class PapRiwayatPsikososialController extends LocaleController<PapRiwayat
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -94,11 +92,11 @@ public class PapRiwayatPsikososialController extends LocaleController<PapRiwayat
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatTumbuhKembangController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatTumbuhKembangController.java
index 33506121..ecfc80ad 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatTumbuhKembangController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatTumbuhKembangController.java
@@ -65,11 +65,11 @@ public class PapRiwayatTumbuhKembangController extends LocaleController<PapRiway
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSirkulasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSirkulasiController.java
index 89ef3a3a..f172d6a6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSirkulasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSirkulasiController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapSirkulasiService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapSirkulasiVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -68,11 +66,11 @@ public class PapSirkulasiController extends LocaleController<PapSirkulasiVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -94,11 +92,11 @@ public class PapSirkulasiController extends LocaleController<PapSirkulasiVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningGiziController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningGiziController.java
index 40ca770b..f5b46415 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningGiziController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningGiziController.java
@@ -13,7 +13,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.domain.Specifications;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -33,12 +32,9 @@ import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.entities.PapSkriningGizi;
-import com.jasamedika.medifirst2000.entities.Ruangan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapSkriningGiziService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.InputPAPSkriningGiziVO;
 import com.jasamedika.medifirst2000.vo.PapSkriningGiziVO;
 
 import net.kaczmarzyk.spring.data.jpa.domain.In;
@@ -77,11 +73,11 @@ public class PapSkriningGiziController extends LocaleController<PapSkriningGiziV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningNyeriController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningNyeriController.java
index b2420363..1c92a25e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningNyeriController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningNyeriController.java
@@ -33,7 +33,6 @@ import com.jasamedika.medifirst2000.service.PapSkriningNyeriService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -66,11 +65,11 @@ public class PapSkriningNyeriController extends LocaleController<PapSkriningNyer
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -90,11 +89,11 @@ public class PapSkriningNyeriController extends LocaleController<PapSkriningNyer
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSmearController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSmearController.java
index 940d033a..1c0909bd 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSmearController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSmearController.java
@@ -1,84 +1,46 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
+import com.jasamedika.medifirst2000.entities.PapSmear;
 import com.jasamedika.medifirst2000.service.PapSmearService;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapSmearVO;
-import com.jasamedika.medifirst2000.vo.VaksinVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR;
+import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
+import static org.springframework.http.HttpStatus.OK;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
 @RestController
 @RequestMapping("/pap-smear")
-@JsonIgnoreProperties(ignoreUnknown = true) 
-public class PapSmearController extends LocaleController<PapSmearVO> implements
-IBaseRestController<PapSmearVO>{
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(GeneralCheckUpController.class);
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class PapSmearController extends LocaleController<PapSmearVO> {
 
 	@Autowired
-	private PapSmearService papSmearService;
-	
-	@RequestMapping(value = "/find-by-pegawai-id/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String,Object>> findByPegawaiId(@RequestParam(value = "pegawaiId", required = false) Integer pegawaiId,HttpServletRequest request) {
-		Map<String,Object> result = papSmearService.findByPegawaiId(pegawaiId);
-		Boolean dataFound=new Boolean((boolean) result.get("dataFound"));
-		if(dataFound){
-			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-		}else{
-			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request ));
+	private PapSmearService<PapSmear> papSmearService;
+
+	@RequestMapping(value = "/find-by-pegawai-id/", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> findByPegawaiId(
+			@RequestParam(value = "pegawaiId", required = false) Integer pegawaiId, HttpServletRequest request) {
+		Map<String, Object> result = papSmearService.findByPegawaiId(pegawaiId);
+		boolean dataFound = (boolean) result.get("dataFound");
+		if (dataFound) {
+			mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
+		} else {
+			mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request));
 		}
-
-		return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage);
+		return getJsonResponse(result, OK, mapHeaderMessage);
 	}
 
-	@Override
-	public ResponseEntity<Collection<PapSmearVO>> getAllVOWithQueryString(HttpServletRequest request, Integer page,
-			Integer limit, String sort, String dir) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<PapSmearVO> getVO(Integer id) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> addVO(PapSmearVO vo) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> editVO(PapSmearVO vo) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<String> deleteVO(Integer id) {
-		return null;
-	}
-
-	@Override
-	public ResponseEntity<List<PapSmearVO>> getAllVO() {
-		return null;
-	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapStatusFungsionalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapStatusFungsionalController.java
index 27750f8b..fb2bcecf 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapStatusFungsionalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapStatusFungsionalController.java
@@ -1,8 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -15,7 +13,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -25,12 +22,10 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapStatusFungsionalService;
-import com.jasamedika.medifirst2000.service.ThtService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapStatusFungsionalVO;
 
@@ -60,11 +55,11 @@ public class PapStatusFungsionalController extends LocaleController<PapStatusFun
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -84,11 +79,11 @@ public class PapStatusFungsionalController extends LocaleController<PapStatusFun
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getStatusFungsional", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getStatusFungsional", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapStatusKemandirianController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapStatusKemandirianController.java
index a14cdafd..ea800769 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapStatusKemandirianController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapStatusKemandirianController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -32,7 +31,6 @@ import com.jasamedika.medifirst2000.service.PapStatusKemandirianService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapStatusKemandirianVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -67,11 +65,11 @@ public class PapStatusKemandirianController extends LocaleController<PapStatusKe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -93,11 +91,11 @@ public class PapStatusKemandirianController extends LocaleController<PapStatusKe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapTandaVitalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapTandaVitalController.java
index ca8e9e4e..be300a14 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapTandaVitalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapTandaVitalController.java
@@ -49,11 +49,11 @@ public class PapTandaVitalController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapThtController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapThtController.java
index 471f314f..575dfebc 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapThtController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapThtController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -34,7 +33,6 @@ import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PapThtVO;
 import com.jasamedika.medifirst2000.vo.ThtVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -72,11 +70,11 @@ public class PapThtController extends LocaleController<PapThtVO> implements
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -98,11 +96,11 @@ public class PapThtController extends LocaleController<PapThtVO> implements
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -124,11 +122,11 @@ public class PapThtController extends LocaleController<PapThtVO> implements
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ParameterController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ParameterController.java
index bcb1386b..85b8aef3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ParameterController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ParameterController.java
@@ -50,13 +50,13 @@ public class ParameterController extends LocaleController<ParameterVO> implement
 			LOGGER.error("Got exception {} when add Parameter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Parameter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -73,13 +73,13 @@ public class ParameterController extends LocaleController<ParameterVO> implement
 			LOGGER.error("Got exception {} when update Parameter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Parameter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -96,13 +96,13 @@ public class ParameterController extends LocaleController<ParameterVO> implement
 			LOGGER.error("Got exception {} when get all sasaran strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all sasaran strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ParameterKepuasanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ParameterKepuasanController.java
index 9a40f401..236c4483 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ParameterKepuasanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ParameterKepuasanController.java
@@ -51,13 +51,13 @@ public class ParameterKepuasanController extends LocaleController<ParameterKepua
 			LOGGER.error("Got exception {} when add ParameterKepuasan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add ParameterKepuasan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -74,13 +74,13 @@ public class ParameterKepuasanController extends LocaleController<ParameterKepua
 			LOGGER.error("Got exception {} when update ParameterKepuasan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update ParameterKepuasan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -97,13 +97,13 @@ public class ParameterKepuasanController extends LocaleController<ParameterKepua
 			LOGGER.error("Got exception {} when get all ParameterKepuasan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all ParameterKepuasan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienController.java
index 8c0bf707..6eddb676 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienController.java
@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -26,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.dao.RegistrasiPelayananPasienDao;
 import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
 import com.jasamedika.medifirst2000.entities.PasienDaftar;
@@ -35,10 +33,8 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapInformasiIbuService;
 import com.jasamedika.medifirst2000.service.PasienDaftarService;
 import com.jasamedika.medifirst2000.service.PasienService;
-import com.jasamedika.medifirst2000.service.TestService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
 import com.jasamedika.medifirst2000.vo.PasienVO;
 
 /**
@@ -122,17 +118,17 @@ public class PasienController extends LocaleController<PasienVO> implements
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 	public ResponseEntity<String> editVO(@Valid @RequestBody PasienVO vo) {
@@ -145,18 +141,18 @@ public class PasienController extends LocaleController<PasienVO> implements
 			LOGGER.error("Got exception {} when update Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Pasien",
 					jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 	public ResponseEntity<PasienVO> getVO(@PathVariable("id") Integer id) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienMeninggalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienMeninggalController.java
index ba696cda..6a4780ac 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienMeninggalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienMeninggalController.java
@@ -23,7 +23,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PasienMeninggalService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
 import com.jasamedika.medifirst2000.vo.PasienMeninggalVO;
 
 /**
@@ -58,11 +57,11 @@ public class PasienMeninggalController extends LocaleController<PasienMeninggalV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien meninggal", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien Meninggal", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -81,11 +80,11 @@ public class PasienMeninggalController extends LocaleController<PasienMeninggalV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when loadPasienMeninggal", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when loadPasienMeninggal", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -102,11 +101,11 @@ public class PasienMeninggalController extends LocaleController<PasienMeninggalV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when loadPasienMeninggal", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when loadPasienMeninggal", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -125,11 +124,11 @@ public class PasienMeninggalController extends LocaleController<PasienMeninggalV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when loadRencanaPindah", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when loadRencanaPindah", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -146,11 +145,11 @@ public class PasienMeninggalController extends LocaleController<PasienMeninggalV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getkelas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getkelas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -168,11 +167,11 @@ public class PasienMeninggalController extends LocaleController<PasienMeninggalV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getRuanganByKelas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getRuanganByKelas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -190,11 +189,11 @@ public class PasienMeninggalController extends LocaleController<PasienMeninggalV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getKamarByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getKamarByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -212,11 +211,11 @@ public class PasienMeninggalController extends LocaleController<PasienMeninggalV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getBedByKamar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getBedByKamar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienPulangController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienPulangController.java
index d21688c0..aa92ff08 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienPulangController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienPulangController.java
@@ -89,11 +89,11 @@ public class PasienPulangController extends LocaleController<PasienPulangVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien Pulang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien Pulng", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -110,11 +110,11 @@ public class PasienPulangController extends LocaleController<PasienPulangVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get Ruangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get Ruangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollPegawaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollPegawaiController.java
index c3a9da15..407477b1 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollPegawaiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollPegawaiController.java
@@ -47,7 +47,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-pegawai-blu-pkwt", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -58,7 +58,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/find-status-pegawai-blu-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -72,7 +72,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/find-jenis-gaji", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -83,7 +83,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-uang-makan-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -99,7 +99,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/find-status-pegawai-uang-makan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -115,7 +115,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-pegawai-uang-makan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -126,7 +126,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/import-uang-makan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -144,10 +144,10 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}
 		
 	}
@@ -162,7 +162,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-harian-lepas-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -178,7 +178,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-pegawai-harian-lepas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -189,7 +189,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/find-status-pegawai-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -202,7 +202,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-dokter-psikologi-pkwt", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -218,7 +218,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-dokter-psikologi-pkwt", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -229,7 +229,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/find-rekanan-penjamin-pasien", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -240,7 +240,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/find-umr", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -253,7 +253,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-premi-asuransi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -269,7 +269,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-premi-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -280,7 +280,7 @@ public class PayRollPegawaiController extends LocaleController<StrukHistoriVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollReportingController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollReportingController.java
index 30f3da8e..7e65da91 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollReportingController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PayRollReportingController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -20,7 +19,6 @@ import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.dto.PayRollReportHarianLepasDto;
 import com.jasamedika.medifirst2000.dto.PayRollReportUangMakanDto;
 import com.jasamedika.medifirst2000.service.PayRollReportingService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.StrukHistoriVO;
 
@@ -42,7 +40,7 @@ public class PayRollReportingController extends LocaleController<StrukHistoriVO>
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/harian-lepas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -56,7 +54,7 @@ public class PayRollReportingController extends LocaleController<StrukHistoriVO>
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
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 a0885432..bab1afcd 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
@@ -165,11 +165,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -208,11 +208,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -246,11 +246,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -268,11 +268,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -292,11 +292,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -309,17 +309,17 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
 						getMessage(MessageResource.LABEL_SUCCESS, request));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED, mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Riwayat Pekerjaan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Riwayat Pekerjaan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -332,17 +332,17 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
 						getMessage(MessageResource.LABEL_SUCCESS, request));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED, mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Riwayat Pelatihan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Riwayat Pelatihan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -355,17 +355,17 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
 						getMessage(MessageResource.LABEL_SUCCESS, request));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED, mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Riwayat Pendidikan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Riwayat Pendidikan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -378,17 +378,17 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
 						getMessage(MessageResource.LABEL_SUCCESS, request));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED, mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Riwayat Jabatan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Riwayat Jabatan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -404,14 +404,14 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add pegawai", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pegawai", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 	/// Alter by Syamsu untuk edit data pegawai
@@ -438,18 +438,18 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 				}else{
 					LOGGER.error("Got exception {} when update Pegawai, password invalid");
 					addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "Invalid Password");
-					return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+					return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 				}
 			} else {
 				LOGGER.error("Got exception {} when update Pegawai");
 				addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "User is unauthorized");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		}catch(Exception e){
 			e.printStackTrace();
 			LOGGER.error("Got exception {} when update Pegawai", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}
 
 	}
@@ -467,15 +467,15 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 			e.printStackTrace();
 			LOGGER.error("Got exception {} when update Pegawai", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			jse.printStackTrace();
 			LOGGER.error("Got exception {} when update Pegawai", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 	public ResponseEntity<PegawaiVO> getVO(@PathVariable("id") Integer id) {
@@ -495,11 +495,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get Asal Rujukan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get Asal Rujukan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -654,11 +654,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPegawaiByPelaksana", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPegawaiByPelaksana", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -675,11 +675,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -696,11 +696,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -718,11 +718,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -738,11 +738,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -791,11 +791,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Catatan Perkembangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add  Catatan Perkembangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	 
@@ -829,11 +829,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -850,11 +850,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -870,11 +870,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPegawaiWithNamaUserById", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPegawaiWithNamaUserById", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -893,11 +893,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}	
@@ -915,11 +915,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -957,11 +957,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	@RequestMapping(value = "/get-pegawai-by-sub-Unit-kerja/{idSubUnitKerja}", method = RequestMethod.GET)
@@ -977,11 +977,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -997,11 +997,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -1017,11 +1017,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -1037,11 +1037,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -1057,11 +1057,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -1077,11 +1077,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -1097,11 +1097,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -1118,11 +1118,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -1140,11 +1140,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -1161,11 +1161,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -1182,11 +1182,11 @@ public class PegawaiController extends LocaleController<PegawaiVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiJadwalKerjaDokterDController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiJadwalKerjaDokterDController.java
index b4ce6485..c34b0c96 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiJadwalKerjaDokterDController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiJadwalKerjaDokterDController.java
@@ -46,11 +46,11 @@ public class PegawaiJadwalKerjaDokterDController extends LocaleController<Pegawa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when loadDataJadwal", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when loadDataJadwal", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -67,11 +67,11 @@ public class PegawaiJadwalKerjaDokterDController extends LocaleController<Pegawa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getKamarByRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getKamarByRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -88,11 +88,11 @@ public class PegawaiJadwalKerjaDokterDController extends LocaleController<Pegawa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveJadwalKerjaDokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveJadwalKerjaDokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -109,11 +109,11 @@ public class PegawaiJadwalKerjaDokterDController extends LocaleController<Pegawa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when updateJadwalKerjaDokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when updateJadwalKerjaDokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -132,11 +132,11 @@ public class PegawaiJadwalKerjaDokterDController extends LocaleController<Pegawa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when deleteJadwalKerjaDokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when deleteJadwalKerjaDokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkAsuransiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkAsuransiController.java
index c666dfd2..4aa073b6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkAsuransiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkAsuransiController.java
@@ -1,11 +1,9 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -20,16 +18,10 @@ import org.springframework.web.bind.annotation.RestController;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.dto.OrderPelayananGiziDto;
-import com.jasamedika.medifirst2000.dto.PayRollDto;
-import com.jasamedika.medifirst2000.dto.PayRollUangMakanDto;
 import com.jasamedika.medifirst2000.dto.PegawaiSkAsuransiDto;
-import com.jasamedika.medifirst2000.service.PayRollPegawaiService;
 import com.jasamedika.medifirst2000.service.PegawaiSKAsuransiService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PegawaiSKAsuransiVO;
-import com.jasamedika.medifirst2000.vo.StrukHistoriVO;
 
 @RestController
 @RequestMapping(value="/pegawai-sk-asuransi")
@@ -46,7 +38,7 @@ public class PegawaiSkAsuransiController extends LocaleController<PegawaiSKAsura
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}else{
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}
 	}
 
@@ -60,7 +52,7 @@ public class PegawaiSkAsuransiController extends LocaleController<PegawaiSKAsura
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pegawai-sk-asuransi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -72,7 +64,7 @@ public class PegawaiSkAsuransiController extends LocaleController<PegawaiSKAsura
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-komponenharga-by-jenis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -85,7 +77,7 @@ public class PegawaiSkAsuransiController extends LocaleController<PegawaiSKAsura
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkGajiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkGajiController.java
index c114dc2d..e2c114b0 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkGajiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkGajiController.java
@@ -38,7 +38,7 @@ public class PegawaiSkGajiController extends LocaleController<PegawaiSKGajiVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pegawai-sk-gaji", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -51,7 +51,7 @@ public class PegawaiSkGajiController extends LocaleController<PegawaiSKGajiVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pegawai-sk-gaji-by-pegawai-id", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -64,7 +64,7 @@ public class PegawaiSkGajiController extends LocaleController<PegawaiSKGajiVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pegawai-sk-gaji", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -76,7 +76,7 @@ public class PegawaiSkGajiController extends LocaleController<PegawaiSKGajiVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -88,7 +88,7 @@ public class PegawaiSkGajiController extends LocaleController<PegawaiSKGajiVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pegawai-aktif", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -100,7 +100,7 @@ public class PegawaiSkGajiController extends LocaleController<PegawaiSKGajiVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-komponenharga-by-jenis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -113,7 +113,7 @@ public class PegawaiSkGajiController extends LocaleController<PegawaiSKGajiVO> {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkPajakController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkPajakController.java
index 28b4e777..8538279d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkPajakController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiSkPajakController.java
@@ -38,7 +38,7 @@ public class PegawaiSkPajakController extends LocaleController<PegawaiSKAsuransi
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pegawai-sk-Pajak", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -51,7 +51,7 @@ public class PegawaiSkPajakController extends LocaleController<PegawaiSKAsuransi
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pegawai-sk-Pajak", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -63,7 +63,7 @@ public class PegawaiSkPajakController extends LocaleController<PegawaiSKAsuransi
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -75,7 +75,7 @@ public class PegawaiSkPajakController extends LocaleController<PegawaiSKAsuransi
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-golongan-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -87,7 +87,7 @@ public class PegawaiSkPajakController extends LocaleController<PegawaiSKAsuransi
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-objek-pajak", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -99,7 +99,7 @@ public class PegawaiSkPajakController extends LocaleController<PegawaiSKAsuransi
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	@RequestMapping(value="/get-all-range", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<Map<String, Object>>> getAllRange(
@@ -110,7 +110,7 @@ public class PegawaiSkPajakController extends LocaleController<PegawaiSKAsuransi
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaController.java
index eec4b592..f7df793b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.dto.PegawaiSkGajiDto;
 import com.jasamedika.medifirst2000.dto.PegawaiStrukturGajiByJaDto;
 import com.jasamedika.medifirst2000.service.PegawaiStrukturGajiByJaService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
@@ -39,7 +38,7 @@ public class PegawaiStrukturGajiByJaController extends LocaleController<PegawaiS
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pegawai-ja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -52,7 +51,7 @@ public class PegawaiStrukturGajiByJaController extends LocaleController<PegawaiS
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pegawai-ja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -64,7 +63,7 @@ public class PegawaiStrukturGajiByJaController extends LocaleController<PegawaiS
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -76,7 +75,7 @@ public class PegawaiStrukturGajiByJaController extends LocaleController<PegawaiS
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-komponenharga-by-jenis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -89,7 +88,7 @@ public class PegawaiStrukturGajiByJaController extends LocaleController<PegawaiS
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaPeController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaPeController.java
index efe1a164..8b620d06 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaPeController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByJaPeController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.dto.PegawaiSkGajiDto;
 import com.jasamedika.medifirst2000.dto.PegawaiStrukturGajiByJaPeDto;
 import com.jasamedika.medifirst2000.service.PegawaiStrukturGajiByJaPeService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
@@ -39,7 +38,7 @@ public class PegawaiStrukturGajiByJaPeController extends LocaleController<Pegawa
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pegawai-jape", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -52,7 +51,7 @@ public class PegawaiStrukturGajiByJaPeController extends LocaleController<Pegawa
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pegawai-jape", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -64,7 +63,7 @@ public class PegawaiStrukturGajiByJaPeController extends LocaleController<Pegawa
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -76,7 +75,7 @@ public class PegawaiStrukturGajiByJaPeController extends LocaleController<Pegawa
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pendidikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -88,7 +87,7 @@ public class PegawaiStrukturGajiByJaPeController extends LocaleController<Pegawa
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-komponenharga-by-jenis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -101,7 +100,7 @@ public class PegawaiStrukturGajiByJaPeController extends LocaleController<Pegawa
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByLTJaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByLTJaController.java
index 4de401c7..a2bf7780 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByLTJaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByLTJaController.java
@@ -38,7 +38,7 @@ public class PegawaiStrukturGajiByLTJaController extends LocaleController<Pegawa
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pegawai-ltja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -51,7 +51,7 @@ public class PegawaiStrukturGajiByLTJaController extends LocaleController<Pegawa
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pegawai-ltja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -63,7 +63,7 @@ public class PegawaiStrukturGajiByLTJaController extends LocaleController<Pegawa
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-jabatan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -75,7 +75,7 @@ public class PegawaiStrukturGajiByLTJaController extends LocaleController<Pegawa
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-komponenharga-by-jenis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -88,7 +88,7 @@ public class PegawaiStrukturGajiByLTJaController extends LocaleController<Pegawa
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByMaKaPeController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByMaKaPeController.java
index 3561b3c2..330e7025 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByMaKaPeController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PegawaiStrukturGajiByMaKaPeController.java
@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.dto.PegawaiSkGajiDto;
 import com.jasamedika.medifirst2000.dto.PegawaiStrukturGajiByMaKaPeDto;
 import com.jasamedika.medifirst2000.service.PegawaiStrukturGajiByMaKaPeService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
@@ -39,7 +38,7 @@ public class PegawaiStrukturGajiByMaKaPeController extends LocaleController<Pega
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pegawai-makape", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -52,7 +51,7 @@ public class PegawaiStrukturGajiByMaKaPeController extends LocaleController<Pega
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pegawai-makape", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -64,7 +63,7 @@ public class PegawaiStrukturGajiByMaKaPeController extends LocaleController<Pega
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-detail-kategori-pegawai", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -76,7 +75,7 @@ public class PegawaiStrukturGajiByMaKaPeController extends LocaleController<Pega
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-range-masa-kerja", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -88,7 +87,7 @@ public class PegawaiStrukturGajiByMaKaPeController extends LocaleController<Pega
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-pendidikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -100,7 +99,7 @@ public class PegawaiStrukturGajiByMaKaPeController extends LocaleController<Pega
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-komponenharga-by-jenis", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -113,7 +112,7 @@ public class PegawaiStrukturGajiByMaKaPeController extends LocaleController<Pega
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PekerjaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PekerjaanController.java
index a604dd6f..55015db3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PekerjaanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PekerjaanController.java
@@ -1,6 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -12,7 +11,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
@@ -40,7 +38,7 @@ public class PekerjaanController extends LocaleController{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-pekerjaan", 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelaksanaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelaksanaController.java
index 52c1ab59..226c272e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelaksanaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelaksanaController.java
@@ -1,11 +1,8 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,23 +11,17 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.AdmisiRencanaPindahRuanganService;
 import com.jasamedika.medifirst2000.service.PelaksanaService;
-import com.jasamedika.medifirst2000.service.TimeOutControlService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.AdmisiRencanaPindahRuanganVO;
 import com.jasamedika.medifirst2000.vo.PelaksanaVO;
 
 @RestController
@@ -55,11 +46,11 @@ public class PelaksanaController extends LocaleController<PelaksanaVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getDataGrid", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getDataGrid", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanBiayaDiklatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanBiayaDiklatController.java
index 89120b84..5e84c4f9 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanBiayaDiklatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanBiayaDiklatController.java
@@ -49,11 +49,11 @@ public class PelatihanBiayaDiklatController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanPaketController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanPaketController.java
index 1da30767..107bf7b0 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanPaketController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelatihanPaketController.java
@@ -50,11 +50,11 @@ public class PelatihanPaketController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananAdmixtureController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananAdmixtureController.java
index d5301738..c3eafa53 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananAdmixtureController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananAdmixtureController.java
@@ -53,13 +53,13 @@ IBaseRestController<PelayananProduksiVO>  {
 			LOGGER.error("Got exception {} when add Pelayanan Admixture", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pelayanan Admixture", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -76,13 +76,13 @@ IBaseRestController<PelayananProduksiVO>  {
 			LOGGER.error("Got exception {} when update Pelayanan Admixture", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Pelayanan Admixture", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananCytotoxicController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananCytotoxicController.java
index 1da6b3ee..9b94a226 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananCytotoxicController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananCytotoxicController.java
@@ -53,13 +53,13 @@ IBaseRestController<PelayananProduksiVO>  {
 			LOGGER.error("Got exception {} when add Pelayanan Cytotoxic", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pelayanan Cytotoxic", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -76,13 +76,13 @@ IBaseRestController<PelayananProduksiVO>  {
 			LOGGER.error("Got exception {} when update Pelayanan Cytotoxic", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Pelayanan Cytotoxic", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananHargaStokDiskonController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananHargaStokDiskonController.java
deleted file mode 100644
index 53f8c7ee..00000000
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananHargaStokDiskonController.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.jasamedika.medifirst2000.controller;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.AsalProduk;
-import com.jasamedika.medifirst2000.entities.JenisTarif;
-import com.jasamedika.medifirst2000.entities.Kelas;
-import com.jasamedika.medifirst2000.entities.KelompokPasien;
-import com.jasamedika.medifirst2000.entities.KomponenHarga;
-import com.jasamedika.medifirst2000.entities.Produk;
-import com.jasamedika.medifirst2000.entities.Ruangan;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.AssetService;
-import com.jasamedika.medifirst2000.service.PelayananHargaStokDiskonService;
-import com.jasamedika.medifirst2000.util.DateUtil;
-import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.AssetVO;
-
-@RestController
-@RequestMapping("/pelayanan-harga-stok-diskon")
-public class PelayananHargaStokDiskonController extends LocaleController<AssetVO> {
-	@Autowired
-	private PelayananHargaStokDiskonService pelayananHargaStokDiskonService;
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(PelayananHargaStokDiskonController.class);
-	
-	@RequestMapping(value = "/get", method = RequestMethod.GET)
-	public ResponseEntity<Map<String,Object>> getData(
-			@RequestParam(value = "noRegistrasi", required = false) String noRegistrasi,
-			@RequestParam(value = "kelompokPasienId", required = false) Integer kelompokPasienId,
-			@RequestParam(value = "produkId", required = false) Integer produkId,
-			@RequestParam(value = "asalProdukId", required = false) Integer asalProdukId,
-			@RequestParam(value = "kelasId", required = false) Integer kelasId,
-			@RequestParam(value = "ruanganId", required = false) Integer ruanganId,
-			@RequestParam(value = "komponenHargaId", required = false) Integer komponenHargaId,
-			@RequestParam(value = "jenisTarifId", required = false) Integer jenisTarifId,
-			@RequestParam(value = "tglPelayanan", required = false) String tglPelayanan,
-			@RequestParam(value = "orderStok", required = false) Double orderStok,
-			@RequestParam(value = "cito", required = false) Integer cito) {
-		Map<String,Object> result = new HashMap<String,Object>();
-		KelompokPasien kelompokPasien=new KelompokPasien();
-		kelompokPasien.setId(kelompokPasienId);
-		Produk produk=new Produk();
-		produk.setId(produkId);
-		AsalProduk asalProduk=new AsalProduk();
-		asalProduk.setId(asalProdukId);
-		Kelas kelas=new Kelas();
-		kelas.setId(kelasId);
-		Ruangan ruangan=new Ruangan();
-		ruangan.setId(ruanganId);
-		JenisTarif jenisTarif=new JenisTarif();
-		jenisTarif.setId(jenisTarifId);		
-		result=pelayananHargaStokDiskonService.getHargaNettoStokDiskonBaru(kelompokPasien, produk, asalProduk, kelas, ruangan, jenisTarif, DateUtil.toDate(tglPelayanan),orderStok,cito);
-		return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
-	}
-}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananTpnController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananTpnController.java
index 727cbb22..9784d7ca 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananTpnController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananTpnController.java
@@ -14,11 +14,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -29,10 +27,8 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PelayananTpnService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PelayananTpnVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 import com.jasamedika.medifirst2000.vo.PelayananProduksiVO;
 
 /**
@@ -68,11 +64,11 @@ public class PelayananTpnController extends LocaleController<PelayananTpnVO> imp
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
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 d336cd7e..0bba5b27 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
@@ -28,14 +28,12 @@ import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.entities.PemakaianAirBersih;
-import com.jasamedika.medifirst2000.entities.Ruangan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PemakaianAirBersihService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PemakaianAirBersihVO;
 
 import net.kaczmarzyk.spring.data.jpa.domain.DateBetween;
-import net.kaczmarzyk.spring.data.jpa.domain.LessThanOrEqual;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 
 @RestController
@@ -60,14 +58,14 @@ public class PemakaianAirBersihController extends LocaleController<PemakaianAirB
 			LOGGER.error("Got exception {} when add Pemakaian air bersih", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pemakaian air bersih", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -84,14 +82,14 @@ public class PemakaianAirBersihController extends LocaleController<PemakaianAirB
 			LOGGER.error("Got exception {} when update Pemakaian air bersih", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Pemakaian air bersih", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -108,13 +106,13 @@ public class PemakaianAirBersihController extends LocaleController<PemakaianAirB
 			   LOGGER.error("Got exception {} when get all Pemakaian air bersih", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get all Pemakaian air bersih", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
@@ -147,17 +145,17 @@ public class PemakaianAirBersihController extends LocaleController<PemakaianAirB
 			LOGGER.error("Got exception {} when delete Pemakaian air bersih", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when delete Pemakaian air bersih", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianBarangHabisPakaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianBarangHabisPakaiController.java
index 971669e4..9b87e529 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianBarangHabisPakaiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianBarangHabisPakaiController.java
@@ -52,11 +52,11 @@ public class PemakaianBarangHabisPakaiController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Pemakaian Barang habis Pakai", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Pemakaian Barang habis Pakai", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianKendaraanDinasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianKendaraanDinasController.java
index 9cb6b74f..9a09b3a6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianKendaraanDinasController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianKendaraanDinasController.java
@@ -53,11 +53,11 @@ public class PemakaianKendaraanDinasController extends LocaleController<Pemakaia
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Pemakaian Kendaraan Dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Pemakaian Kendaraan Dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -72,11 +72,11 @@ public class PemakaianKendaraanDinasController extends LocaleController<Pemakaia
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Aset Kendaraan Dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Aset Kendaraan Dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -91,11 +91,11 @@ public class PemakaianKendaraanDinasController extends LocaleController<Pemakaia
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get All Supir Kendaraan Dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get All Supir Kendaraan Dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
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 b18c0005..b80e4e78 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
@@ -25,16 +25,13 @@ import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.PemakaianAirBersih;
 import com.jasamedika.medifirst2000.entities.PemakaianMesin;
-import com.jasamedika.medifirst2000.entities.Ruangan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PemakaianMesinService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PemakaianMesinVO;
 
 import net.kaczmarzyk.spring.data.jpa.domain.DateBetween;
-import net.kaczmarzyk.spring.data.jpa.domain.LessThanOrEqual;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 
 @RestController
@@ -59,14 +56,14 @@ public class PemakaianMesinController extends LocaleController<PemakaianMesinVO>
 			LOGGER.error("Got exception {} when add Pemakaian mesin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pemakaian mesin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -83,14 +80,14 @@ public class PemakaianMesinController extends LocaleController<PemakaianMesinVO>
 			LOGGER.error("Got exception {} when add Pemakaian mesin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pemakaian mesin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -107,13 +104,13 @@ public class PemakaianMesinController extends LocaleController<PemakaianMesinVO>
 			   LOGGER.error("Got exception {} when get all Pemakaian mesin", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get all Pemakaian mesin", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
@@ -129,17 +126,17 @@ public class PemakaianMesinController extends LocaleController<PemakaianMesinVO>
 			LOGGER.error("Got exception {} when delete Pemakaian mesin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when delete Pemakaian mesin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 	
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRuangRapatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRuangRapatController.java
index f2269d89..7487b01f 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRuangRapatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRuangRapatController.java
@@ -49,11 +49,11 @@ public class PemakaianRuangRapatController extends LocaleController<PemakaianRua
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Pemakaian Ruang Rapat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Pemakaian Ruang Rapat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRumahDukaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRumahDukaController.java
index 9e3cb008..5044dbb0 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRumahDukaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianRumahDukaController.java
@@ -50,11 +50,11 @@ public class PemakaianRumahDukaController extends LocaleController<PemakaianRuma
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePemakaianRumahDuka", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePemakaianRumahDuka", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -69,11 +69,11 @@ public class PemakaianRumahDukaController extends LocaleController<PemakaianRuma
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when FindProdukRumahDuka", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when FindProdukRumahDuka", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -88,11 +88,11 @@ public class PemakaianRumahDukaController extends LocaleController<PemakaianRuma
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when FindKamarRumahDuka", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when FindKamarRumahDuka", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanAnestesiLokalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanAnestesiLokalController.java
index 1245f70b..b41aed1c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanAnestesiLokalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanAnestesiLokalController.java
@@ -56,7 +56,7 @@ public class PemantauanAnestesiLokalController extends LocaleController<AsuhanKe
 		}  catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPemantauanAnestesi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -80,13 +80,13 @@ public class PemantauanAnestesiLokalController extends LocaleController<AsuhanKe
 
 			LOGGER.error("Got exception {} when savePemantauanAnestesi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePemantauanAnestesi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	
@@ -111,12 +111,12 @@ public class PemantauanAnestesiLokalController extends LocaleController<AsuhanKe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataByNoTrans", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataByNoTrans", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -141,12 +141,12 @@ public class PemantauanAnestesiLokalController extends LocaleController<AsuhanKe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPasienDaftarOperasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPasienDaftarOperasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -170,7 +170,7 @@ public class PemantauanAnestesiLokalController extends LocaleController<AsuhanKe
 		}  catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPemantauanAnestesiTable", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -194,7 +194,7 @@ public class PemantauanAnestesiLokalController extends LocaleController<AsuhanKe
 		}  catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getTandaVital", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanKinerjaPihakKetigaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanKinerjaPihakKetigaController.java
index e76755ad..1109e122 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanKinerjaPihakKetigaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemantauanKinerjaPihakKetigaController.java
@@ -47,11 +47,11 @@ public class PemantauanKinerjaPihakKetigaController extends LocaleController<Pem
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePemantauanKinerjaPihakKetiga", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePemantauanKinerjaPihakKetiga", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -68,11 +68,11 @@ public class PemantauanKinerjaPihakKetigaController extends LocaleController<Pem
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPemantauanKinerjaPihakKetiga", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPemantauanKinerjaPihakKetiga", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -87,11 +87,11 @@ public class PemantauanKinerjaPihakKetigaController extends LocaleController<Pem
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when updatePemantauanKinerjaPihakKetiga", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when updatePemantauanKinerjaPihakKetiga", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -107,11 +107,11 @@ public class PemantauanKinerjaPihakKetigaController extends LocaleController<Pem
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when deletePemantauanKinerjaPihakKetiga", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when deletePemantauanKinerjaPihakKetiga", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -129,11 +129,11 @@ public class PemantauanKinerjaPihakKetigaController extends LocaleController<Pem
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when downloadHasilPemantauan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when downloadHasilPemantauan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}	
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PembatalanPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PembatalanPasienController.java
index b93dd510..d6a3e14c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PembatalanPasienController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PembatalanPasienController.java
@@ -55,11 +55,11 @@ public class PembatalanPasienController extends LocaleController<PembatalanPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Masuk Kamar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Masuk kamar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -76,11 +76,11 @@ public class PembatalanPasienController extends LocaleController<PembatalanPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Masuk Kamar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Masuk kamar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PembedahanDanInstruksiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PembedahanDanInstruksiController.java
index 3cbe0f72..ec85d0da 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PembedahanDanInstruksiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PembedahanDanInstruksiController.java
@@ -63,11 +63,11 @@ public class PembedahanDanInstruksiController extends LocaleController<Pembedaha
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pembedahan Instruksi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pembedahan Instruksi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanAngkaKumanUdaraController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanAngkaKumanUdaraController.java
index 7cd7b819..5836f31c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanAngkaKumanUdaraController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanAngkaKumanUdaraController.java
@@ -50,11 +50,11 @@ public class PemeriksaanAngkaKumanUdaraController extends LocaleController<Pemer
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getUnitRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getUnitRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -71,11 +71,11 @@ public class PemeriksaanAngkaKumanUdaraController extends LocaleController<Pemer
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getBakuMutu", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getBakuMutu", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -90,11 +90,11 @@ public class PemeriksaanAngkaKumanUdaraController extends LocaleController<Pemer
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePemeriksaanAngkaKumanUdara", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePemeriksaanAngkaKumanUdara", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -111,11 +111,11 @@ public class PemeriksaanAngkaKumanUdaraController extends LocaleController<Pemer
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPemeriksaanAngkaKumanUdara", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPemeriksaanAngkaKumanUdara", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -130,11 +130,11 @@ public class PemeriksaanAngkaKumanUdaraController extends LocaleController<Pemer
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when updatePemeriksaanAngkaKumanUdara", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when updatePemeriksaanAngkaKumanUdara", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -150,11 +150,11 @@ public class PemeriksaanAngkaKumanUdaraController extends LocaleController<Pemer
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when deletePemeriksaanAngkaKumanUdara", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when deletePemeriksaanAngkaKumanUdara", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -193,11 +193,11 @@ public class PemeriksaanAngkaKumanUdaraController extends LocaleController<Pemer
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when downloadFileHasilPemantauan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when downloadFileHasilPemantauan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanLimbahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanLimbahController.java
index 9fb3bdf8..44b36ae7 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanLimbahController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanLimbahController.java
@@ -25,7 +25,6 @@ import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PemeriksaanLimbahService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.AgamaVO;
 import com.jasamedika.medifirst2000.vo.PemeriksaanLimbahVO;
 
 @RestController
@@ -50,13 +49,13 @@ public class PemeriksaanLimbahController extends LocaleController   {
 			LOGGER.error("Got exception {} when add Agama", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Agama", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanTumbuhKembangController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanTumbuhKembangController.java
index 43e56ea8..241d7bac 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanTumbuhKembangController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanTumbuhKembangController.java
@@ -49,13 +49,13 @@ public class PemeriksaanTumbuhKembangController extends LocaleController  {
 			LOGGER.error("Got exception {} when add PemeriksaanTumbuhKembang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add PemeriksaanTumbuhKembang", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanUmumController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanUmumController.java
index e2a15ea0..995cd61a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanUmumController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemeriksaanUmumController.java
@@ -48,11 +48,11 @@ public class PemeriksaanUmumController extends LocaleController<PemeriksaanUmumV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePemeriksaanUmum", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePemeriksaanUmum", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemindahanEmbrioController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemindahanEmbrioController.java
index 6ece432e..feb54ffc 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemindahanEmbrioController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemindahanEmbrioController.java
@@ -17,7 +17,6 @@ import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.Constants;
@@ -83,13 +82,13 @@ public class PemindahanEmbrioController extends LocaleController<PemindahanEmbri
 			LOGGER.error("Got exception {} when add Pemindahan Embrio", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add  Pemindahan Embrio", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemulasaraanJenazahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemulasaraanJenazahController.java
index f4bf1d85..417e9da8 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemulasaraanJenazahController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemulasaraanJenazahController.java
@@ -52,11 +52,11 @@ public class PemulasaraanJenazahController extends LocaleController<Pemulasaraan
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Pemulasaraan Jenazah", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Pemulasaraan Jenazah", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -71,11 +71,11 @@ public class PemulasaraanJenazahController extends LocaleController<Pemulasaraan
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Pelayanan Pemulasaraan Jenazah", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Pelayanan Pemulasaraan Jenazah", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -91,11 +91,11 @@ public class PemulasaraanJenazahController extends LocaleController<Pemulasaraan
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Rincian Biaya Pelayanan Pemulasaraan Jenazah", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Rincian Biaya Pelayanan Pemulasaraan Jenazah", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -113,11 +113,11 @@ public class PemulasaraanJenazahController extends LocaleController<Pemulasaraan
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Pemulasaraan Jenazah External", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Pemulasaraan Jenazah External", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemusnahanBarangController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemusnahanBarangController.java
index c00373d2..58fc6564 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemusnahanBarangController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemusnahanBarangController.java
@@ -1,7 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.*;
@@ -10,7 +8,6 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -26,31 +23,11 @@ import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.DetailSpekAnggaran;
-import com.jasamedika.medifirst2000.entities.StrukOrder;
-import com.jasamedika.medifirst2000.entities.StrukPelayananDetail;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.security.model.AppPermission;
 import com.jasamedika.medifirst2000.service.PemusnahanBarangService;
-import com.jasamedika.medifirst2000.service.StrukOrderService;
-import com.jasamedika.medifirst2000.service.StrukPelayananDetailService;
-import com.jasamedika.medifirst2000.service.StrukPelayananService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.DetailAnggaranVO;
-import com.jasamedika.medifirst2000.vo.DistribusiBarangInvestasiVO;
-import com.jasamedika.medifirst2000.vo.PenerimaanBarangDetailVO;
-import com.jasamedika.medifirst2000.vo.PenerimaanBarangVO;
 import com.jasamedika.medifirst2000.vo.RequestBarangDariRuanganVO;
 import com.jasamedika.medifirst2000.vo.StrukHistoriVO;
-import com.jasamedika.medifirst2000.vo.StrukKirimVO;
-import com.jasamedika.medifirst2000.vo.StrukOrderVO;
-
-import net.kaczmarzyk.spring.data.jpa.domain.DateBetween;
-import net.kaczmarzyk.spring.data.jpa.domain.Equal;
-import net.kaczmarzyk.spring.data.jpa.domain.Like;
-import net.kaczmarzyk.spring.data.jpa.domain.Null;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.And;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 
 @RestController
 @RequestMapping("/pemusnahan-barang")
@@ -72,11 +49,11 @@ public class PemusnahanBarangController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Pemusnahan Barang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Pemusnahan Barang", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -109,11 +86,11 @@ public class PemusnahanBarangController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Pemusnahan Barang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Pemusnahan Barang", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenangananKasusController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenangananKasusController.java
index 39452e82..14902a82 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenangananKasusController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenangananKasusController.java
@@ -56,13 +56,13 @@ public class PenangananKasusController extends LocaleController<UsulanEvaluasiVO
 
 			LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	@RequestMapping(value = "/get-no-evaluasi", method = RequestMethod.GET)
@@ -79,13 +79,13 @@ public class PenangananKasusController extends LocaleController<UsulanEvaluasiVO
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -108,13 +108,13 @@ public class PenangananKasusController extends LocaleController<UsulanEvaluasiVO
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -136,13 +136,13 @@ public class PenangananKasusController extends LocaleController<UsulanEvaluasiVO
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -168,13 +168,13 @@ public class PenangananKasusController extends LocaleController<UsulanEvaluasiVO
 
 			LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenangananKeluhanPelangganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenangananKeluhanPelangganController.java
index f72144d3..abac9de5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenangananKeluhanPelangganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenangananKeluhanPelangganController.java
@@ -12,7 +12,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,13 +48,13 @@ public class PenangananKeluhanPelangganController extends LocaleController<Penan
 			LOGGER.error("Got exception {} when add Penanganan Keluhan Pelanggan ", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Penanganan Keluhan Pelanggan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -72,13 +71,13 @@ public class PenangananKeluhanPelangganController extends LocaleController<Penan
 			LOGGER.error("Got exception {} when update Penanganan Keluhan Pelanggan ", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Penanganan Keluhan Pelanggan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -95,13 +94,13 @@ public class PenangananKeluhanPelangganController extends LocaleController<Penan
 			LOGGER.error("Got exception {} when get all Penanganan Keluhan Pelanggan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all Penanganan Keluhan Pelanggan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenanggungJawabPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenanggungJawabPasienController.java
index 5ec50589..b4cdb79b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenanggungJawabPasienController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenanggungJawabPasienController.java
@@ -75,11 +75,11 @@ public class PenanggungJawabPasienController extends LocaleController<Penanggung
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Penanggung Jawab Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Penanggung Jawab Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -114,11 +114,11 @@ public class PenanggungJawabPasienController extends LocaleController<Penanggung
 		} catch(ServiceVOException se) {
 			LOGGER.error("Got exception {} when add Penanggung Jawab Pasien", se.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, se.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch(JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Penanggung Jawab Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}
 	}
 	
@@ -135,11 +135,11 @@ public class PenanggungJawabPasienController extends LocaleController<Penanggung
 		} catch(ServiceVOException se) {
 			LOGGER.error("Exception when get list Surat Pernyataan");
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, se.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch(JpaSystemException jse) {
 			LOGGER.error("Exception {} when get list Surat Pernyataan");
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}
 	}
 
@@ -152,11 +152,11 @@ public class PenanggungJawabPasienController extends LocaleController<Penanggung
 		} catch (ServiceVOException se) {
 			LOGGER.error("Got exception {} when get surat pernyataan", se.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, se.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get surat pernyataan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -174,15 +174,15 @@ public class PenanggungJawabPasienController extends LocaleController<Penanggung
 		} catch(ServiceVOException se) {
 			LOGGER.error("Exception {} when list surat pernyataan", se.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, se.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Exception {} when list surat pernyataan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} catch (ParseException jse) {
 			LOGGER.error("Exception {} when list surat pernyataan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PencatatanSuhuMesinController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PencatatanSuhuMesinController.java
index 921a80e6..ee173916 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PencatatanSuhuMesinController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PencatatanSuhuMesinController.java
@@ -15,7 +15,6 @@ import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.Constants;
@@ -50,14 +49,14 @@ public class PencatatanSuhuMesinController extends LocaleController<PencatatanSu
 			LOGGER.error("Got exception {} when add Pencatatan Suhu Mesin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Pencatatan Suhu Mesin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -74,14 +73,14 @@ public class PencatatanSuhuMesinController extends LocaleController<PencatatanSu
 			LOGGER.error("Got exception {} when add Pencatatan Suhu Mesin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Pencatatan Suhu Mesin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -98,13 +97,13 @@ public class PencatatanSuhuMesinController extends LocaleController<PencatatanSu
 			   LOGGER.error("Got exception {} when get all pencatatan suhu mesin", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get all pencatatan suhu mesin", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
@@ -137,14 +136,14 @@ public class PencatatanSuhuMesinController extends LocaleController<PencatatanSu
 			LOGGER.error("Got exception {} when add Pencatatan Suhu Mesin Grafik", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Pencatatan Suhu Mesin Grafik", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PencucianLinenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PencucianLinenController.java
index bc06f221..882a8e64 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PencucianLinenController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PencucianLinenController.java
@@ -49,11 +49,11 @@ public class PencucianLinenController extends LocaleController<PencucianLinenVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Pencucian Linen", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Pencucian Linen", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -68,11 +68,11 @@ public class PencucianLinenController extends LocaleController<PencucianLinenVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Mapping Cycle Dengan Bahan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Mapping Cycle Dengan Bahan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -88,11 +88,11 @@ public class PencucianLinenController extends LocaleController<PencucianLinenVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Satuan Standar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Satuan Standar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanBarangController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanBarangController.java
index a55d7e06..59ae48c1 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanBarangController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanBarangController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -11,7 +10,6 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -27,26 +25,15 @@ import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.DetailSpekAnggaran;
-import com.jasamedika.medifirst2000.entities.StrukPelayananDetail;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.StrukPelayananDetailService;
 import com.jasamedika.medifirst2000.service.StrukPelayananService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.DetailAnggaranVO;
-import com.jasamedika.medifirst2000.vo.DistribusiBarangInvestasiVO;
 import com.jasamedika.medifirst2000.vo.InputNoBatchVO;
 import com.jasamedika.medifirst2000.vo.PenerimaanBarangDetailVO;
 import com.jasamedika.medifirst2000.vo.PenerimaanBarangVO;
 import com.jasamedika.medifirst2000.vo.UploadExcelVO;
 
-import net.kaczmarzyk.spring.data.jpa.domain.DateBetween;
-import net.kaczmarzyk.spring.data.jpa.domain.Equal;
-import net.kaczmarzyk.spring.data.jpa.domain.Like;
-import net.kaczmarzyk.spring.data.jpa.domain.Null;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.And;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
-
 @RestController
 @RequestMapping("/penerimaan-barang")
 public class PenerimaanBarangController extends LocaleController<PenerimaanBarangVO> {
@@ -70,11 +57,11 @@ public class PenerimaanBarangController extends LocaleController<PenerimaanBaran
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Penerimaan Barang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Penerimaan Barang", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -91,13 +78,13 @@ public class PenerimaanBarangController extends LocaleController<PenerimaanBaran
 			LOGGER.error("Got exception {} when add Agama", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Agama", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
@@ -114,11 +101,11 @@ public class PenerimaanBarangController extends LocaleController<PenerimaanBaran
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save No Batch", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save No Batch", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanLinenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanLinenController.java
index b108c8a0..7b1d0e70 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanLinenController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanLinenController.java
@@ -11,7 +11,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.domain.Specifications;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -56,11 +55,11 @@ public class PenerimaanLinenController extends LocaleController<PenerimaanLinenV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Penerimaan Linen", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Penerimaan Linen", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -76,11 +75,11 @@ public class PenerimaanLinenController extends LocaleController<PenerimaanLinenV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Satuan Standar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Satuan Standar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -96,11 +95,11 @@ public class PenerimaanLinenController extends LocaleController<PenerimaanLinenV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Ruang Loundry", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Ruang Loundry", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanSterilisasiAlatInternalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanSterilisasiAlatInternalController.java
index f829da20..49d9850d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanSterilisasiAlatInternalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanSterilisasiAlatInternalController.java
@@ -48,11 +48,11 @@ public class PenerimaanSterilisasiAlatInternalController extends LocaleControlle
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Penerimaan Sterilisasi Alat Internal", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Penerimaan Sterilisasi Alat Internal", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -68,11 +68,11 @@ public class PenerimaanSterilisasiAlatInternalController extends LocaleControlle
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Satuan Standar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Satuan Standar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -88,11 +88,11 @@ public class PenerimaanSterilisasiAlatInternalController extends LocaleControlle
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Ruang Cssd", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Ruang Cssd", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -108,11 +108,11 @@ public class PenerimaanSterilisasiAlatInternalController extends LocaleControlle
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Paket", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Paket", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengambilanOvumController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengambilanOvumController.java
index e2e29bb9..280b2641 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengambilanOvumController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengambilanOvumController.java
@@ -17,7 +17,6 @@ import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.Constants;
@@ -83,13 +82,13 @@ public class PengambilanOvumController  extends LocaleController<PengambilanOvum
 			LOGGER.error("Got exception {} when add Pengambilan Ovum", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add  Pengambilan Ovum", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengembalianKendaraanDinasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengembalianKendaraanDinasController.java
index 1538f99c..f1d0fcf3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengembalianKendaraanDinasController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengembalianKendaraanDinasController.java
@@ -50,11 +50,11 @@ public class PengembalianKendaraanDinasController extends LocaleController<Penge
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Pengembalian Kendaraan Dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Pengembalian Kendaraan Dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengendaliController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengendaliController.java
index 64e8926f..bbe1bd19 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengendaliController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengendaliController.java
@@ -48,11 +48,11 @@ public class PengendaliController extends LocaleController<PengendaliVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengendali", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengendali", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenghitunganKassaDanAlatOperasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenghitunganKassaDanAlatOperasiController.java
index 392c7c0a..7a19e8d4 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenghitunganKassaDanAlatOperasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenghitunganKassaDanAlatOperasiController.java
@@ -47,13 +47,13 @@ public class PenghitunganKassaDanAlatOperasiController extends LocaleController<
 			LOGGER.error("Got exception {} when add PenghitunganKassaDanAlatOperasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add PenghitunganKassaDanAlatOperasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
@@ -80,12 +80,12 @@ public class PenghitunganKassaDanAlatOperasiController extends LocaleController<
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getHitKassaByNoRec", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getHitKassaByNoRec", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
@@ -111,12 +111,12 @@ public class PenghitunganKassaDanAlatOperasiController extends LocaleController<
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getHitKassa", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getHitKassa", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalBaruController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalBaruController.java
index ba195abc..89810d77 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalBaruController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalBaruController.java
@@ -45,11 +45,11 @@ public class PengkajianAwalBaruController extends LocaleController<PengkajianAwa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengkajian", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengkajian", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -67,11 +67,11 @@ public class PengkajianAwalBaruController extends LocaleController<PengkajianAwa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getOnePengkajian", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getOnePengkajian", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -89,11 +89,11 @@ public class PengkajianAwalBaruController extends LocaleController<PengkajianAwa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPengkajian", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPengkajian", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -111,11 +111,11 @@ public class PengkajianAwalBaruController extends LocaleController<PengkajianAwa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getOnePengkajianLanjutan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getOnePengkajianLanjutan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -133,11 +133,11 @@ public class PengkajianAwalBaruController extends LocaleController<PengkajianAwa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPengkajianLanjutan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPengkajianLanjutan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalController.java
index 840b1cab..aa698e34 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Map;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -22,7 +21,6 @@ import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.PengkajianAwal;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PengkajianAwalTransaksiService;
 import com.jasamedika.medifirst2000.service.PengkajianAwalService;
@@ -53,11 +51,11 @@ public class PengkajianAwalController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengkajianAwalMaster", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengkajianAwalMaster", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -72,11 +70,11 @@ public class PengkajianAwalController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengkajianAwal", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengkajianAwal", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -91,11 +89,11 @@ public class PengkajianAwalController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when updatePengkajianAwal", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when updatePengkajianAwal", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalPasienRawatInapAnakController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalPasienRawatInapAnakController.java
index 24b65704..fc7ec418 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalPasienRawatInapAnakController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalPasienRawatInapAnakController.java
@@ -81,17 +81,17 @@ public class PengkajianAwalPasienRawatInapAnakController extends LocaleControlle
 			DataRujukanVO result = dataRujukanService.add(vo);
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("", HttpStatus.CREATED);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Data Rujukan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Data Rujukan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalPsikologiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalPsikologiController.java
index c34e51c9..4713150a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalPsikologiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianAwalPsikologiController.java
@@ -27,7 +27,6 @@ import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PengkajianAwalPsikologiService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.CheckInVO;
 import com.jasamedika.medifirst2000.vo.PengkajianAwalPsikologiVO;
 
 @RestController
@@ -82,13 +81,13 @@ public class PengkajianAwalPsikologiController extends LocaleController<Pengkaji
 			LOGGER.error("Got exception {} when add CheckIn", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add CheckIn", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -106,13 +105,13 @@ public class PengkajianAwalPsikologiController extends LocaleController<Pengkaji
 			LOGGER.error("Got exception {} when add CheckIn", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add CheckIn", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianKebutuhanDasarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianKebutuhanDasarController.java
index 64cd9577..12b65438 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianKebutuhanDasarController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianKebutuhanDasarController.java
@@ -44,11 +44,11 @@ public class PengkajianKebutuhanDasarController extends LocaleController<Pengkaj
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -65,11 +65,11 @@ public class PengkajianKebutuhanDasarController extends LocaleController<Pengkaj
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getOne", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getOne", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianLanjutanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianLanjutanController.java
index 06fbf6c0..2f6d0a70 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianLanjutanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengkajianLanjutanController.java
@@ -48,11 +48,11 @@ public class PengkajianLanjutanController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengkajianLanjutan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengkajianLanjutan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -67,11 +67,11 @@ public class PengkajianLanjutanController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when updatePengkajianLanjutan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when updatePengkajianLanjutan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -87,11 +87,11 @@ public class PengkajianLanjutanController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPengkajianLanjutan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPengkajianLanjutan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -108,11 +108,11 @@ public class PengkajianLanjutanController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when loadPengkajianLanjutan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when loadPengkajianLanjutan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKebisinganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKebisinganController.java
index 8f98cf08..f01c1e3b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKebisinganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKebisinganController.java
@@ -50,11 +50,11 @@ public class PengukuranKebisinganController extends LocaleController<PengukuranK
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getUnitRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getUnitRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -71,11 +71,11 @@ public class PengukuranKebisinganController extends LocaleController<PengukuranK
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getBakuMutu", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getBakuMutu", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -91,11 +91,11 @@ public class PengukuranKebisinganController extends LocaleController<PengukuranK
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengukuranKebisingan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengukuranKebisingan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -112,11 +112,11 @@ public class PengukuranKebisinganController extends LocaleController<PengukuranK
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPengukuranKebisingan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPengukuranKebisingan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKelembabanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKelembabanController.java
index 381f7c5d..17d89bcb 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKelembabanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKelembabanController.java
@@ -50,11 +50,11 @@ public class PengukuranKelembabanController extends LocaleController<PengukuranK
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getUnitRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getUnitRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -71,11 +71,11 @@ public class PengukuranKelembabanController extends LocaleController<PengukuranK
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getBakuMutu", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getBakuMutu", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -91,11 +91,11 @@ public class PengukuranKelembabanController extends LocaleController<PengukuranK
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengukuranKelembaban", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengukuranKelembaban", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -112,11 +112,11 @@ public class PengukuranKelembabanController extends LocaleController<PengukuranK
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPengukuranKebisingan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPengukuranKebisingan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKinerjaKegiatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKinerjaKegiatanController.java
index c1f0e239..b5d9a19e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKinerjaKegiatanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranKinerjaKegiatanController.java
@@ -48,14 +48,14 @@ public class PengukuranKinerjaKegiatanController extends LocaleController<Penguk
 			LOGGER.error("Got exception {} when add pengukuran kinerja kegiatan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add pengukuran kinerja kegiatan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -72,14 +72,14 @@ public class PengukuranKinerjaKegiatanController extends LocaleController<Penguk
 			LOGGER.error("Got exception {} when update pengukuran kinerja kegiatan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update pengukuran kinerja kegiatan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -96,13 +96,13 @@ public class PengukuranKinerjaKegiatanController extends LocaleController<Penguk
 			   LOGGER.error("Got exception {} when get all pengukuran kinerja kegiatan", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get all pengukuran kinerja kegiatan", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranPencahayaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranPencahayaanController.java
index ebdc24b7..359562da 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranPencahayaanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranPencahayaanController.java
@@ -50,11 +50,11 @@ public class PengukuranPencahayaanController extends LocaleController<Pengukuran
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getUnitRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getUnitRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -71,11 +71,11 @@ public class PengukuranPencahayaanController extends LocaleController<Pengukuran
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getBakuMutu", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getBakuMutu", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -91,11 +91,11 @@ public class PengukuranPencahayaanController extends LocaleController<Pengukuran
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengukuranPencahayaan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengukuranPencahayaan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -112,11 +112,11 @@ public class PengukuranPencahayaanController extends LocaleController<Pengukuran
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPengukuranKebisingan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPengukuranKebisingan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}	
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranSuhuController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranSuhuController.java
index a9a4c37e..1f0b6061 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranSuhuController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PengukuranSuhuController.java
@@ -50,11 +50,11 @@ public class PengukuranSuhuController extends LocaleController<PengukuranKebisin
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getUnitRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getUnitRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -71,11 +71,11 @@ public class PengukuranSuhuController extends LocaleController<PengukuranKebisin
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getBakuMutu", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getBakuMutu", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -91,11 +91,11 @@ public class PengukuranSuhuController extends LocaleController<PengukuranKebisin
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengukuranPencahayaan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengukuranPencahayaan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -112,11 +112,11 @@ public class PengukuranSuhuController extends LocaleController<PengukuranKebisin
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPengukuranKebisingan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPengukuranKebisingan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenilaianKinerjaSatpamController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenilaianKinerjaSatpamController.java
index e1af811a..79e64c70 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenilaianKinerjaSatpamController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenilaianKinerjaSatpamController.java
@@ -47,11 +47,11 @@ public class PenilaianKinerjaSatpamController extends LocaleController<Penilaian
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Penilaian Kinerja Satpam", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Penilaian Kinerja Satpam", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyuluhanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyuluhanController.java
index 09d5f238..e7451a35 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyuluhanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyuluhanController.java
@@ -51,13 +51,13 @@ public class PenyuluhanController extends LocaleController{
 
 			LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	
@@ -79,12 +79,12 @@ public class PenyuluhanController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataByNoPlanning", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataByNoPlanning", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -107,12 +107,12 @@ public class PenyuluhanController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataByNoPlanning", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataByNoPlanning", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -137,12 +137,12 @@ public class PenyuluhanController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataNoPlanning", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataNoPlanning", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -161,13 +161,13 @@ public class PenyuluhanController extends LocaleController{
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -186,13 +186,13 @@ public class PenyuluhanController extends LocaleController{
 
 			LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	@RequestMapping(value = "/get-peserta-penyuluhan-by-noplanning/", method = RequestMethod.GET)
@@ -209,13 +209,13 @@ public class PenyuluhanController extends LocaleController{
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -234,13 +234,13 @@ public class PenyuluhanController extends LocaleController{
 
 			LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	@RequestMapping(value = "/get-daftar-pelaksanaan-diseminasi",method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE)
@@ -264,12 +264,12 @@ public class PenyuluhanController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataNoPlanning", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataNoPlanning", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -292,12 +292,12 @@ public class PenyuluhanController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataNoPlanning", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataNoPlanning", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -315,13 +315,13 @@ public class PenyuluhanController extends LocaleController{
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -340,13 +340,13 @@ public class PenyuluhanController extends LocaleController{
 
 			LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanEPlanningController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanEPlanningController.java
index fe93229b..a1d69836 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanEPlanningController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanEPlanningController.java
@@ -70,11 +70,11 @@ public class PenyusunanEPlanningController extends LocaleController<DetailSpekAn
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePenyusunanEPlanning", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePenyusunanEPlanning", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanTRPNBPController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanTRPNBPController.java
index 0eac4835..de1ed1ce 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanTRPNBPController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenyusunanTRPNBPController.java
@@ -63,11 +63,11 @@ public class PenyusunanTRPNBPController extends LocaleController<StrukPelayananD
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePenyusunanTRPNBP", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePenyusunanTRPNBP", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
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 42c21dac..4bc79b1f 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
@@ -103,14 +103,14 @@ implements IBaseRestController<PeranVO>{
 			LOGGER.error("Got exception {} when add/update Peran", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update Peran", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java
index 26723746..1d446cd3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java
@@ -14,11 +14,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -29,7 +27,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PeranHubunganService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PeranHubunganVO;
 
@@ -65,11 +62,11 @@ public class PeranHubunganController extends LocaleController<PeranHubunganVO> i
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
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 fad8db05..a9862328 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
@@ -27,12 +27,10 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.BobotIndikator;
 import com.jasamedika.medifirst2000.entities.PeriodePelaporan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PeriodePelaporanService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.BobotIndikatorVO;
 import com.jasamedika.medifirst2000.vo.PeriodePelaporanVO;
 
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
@@ -105,14 +103,14 @@ implements IBaseRestController<PeriodePelaporanVO>{
 			LOGGER.error("Got exception {} when add/update Periode Pelaporan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update Periode Pelaporan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PerlakuanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PerlakuanController.java
index d0ab823d..8df96ecd 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PerlakuanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PerlakuanController.java
@@ -49,14 +49,14 @@ public class PerlakuanController extends LocaleController<BaseModelVO>{
 			LOGGER.error("Got exception {} when add perlakuan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add limbah b3 keluar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -73,13 +73,13 @@ public class PerlakuanController extends LocaleController<BaseModelVO>{
 			   LOGGER.error("Got exception {} when get all perlakuan", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get all perlakuan", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
@@ -97,13 +97,13 @@ public class PerlakuanController extends LocaleController<BaseModelVO>{
 			   LOGGER.error("Got exception {} when get all perlakuan", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get all perlakuan", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PermintaanBarangDariRuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PermintaanBarangDariRuanganController.java
index 8a04f753..ceb04d1a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PermintaanBarangDariRuanganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PermintaanBarangDariRuanganController.java
@@ -48,11 +48,11 @@ public class PermintaanBarangDariRuanganController extends LocaleController<Perm
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Permintaan Barang Dari Ruangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Permintaan Barang Dari Ruangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -70,11 +70,11 @@ public class PermintaanBarangDariRuanganController extends LocaleController<Perm
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when update Permintaan Barang Dari Ruangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Permintaan Barang Dari Ruangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiKognisiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiKognisiController.java
index 4ae1842c..110793cc 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiKognisiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiKognisiController.java
@@ -14,11 +14,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -29,7 +27,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PersepsiKognisiService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PersepsiKognisiVO;
 
@@ -65,11 +62,11 @@ public class PersepsiKognisiController extends LocaleController<PersepsiKognisiV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiPasienController.java
index 04378e78..51bbcd1c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiPasienController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiPasienController.java
@@ -14,11 +14,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -29,7 +27,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PersepsiPasienService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PersepsiPasienVO;
 
@@ -65,11 +62,11 @@ public class PersepsiPasienController extends LocaleController<PersepsiPasienVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
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 259d167d..86b0ef66 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
@@ -28,7 +28,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.DetailTOWS;
 import com.jasamedika.medifirst2000.entities.Perspektif;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PerspektifService;
@@ -107,14 +106,14 @@ implements IBaseRestController<PerspektifVO>{
 			LOGGER.error("Got exception {} when add/update perspektif", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update perspektif", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PertanyaanSurveyController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PertanyaanSurveyController.java
index 75e6ad3d..90a536a8 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PertanyaanSurveyController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PertanyaanSurveyController.java
@@ -52,13 +52,13 @@ public class PertanyaanSurveyController extends LocaleController<PertanyaanSurve
 			LOGGER.error("Got exception {} when add PertanyaanSurveyVO", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add PertanyaanSurveyVO", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -75,13 +75,13 @@ public class PertanyaanSurveyController extends LocaleController<PertanyaanSurve
 			LOGGER.error("Got exception {} when add PertanyaanSurveyVO", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add PertanyaanSurveyVO", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -98,13 +98,13 @@ public class PertanyaanSurveyController extends LocaleController<PertanyaanSurve
 			LOGGER.error("Got exception {} when get all PertanyaanSurveyVO", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all PertanyaanSurveyVO", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PesertaAsuransiBpjsNakerController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PesertaAsuransiBpjsNakerController.java
index 2ef207bc..e70c7c8e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PesertaAsuransiBpjsNakerController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PesertaAsuransiBpjsNakerController.java
@@ -38,7 +38,7 @@ public class PesertaAsuransiBpjsNakerController extends LocaleController<Asurans
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-peserta-asuransi-bpjs-naker", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -51,7 +51,7 @@ public class PesertaAsuransiBpjsNakerController extends LocaleController<Asurans
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-peserta-asuransi-bpjs-naker", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -63,7 +63,7 @@ public class PesertaAsuransiBpjsNakerController extends LocaleController<Asurans
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-all-pegawai-aktif", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -75,7 +75,7 @@ public class PesertaAsuransiBpjsNakerController extends LocaleController<Asurans
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-rekanan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -87,7 +87,7 @@ public class PesertaAsuransiBpjsNakerController extends LocaleController<Asurans
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-all-hubungan-peserta", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -99,7 +99,7 @@ public class PesertaAsuransiBpjsNakerController extends LocaleController<Asurans
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PesertaDidikController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PesertaDidikController.java
index 2cf2e424..53acae70 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PesertaDidikController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PesertaDidikController.java
@@ -47,17 +47,17 @@ public class PesertaDidikController extends LocaleController<InputMouPKSTempVO>
 			 Map<String, Object> result = pesertaDidikService.savePesertaDidik(vo);
 			if (null != result)
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Riwayat Pekerjaan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Riwayat Pekerjaan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 		 
 	}
@@ -67,17 +67,17 @@ public class PesertaDidikController extends LocaleController<InputMouPKSTempVO>
 			Rekanan result = pesertaDidikService.inputMouPKS(vo);
 			if (null != result)
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			//LOGGER.error("Got exception {} when add Riwayat Pekerjaan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			//LOGGER.error("Got exception {} when add Riwayat Pekerjaan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 		//return null;
 	}
@@ -92,11 +92,11 @@ public class PesertaDidikController extends LocaleController<InputMouPKSTempVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	@RequestMapping(value = "/get-all-pegawai-no-paging-search", method = RequestMethod.GET)
@@ -109,11 +109,11 @@ public class PesertaDidikController extends LocaleController<InputMouPKSTempVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	@RequestMapping(value = "/get-all-pegawai-by-pengajar", method = RequestMethod.GET)
@@ -126,11 +126,11 @@ public class PesertaDidikController extends LocaleController<InputMouPKSTempVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	@RequestMapping(value = "/get-all-pegawai-by-peserta-didik", method = RequestMethod.GET)
@@ -143,11 +143,11 @@ public class PesertaDidikController extends LocaleController<InputMouPKSTempVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PioController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PioController.java
index c15b5c93..b8cf647d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PioController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PioController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -65,13 +64,13 @@ IBaseRestController<PioVO>  {
 			LOGGER.error("Got exception {} when add Pio", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pio", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
@@ -88,18 +87,18 @@ IBaseRestController<PioVO>  {
 			LOGGER.error("Got exception {} when update Pio", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Pio",
 					jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 	@RequestMapping(value = "/delete-pio/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
@@ -112,17 +111,17 @@ IBaseRestController<PioVO>  {
 			LOGGER.error("Got exception {} when delete Pio", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when delete Pio", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 	@Override
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketBiayaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketBiayaController.java
index ac66c970..a37b9949 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketBiayaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketBiayaController.java
@@ -54,13 +54,13 @@ public class PlanningDiklatHumasMarketBiayaController extends LocaleController<P
 
 			LOGGER.error("Got exception {} when savePlanningDHMBiaya", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHMBiaya", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	
@@ -85,12 +85,12 @@ public class PlanningDiklatHumasMarketBiayaController extends LocaleController<P
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataByNoPlanning", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataByNoPlanning", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -115,12 +115,12 @@ public class PlanningDiklatHumasMarketBiayaController extends LocaleController<P
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getProdukByHarga", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getProdukByHarga", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -146,12 +146,12 @@ public class PlanningDiklatHumasMarketBiayaController extends LocaleController<P
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getProdukAsal", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getProdukAsal", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketController.java
index a89977fd..a58e5196 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketController.java
@@ -58,13 +58,13 @@ public class PlanningDiklatHumasMarketController extends LocaleController<AkunVO
 
 			LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	
@@ -89,12 +89,12 @@ public class PlanningDiklatHumasMarketController extends LocaleController<AkunVO
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataByNoPlanning", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataByNoPlanning", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -119,12 +119,12 @@ public class PlanningDiklatHumasMarketController extends LocaleController<AkunVO
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataNoPlanning", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataNoPlanning", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -150,12 +150,12 @@ public class PlanningDiklatHumasMarketController extends LocaleController<AkunVO
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadData", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadData", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -181,12 +181,12 @@ public class PlanningDiklatHumasMarketController extends LocaleController<AkunVO
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListDokumen", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListDokumen", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 	
 		}
 	}
@@ -211,12 +211,12 @@ public class PlanningDiklatHumasMarketController extends LocaleController<AkunVO
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListJenisAnggaran", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListJenisAnggaran", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 	
 		}
 	}
@@ -241,12 +241,12 @@ public class PlanningDiklatHumasMarketController extends LocaleController<AkunVO
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListJenisTempat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListJenisTempat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 	
 		}
 	}
@@ -271,12 +271,12 @@ public class PlanningDiklatHumasMarketController extends LocaleController<AkunVO
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListRekanan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListRekanan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 	
 		}
 	}
@@ -296,13 +296,13 @@ public class PlanningDiklatHumasMarketController extends LocaleController<AkunVO
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -326,16 +326,16 @@ public class PlanningDiklatHumasMarketController extends LocaleController<AkunVO
 
 			LOGGER.error("Got exception {} when savePelaksanaDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePelaksanaDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} catch(Exception ex) {
 			LOGGER.error("Exception at savePelasanaDHN", ex.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketPesertaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketPesertaController.java
index 627d55b2..3f1dd167 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketPesertaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningDiklatHumasMarketPesertaController.java
@@ -25,7 +25,6 @@ import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PlanningDiklatHumasMarketPesertaService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.PlanningDiklatHumasMarketBiayaVO;
 import com.jasamedika.medifirst2000.vo.PlanningDiklatHumasMarketPesertaVO;
 
 @RestController
@@ -55,13 +54,13 @@ public class PlanningDiklatHumasMarketPesertaController extends LocaleController
 
 			LOGGER.error("Got exception {} when savePlanningDHMPeserta", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHMPeserta", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	
@@ -86,12 +85,12 @@ public class PlanningDiklatHumasMarketPesertaController extends LocaleController
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataByNoPlanning", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataByNoPlanning", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -116,12 +115,12 @@ public class PlanningDiklatHumasMarketPesertaController extends LocaleController
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataJenisPetugasPe", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataJenisPetugasPe", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -146,12 +145,12 @@ public class PlanningDiklatHumasMarketPesertaController extends LocaleController
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataAsalPeserta", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataAsalPeserta", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -176,12 +175,12 @@ public class PlanningDiklatHumasMarketPesertaController extends LocaleController
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataRekananPeserta", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataRekananPeserta", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -206,12 +205,12 @@ public class PlanningDiklatHumasMarketPesertaController extends LocaleController
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataAllPlanningDH", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataAllPlanningDH", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -236,12 +235,12 @@ public class PlanningDiklatHumasMarketPesertaController extends LocaleController
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataAllPegawai", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataAllPegawai", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -267,12 +266,12 @@ public class PlanningDiklatHumasMarketPesertaController extends LocaleController
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataProdukDKMbyNoPlanning", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataProdukDKMbyNoPlanning", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningHistoriPelayananCsController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningHistoriPelayananCsController.java
index d664f0d3..461340c6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningHistoriPelayananCsController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningHistoriPelayananCsController.java
@@ -27,7 +27,6 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PlanningHistoriPelayananCsService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PlanningHistoriPelayananCsVO;
-import com.jasamedika.medifirst2000.vo.StrukPlanningVO;
 
 @RestController
 @RequestMapping("/planningHistoriPelayananCs")
@@ -57,13 +56,13 @@ public class PlanningHistoriPelayananCsController extends LocaleController<Plann
 
 			LOGGER.error("Got exception {} when savePlanningHistoriPelayananCs", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningHistoriPelayananCs", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	/*
@@ -149,12 +148,12 @@ public class PlanningHistoriPelayananCsController extends LocaleController<Plann
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListPlanningHistoriPelayanan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListPlanningHistoriPelayanan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -180,12 +179,12 @@ public class PlanningHistoriPelayananCsController extends LocaleController<Plann
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadData", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadData", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -210,12 +209,12 @@ public class PlanningHistoriPelayananCsController extends LocaleController<Plann
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataProdukHistori", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataProdukHistori", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningPelayananSistemController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningPelayananSistemController.java
index 5cbec0c0..95b9f4ac 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningPelayananSistemController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningPelayananSistemController.java
@@ -56,13 +56,13 @@ public class PlanningPelayananSistemController extends LocaleController<AkunVO>
 
 			LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	
@@ -87,12 +87,12 @@ public class PlanningPelayananSistemController extends LocaleController<AkunVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataByNoPlanning", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataByNoPlanning", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -118,12 +118,12 @@ public class PlanningPelayananSistemController extends LocaleController<AkunVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadData", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadData", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -148,12 +148,12 @@ public class PlanningPelayananSistemController extends LocaleController<AkunVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataAllPlanningSI", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataAllPlanningSI", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -178,12 +178,12 @@ public class PlanningPelayananSistemController extends LocaleController<AkunVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataNoPlanningDesc", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataNoPlanningDesc", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningPelayananSistemPetugasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningPelayananSistemPetugasController.java
index f7833234..2eb0abcf 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningPelayananSistemPetugasController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PlanningPelayananSistemPetugasController.java
@@ -53,13 +53,13 @@ public class PlanningPelayananSistemPetugasController  extends LocaleController<
 
 			LOGGER.error("Got exception {} when PlanningPelayananSistemPetugasVO", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when PlanningPelayananSistemPetugasVO", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	
@@ -84,12 +84,12 @@ public class PlanningPelayananSistemPetugasController  extends LocaleController<
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPelayananSistemPetugas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPelayananSistemPetugas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PostOperasiAnestesiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PostOperasiAnestesiController.java
index 3139334e..7743e374 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PostOperasiAnestesiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PostOperasiAnestesiController.java
@@ -54,13 +54,13 @@ public class PostOperasiAnestesiController extends  LocaleController<AsuhanKeper
 
 			LOGGER.error("Got exception {} when savePostOperasiAnestesi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePostOperasiAnestesi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	
@@ -85,12 +85,12 @@ public class PostOperasiAnestesiController extends  LocaleController<AsuhanKeper
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataByNoTrans", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataByNoTrans", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -115,12 +115,12 @@ public class PostOperasiAnestesiController extends  LocaleController<AsuhanKeper
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPasienDaftarOperasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPasienDaftarOperasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PostOperasiPerawatBedahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PostOperasiPerawatBedahController.java
index 44a6ec53..49fe92e7 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PostOperasiPerawatBedahController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PostOperasiPerawatBedahController.java
@@ -23,7 +23,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.IntraOperasiPerawatBedahService;
 import com.jasamedika.medifirst2000.service.PostOperasiPerawatBedahService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.AsuhanKeperawatanPeriOperasiHeaderVO;
@@ -55,13 +54,13 @@ public class PostOperasiPerawatBedahController extends  LocaleController<AsuhanK
 
 			LOGGER.error("Got exception {} when savePostOperasiPerawatBedah", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePostOperasiPerawatBedah", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	
@@ -86,12 +85,12 @@ public class PostOperasiPerawatBedahController extends  LocaleController<AsuhanK
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataByNoTrans", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataByNoTrans", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -116,12 +115,12 @@ public class PostOperasiPerawatBedahController extends  LocaleController<AsuhanK
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPasienDaftarOperasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPasienDaftarOperasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PphpController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PphpController.java
index f9980564..df7def51 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PphpController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PphpController.java
@@ -83,11 +83,11 @@ public class PphpController extends LocaleController<RegistrasiPelayananVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Sppb", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Sppb", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiController.java
index 8dc570b2..50c1791c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiController.java
@@ -4,7 +4,6 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.jboss.logging.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,12 +54,12 @@ public class PraAnestesiController extends LocaleController<PraAnestesiVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPraAnestesiPasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPraAnestesiPasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
@@ -85,12 +84,12 @@ public class PraAnestesiController extends LocaleController<PraAnestesiVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPasienByRencanaOperasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPasienByRencanaOperasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
@@ -115,12 +114,12 @@ public class PraAnestesiController extends LocaleController<PraAnestesiVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPasienById", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPasienById", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
@@ -145,12 +144,12 @@ public class PraAnestesiController extends LocaleController<PraAnestesiVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPraAnestesiPerawat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPraAnestesiPerawat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiDokterBedahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiDokterBedahController.java
index 244f6771..85b28b3c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiDokterBedahController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiDokterBedahController.java
@@ -28,7 +28,6 @@ import com.jasamedika.medifirst2000.service.PraAnestesiDokterBedahService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PraAnestesiDokterBedahHeaderVO;
 import com.jasamedika.medifirst2000.vo.PraAnestesiDokterBedahVO;
-import com.jasamedika.medifirst2000.vo.PraAnestesiPasienHeaderVO;
 
 
 @RestController
@@ -57,11 +56,11 @@ public class PraAnestesiDokterBedahController extends LocaleController<PraAneste
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveAnestesiDokterBedah", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveAnestesiDokterBedah", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -82,11 +81,11 @@ public class PraAnestesiDokterBedahController extends LocaleController<PraAneste
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveAnestesiDokterBedahRev1", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveAnestesiDokterBedahRev1", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -111,12 +110,12 @@ public class PraAnestesiDokterBedahController extends LocaleController<PraAneste
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPraAnestesiDokterByNoRec", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPraAnestesiDokterByNoRec", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
@@ -142,12 +141,12 @@ public class PraAnestesiDokterBedahController extends LocaleController<PraAneste
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPraAnestesiDokterByNoRecAntrian", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPraAnestesiDokterByNoRecAntrian", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiDokterController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiDokterController.java
index 8db0bd4f..070f20f0 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiDokterController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiDokterController.java
@@ -30,7 +30,6 @@ import com.jasamedika.medifirst2000.service.PemeriksaanFisikService;
 import com.jasamedika.medifirst2000.service.PerencanaanAnestesiService;
 import com.jasamedika.medifirst2000.service.PraAnestesiDokterService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.CheckInVO;
 import com.jasamedika.medifirst2000.vo.KajianSistemVO;
 import com.jasamedika.medifirst2000.vo.PemeriksaanFisikVO;
 import com.jasamedika.medifirst2000.vo.PerencanaanAnestesiVO;
@@ -99,13 +98,13 @@ IBaseRestController<PraAnestesiDokterVO>  {
 			LOGGER.error("Got exception {} when add PraAnestesi Dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add PraAnestesi Dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -122,13 +121,13 @@ IBaseRestController<PraAnestesiDokterVO>  {
 			LOGGER.error("Got exception {} when add Kajian Sistem", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Kajian Sistem", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -145,13 +144,13 @@ IBaseRestController<PraAnestesiDokterVO>  {
 			LOGGER.error("Got exception {} when add Pemeriksaan Fisik", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pemeriksaan Fisik", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -168,13 +167,13 @@ IBaseRestController<PraAnestesiDokterVO>  {
 			LOGGER.error("Got exception {} when add Perencanaan Anestesi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Perencanaan Anestesi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -191,13 +190,13 @@ IBaseRestController<PraAnestesiDokterVO>  {
 			LOGGER.error("Got exception {} when update Pemeriksaan Fisik", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Pemeriksaan Fisik", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -214,13 +213,13 @@ IBaseRestController<PraAnestesiDokterVO>  {
 			LOGGER.error("Got exception {} when update Perencanaan Anestesi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Perencanaan Anestesi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiPasienBedahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiPasienBedahController.java
index e0d829eb..d2099ffe 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiPasienBedahController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiPasienBedahController.java
@@ -26,7 +26,6 @@ import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PraAnestesiPasienBedahService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.MapPegawaiToObjekPajakVO;
 import com.jasamedika.medifirst2000.vo.PraAnestesiPasienBedahVO;
 import com.jasamedika.medifirst2000.vo.PraAnestesiPasienHeaderVO;
 
@@ -55,11 +54,11 @@ public class PraAnestesiPasienBedahController extends LocaleController<PraAneste
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveAnestesiPasienBedah", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveAnestesiPasienBedah", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -83,12 +82,12 @@ public class PraAnestesiPasienBedahController extends LocaleController<PraAneste
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadDataPasienBedah", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadDataPasienBedah", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 
 		}
 	}
@@ -110,11 +109,11 @@ public class PraAnestesiPasienBedahController extends LocaleController<PraAneste
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveAnestesiPasienBedahRev1", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveAnestesiPasienBedahRev1", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -139,12 +138,12 @@ public class PraAnestesiPasienBedahController extends LocaleController<PraAneste
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPraAnestesiPasienByNoRec", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPraAnestesiPasienByNoRec", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
@@ -170,12 +169,12 @@ public class PraAnestesiPasienBedahController extends LocaleController<PraAneste
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPraAnestesiPasienByNoRecAntrian", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPraAnestesiPasienByNoRecAntrian", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiPasienController.java
index cab36148..20128e86 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiPasienController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PraAnestesiPasienController.java
@@ -83,13 +83,13 @@ IBaseRestController<PraAnestesiPasienVO>  {
 			LOGGER.error("Got exception {} when add PraAnestesi Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add PraAnestesi Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProductController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProductController.java
index 25051ad3..2d7fec9c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProductController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProductController.java
@@ -362,11 +362,11 @@ IBaseRestController<ProdukVO>  {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add BarangMedis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add BarangMedis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -382,11 +382,11 @@ IBaseRestController<ProdukVO>  {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add BarangMedis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add BarangMedis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -403,14 +403,14 @@ IBaseRestController<ProdukVO>  {
 			LOGGER.error("Got exception {} when add BarangNonMedis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add BarangNonMedis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -427,14 +427,14 @@ IBaseRestController<ProdukVO>  {
 			LOGGER.error("Got exception {} when update BarangNonMedis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update BarangNonMedis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -460,14 +460,14 @@ IBaseRestController<ProdukVO>  {
 			LOGGER.error("Got exception {} when add jenisLimbahB3Masuk", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add jenisLimbahB3Masuk", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -484,13 +484,13 @@ IBaseRestController<ProdukVO>  {
 			   LOGGER.error("Got exception {} when get all jenisLimbahB3Masuk", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get all jenisLimbahB3Masuk", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
@@ -519,14 +519,14 @@ IBaseRestController<ProdukVO>  {
 			LOGGER.error("Got exception {} when add detailHasil", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add detailHasil", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -565,11 +565,11 @@ IBaseRestController<ProdukVO>  {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all produk", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all produk", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -613,11 +613,11 @@ IBaseRestController<ProdukVO>  {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all Detail Jenis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all Detail Jenis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukDetailLabAnatomiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukDetailLabAnatomiController.java
index 2a2b05f3..c3ac9af6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukDetailLabAnatomiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukDetailLabAnatomiController.java
@@ -66,11 +66,11 @@ public class ProdukDetailLabAnatomiController extends LocaleController<ProdukDet
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukHukumController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukHukumController.java
index d4c42cd4..effc368b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukHukumController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukHukumController.java
@@ -57,10 +57,10 @@ public class ProdukHukumController extends LocaleController<AgamaVO>   {
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}		
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukKeslingNilaiNormalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukKeslingNilaiNormalController.java
index 21df2bae..9d06299d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukKeslingNilaiNormalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukKeslingNilaiNormalController.java
@@ -43,11 +43,11 @@ public class ProdukKeslingNilaiNormalController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all pengendali", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProduksiNonSterilController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProduksiNonSterilController.java
index 8445bc1a..ca56da19 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProduksiNonSterilController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProduksiNonSterilController.java
@@ -14,7 +14,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -25,11 +24,9 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.ProduksiNonSteril;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.ProduksiNonSterilService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.PelayananProduksiVO;
 import com.jasamedika.medifirst2000.vo.ProduksiNonSterilVO;
@@ -58,13 +55,13 @@ IBaseRestController<PelayananProduksiVO>  {
 			LOGGER.error("Got exception {} when add Pelayanan Admixture", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pelayanan Admixture", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -81,13 +78,13 @@ IBaseRestController<PelayananProduksiVO>  {
 			LOGGER.error("Got exception {} when update Pelayanan Admixture", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Pelayanan Admixture", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramController.java
index aa05c64c..c58384be 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramController.java
@@ -48,14 +48,14 @@ public class ProgramController extends LocaleController<ProgramVO> {
 			LOGGER.error("Got exception {} when add Program", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Program", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -72,14 +72,14 @@ public class ProgramController extends LocaleController<ProgramVO> {
 			LOGGER.error("Got exception {} when update Program", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Program", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramDanPerencanaanPenangananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramDanPerencanaanPenangananController.java
index 88641dfb..539f6449 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramDanPerencanaanPenangananController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramDanPerencanaanPenangananController.java
@@ -83,13 +83,13 @@ public class ProgramDanPerencanaanPenangananController extends LocaleController<
 			LOGGER.error("Got exception {} when add Program dan Perencanaan Penanganan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add  Program dan Perencanaan Penanganan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -106,13 +106,13 @@ public class ProgramDanPerencanaanPenangananController extends LocaleController<
 			LOGGER.error("Got exception {} when update Program dan Perencanaan Penanganan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update  Program dan Perencanaan Penanganan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
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 a577a26f..dacdc79c 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
@@ -103,14 +103,14 @@ implements IBaseRestController<ProgramKerjaStrategisVO>{
 			LOGGER.error("Got exception {} when add/update programKerjaStrategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update programKerjaStrategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PropinsiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PropinsiController.java
index bd8597b0..f3702436 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PropinsiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PropinsiController.java
@@ -50,17 +50,17 @@ public class PropinsiController extends LocaleController<PropinsiVO> implements
 			PropinsiVO result = propinsiService.add(vo);
 			if (null != result)
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "");
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("", HttpStatus.CREATED);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Propinsi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Propinsi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesCuciController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesCuciController.java
index e13fdc81..a6c22f4c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesCuciController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesCuciController.java
@@ -48,11 +48,11 @@ public class ProsesCuciController extends LocaleController<ProsesCuciVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Proses Cuci", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Proses Cuci", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -69,11 +69,11 @@ public class ProsesCuciController extends LocaleController<ProsesCuciVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get All Proses Cuci", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get All Proses Cuci", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -88,14 +88,14 @@ public class ProsesCuciController extends LocaleController<ProsesCuciVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when delete Proses Cuci", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when delete Proses Cuci", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesSterilisasiAlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesSterilisasiAlatController.java
index 74121d37..3422d79e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesSterilisasiAlatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProsesSterilisasiAlatController.java
@@ -47,11 +47,11 @@ public class ProsesSterilisasiAlatController extends LocaleController<ProsesSter
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Proses Sterilisasi Alat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Proses Sterilisasi Alat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PsrsPermintaanPerbaikanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PsrsPermintaanPerbaikanController.java
index c86a3879..87292953 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PsrsPermintaanPerbaikanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PsrsPermintaanPerbaikanController.java
@@ -11,7 +11,6 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -29,19 +28,16 @@ import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.entities.Pegawai;
 import com.jasamedika.medifirst2000.entities.Ruangan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.AkunService;
 import com.jasamedika.medifirst2000.service.PsrsPermintaanPerbaikanService;
 import com.jasamedika.medifirst2000.service.StokProdukGlobalService;
 import com.jasamedika.medifirst2000.service.StrukOrderService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.AkunVO;
-import com.jasamedika.medifirst2000.vo.DistribusiBarangInvestasiVO;
 import com.jasamedika.medifirst2000.vo.KirimPerbaikanVO;
 import com.jasamedika.medifirst2000.vo.PemeliharaanVO;
 import com.jasamedika.medifirst2000.vo.PenjadwalanHeaderVO;
 import com.jasamedika.medifirst2000.vo.PerbaikanVO;
 import com.jasamedika.medifirst2000.vo.PermintaanPerbaikanVO;
-import com.jasamedika.medifirst2000.vo.RequestBarangDariRuanganVO;
 import com.jasamedika.medifirst2000.vo.SukuCadangLuarVO;
 
 @RestController
@@ -71,11 +67,11 @@ public class PsrsPermintaanPerbaikanController extends LocaleController<AkunVO>{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -217,11 +213,11 @@ public class PsrsPermintaanPerbaikanController extends LocaleController<AkunVO>{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Penerimaan Barang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Penerimaan Barang", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -237,11 +233,11 @@ public class PsrsPermintaanPerbaikanController extends LocaleController<AkunVO>{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Penerimaan Barang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Penerimaan Barang", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -259,11 +255,11 @@ public class PsrsPermintaanPerbaikanController extends LocaleController<AkunVO>{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getRuanganRegistrasiAset", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getRuanganRegistrasiAset", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -280,11 +276,11 @@ public class PsrsPermintaanPerbaikanController extends LocaleController<AkunVO>{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAsetPerbaikan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAsetPerbaikan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -307,11 +303,11 @@ public class PsrsPermintaanPerbaikanController extends LocaleController<AkunVO>{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -328,11 +324,11 @@ public class PsrsPermintaanPerbaikanController extends LocaleController<AkunVO>{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -349,11 +345,11 @@ public class PsrsPermintaanPerbaikanController extends LocaleController<AkunVO>{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Permintaan Perbaikan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Permintaan Perbaikan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RISController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RISController.java
index c4720eb1..75bc7d14 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RISController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RISController.java
@@ -46,11 +46,11 @@ public class RISController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveRisOrder", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveRisOrder", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RadiologiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RadiologiController.java
index 120ea414..68280b31 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RadiologiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RadiologiController.java
@@ -53,11 +53,11 @@ public class RadiologiController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveOrderRadiologi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveOrderRadiologi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -72,11 +72,11 @@ public class RadiologiController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when updateOrderRadiologi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when updateOrderRadiologi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -96,11 +96,11 @@ public class RadiologiController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getDataAsuransiPasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getDataAsuransiPasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RefackingController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RefackingController.java
index b8d2422a..0a90a994 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RefackingController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RefackingController.java
@@ -28,7 +28,6 @@ import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RefackingService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.PapKeluhanUtamaVO;
 import com.jasamedika.medifirst2000.vo.RefackingVO;
 
 @RestController
@@ -60,11 +59,11 @@ IBaseRestController<RefackingVO>  {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiAsetController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiAsetController.java
index 5245fb3e..97b8c520 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiAsetController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiAsetController.java
@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.*;
@@ -13,7 +12,6 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -29,27 +27,15 @@ import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.DetailSpekAnggaran;
-import com.jasamedika.medifirst2000.entities.RegistrasiAset;
-import com.jasamedika.medifirst2000.entities.StrukPelayananDetail;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RegistrasiAsetService;
-import com.jasamedika.medifirst2000.service.StrukPelayananDetailService;
 import com.jasamedika.medifirst2000.service.StrukPelayananService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.DetailAnggaranVO;
 import com.jasamedika.medifirst2000.vo.DistribusiBarangInvestasiVO;
 import com.jasamedika.medifirst2000.vo.HistoryAlatVO;
-import com.jasamedika.medifirst2000.vo.PenerimaanBarangDetailVO;
 import com.jasamedika.medifirst2000.vo.PenerimaanBarangVO;
 import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO;
 
-import net.kaczmarzyk.spring.data.jpa.domain.DateBetween;
-import net.kaczmarzyk.spring.data.jpa.domain.Equal;
-import net.kaczmarzyk.spring.data.jpa.domain.Null;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.And;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
-
 @RestController
 @RequestMapping("/registrasi-aset")
 public class RegistrasiAsetController extends LocaleController<PenerimaanBarangVO> {
@@ -75,11 +61,11 @@ public class RegistrasiAsetController extends LocaleController<PenerimaanBarangV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Distribusi Barang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Distribusi Barang", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -97,11 +83,11 @@ public class RegistrasiAsetController extends LocaleController<PenerimaanBarangV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save History Alat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save History Alat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -145,11 +131,11 @@ public class RegistrasiAsetController extends LocaleController<PenerimaanBarangV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Distribusi Barang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Distribusi Barang", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiMasukRuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiMasukRuanganController.java
index d72c1320..5561b907 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiMasukRuanganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiMasukRuanganController.java
@@ -24,11 +24,8 @@ import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RegistrasiMasukRuanganService;
-import com.jasamedika.medifirst2000.service.RegistrasiPasienService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.RegistrasiMasukRuanganVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPasienVO;
 
 /**
  * Controller class for Registrasi Pasien Business
@@ -61,17 +58,17 @@ public class RegistrasiMasukRuanganController extends LocaleController<Registras
 
 			if (null != result)
 				addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "");
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse(result, HttpStatus.CREATED);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienController.java
index 03c15cad..1c38fda8 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienController.java
@@ -1,9 +1,6 @@
 
 package com.jasamedika.medifirst2000.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -18,7 +15,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -30,9 +26,7 @@ import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.dao.custom.HasilTriaseDaoCustom;
 import com.jasamedika.medifirst2000.entities.HasilTriase;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DataAsuransiService;
 import com.jasamedika.medifirst2000.service.HasilTriaseService;
@@ -42,9 +36,6 @@ import com.jasamedika.medifirst2000.service.RegistrasiPelayananService;
 import com.jasamedika.medifirst2000.service.ReportingPelayananRekamMedisService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.DataAsuransiVO;
-import com.jasamedika.medifirst2000.vo.GridAntrianPasienDiPeriksaVO;
-import com.jasamedika.medifirst2000.vo.IpsrsMaintenanceVO;
-import com.jasamedika.medifirst2000.vo.IpsrsSertifikatKalibrasiVO;
 import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
 import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.RegistrasiPasienPenunjangVO;
@@ -85,11 +76,11 @@ public class RegistrasiPasienController extends LocaleController<RegistrasiPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -106,11 +97,11 @@ public class RegistrasiPasienController extends LocaleController<RegistrasiPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -127,11 +118,11 @@ public class RegistrasiPasienController extends LocaleController<RegistrasiPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -180,11 +171,11 @@ public class RegistrasiPasienController extends LocaleController<RegistrasiPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveRegistrasiPasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveRegistrasiPasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -199,11 +190,11 @@ public class RegistrasiPasienController extends LocaleController<RegistrasiPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePasienDaftar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePasienDaftar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -221,11 +212,11 @@ public class RegistrasiPasienController extends LocaleController<RegistrasiPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPasienByNocm", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPasienByNocm", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -240,11 +231,11 @@ public class RegistrasiPasienController extends LocaleController<RegistrasiPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when updatePasienDaftar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when updatePasienDaftar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -263,11 +254,11 @@ public class RegistrasiPasienController extends LocaleController<RegistrasiPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getUmur ", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getUmur", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienGawatDaruratController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienGawatDaruratController.java
index c0cebfad..dc2bf88d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienGawatDaruratController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienGawatDaruratController.java
@@ -59,11 +59,11 @@ public class RegistrasiPasienGawatDaruratController extends LocaleController<Reg
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -79,11 +79,11 @@ public class RegistrasiPasienGawatDaruratController extends LocaleController<Reg
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
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 4ea46d6f..a5ea1524 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
@@ -1,12 +1,10 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,7 +13,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -31,13 +28,8 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RegistrasiPasienOnlineService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.AgamaVO;
 import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO;
 import com.jasamedika.medifirst2000.vo.GridAntrianPasienDiPeriksaVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
-import com.jasamedika.medifirst2000.vo.PelayananObatLuarVO;
-
-import io.socket.client.IO;
 
 /**
  * Controller class for Registrasi Pasien Business
@@ -65,11 +57,11 @@ public class RegistrasiPasienOnlineController extends LocaleController<AntrianPa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -96,11 +88,11 @@ public class RegistrasiPasienOnlineController extends LocaleController<AntrianPa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -122,11 +114,11 @@ public class RegistrasiPasienOnlineController extends LocaleController<AntrianPa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get Ruangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get Ruangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	
@@ -146,11 +138,11 @@ public class RegistrasiPasienOnlineController extends LocaleController<AntrianPa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get Ruangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get Ruangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	
@@ -184,11 +176,11 @@ public class RegistrasiPasienOnlineController extends LocaleController<AntrianPa
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get Ruangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get Ruangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienSmsController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienSmsController.java
index f8b40f21..f205c81e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienSmsController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienSmsController.java
@@ -1,8 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -79,11 +77,11 @@ public class RegistrasiPasienSmsController extends LocaleController<AntrianPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -130,11 +128,11 @@ public class RegistrasiPasienSmsController extends LocaleController<AntrianPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -158,11 +156,11 @@ public class RegistrasiPasienSmsController extends LocaleController<AntrianPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -188,11 +186,11 @@ public class RegistrasiPasienSmsController extends LocaleController<AntrianPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -216,11 +214,11 @@ public class RegistrasiPasienSmsController extends LocaleController<AntrianPasie
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
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 55c6ae4a..9a67ab55 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
@@ -35,7 +35,7 @@ import static com.jasamedika.medifirst2000.util.CommonUtil.isNotNullOrEmpty;
 import static com.jasamedika.medifirst2000.util.CommonUtil.isNullOrEmpty;
 import static com.jasamedika.medifirst2000.util.DateUtil.toDate;
 import static com.jasamedika.medifirst2000.util.JsonUtil.ToMaps;
-import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttptatus;
+import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonHttpStatus;
 import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse;
 import static org.springframework.http.HttpStatus.*;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@@ -153,11 +153,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveRencanaOperasiNew", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveRencanaOperasiNew", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -172,11 +172,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when savePapInformasiIbu", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when savePapInformasiIbu", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -192,11 +192,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveKirimProduk", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveKirimProduk", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -231,11 +231,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveOrderProduk", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveOrderProduk", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -257,11 +257,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when save", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when save", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -279,11 +279,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getOrderFromSirs", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getOrderFromSirs", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -298,11 +298,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveHasilPelayanan", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveHasilPelayanan", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -322,11 +322,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveSuratPermintaanMasuk", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveSuratPermintaanMasuk", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -346,11 +346,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveVerifikasiPelayananObat3", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveVerifikasiPelayananObat3", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -365,11 +365,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when savePengambilOrder", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when savePengambilOrder", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -384,11 +384,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when updateStatusOrder", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when updateStatusOrder", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -405,11 +405,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when savePelayananObat3", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when savePelayananObat3", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -453,11 +453,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when kirimDokumen", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when kirimDokumen", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -497,11 +497,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when deletePelayanan", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when deletePelayanan", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -560,11 +560,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveRegistrasiPasienTouchScreen", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveRegistrasiPasienTouchScreen", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -619,11 +619,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when savePasienTouchScreen", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when savePasienTouchScreen", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -645,11 +645,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getPasienDaftar", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getPasienDaftar", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -670,11 +670,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when ambilHasil", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when ambilHasil", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -699,11 +699,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when savePasienDafar", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when savePasienDafar", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -718,11 +718,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when savePersetujuanUmum", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when savePersetujuanUmum", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -842,11 +842,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getAllDokter", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getAllDokter", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -859,11 +859,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when findAll", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when findAll", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -882,13 +882,13 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 					"Got ServiceVOException {} when findRuanganByDepartemenSettingDataFixed[KdDepartemenInstalasiRawat,KdDepartemenInstalasiRawatInapBayi]",
 					e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error(
 					"Got JpaSystemException {} when findRuanganByDepartemenSettingDataFixed[KdDepartemenInstalasiRawat,KdDepartemenInstalasiRawatInapBayi]",
 					jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -914,11 +914,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when findRuanganByDepartemen", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when findRuanganByDepartemen", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -937,13 +937,13 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 					"Got ServiceVOException {} when findRuanganByDepartemenSettingDataFixed[KdDepartemenInstalasiLaboratorium,KdDepartemenInstalasiRadiologi]",
 					e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error(
 					"Got JpaSystemException {} when findRuanganByDepartemenSettingDataFixed[KdDepartemenInstalasiLaboratorium,KdDepartemenInstalasiRadiologi]",
 					jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1012,11 +1012,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when findAllAntrianPaging", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when findAllAntrianPaging", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1046,11 +1046,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when finByNoIdAndTglRegistrasi", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when finByNoIdAndTglRegistrasi", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1105,11 +1105,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when updatStatusAntrian", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when updatStatusAntrian", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1137,11 +1137,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when findRuanganByDepartemenByName", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when findRuanganByDepartemenByName", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1155,11 +1155,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when findRuanganRehamMedik", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when findRuanganRehamMedik", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1302,11 +1302,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when findKelompokPasien", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when findKelompokPasien", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1373,11 +1373,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getKelompokPasien", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getKelompokPasien", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1395,11 +1395,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getRekananByKelompokPasien", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getRekananByKelompokPasien", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1418,11 +1418,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getLoadData", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getLoadData", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1440,11 +1440,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getDataAsuransiPasien", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getDataAsuransiPasien", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1470,12 +1470,12 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 			LOGGER.error("Got ServiceVOException {} when saveAsuransiPasien", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
 			bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveAsuransiPasien", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
 			bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1490,11 +1490,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when savePelayananObatLuar", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when savePelayananObatLuar", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1509,11 +1509,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when returStrukPenjualanBebas", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when returStrukPenjualanBebas", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1532,11 +1532,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getPenjualanBebas", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getPenjualanBebas", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1555,11 +1555,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getProdukPenjualanBebas", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getProdukPenjualanBebas", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1580,11 +1580,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveOrderPelayananGizi", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveOrderPelayananGizi", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1602,11 +1602,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getOrderPelayananGizi", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getOrderPelayananGizi", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1626,11 +1626,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getOrderPelayananGiziMinuman", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getOrderPelayananGiziMinuman", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1644,11 +1644,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when findProdukGiziMenuTambahan", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when findProdukGiziMenuTambahan", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1664,11 +1664,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getKomposisiMakanan", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getKomposisiMakanan", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1684,11 +1684,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getKomposisiMakanan get-kalori", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getKomposisiMakanan get-kalori", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1704,11 +1704,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getKomposisiMakanan get-komposisi-formula", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getKomposisiMakanan get-komposisi-formula", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1727,11 +1727,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getPemesananBahan", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getPemesananBahan", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1748,11 +1748,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getProduksi", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getProduksi", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1768,11 +1768,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} getTindakanPelayanan", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} getTindakanPelayanan", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1792,11 +1792,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveVerifikasiGiziAll", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveVerifikasiGiziAll", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1816,11 +1816,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when cekStokGiziProduksi", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when cekStokGiziProduksi", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1841,11 +1841,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveProduksi", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveProduksi", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1866,11 +1866,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveKirimMenu", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveKirimMenu", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1886,11 +1886,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getOrderPelayananKirimMenuGiziMakanan", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getOrderPelayananKirimMenuGiziMakanan", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1906,11 +1906,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getOrderPelayananKirimMenuGiziMinuman", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getOrderPelayananKirimMenuGiziMinuman", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1926,11 +1926,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getOrder", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getOrder", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1966,11 +1966,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveOrderProduklab", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveOrderProduklab", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1988,11 +1988,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when deleteOrderlaboratorium", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when deleteOrderlaboratorium", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2009,11 +2009,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when updateOrderProduklab", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when updateOrderProduklab", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2029,11 +2029,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getAllProdukProduksiGizi", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getAllProdukProduksiGizi", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2047,11 +2047,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when findJenisProdukRadiologi", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when findJenisProdukRadiologi", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2089,11 +2089,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveOperasi", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveOperasi", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2168,11 +2168,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when updatePelayananDokter", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when updatePelayananDokter", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2213,11 +2213,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getDataRegistrasiPelayanan", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getDataRegistrasiPelayanan", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2242,11 +2242,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when editPasienDaftar", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when editPasienDaftar", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2271,11 +2271,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when editAsuransiPasien", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when editAsuransiPasien", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2315,11 +2315,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveKendaliDokumenRekamMedis", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when saveKendaliDokumenRekamMedis", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2339,11 +2339,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when getListAntrian", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when getListAntrian", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2366,11 +2366,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when findAllKendaliDokumenRekamMedis", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when findAllKendaliDokumenRekamMedis", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2392,11 +2392,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when riwayatRegistrasiPasien", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when riwayatRegistrasiPasien", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2414,11 +2414,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when riwayatAntrianPasien", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when riwayatAntrianPasien", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2439,11 +2439,11 @@ public class RegistrasiPelayananController extends LocaleController<RegistrasiPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when trigerringSaveAkomodasi", e.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
-			return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got JpaSystemException {} when trigerringSaveAkomodasi", jse.getMessage());
 			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
-			return getJsonHttptatus(CONFLICT, mapHeaderMessage);
+			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananPasienController.java
index 7f4a98de..eb5dc7e6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananPasienController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananPasienController.java
@@ -60,11 +60,11 @@ public class RegistrasiPelayananPasienController extends LocaleController<Pemeri
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -81,11 +81,11 @@ public class RegistrasiPelayananPasienController extends LocaleController<Pemeri
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananRawatInapController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananRawatInapController.java
index a12bc5dc..7eb15a10 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananRawatInapController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPelayananRawatInapController.java
@@ -25,19 +25,8 @@ import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.AsalRujukanService;
-import com.jasamedika.medifirst2000.service.KelompokPasienService;
-import com.jasamedika.medifirst2000.service.PasienService;
-import com.jasamedika.medifirst2000.service.PegawaiService;
 import com.jasamedika.medifirst2000.service.RegistrasiPelayananRawatInapService;
-import com.jasamedika.medifirst2000.service.RuanganService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.AsalRujukanVO;
-import com.jasamedika.medifirst2000.vo.KelompokPasienVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
-import com.jasamedika.medifirst2000.vo.PegawaiVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPelayananRawatInapVO;
-import com.jasamedika.medifirst2000.vo.RuanganVO;
 import com.jasamedika.medifirst2000.vo.RegistrasiPelayananRawatInapVO;
 
 /**
@@ -68,11 +57,11 @@ public class RegistrasiPelayananRawatInapController extends LocaleController<Reg
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Registrasi Pelayanan Rawat Inap", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Registrasi Pelayanan Rawat Inap", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RehabilitasiAsesmenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RehabilitasiAsesmenController.java
index 23cbc969..ebc505fb 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RehabilitasiAsesmenController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RehabilitasiAsesmenController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.text.ParseException;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,7 +24,6 @@ import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.RehabilitasiFormulirKlaim;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RehabilitasiAsesmenService;
 import com.jasamedika.medifirst2000.service.RehabilitasiKlaimFormulirService;
@@ -60,11 +58,11 @@ public class RehabilitasiAsesmenController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -82,11 +80,11 @@ public class RehabilitasiAsesmenController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getKalkulasiDataRemunerasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getKalkulasiDataRemunerasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -104,11 +102,11 @@ public class RehabilitasiAsesmenController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getKalkulasiDataRemunerasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getKalkulasiDataRemunerasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -127,11 +125,11 @@ public class RehabilitasiAsesmenController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -149,11 +147,11 @@ public class RehabilitasiAsesmenController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getKalkulasiDataRemunerasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getKalkulasiDataRemunerasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -171,11 +169,11 @@ public class RehabilitasiAsesmenController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getKalkulasiDataRemunerasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getKalkulasiDataRemunerasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekananController.java
index e74cb695..276fa672 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekananController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekananController.java
@@ -1,7 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.*;
@@ -10,7 +8,6 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -26,33 +23,10 @@ import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.DetailSpekAnggaran;
-import com.jasamedika.medifirst2000.entities.StrukOrder;
-import com.jasamedika.medifirst2000.entities.StrukPelayananDetail;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.security.model.AppPermission;
-import com.jasamedika.medifirst2000.service.PemusnahanBarangService;
 import com.jasamedika.medifirst2000.service.RekananService;
-import com.jasamedika.medifirst2000.service.StrukOrderService;
-import com.jasamedika.medifirst2000.service.StrukPelayananDetailService;
-import com.jasamedika.medifirst2000.service.StrukPelayananService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.DetailAnggaranVO;
-import com.jasamedika.medifirst2000.vo.DistribusiBarangInvestasiVO;
-import com.jasamedika.medifirst2000.vo.PenerimaanBarangDetailVO;
-import com.jasamedika.medifirst2000.vo.PenerimaanBarangVO;
 import com.jasamedika.medifirst2000.vo.RekananVO;
-import com.jasamedika.medifirst2000.vo.RequestBarangDariRuanganVO;
-import com.jasamedika.medifirst2000.vo.StrukHistoriVO;
-import com.jasamedika.medifirst2000.vo.StrukKirimVO;
-import com.jasamedika.medifirst2000.vo.StrukOrderVO;
-
-import net.kaczmarzyk.spring.data.jpa.domain.DateBetween;
-import net.kaczmarzyk.spring.data.jpa.domain.Equal;
-import net.kaczmarzyk.spring.data.jpa.domain.Like;
-import net.kaczmarzyk.spring.data.jpa.domain.Null;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.And;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
 
 @RestController
 @RequestMapping("/rekanan")
@@ -74,11 +48,11 @@ public class RekananController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Rekanan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Rekanan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekapGajiPegawaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekapGajiPegawaiController.java
index 6fd893d5..f7c7ffd9 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekapGajiPegawaiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekapGajiPegawaiController.java
@@ -39,10 +39,10 @@ public class RekapGajiPegawaiController extends LocaleController<StrukHistoriVO>
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}
 		
 	}
@@ -55,7 +55,7 @@ public class RekapGajiPegawaiController extends LocaleController<StrukHistoriVO>
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/gaji-pegawai", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE, 
@@ -73,11 +73,11 @@ public class RekapGajiPegawaiController extends LocaleController<StrukHistoriVO>
 				} else {
 					mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
 				}
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 				
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}
 	}
 	
@@ -88,7 +88,7 @@ public class RekapGajiPegawaiController extends LocaleController<StrukHistoriVO>
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenController.java
index 27da6942..de3099cd 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenController.java
@@ -48,7 +48,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-agama", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -60,7 +60,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-status-perkawinan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -72,7 +72,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-posisi-lamar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -84,7 +84,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-degree", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -96,7 +96,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-registrasi-pelamar", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -109,7 +109,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-daftar-pelamar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -124,7 +124,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pns-nonpns", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -136,7 +136,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/generate-no-planning", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -148,7 +148,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-berkas-lamaran", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -162,7 +162,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-terima-berkas-lamaran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -175,7 +175,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-jenis-test", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -187,7 +187,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-all-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -199,7 +199,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-petugas-sdm", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -211,7 +211,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pelamars-lolos-administrasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -226,7 +226,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-jadwal-seleksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -239,7 +239,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-jadwal-seleksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -252,7 +252,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pelaksana-pelamar-by-jenis-test-periode", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -266,7 +266,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-pelaksana-seleksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -279,7 +279,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-pelaksana-seleksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -292,7 +292,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-pelaksana-seleksi-by-no-rec-struk-planning", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -305,7 +305,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-inputnilai-pelamar-by-jenis-test-periode", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -319,7 +319,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-nilai-seleksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -332,7 +332,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-daftar-hadir", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -347,7 +347,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-download-dokumen", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -381,7 +381,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, "SUKSES DOWNLOAD");
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-jadwal-pelamar-by-jenis-test-periode", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -395,7 +395,7 @@ public class RekrutmenController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenOnlineController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenOnlineController.java
index 4fcf4a5f..2bdf5d8f 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenOnlineController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RekrutmenOnlineController.java
@@ -38,7 +38,7 @@ public class RekrutmenOnlineController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-agama", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -50,7 +50,7 @@ public class RekrutmenOnlineController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-status-perkawinan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -62,7 +62,7 @@ public class RekrutmenOnlineController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-posisi-lamar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -74,7 +74,7 @@ public class RekrutmenOnlineController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-degree", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -86,7 +86,7 @@ public class RekrutmenOnlineController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-jenis-organisasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -98,7 +98,7 @@ public class RekrutmenOnlineController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save-registrasi-pelamar", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -111,7 +111,7 @@ public class RekrutmenOnlineController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaController.java
index cdbff384..cfb5bb26 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RencanaController.java
@@ -48,11 +48,11 @@ public class RencanaController extends LocaleController<RencanaCustomVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveRencana", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveRencana", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
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 c6fe3c87..5a138c27 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
@@ -92,14 +92,14 @@ implements IBaseRestController<RencanaKinerjaTahunanVO>{
 			LOGGER.error("Got exception {} when add/update Rencana Kinerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update Rencana Kinerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -131,14 +131,14 @@ implements IBaseRestController<RencanaKinerjaTahunanVO>{
 			LOGGER.error("Got exception {} when update Rencana Kinerja Operasional", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Rencana Kinerja Operasional", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
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 38a8a311..2ee0d2f5 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
@@ -27,12 +27,10 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.KamusIndikator;
 import com.jasamedika.medifirst2000.entities.RencanaMitigasiRisiko;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RencanaMitigasiRisikoService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.KamusIndikatorVO;
 import com.jasamedika.medifirst2000.vo.RencanaMitigasiRisikoVO;
 
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
@@ -105,14 +103,14 @@ implements IBaseRestController<RencanaMitigasiRisikoVO>{
 			LOGGER.error("Got exception {} when add/update kamus IKU", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update kamus IKU", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReportPengadaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReportPengadaanController.java
index 531306ea..afb92919 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReportPengadaanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReportPengadaanController.java
@@ -41,11 +41,11 @@ public class ReportPengadaanController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when reportPengendaan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return (Map<String, Object>) RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return (Map<String, Object>) RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when reportPengendaan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return (Map<String, Object>) RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return (Map<String, Object>) RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -61,11 +61,11 @@ public class ReportPengadaanController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when reportPengendaan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return (Map<String, Object>) RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return (Map<String, Object>) RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when reportPengendaan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return (Map<String, Object>) RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return (Map<String, Object>) RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -83,11 +83,11 @@ public class ReportPengadaanController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when reportPengendaan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return (Map<String, Object>) RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return (Map<String, Object>) RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when reportPengendaan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return (Map<String, Object>) RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return (Map<String, Object>) RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -103,11 +103,11 @@ public class ReportPengadaanController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when reportPengendaan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return (Map<String, Object>) RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return (Map<String, Object>) RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when reportPengendaan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return (Map<String, Object>) RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return (Map<String, Object>) RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RequestPermintaanBarangController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RequestPermintaanBarangController.java
index 42151550..997f72c3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RequestPermintaanBarangController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RequestPermintaanBarangController.java
@@ -55,11 +55,11 @@ public class RequestPermintaanBarangController extends LocaleController<Penerima
 		} catch (ServiceVOException e) {
 			LOG.error("Got exception {} when save Penerimaan Barang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOG.error("Got exception {} when save Penerimaan Barang", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -89,11 +89,11 @@ public class RequestPermintaanBarangController extends LocaleController<Penerima
 		} catch (ServiceVOException e) {
 			LOG.error("Got exception {} when save Penerimaan Barang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOG.error("Got exception {} when save Penerimaan Barang", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReservasiPasienController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReservasiPasienController.java
index bfc99c7b..eff8954c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReservasiPasienController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReservasiPasienController.java
@@ -19,22 +19,13 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PegawaiService;
-import com.jasamedika.medifirst2000.service.RegistrasiPasienService;
 import com.jasamedika.medifirst2000.service.ReservasiPasienService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.AgamaVO;
-import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiDetailVO;
-import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO;
-import com.jasamedika.medifirst2000.vo.JenisKartuDetailVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.PegawaiVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPasienVO;
 import com.jasamedika.medifirst2000.vo.ReservasiPasienVO;
 
 /**
@@ -86,17 +77,17 @@ public class ReservasiPasienController extends LocaleController<ReservasiPasienV
 
 			if (null != result)
 				addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, "");
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse(result, HttpStatus.CREATED);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -109,11 +100,11 @@ public class ReservasiPasienController extends LocaleController<ReservasiPasienV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturObatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturObatController.java
index dbf40062..999e1466 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturObatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturObatController.java
@@ -79,11 +79,11 @@ public class ReturObatController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getDetailRetur", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getDetailRetur", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturRuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturRuanganController.java
index 278bc875..dc84db3f 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturRuanganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturRuanganController.java
@@ -70,11 +70,11 @@ public class ReturRuanganController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Retur Ruangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {}  when save Retur Ruangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -175,11 +175,11 @@ public class ReturRuanganController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Retur Ruangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {}  when save Retur Ruangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturSupplierController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturSupplierController.java
index e48c2cfb..4abc607e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturSupplierController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturSupplierController.java
@@ -24,11 +24,8 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.ReturRuanganService;
 import com.jasamedika.medifirst2000.service.StrukPelayananService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.RequestBarangDariRuanganVO;
-import com.jasamedika.medifirst2000.vo.ReturRuanganVO;
 import com.jasamedika.medifirst2000.vo.ReturSupplierVO;
 
 @RestController
@@ -54,11 +51,11 @@ public class ReturSupplierController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Retur Ruangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {}  when save Retur Ruangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
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 e4144166..c9d02a54 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
@@ -103,14 +103,14 @@ implements IBaseRestController<RisikoVO>{
 			LOGGER.error("Got exception {} when add/update Risiko", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update Risiko", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoKerjaRuanganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoKerjaRuanganController.java
index 18ff91e1..503d5d73 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoKerjaRuanganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoKerjaRuanganController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -15,7 +14,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -30,10 +28,8 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RisikoKerjaRuanganService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.RisikoKerjaRuanganVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -66,11 +62,11 @@ public class RisikoKerjaRuanganController extends LocaleController<RisikoKerjaRu
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add RisikoKerjaRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add RisikoKerjaRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -88,17 +84,17 @@ public class RisikoKerjaRuanganController extends LocaleController<RisikoKerjaRu
 			LOGGER.error("Got exception {} when delete RisikoKerjaRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when delete RisikoKerjaRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 	
 	@RequestMapping(value = "/find-all", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatAsupanMakanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatAsupanMakanController.java
index 42f07deb..933ce7af 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatAsupanMakanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatAsupanMakanController.java
@@ -26,7 +26,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RiwayatAsupanMakanService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.RiwayatAsupanMakanVO;
 
@@ -54,13 +53,13 @@ IBaseRestController<RiwayatAsupanMakanVO>  {
 			LOGGER.error("Got exception {} when add Riwayat Pasca Lahir", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Riwayat Pasca Lahir", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -77,13 +76,13 @@ IBaseRestController<RiwayatAsupanMakanVO>  {
 			LOGGER.error("Got exception {} when add Riwayat Pasca Lahir", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Riwayat Pasca Lahir", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKehamilanPersalinanNifasYangLaluController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKehamilanPersalinanNifasYangLaluController.java
index 0c1e8705..1e37fa2b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKehamilanPersalinanNifasYangLaluController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKehamilanPersalinanNifasYangLaluController.java
@@ -67,11 +67,11 @@ public class RiwayatKehamilanPersalinanNifasYangLaluController extends LocaleCon
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKelahiranYangLaluController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKelahiranYangLaluController.java
index d9eaf9b2..ab8d1716 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKelahiranYangLaluController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKelahiranYangLaluController.java
@@ -67,11 +67,11 @@ public class RiwayatKelahiranYangLaluController extends LocaleController<Riwayat
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKesehatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKesehatanController.java
index 287936b0..c39b701b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKesehatanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKesehatanController.java
@@ -1,9 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -24,14 +21,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.DetailTriaseService;
-import com.jasamedika.medifirst2000.service.HasilTriaseService;
-import com.jasamedika.medifirst2000.service.KategoriHasilTriaseService;
-import com.jasamedika.medifirst2000.service.PemeriksaanTriageService;
 import com.jasamedika.medifirst2000.service.RiwayatKesehatanService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.RiwayatKesehatanVO;
@@ -58,17 +50,17 @@ public class RiwayatKesehatanController extends LocaleController<RiwayatKesehata
 			Map<String,Object> result = riwayatKesehatanService.saveRiwayatKesehatanService(vo);
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-				RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+				RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 				SaveLog("Riwayat Kesehatan", "Pemeriksaan",request);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Riwayat Kesehatan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Riwayat Kesehatan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatMasaKehamilanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatMasaKehamilanController.java
index 38a94e14..1ed20a21 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatMasaKehamilanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatMasaKehamilanController.java
@@ -52,13 +52,13 @@ IBaseRestController<RiwayatMasaKehamilanVO>  {
 			LOGGER.error("Got exception {} when add Riwayat Masa Kehamilan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Riwayat Masa Kehamilan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -75,13 +75,13 @@ IBaseRestController<RiwayatMasaKehamilanVO>  {
 			LOGGER.error("Got exception {} when update Riwayat Masa Kehamilan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Riwayat Masa Kehamilan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPascaLahirController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPascaLahirController.java
index 669f8bd6..f5450fec 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPascaLahirController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPascaLahirController.java
@@ -26,7 +26,6 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RiwayatPascaLahirService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.RiwayatPascaLahirVO;
 
@@ -54,13 +53,13 @@ IBaseRestController<RiwayatPascaLahirVO>  {
 			LOGGER.error("Got exception {} when add Riwayat Pasca Lahir", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Riwayat Pasca Lahir", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -77,13 +76,13 @@ IBaseRestController<RiwayatPascaLahirVO>  {
 			LOGGER.error("Got exception {} when add Riwayat Pasca Lahir", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Riwayat Pasca Lahir", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPekerjaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPekerjaanController.java
index 14ac7293..489f3d9d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPekerjaanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPekerjaanController.java
@@ -50,17 +50,17 @@ public class RiwayatPekerjaanController extends LocaleController<RiwayatPekerjaa
 			RiwayatPekerjaanVO result = riwayatPekerjaanService.add(vo);
 			if (null != result)
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Status Keluarga", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Status Keluarga", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPelatihanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPelatihanController.java
index bab04c5f..a1d2bda9 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPelatihanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPelatihanController.java
@@ -49,17 +49,17 @@ public class RiwayatPelatihanController extends LocaleController<RiwayatPelatiha
 			RiwayatPelatihanVO result = riwayatPelatihanService.add(vo);
 			if (null != result)
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Status Keluarga", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Status Keluarga", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPendidikanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPendidikanController.java
index 8d6bb388..069a820a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPendidikanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPendidikanController.java
@@ -49,17 +49,17 @@ public class RiwayatPendidikanController extends LocaleController<RiwayatPendidi
 			RiwayatPendidikanVO result = riwayatPendidikanService.add(vo);
 			if (null != result)
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Status Keluarga", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Status Keluarga", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPenyakitPengobatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPenyakitPengobatanController.java
index 1a5b519f..e0a8a61c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPenyakitPengobatanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPenyakitPengobatanController.java
@@ -48,11 +48,11 @@ public class RiwayatPenyakitPengobatanController extends LocaleController<Riwaya
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveRiwayatPenyakitPengobatan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveRiwayatPenyakitPengobatan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPerkembanganPsikomotorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPerkembanganPsikomotorController.java
index 1083884f..1ef5d3a3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPerkembanganPsikomotorController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatPerkembanganPsikomotorController.java
@@ -53,14 +53,14 @@ public class RiwayatPerkembanganPsikomotorController extends LocaleController<Ke
 			LOGGER.error("Got exception {} when add riwayat perkembangan psikomotor", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add riwayat perkembangan psikomotor", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}	
@@ -77,14 +77,14 @@ public class RiwayatPerkembanganPsikomotorController extends LocaleController<Ke
 			LOGGER.error("Got exception {} when update riwayat perkembangan psikomotor", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update riwayat perkembangan psikomotor", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
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 b0809c1f..8fdf3f7f 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
@@ -82,11 +82,11 @@ public class RuanganController extends LocaleController<RuanganVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Ruangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Ruangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -101,14 +101,14 @@ public class RuanganController extends LocaleController<RuanganVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when update Ruangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Ruangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 	@RequestMapping(value = "/delete-ruangan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
@@ -121,18 +121,18 @@ public class RuanganController extends LocaleController<RuanganVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when delete Ruangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when delete Ruangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} catch (DataIntegrityViolationException ex) {
 
 			LOGGER.error("Got exception {} when delete Ruangan", ex.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, ex.getMessage());
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 
 	}
 
@@ -374,11 +374,11 @@ public class RuanganController extends LocaleController<RuanganVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all dokter", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all dokter", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -393,11 +393,11 @@ public class RuanganController extends LocaleController<RuanganVO> implements IB
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all unit kerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all unit kerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RunningNumberController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RunningNumberController.java
index 3972bfa6..d8b7695b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RunningNumberController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RunningNumberController.java
@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,7 +11,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -23,11 +21,8 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.IpsrsDataAlatService;
 import com.jasamedika.medifirst2000.service.RunningNumberService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.IpsrsSertifikatKalibrasiVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiAsetVO;
 
 @RestController
 @RequestMapping("/pasien-daftar-setting")
@@ -52,11 +47,11 @@ public class RunningNumberController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getOneRegistrasiAset", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getOneRegistrasiAset", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
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 7c4c7299..5c1b9586 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
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,20 +28,15 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.AdvokasiHukumMedicolegal;
 import com.jasamedika.medifirst2000.entities.DetailSWOT;
-import com.jasamedika.medifirst2000.entities.KajianEvaluasi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DetailSWOTService;
 import com.jasamedika.medifirst2000.service.SWOTService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.DetailSWOTVO;
 import com.jasamedika.medifirst2000.vo.SWOTVO;
 
-import net.kaczmarzyk.spring.data.jpa.domain.DateBetween;
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
-import net.kaczmarzyk.spring.data.jpa.domain.GreaterThan;
 import net.kaczmarzyk.spring.data.jpa.domain.GreaterThanOrEqual;
 import net.kaczmarzyk.spring.data.jpa.domain.LessThanOrEqual;
 import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
@@ -72,11 +66,11 @@ IBaseRestController<SWOTVO>{
 		}catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when get all swot", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all swot", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -112,14 +106,14 @@ IBaseRestController<SWOTVO>{
 			LOGGER.error("Got exception {} when add detailHasil", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add detailHasil", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -136,14 +130,14 @@ IBaseRestController<SWOTVO>{
 			LOGGER.error("Got exception {} when add detailHasil", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add detailHasil", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
@@ -161,14 +155,14 @@ IBaseRestController<SWOTVO>{
 			LOGGER.error("Got exception {} when delete Detail Analisis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when delete Detail Analisis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SanitasiKesehatanLingkunganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SanitasiKesehatanLingkunganController.java
index 2aef8954..b9a24791 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SanitasiKesehatanLingkunganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SanitasiKesehatanLingkunganController.java
@@ -49,11 +49,11 @@ public class SanitasiKesehatanLingkunganController extends LocaleController<Sani
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getUnitRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getUnitRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -70,11 +70,11 @@ public class SanitasiKesehatanLingkunganController extends LocaleController<Sani
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getUserLogin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getUserLogin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -91,11 +91,11 @@ public class SanitasiKesehatanLingkunganController extends LocaleController<Sani
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getParameterSanitasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getParameterSanitasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -113,11 +113,11 @@ public class SanitasiKesehatanLingkunganController extends LocaleController<Sani
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPjRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPjRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -132,11 +132,11 @@ public class SanitasiKesehatanLingkunganController extends LocaleController<Sani
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveSanitasiKesehatanLingkungan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveSanitasiKesehatanLingkungan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
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 4793af7d..9e7efde6 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
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -63,13 +62,13 @@ IBaseRestController<SasaranStrategisVO> {
 			LOGGER.error("Got exception {} when add Sasaran Strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Sasaran Strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -86,13 +85,13 @@ IBaseRestController<SasaranStrategisVO> {
 			LOGGER.error("Got exception {} when add Sasaran Strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Sasaran Strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -109,13 +108,13 @@ IBaseRestController<SasaranStrategisVO> {
 			LOGGER.error("Got exception {} when get all sasaran strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all sasaran strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -150,13 +149,13 @@ IBaseRestController<SasaranStrategisVO> {
 			LOGGER.error("Got exception {} when get all sasaran strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all sasaran strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
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 8a7d5bb3..52b5d74c 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
@@ -27,12 +27,10 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.Peran;
 import com.jasamedika.medifirst2000.entities.SatuanIndikator;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.SatuanIndikatorService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.PeranVO;
 import com.jasamedika.medifirst2000.vo.SatuanIndikatorVO;
 
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
@@ -105,14 +103,14 @@ implements IBaseRestController<SatuanIndikatorVO>{
 			LOGGER.error("Got exception {} when add/update Satuann Indikator", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update Satuan Indikator", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SatuanStandarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SatuanStandarController.java
index b4a1541f..36d18282 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SatuanStandarController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SatuanStandarController.java
@@ -50,13 +50,13 @@ public class SatuanStandarController extends LocaleController<SatuanStandarVO> i
 			LOGGER.error("Got exception {} when add SatuanStandar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add SatuanStandar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -73,13 +73,13 @@ public class SatuanStandarController extends LocaleController<SatuanStandarVO> i
 			LOGGER.error("Got exception {} when update SatuanStandar", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update SatuanStandar", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -96,13 +96,13 @@ public class SatuanStandarController extends LocaleController<SatuanStandarVO> i
 			LOGGER.error("Got exception {} when get all sasaran strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all sasaran strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
index b570e6bb..3000144a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
@@ -77,11 +77,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -95,7 +95,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -112,11 +112,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -132,7 +132,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -155,11 +155,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -177,11 +177,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -202,11 +202,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -227,11 +227,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -247,7 +247,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -260,7 +260,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -274,11 +274,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveAkun", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveAkun", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -297,11 +297,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -321,11 +321,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -345,11 +345,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -369,11 +369,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -393,11 +393,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -417,11 +417,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -441,11 +441,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -465,11 +465,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -489,11 +489,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -513,11 +513,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -536,11 +536,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -559,11 +559,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -582,11 +582,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -605,11 +605,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -628,11 +628,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -651,11 +651,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -674,11 +674,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -697,11 +697,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -720,11 +720,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -743,11 +743,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -766,11 +766,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -789,11 +789,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -809,11 +809,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -828,11 +828,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -851,11 +851,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -874,11 +874,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -891,7 +891,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -912,11 +912,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -936,11 +936,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -957,11 +957,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -981,11 +981,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1004,11 +1004,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1027,11 +1027,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1051,11 +1051,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1075,11 +1075,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1098,11 +1098,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1122,11 +1122,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1145,11 +1145,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1195,11 +1195,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1212,7 +1212,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -1231,11 +1231,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1251,11 +1251,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1274,11 +1274,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1297,11 +1297,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -1313,7 +1313,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -1334,11 +1334,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1360,11 +1360,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1386,11 +1386,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1412,11 +1412,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1437,11 +1437,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1462,11 +1462,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1487,11 +1487,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1512,11 +1512,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1537,11 +1537,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1571,11 +1571,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1596,11 +1596,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1621,11 +1621,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1640,7 +1640,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -1661,9 +1661,9 @@ public class SdmController extends LocaleController<AkunVO> {
 			mapUraianTugasToRincianKegiatanDao.save(model);
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
 					getMessage(MessageResource.LABEL_SUCCESS, request));
-			return RestUtil.getJsonHttptatus(HttpStatus.OK);
+			return RestUtil.getJsonHttpStatus(HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -1684,9 +1684,9 @@ public class SdmController extends LocaleController<AkunVO> {
 			mapUraianTugasToRincianKegiatanDao.save(model);
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
 					getMessage(MessageResource.LABEL_SUCCESS, request));
-			return RestUtil.getJsonHttptatus(HttpStatus.OK);
+			return RestUtil.getJsonHttpStatus(HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -1706,11 +1706,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1731,11 +1731,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1756,11 +1756,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1781,11 +1781,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1806,11 +1806,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1831,11 +1831,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1856,11 +1856,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1878,11 +1878,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1900,11 +1900,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1917,7 +1917,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -1930,7 +1930,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -1950,11 +1950,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -1969,7 +1969,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -1982,7 +1982,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -1995,7 +1995,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2009,7 +2009,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2029,11 +2029,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -2047,7 +2047,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2067,11 +2067,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -2085,7 +2085,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2105,11 +2105,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -2123,7 +2123,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2136,7 +2136,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2149,7 +2149,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2161,7 +2161,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2175,7 +2175,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2188,7 +2188,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2201,7 +2201,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
 	}
@@ -2219,11 +2219,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add UraianTugas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add UraianTugas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -2238,7 +2238,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2251,7 +2251,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2264,7 +2264,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2277,7 +2277,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2289,7 +2289,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2306,11 +2306,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add UraianTugas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add UraianTugas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -2328,11 +2328,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add UraianTugas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add UraianTugas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -2350,11 +2350,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add UraianTugas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add UraianTugas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -2368,7 +2368,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2383,7 +2383,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2400,11 +2400,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add UraianTugas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add UraianTugas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -2418,7 +2418,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2433,7 +2433,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2448,7 +2448,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2461,7 +2461,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2474,7 +2474,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2489,7 +2489,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -2506,11 +2506,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add UraianTugas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add UraianTugas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -2569,11 +2569,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getUserLogin", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getUserLogin", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2592,11 +2592,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getDataByPegawai", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getDataByPegawai", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2617,11 +2617,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when loadPagePengajuanMutasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when loadPagePengajuanMutasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2638,11 +2638,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengajuanMutasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengajuanMutasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2661,11 +2661,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListPengajuanMutasi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListPengajuanMutasi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2686,11 +2686,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when loadPagePengajuanSanksi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when loadPagePengajuanSanksi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2707,11 +2707,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengajuanSanksi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengajuanSanksi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2730,11 +2730,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListPengajuanSanksi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListPengajuanSanksi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2755,11 +2755,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when loadPagePengajuanResign", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when loadPagePengajuanResign", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2776,11 +2776,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePengajuanResign", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePengajuanResign", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2799,11 +2799,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListPengajuanResign", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListPengajuanResign", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2824,11 +2824,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListDaftarMuSaRe", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListDaftarMuSaRe", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2845,11 +2845,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when ApprovalMusare", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when ApprovalMusare", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2866,11 +2866,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when unVerifMusare", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when unVerifMusare", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2889,11 +2889,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getHistoryExecSanksi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getHistoryExecSanksi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2912,11 +2912,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getHistoryExecPangkat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getHistoryExecPangkat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2935,11 +2935,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getHistoryExecJabatan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getHistoryExecJabatan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2958,11 +2958,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when servicePermohonanStatus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when servicePermohonanStatus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -2981,11 +2981,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getLoadData", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getLoadData", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3005,11 +3005,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getDataCuti", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getDataCuti", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3028,11 +3028,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getDataPermohonanStatus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getDataPermohonanStatus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3051,11 +3051,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListPermohonanStatus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListPermohonanStatus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3074,11 +3074,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListApprovalStatus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListApprovalStatus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3100,11 +3100,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListApprovalStatus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListApprovalStatus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3121,11 +3121,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePlanningPegawaiStatus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePlanningPegawaiStatus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3142,11 +3142,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when update PlanningPegawaiStatus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update PlanningPegawaiStatus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3163,11 +3163,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when update PlanningPegawaiStatus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update PlanningPegawaiStatus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3184,11 +3184,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when approvalPermohonanStatus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when approvalPermohonanStatus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3205,11 +3205,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when unVerifPermohonanStatus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when unVerifPermohonanStatus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3230,11 +3230,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getPeriodeRekap", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getPeriodeRekap", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3253,11 +3253,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getStrukHistori", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getStrukHistori", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3277,11 +3277,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getDataGajiPegawai", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getDataGajiPegawai", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3300,11 +3300,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getDaftarGajiPkwt", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getDaftarGajiPkwt", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3323,11 +3323,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getDtailGajiPkwt", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getDtailGajiPkwt", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3343,7 +3343,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
 	}
@@ -3357,7 +3357,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3374,11 +3374,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add rekapKehadiran", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add rekapKehadiran", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3396,11 +3396,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add rekapKehadiran", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add rekapKehadiran", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3418,11 +3418,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add factor rate", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add factor rate", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3435,7 +3435,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3450,7 +3450,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3465,7 +3465,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3480,7 +3480,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3495,7 +3495,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3507,7 +3507,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3520,7 +3520,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3537,11 +3537,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pegawai Jadwal kerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pegawai Jadwal kerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3554,7 +3554,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3567,7 +3567,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3582,7 +3582,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3598,7 +3598,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3611,7 +3611,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3628,11 +3628,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add UraianTugas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add UraianTugas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3648,11 +3648,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifVerfiedByUnitKerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifVerfiedByUnitKerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3666,11 +3666,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifVerfiedByUnitKerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifVerfiedByUnitKerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3686,11 +3686,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifVerfiedByUnitKerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getAllPegawaiAktifVerfiedByUnitKerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3707,11 +3707,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add UraianTugas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add UraianTugas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3726,7 +3726,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3743,11 +3743,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when unVerifPermohonanStatus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when unVerifPermohonanStatus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3766,11 +3766,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getListPermohonanStatus", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getListPermohonanStatus", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -3787,11 +3787,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add jatahCuti", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add jatahCuti", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3809,11 +3809,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add jatahCuti pegawai", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add jatahCuti pegawai", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3831,11 +3831,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add UraianTugas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add UraianTugas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3849,7 +3849,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3861,7 +3861,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3874,7 +3874,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3891,11 +3891,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add rincian kegiatan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add rincian kegiatan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3913,11 +3913,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add rincian kegiatan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add rincian kegiatan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3935,11 +3935,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add acuan indeks iki", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when acuan indeks iki", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -3952,7 +3952,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3964,7 +3964,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3976,7 +3976,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -3989,7 +3989,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4006,11 +4006,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add unit kerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add unit kerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -4023,7 +4023,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4036,7 +4036,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4053,11 +4053,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add habsen", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add habsen", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -4075,11 +4075,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add unit kerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add unit kerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -4092,7 +4092,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4105,7 +4105,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4118,7 +4118,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4131,7 +4131,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4144,7 +4144,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4158,7 +4158,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4173,7 +4173,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4185,7 +4185,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4202,11 +4202,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add unit kerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add unit kerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -4219,7 +4219,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4231,7 +4231,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4243,7 +4243,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4255,7 +4255,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4272,11 +4272,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add unit kerja", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add unit kerja", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -4289,7 +4289,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4301,7 +4301,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4314,7 +4314,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4327,7 +4327,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4344,11 +4344,11 @@ public class SdmController extends LocaleController<AkunVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add UraianTugas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add UraianTugas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -4362,7 +4362,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4377,7 +4377,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4390,7 +4390,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4402,7 +4402,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 
@@ -4414,7 +4414,7 @@ public class SdmController extends LocaleController<AkunVO> {
 					getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK);
 		} catch (Exception e) {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SewaAsramaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SewaAsramaController.java
index 8edabbb5..30138a55 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SewaAsramaController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SewaAsramaController.java
@@ -49,11 +49,11 @@ public class SewaAsramaController extends LocaleController<SewaAsramaVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Sewa Asrama", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Sewa Asrama", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -86,11 +86,11 @@ public class SewaAsramaController extends LocaleController<SewaAsramaVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Kamar Asrama", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Kamar Asrama", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -106,11 +106,11 @@ public class SewaAsramaController extends LocaleController<SewaAsramaVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Kamar Asrama", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Kamar Asrama", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SewaLahanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SewaLahanController.java
index 72bf80b2..cc6cf92e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SewaLahanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SewaLahanController.java
@@ -51,11 +51,11 @@ public class SewaLahanController extends LocaleController<SewaLahanVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Sewa Lahan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Sewa Lahan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -85,11 +85,11 @@ public class SewaLahanController extends LocaleController<SewaLahanVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Sewa Lahan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Sewa Lahan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -107,11 +107,11 @@ public class SewaLahanController extends LocaleController<SewaLahanVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Find Status Lahan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Find Status Lahan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignInOperationController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignInOperationController.java
index 55829681..443023a1 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignInOperationController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignInOperationController.java
@@ -1,7 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -23,13 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.SignInOperationService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
 import com.jasamedika.medifirst2000.vo.SignInOperationVO;
 
 
@@ -54,16 +50,16 @@ public class SignInOperationController extends LocaleController<SignInOperationV
 			Map<String,Object> result = signInOperationService.saveSignInOperationService(vo);
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-				RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+				RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save SignInOperation", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update SignInOperation", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -89,12 +85,12 @@ public class SignInOperationController extends LocaleController<SignInOperationV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getSingInByNoRec", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getSingInByNoRec", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
@@ -120,12 +116,12 @@ public class SignInOperationController extends LocaleController<SignInOperationV
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getSignInByNoRecAntrian", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getSignInByNoRecAntrian", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignOutOperationController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignOutOperationController.java
index 02bf2904..a14c77a5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignOutOperationController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignOutOperationController.java
@@ -1,7 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -23,15 +21,11 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.SignInOperationService;
 import com.jasamedika.medifirst2000.service.SignOutOperationService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
-import com.jasamedika.medifirst2000.vo.SignInOperationVO;
 import com.jasamedika.medifirst2000.vo.SignOutOperationVO;
 
 
@@ -56,16 +50,16 @@ public class SignOutOperationController extends LocaleController<SignOutOperatio
 			Map<String,Object> result = signOutOperationService.saveSignOutOperationService(vo);
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-				RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+				RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save SignOutOperation1", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update SignOutOperation2", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -90,12 +84,12 @@ public class SignOutOperationController extends LocaleController<SignOutOperatio
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getSingOutByNoRec", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getSingOutByNoRec", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
@@ -121,12 +115,12 @@ public class SignOutOperationController extends LocaleController<SignOutOperatio
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getSingOutByNoRecAntrian", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getSingOutByNoRecAntrian", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SiklusGiziController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SiklusGiziController.java
index 6fc1a963..1aaa6262 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SiklusGiziController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SiklusGiziController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -11,8 +10,6 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.domain.Specifications;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -28,17 +25,11 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.SatuanIndikator;
-import com.jasamedika.medifirst2000.entities.SiklusGizi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.SiklusGiziService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.SatuanIndikatorVO;
 import com.jasamedika.medifirst2000.vo.SiklusGiziVO;
 
-import net.kaczmarzyk.spring.data.jpa.domain.Equal;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
-
 @RestController
 @RequestMapping(value="/siklus-gizi")
 public class SiklusGiziController extends LocaleController<SiklusGiziVO>
@@ -118,14 +109,14 @@ implements IBaseRestController<SiklusGiziVO>{
 			LOGGER.error("Got exception {} when get Siklus Gizi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get Siklus Gizi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -143,14 +134,14 @@ implements IBaseRestController<SiklusGiziVO>{
 			LOGGER.error("Got exception {} when add/update Siklus Gizi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update Siklus Gizi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SoapController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SoapController.java
index 775adeda..40654327 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SoapController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SoapController.java
@@ -1,11 +1,9 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -37,7 +35,6 @@ import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
 import com.jasamedika.medifirst2000.entities.DiagnosaTindakanPasien;
 import com.jasamedika.medifirst2000.entities.LembarKonsultasi;
 import com.jasamedika.medifirst2000.entities.PapAnamesis;
-import com.jasamedika.medifirst2000.entities.PapBedah;
 import com.jasamedika.medifirst2000.entities.PapEliminasi;
 import com.jasamedika.medifirst2000.entities.PapGastrointestinal;
 import com.jasamedika.medifirst2000.entities.PapGenatalia;
@@ -45,13 +42,11 @@ import com.jasamedika.medifirst2000.entities.PapGigiMulut;
 import com.jasamedika.medifirst2000.entities.PapGinekologi;
 import com.jasamedika.medifirst2000.entities.PapIntegumen;
 import com.jasamedika.medifirst2000.entities.PapKeluhanUtama;
-import com.jasamedika.medifirst2000.entities.PapMata;
 import com.jasamedika.medifirst2000.entities.PapMuskuloskeletal;
 import com.jasamedika.medifirst2000.entities.PapNeurologi;
 import com.jasamedika.medifirst2000.entities.PapPernapasan;
 import com.jasamedika.medifirst2000.entities.PapRehabilitasi;
 import com.jasamedika.medifirst2000.entities.PapSirkulasi;
-import com.jasamedika.medifirst2000.entities.Soap;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.AnamnesisService;
 import com.jasamedika.medifirst2000.service.DiagnosaPasienService;
@@ -77,8 +72,6 @@ import com.jasamedika.medifirst2000.service.SoapService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.SoapVO;
-import com.jasamedika.medifirst2000.vo.PapRiwayatPenyakitPengobatanVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 
 /**
  * Controller class for Pengakjian Awal Gawat Darurat Business
@@ -156,11 +149,11 @@ public class SoapController extends LocaleController<SoapVO> implements
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); 
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -182,11 +175,11 @@ public class SoapController extends LocaleController<SoapVO> implements
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SocketClientController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SocketClientController.java
index 16785200..eee07227 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SocketClientController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SocketClientController.java
@@ -24,7 +24,6 @@ import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.impl.SocketClientServiceImpl;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.OrderRadiologiVO;
 
 @RestController
 @RequestMapping("/client-socket")
@@ -46,11 +45,11 @@ public class SocketClientController extends LocaleController{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when connectToWinSock", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when connectToWinSock", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SppbController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SppbController.java
index 402a1d02..43032540 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SppbController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SppbController.java
@@ -100,11 +100,11 @@ public class SppbController extends LocaleController<RegistrasiPelayananVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Sppb", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Sppb", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -123,11 +123,11 @@ public class SppbController extends LocaleController<RegistrasiPelayananVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when Verif Sppb", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when Verif Sppb", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -144,11 +144,11 @@ public class SppbController extends LocaleController<RegistrasiPelayananVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when un Verif Sppb", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when un Verif Sppb", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -164,11 +164,11 @@ public class SppbController extends LocaleController<RegistrasiPelayananVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Sppb", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Sppb", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StandarPelayananMakananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StandarPelayananMakananController.java
index 431b927d..75801b99 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StandarPelayananMakananController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StandarPelayananMakananController.java
@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.dto.PengeringanDto;
 import com.jasamedika.medifirst2000.dto.StandarPelayananMakananDto;
 import com.jasamedika.medifirst2000.service.StandarPelayananMakananService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
@@ -37,7 +36,7 @@ public class StandarPelayananMakananController extends LocaleController {
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 	
 	@RequestMapping(value="/get-all/", 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SterilisasiAlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SterilisasiAlatController.java
index 81b3976b..eb1b8c37 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SterilisasiAlatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SterilisasiAlatController.java
@@ -49,14 +49,14 @@ public class SterilisasiAlatController extends LocaleController<SterilisasiAlatV
 			LOGGER.error("Got exception {} when add SterilisasiAlat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add SterilisasiAlat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -73,14 +73,14 @@ public class SterilisasiAlatController extends LocaleController<SterilisasiAlatV
 			LOGGER.error("Got exception {} when update SterilisasiAlat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update SterilisasiAlat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -97,13 +97,13 @@ public class SterilisasiAlatController extends LocaleController<SterilisasiAlatV
 			   LOGGER.error("Got exception {} when get all sterilisasi alat", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get all sterilisasi alat", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
@@ -119,17 +119,17 @@ public class SterilisasiAlatController extends LocaleController<SterilisasiAlatV
 			LOGGER.error("Got exception {} when delete sterilisasi alat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when delete sterilisasi alat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SterilisasiAlatExternalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SterilisasiAlatExternalController.java
index 67bbee8b..e76ccef2 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SterilisasiAlatExternalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SterilisasiAlatExternalController.java
@@ -47,14 +47,14 @@ public class SterilisasiAlatExternalController extends LocaleController<Sterilis
 			LOGGER.error("Got exception {} when add Sterilisasi alat external", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Sterilisasi alat externalo", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -71,14 +71,14 @@ public class SterilisasiAlatExternalController extends LocaleController<Sterilis
 			LOGGER.error("Got exception {} when update Sterilisasi alat external", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Sterilisasi alat externalo", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -95,13 +95,13 @@ public class SterilisasiAlatExternalController extends LocaleController<Sterilis
 			   LOGGER.error("Got exception {} when get all SterilisasiAlatExternal", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get all SterilisasiAlatExternal", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SterilisasiAlatMesinEoController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SterilisasiAlatMesinEoController.java
index 47a20db3..d99af82a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SterilisasiAlatMesinEoController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SterilisasiAlatMesinEoController.java
@@ -48,14 +48,14 @@ public class SterilisasiAlatMesinEoController extends LocaleController<Sterilisa
 			LOGGER.error("Got exception {} when add Sterilisasi alat menggunakan mesin eo", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Sterilisasi alat menggunakan mesin eo", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -72,14 +72,14 @@ public class SterilisasiAlatMesinEoController extends LocaleController<Sterilisa
 			LOGGER.error("Got exception {} when update Sterilisasi alat menggunakan mesin eo", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Sterilisasi alat menggunakan mesin eo", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -96,13 +96,13 @@ public class SterilisasiAlatMesinEoController extends LocaleController<Sterilisa
 			   LOGGER.error("Got exception {} when get all Sterilisasi alat menggunakan mesin eo", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get all Sterilisasi alat menggunakan mesin eo", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StokOpNameController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StokOpNameController.java
index 83e4797d..4b188495 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StokOpNameController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StokOpNameController.java
@@ -1,6 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -9,7 +8,6 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.repository.query.Param;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -64,11 +62,11 @@ public class StokOpNameController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveKartuPengendali", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveKartuPengendali", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukBuktiPengeluaranController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukBuktiPengeluaranController.java
index 6b945e32..f215306b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukBuktiPengeluaranController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukBuktiPengeluaranController.java
@@ -45,10 +45,10 @@ public class StrukBuktiPengeluaranController extends LocaleController<StrukPenge
 			return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 		} catch(ServiceVOException se) {
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, se.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch(JpaSystemException jse) {
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukKirimController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukKirimController.java
index ee30f550..2b8eed4a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukKirimController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukKirimController.java
@@ -51,13 +51,13 @@ public class StrukKirimController extends LocaleController<StrukKirimVO> impleme
 			LOGGER.error("Got exception {} when add Sasaran Strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Sasaran Strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukPelayananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukPelayananController.java
index 60b66490..2fbc10f3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukPelayananController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukPelayananController.java
@@ -71,11 +71,11 @@ public class StrukPelayananController extends LocaleController<StrukPelayananVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save blood pack data", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save blood pack data", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -90,11 +90,11 @@ public class StrukPelayananController extends LocaleController<StrukPelayananVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save blood pack data", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save blood pack data", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -110,11 +110,11 @@ public class StrukPelayananController extends LocaleController<StrukPelayananVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save limbah b3 masuk data", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save limbah b3 masuk data", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -130,11 +130,11 @@ public class StrukPelayananController extends LocaleController<StrukPelayananVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save limbah b3 masuk data", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save limbah b3 masuk data", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -151,15 +151,15 @@ public class StrukPelayananController extends LocaleController<StrukPelayananVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when deleteLimbahB3Masuk", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when deleteLimbahB3Masuk", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} catch (IllegalAccessException e) {
 			LOGGER.error("Got exception {} when deleteLimbahB3Masuk", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -175,13 +175,13 @@ public class StrukPelayananController extends LocaleController<StrukPelayananVO>
 			   LOGGER.error("Got exception {} when get all LimbahB3Masuk", e.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     e.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 			     mapHeaderMessage);
 		  } catch (JpaSystemException jse) {
 			   LOGGER.error("Got exception {} when get all LimbahB3Masuk", jse.getMessage());
 			   addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 			     jse.getMessage());
-			   return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			   return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 			     mapHeaderMessage);
 		  }
 	 }
@@ -232,11 +232,11 @@ public class StrukPelayananController extends LocaleController<StrukPelayananVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -255,11 +255,11 @@ public class StrukPelayananController extends LocaleController<StrukPelayananVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveK3CheckListFacillitySefety", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveK3CheckListFacillitySefety", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukVerifikasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukVerifikasiController.java
index 803870c6..e818a2d8 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukVerifikasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukVerifikasiController.java
@@ -1,6 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -10,7 +9,6 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -18,33 +16,19 @@ import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.DetailSpekAnggaran;
-import com.jasamedika.medifirst2000.entities.StrukPelayananDetail;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.StrukPelayananDetailService;
 import com.jasamedika.medifirst2000.service.StrukPelayananService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.DetailAnggaranVO;
-import com.jasamedika.medifirst2000.vo.DistribusiBarangInvestasiVO;
 import com.jasamedika.medifirst2000.vo.KirimPesananBarangVO;
-import com.jasamedika.medifirst2000.vo.PenerimaanBarangDetailVO;
 import com.jasamedika.medifirst2000.vo.PenerimaanBarangVO;
 
-import net.kaczmarzyk.spring.data.jpa.domain.DateBetween;
-import net.kaczmarzyk.spring.data.jpa.domain.Equal;
-import net.kaczmarzyk.spring.data.jpa.domain.Like;
-import net.kaczmarzyk.spring.data.jpa.domain.Null;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.And;
-import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec;
-
 @RestController
 @RequestMapping("/kirim-pesanan-barang")
 public class StrukVerifikasiController extends LocaleController<PenerimaanBarangVO> {
@@ -69,11 +53,11 @@ public class StrukVerifikasiController extends LocaleController<PenerimaanBarang
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Penerimaan Barang", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Penerimaan Barang", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratController.java
index 2ca2ac45..e95b6736 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratController.java
@@ -50,13 +50,13 @@ public class SuratController extends LocaleController<SuratVO> implements IBaseR
 			LOGGER.error("Got exception {} when add Surat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Surat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -73,13 +73,13 @@ public class SuratController extends LocaleController<SuratVO> implements IBaseR
 			LOGGER.error("Got exception {} when update Surat", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Surat", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -96,13 +96,13 @@ public class SuratController extends LocaleController<SuratVO> implements IBaseR
 			LOGGER.error("Got exception {} when get all sasaran strategis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all sasaran strategis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratMasukController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratMasukController.java
index 2e647fc2..71c6a300 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratMasukController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SuratMasukController.java
@@ -69,10 +69,10 @@ public class SuratMasukController extends LocaleController<SuratMasukVO> {
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}		
 	}
 
@@ -186,10 +186,10 @@ public class SuratMasukController extends LocaleController<SuratMasukVO> {
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}		
 	}
 	@RequestMapping(value = "/get-draft-surat", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -239,10 +239,10 @@ public class SuratMasukController extends LocaleController<SuratMasukVO> {
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}		
 	}
 	 
@@ -265,10 +265,10 @@ public class SuratMasukController extends LocaleController<SuratMasukVO> {
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}		
 	}
 	@RequestMapping(value = "/get-verbal-konsep-by-id-dokumen/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -293,10 +293,10 @@ public class SuratMasukController extends LocaleController<SuratMasukVO> {
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}		
 	}
  
@@ -336,10 +336,10 @@ public class SuratMasukController extends LocaleController<SuratMasukVO> {
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}		
 	}
 	@RequestMapping(value="/save-terima-surat", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -353,10 +353,10 @@ public class SuratMasukController extends LocaleController<SuratMasukVO> {
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}		
 	}
 	/*SURAT MASUK INTERNAL DAN EKSTERNAL*/
@@ -371,10 +371,10 @@ public class SuratMasukController extends LocaleController<SuratMasukVO> {
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}		
 	}
 	@RequestMapping(value = "/get-surat-masuk-internal-eksternal-by-ruangan-periode-penomoran/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -435,10 +435,10 @@ public class SuratMasukController extends LocaleController<SuratMasukVO> {
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}		
 	}
 	@RequestMapping(value="/save-surat-masuk-ke-internal-penomoran", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -452,10 +452,10 @@ public class SuratMasukController extends LocaleController<SuratMasukVO> {
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, "Processing data error returns empty data");
-				return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+				return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			}
 		} else {
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		}		
 	}
 	@RequestMapping(value = "/get-no-surat-ke-eksternal/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveiController.java
index fc675713..a030acba 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveiController.java
@@ -1,15 +1,11 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.net.URLDecoder;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -17,7 +13,6 @@ import javax.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -27,92 +22,20 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.ModelAndView;
 
 import com.jasamedika.medifirst2000.constants.Constants;
-import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
-import com.jasamedika.medifirst2000.converter.KelompokPasienConverter;
-import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.dao.KelompokPasienDao;
-import com.jasamedika.medifirst2000.dao.MappingPasienPacsDao;
-import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
 import com.jasamedika.medifirst2000.dao.ResultSurveiDetailDao;
-import com.jasamedika.medifirst2000.dao.StrukOrderDao;
 import com.jasamedika.medifirst2000.dao.SurveiDao;
 import com.jasamedika.medifirst2000.dao.SurveiDetailDao;
-import com.jasamedika.medifirst2000.dto.HasilLaboratoriumDto;
-import com.jasamedika.medifirst2000.entities.HasilPemeriksaan;
-import com.jasamedika.medifirst2000.entities.MappingPasienPacs;
-import com.jasamedika.medifirst2000.entities.PapPengambilanSpesimen;
-import com.jasamedika.medifirst2000.dto.SuratEligibilitasAsuransi;
-import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.Alamat;
-import com.jasamedika.medifirst2000.entities.AntrianPasienRegistrasi;
-import com.jasamedika.medifirst2000.entities.Pasien;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
-import com.jasamedika.medifirst2000.entities.PelayananPasien;
-import com.jasamedika.medifirst2000.entities.PemakaianAsuransi;
-import com.jasamedika.medifirst2000.entities.PersetujuanUmum;
-import com.jasamedika.medifirst2000.entities.ProdukDetailLaboratoriumNilaiNormal;
-import com.jasamedika.medifirst2000.entities.StrukOrder;
-import com.jasamedika.medifirst2000.entities.SuratPermintaanMasuk;
 import com.jasamedika.medifirst2000.entities.Survei;
-import com.jasamedika.medifirst2000.enums.TipePasienEnum;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.ActivityPegawaiService;
-import com.jasamedika.medifirst2000.service.AlamatService;
-import com.jasamedika.medifirst2000.service.AntrianPasienDiPeriksaService;
-import com.jasamedika.medifirst2000.service.AntrianPasienRegistrasiService;
-import com.jasamedika.medifirst2000.service.AsalRujukanService;
-import com.jasamedika.medifirst2000.service.KelompokPasienService;
-import com.jasamedika.medifirst2000.service.OrderProdukService;
-import com.jasamedika.medifirst2000.service.PapInformasiIbuService;
-import com.jasamedika.medifirst2000.service.PapPengambilanSpesimenService;
-import com.jasamedika.medifirst2000.service.PasienDaftarService;
-import com.jasamedika.medifirst2000.service.PasienService;
-import com.jasamedika.medifirst2000.service.PegawaiService;
-import com.jasamedika.medifirst2000.service.PelayananObatService;
-import com.jasamedika.medifirst2000.service.PemakaianAsuransiService;
-import com.jasamedika.medifirst2000.service.PersetujuanUmumService;
-import com.jasamedika.medifirst2000.service.RegistrasiPasienOnlineService;
-import com.jasamedika.medifirst2000.service.RegistrasiPelayananPasienService;
-import com.jasamedika.medifirst2000.service.RegistrasiPelayananService;
-import com.jasamedika.medifirst2000.service.RuanganService;
-import com.jasamedika.medifirst2000.service.StatusKemandirianService;
-import com.jasamedika.medifirst2000.service.SuratPermintaanMasukService;
 import com.jasamedika.medifirst2000.service.SurveiService;
 import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.JsonUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.AlamatVO;
-import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO;
-import com.jasamedika.medifirst2000.vo.AsalRujukanVO;
-import com.jasamedika.medifirst2000.vo.DetailHasilDeviceVO;
-import com.jasamedika.medifirst2000.vo.GridAntrianPasienDiPeriksaVO;
-import com.jasamedika.medifirst2000.vo.HasilPemeriksaanVO;
-import com.jasamedika.medifirst2000.vo.HeaderDetailHasilDeviceVO;
-import com.jasamedika.medifirst2000.vo.JenisKelaminVO;
-import com.jasamedika.medifirst2000.vo.KelompokPasienVO;
-import com.jasamedika.medifirst2000.vo.KirimProdukVO;
-import com.jasamedika.medifirst2000.vo.MainPelayananDetailVO;
-import com.jasamedika.medifirst2000.vo.OrderProdukVO;
-import com.jasamedika.medifirst2000.vo.PapInformasiIbuVO;
-import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
-import com.jasamedika.medifirst2000.vo.PegawaiVO;
-import com.jasamedika.medifirst2000.vo.PelayananObatVO;
-import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO;
-import com.jasamedika.medifirst2000.vo.PendidikanVO;
-import com.jasamedika.medifirst2000.vo.PersetujuanUmumVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
 import com.jasamedika.medifirst2000.vo.ResultSurveiVO;
-import com.jasamedika.medifirst2000.vo.RuanganVO;
-import com.jasamedika.medifirst2000.vo.StatusKemandirianVO;
-import com.jasamedika.medifirst2000.vo.StrukOrderVO;
-import com.jasamedika.medifirst2000.vo.SuratPermintaanMasukVO;
 //import com.jasamedika.medifirst2000.vo.UploadVO;
 
 /**
@@ -140,11 +63,11 @@ implements IBaseRestController<ResultSurveiVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -187,11 +110,11 @@ implements IBaseRestController<ResultSurveiVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -228,11 +151,11 @@ implements IBaseRestController<ResultSurveiVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -268,11 +191,11 @@ implements IBaseRestController<ResultSurveiVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -291,11 +214,11 @@ implements IBaseRestController<ResultSurveiVO> {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveyKepuasanPelangganController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveyKepuasanPelangganController.java
index 529c570b..606848c5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveyKepuasanPelangganController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveyKepuasanPelangganController.java
@@ -25,7 +25,6 @@ import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.SurveyKepuasanPelangganService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.ApresiasiAtasLayananVO;
 import com.jasamedika.medifirst2000.vo.SurveyKepuasanPelangganVO;
 
 @RestController
@@ -50,13 +49,13 @@ public class SurveyKepuasanPelangganController extends LocaleController<SurveyKe
 			LOGGER.error("Got exception {} when add SurveyKepuasanPelanggan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add SurveyKepuasanPelanggan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -73,13 +72,13 @@ public class SurveyKepuasanPelangganController extends LocaleController<SurveyKe
 			LOGGER.error("Got exception {} when add all SurveyKepuasanPelanggan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add all SurveyKepuasanPelanggan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -96,13 +95,13 @@ public class SurveyKepuasanPelangganController extends LocaleController<SurveyKe
 			LOGGER.error("Got exception {} when update SurveyKepuasanPelanggan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update SurveyKepuasanPelanggan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -119,13 +118,13 @@ public class SurveyKepuasanPelangganController extends LocaleController<SurveyKe
 			LOGGER.error("Got exception {} when get all SurveyKepuasanPelanggan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when get all SurveyKepuasanPelanggan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SwabAlatPermukaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SwabAlatPermukaanController.java
index 4fe2dd00..f0d15f4b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SwabAlatPermukaanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SwabAlatPermukaanController.java
@@ -49,11 +49,11 @@ public class SwabAlatPermukaanController extends LocaleController<SwabAlatPermuk
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getUnitRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getUnitRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -68,11 +68,11 @@ public class SwabAlatPermukaanController extends LocaleController<SwabAlatPermuk
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveSwabAlatPermukaan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveSwabAlatPermukaan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -89,11 +89,11 @@ public class SwabAlatPermukaanController extends LocaleController<SwabAlatPermuk
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getSwabAlatPermukaa", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getSwabAlatPermukaa", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -108,11 +108,11 @@ public class SwabAlatPermukaanController extends LocaleController<SwabAlatPermuk
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when updateSwabAlatPermukaan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when updateSwabAlatPermukaan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -128,11 +128,11 @@ public class SwabAlatPermukaanController extends LocaleController<SwabAlatPermuk
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when deleteSwabAlatPermukaan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when deleteSwabAlatPermukaan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -150,11 +150,11 @@ public class SwabAlatPermukaanController extends LocaleController<SwabAlatPermuk
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when downloadFileHasilPemantauan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when downloadFileHasilPemantauan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TOWSController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TOWSController.java
index e63dce58..bf434621 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TOWSController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TOWSController.java
@@ -12,7 +12,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.domain.Specifications;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -28,16 +27,13 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.DetailSWOT;
 import com.jasamedika.medifirst2000.entities.DetailTOWS;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DetailTOWSService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.DetailSWOTVO;
 import com.jasamedika.medifirst2000.vo.DetailTOWSVO;
 import com.jasamedika.medifirst2000.vo.TOWSVO;
 
-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;
 
@@ -109,14 +105,14 @@ IBaseRestController<TOWSVO>{
 			LOGGER.error("Got exception {} when add detailTOWS", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add detailTOWS", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TagihanRekananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TagihanRekananController.java
index b805dbed..90b54598 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TagihanRekananController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TagihanRekananController.java
@@ -135,11 +135,11 @@ public class TagihanRekananController extends LocaleController<StrukPelayananVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when savePembayaranTagihan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when savePembayaranTagihan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -156,11 +156,11 @@ public class TagihanRekananController extends LocaleController<StrukPelayananVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveVerifikasiTagihanRekanan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveVerifikasiTagihanRekanan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -175,11 +175,11 @@ public class TagihanRekananController extends LocaleController<StrukPelayananVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getRuangan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getRuangan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -196,11 +196,11 @@ public class TagihanRekananController extends LocaleController<StrukPelayananVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveKlaimPembayaran", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveKlaimPembayaran", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TahapanRekrutmenTestController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TahapanRekrutmenTestController.java
index c0d2568a..668d9603 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TahapanRekrutmenTestController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TahapanRekrutmenTestController.java
@@ -1,6 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -39,7 +38,7 @@ public class TahapanRekrutmenTestController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -52,7 +51,7 @@ public class TahapanRekrutmenTestController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 	@RequestMapping(value="/get-by-id", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -65,7 +64,7 @@ public class TahapanRekrutmenTestController extends LocaleController<PegawaiVO>{
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
 		}
-		return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 	}
 
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TargetIndikatorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TargetIndikatorController.java
index c788a4bb..14f7333f 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TargetIndikatorController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TargetIndikatorController.java
@@ -27,12 +27,10 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.KamusIndikator;
 import com.jasamedika.medifirst2000.entities.TargetIndikator;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.TargetIndikatorService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
-import com.jasamedika.medifirst2000.vo.KamusIndikatorVO;
 import com.jasamedika.medifirst2000.vo.TargetIndikatorVO;
 
 import net.kaczmarzyk.spring.data.jpa.domain.Equal;
@@ -105,14 +103,14 @@ implements IBaseRestController<TargetIndikatorVO>{
 			LOGGER.error("Got exception {} when add/update kamus IKU", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update kamus IKU", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/Tht2Controller.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/Tht2Controller.java
index 2fa481a6..02591a25 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/Tht2Controller.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/Tht2Controller.java
@@ -64,11 +64,11 @@ public class Tht2Controller extends LocaleController<Tht2VO> implements
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TidurIstirahatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TidurIstirahatController.java
index 8c4bbcf6..113347a8 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TidurIstirahatController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TidurIstirahatController.java
@@ -14,11 +14,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -29,11 +27,8 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.TidurIstirahatService;
-import com.jasamedika.medifirst2000.service.TidurIstirahatService;
-import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.TidurIstirahatVO;
-import com.jasamedika.medifirst2000.vo.TidurIstirahatVO;
 
 /**
  * Controller class for TidurIstirahatController
@@ -67,11 +62,11 @@ public class TidurIstirahatController extends LocaleController<TidurIstirahatVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pasien", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pasien", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TimeOutControlController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TimeOutControlController.java
index caa9a81e..4c14d3db 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TimeOutControlController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TimeOutControlController.java
@@ -49,11 +49,11 @@ public class TimeOutControlController extends LocaleController<TimeOutControlVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when save Time Out Control", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when save Time Out Control", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -71,11 +71,11 @@ public class TimeOutControlController extends LocaleController<TimeOutControlVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when update Time Out Control", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Time Out Control", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -101,12 +101,12 @@ public class TimeOutControlController extends LocaleController<TimeOutControlVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getTimeOutByNoRec", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getTimeOutByNoRec", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
@@ -132,12 +132,12 @@ public class TimeOutControlController extends LocaleController<TimeOutControlVO>
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when getTimeOutByNoRecAntrian", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when getTimeOutByNoRecAntrian", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 			
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TingkatKelulusanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TingkatKelulusanController.java
index 96fe9111..7f64b5ac 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TingkatKelulusanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TingkatKelulusanController.java
@@ -51,17 +51,17 @@ public class TingkatKelulusanController extends LocaleController<TingkatKelulusa
 			TingkatKelulusanVO result = tingkatKelulusanService.add(vo);
 			if (null != result)
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Status Keluarga", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Status Keluarga", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TingkatResikoController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TingkatResikoController.java
index 510b3bd8..7781c669 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TingkatResikoController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TingkatResikoController.java
@@ -27,7 +27,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.KemungkinanResikoTerjadi;
 import com.jasamedika.medifirst2000.entities.TingkatResiko;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.TingkatResikoService;
@@ -104,14 +103,14 @@ implements IBaseRestController<TingkatResikoVO>{
 			LOGGER.error("Got exception {} when add/update tingkatResiko", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 			
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add/update tingkatResiko", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TorController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TorController.java
index 8fa7b88c..f7f97bbe 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TorController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TorController.java
@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.controller;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -26,8 +25,6 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.Tor;
-import com.jasamedika.medifirst2000.entities.Pasien;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.TorService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
@@ -67,13 +64,13 @@ IBaseRestController<TorVO>  {
 			LOGGER.error("Got exception {} when add Tor", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Tor", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 		
@@ -90,18 +87,18 @@ IBaseRestController<TorVO>  {
 			LOGGER.error("Got exception {} when update Tor", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Tor",
 					jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 	@RequestMapping(value = "/delete-tor/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
@@ -114,17 +111,17 @@ IBaseRestController<TorVO>  {
 			LOGGER.error("Got exception {} when delete Tor", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when delete Tor", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 
-		return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+		return RestUtil.getJsonHttpStatus(HttpStatus.NOT_ACCEPTABLE);
 	}
 
 	@Override
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TransferPasienExsternalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TransferPasienExsternalController.java
index 47fa7c12..e1ac6b17 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TransferPasienExsternalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TransferPasienExsternalController.java
@@ -85,11 +85,11 @@ public class TransferPasienExsternalController extends LocaleController<AlasanPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Detail Psikologi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Detail Psikologi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -106,11 +106,11 @@ public class TransferPasienExsternalController extends LocaleController<AlasanPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add informasi Medis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add informasi Medis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -128,11 +128,11 @@ public class TransferPasienExsternalController extends LocaleController<AlasanPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Transfer Pasien Exsternal", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Transfer Pasien Exsternal", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -148,11 +148,11 @@ public class TransferPasienExsternalController extends LocaleController<AlasanPe
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Transfer Aktivias Kemandirian Exsternal", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Transfer Pasien Exsternal", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -169,13 +169,13 @@ public class TransferPasienExsternalController extends LocaleController<AlasanPe
 			LOGGER.error("Got exception {} when add Peralatan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add  Peralatan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -192,13 +192,13 @@ public class TransferPasienExsternalController extends LocaleController<AlasanPe
 			LOGGER.error("Got exception {} when add Resiko Jatuh", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add  Resiko Jatuh", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TransferPasienInternalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TransferPasienInternalController.java
index b6a54e62..65ed2e9a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TransferPasienInternalController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TransferPasienInternalController.java
@@ -24,7 +24,6 @@ import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.TransferPasienInternal;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DetailAktivitasKemandirianService;
 import com.jasamedika.medifirst2000.service.DetailAlasanPemindahanPasienService;
@@ -39,7 +38,6 @@ import com.jasamedika.medifirst2000.vo.AlasanPemindahanPasienVO;
 import com.jasamedika.medifirst2000.vo.PeralatanDetailCustomVO;
 import com.jasamedika.medifirst2000.vo.ResikoJatuhDetailCustomVO;
 import com.jasamedika.medifirst2000.vo.TransferPasienAktivitasKemandirianVO;
-import com.jasamedika.medifirst2000.vo.TransferPasienAlasanPindahPasienVO;
 import com.jasamedika.medifirst2000.vo.TransferPasienInformasiMedisVO;
 import com.jasamedika.medifirst2000.vo.TransferPasienPsikologisVO;
 import com.jasamedika.medifirst2000.vo.TransferPasienInternalVO;
@@ -92,11 +90,11 @@ public class TransferPasienInternalController extends LocaleController<AlasanPem
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Detail Psikologi", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Detail Psikologi", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -113,11 +111,11 @@ public class TransferPasienInternalController extends LocaleController<AlasanPem
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add informasi Medis", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add informasi Medis", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -134,11 +132,11 @@ public class TransferPasienInternalController extends LocaleController<AlasanPem
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Transfer Pasien Internal", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Transfer Pasien Internal", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -154,11 +152,11 @@ public class TransferPasienInternalController extends LocaleController<AlasanPem
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Transfer Aktivias Kemandirian Internal", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Transfer Pasien Internal", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -175,13 +173,13 @@ public class TransferPasienInternalController extends LocaleController<AlasanPem
 			LOGGER.error("Got exception {} when add Peralatan", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add  Peralatan", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -198,13 +196,13 @@ public class TransferPasienInternalController extends LocaleController<AlasanPem
 			LOGGER.error("Got exception {} when add Resiko Jatuh", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add  Resiko Jatuh", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TriaseController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TriaseController.java
index 0b42d8af..020d50d3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TriaseController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TriaseController.java
@@ -1,7 +1,5 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.util.Collection;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -22,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
-import com.jasamedika.medifirst2000.controller.base.IBaseRestController;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
@@ -34,7 +31,6 @@ import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.DetailTriaseVO;
 import com.jasamedika.medifirst2000.vo.HasilTriaseVO;
 import com.jasamedika.medifirst2000.vo.KategoriHasilTriaseVO;
-import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
 import com.jasamedika.medifirst2000.vo.PemeriksaanTriageVO;
 import com.jasamedika.medifirst2000.vo.TriaseVO;
 
@@ -68,17 +64,17 @@ public class TriaseController extends LocaleController<TriaseVO>{
 			DetailTriaseVO result = detailTriaseService.add(vo);
 			if (null != result)
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Detail Triase", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Detail Triase", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -88,17 +84,17 @@ public class TriaseController extends LocaleController<TriaseVO>{
 			PemeriksaanTriageVO result = pemeriksaanTriageService.add(vo);
 			if (null != result)
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Pemeriksaan Triase", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Pemeriksaan Triase", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -108,17 +104,17 @@ public class TriaseController extends LocaleController<TriaseVO>{
 			KategoriHasilTriaseVO result = kategoriHasilTriaseService.add(vo);
 			if (null != result)
 			mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-			RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+			RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when add Hasil Kategori Triase", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add Hasil Kategori Triase", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
@@ -129,16 +125,16 @@ public class TriaseController extends LocaleController<TriaseVO>{
 			DetailTriaseVO result = detailTriaseService.update(vo);
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-				RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+				RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when update Detail Triase", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Detail Triase", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -148,16 +144,16 @@ public class TriaseController extends LocaleController<TriaseVO>{
 			PemeriksaanTriageVO result = pemeriksaanTriageService.update(vo);
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-				RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+				RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when update Pemeriksaan Triase", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Pemeriksaan Triase", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
@@ -167,16 +163,16 @@ public class TriaseController extends LocaleController<TriaseVO>{
 			KategoriHasilTriaseVO result = kategoriHasilTriaseService.update(vo);
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-				RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+				RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when update Detail Triase", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Detail Triase", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -186,16 +182,16 @@ public class TriaseController extends LocaleController<TriaseVO>{
 			Map<String,Object> result = hasilTriaseService.saveHasilTriaseService(vo);
 			if (null != result)
 				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request ));
-				RestUtil.getJsonHttptatus(HttpStatus.CREATED);
+				RestUtil.getJsonHttpStatus(HttpStatus.CREATED);
 			return RestUtil.getJsonResponse("Status Sukses", HttpStatus.CREATED,mapHeaderMessage);
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when update Detail Triase", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when update Detail Triase", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UnitOrgController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UnitOrgController.java
index bb58c4cb..ff787196 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UnitOrgController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UnitOrgController.java
@@ -49,11 +49,11 @@ public class UnitOrgController extends LocaleController<UnitOrgVO>{
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveUnitOrg", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveUnitOrg", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 
 	}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UploadDownloadmageController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UploadDownloadmageController.java
index 53892f16..d4bf78d8 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UploadDownloadmageController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UploadDownloadmageController.java
@@ -46,11 +46,11 @@ public class UploadDownloadmageController extends LocaleController<UploadImageVO
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when upload", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when upload", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 	
@@ -68,11 +68,11 @@ public class UploadDownloadmageController extends LocaleController<UploadImageVO
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when download", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when download", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 }
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UskomPemeriksaanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UskomPemeriksaanController.java
index 5a4ab959..178f45da 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UskomPemeriksaanController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UskomPemeriksaanController.java
@@ -1,17 +1,11 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
-import org.json.JSONArray;
 import org.json.JSONException;
-import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,15 +20,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.google.gson.Gson;
 import com.jasamedika.medifirst2000.constants.Constants;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
-import com.jasamedika.medifirst2000.entities.UskomPemeriksaan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.UskomPemeriksaanService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
 import com.jasamedika.medifirst2000.vo.UskomPemeriksaanVO;
 
@@ -74,11 +65,11 @@ public class UskomPemeriksaanController extends LocaleController {
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got exception {} when saveUskom", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when saveUskom", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		}
 	}
 
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UsulanEvaluasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UsulanEvaluasiController.java
index 70090b0e..4af6c65c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UsulanEvaluasiController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/UsulanEvaluasiController.java
@@ -57,13 +57,13 @@ public class UsulanEvaluasiController extends LocaleController<UsulanEvaluasiVO>
 
 			LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 	@RequestMapping(value = "/get-no-usulan/", method = RequestMethod.GET)
@@ -80,13 +80,13 @@ public class UsulanEvaluasiController extends LocaleController<UsulanEvaluasiVO>
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -108,13 +108,13 @@ public class UsulanEvaluasiController extends LocaleController<UsulanEvaluasiVO>
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -136,13 +136,13 @@ public class UsulanEvaluasiController extends LocaleController<UsulanEvaluasiVO>
 			LOGGER.error("Got exception {} when add nota-dinas", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR,
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR,
 					mapHeaderMessage);
 		} catch (JpaSystemException jse) {
 			LOGGER.error("Got exception {} when add nota-dinas", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE,
 					jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT,
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT,
 					mapHeaderMessage);
 		}
 	}
@@ -168,13 +168,13 @@ public class UsulanEvaluasiController extends LocaleController<UsulanEvaluasiVO>
 
 			LOGGER.error("Got exception {} when savePlanningDHM", e.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
 
 		} catch (JpaSystemException jse) {
 
 			LOGGER.error("Got exception {} when savePlanningDHM", jse.getMessage());
 			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
-			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+			return RestUtil.getJsonHttpStatus(HttpStatus.CONFLICT, mapHeaderMessage);
 		} 
 	}
 }