From eb88d4b71af660cbe0e8e9a75285eaafb1a1f480 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Tue, 17 Dec 2024 12:19:25 +0700 Subject: [PATCH] Update controller Clean code --- .../controller/BakuMutuController.java | 31 +- .../controller/BatalRegistrasiController.java | 83 +- .../controller/BentukProdukController.java | 170 +- .../controller/IpsrsPerbaikanController.java | 311 +- .../controller/ItPerbaikanController.java | 2 +- .../RegistrasiPelayananController.java | 3155 +++++------------ .../controller/base/LocaleController.java | 325 +- 7 files changed, 1192 insertions(+), 2885 deletions(-) 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 11079579..3a765436 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 @@ -9,10 +9,12 @@ 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.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; @@ -44,12 +46,11 @@ public class BakuMutuController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when add Baku Mutu", e.getMessage()); + LOGGER.error("Got ServiceVOException {} when addBakuMutu", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when add Baku Mutu", jse.getMessage()); + LOGGER.error("Got JpaSystemException {} when addBakuMutu", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); return getJsonHttptatus(CONFLICT, mapHeaderMessage); } @@ -63,11 +64,11 @@ public class BakuMutuController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when get all baku mutu", e.getMessage()); + LOGGER.error("Got ServiceVOException {} when findAllBakuMutu", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get all baku mutu", jse.getMessage()); + LOGGER.error("Got JpaSystemException {} when findAllBakuMutu", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); return getJsonHttptatus(CONFLICT, mapHeaderMessage); } @@ -80,11 +81,11 @@ public class BakuMutuController extends LocaleController { mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); return getJsonResponse(bakuMutu, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when get Baku Mutu parent", e.getMessage()); + LOGGER.error("Got ServiceVOException {} when getBakuMutuParent", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get Baku Mutu parent", jse.getMessage()); + LOGGER.error("Got JpaSystemException {} when getBakuMutuParent", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); return getJsonHttptatus(CONFLICT, mapHeaderMessage); } @@ -96,13 +97,13 @@ public class BakuMutuController extends LocaleController { try { Map bakuMutu = bakuMutuService.getBakuMutuChild(); mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return getJsonResponse(bakuMutu, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(bakuMutu, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when get Baku Mutu child", e.getMessage()); + LOGGER.error("Got ServiceVOException {} when getBakuMutuChild", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get Baku Mutu child", jse.getMessage()); + LOGGER.error("Got JpaSystemException {} when getBakuMutuChild", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); return getJsonHttptatus(CONFLICT, mapHeaderMessage); } @@ -114,13 +115,13 @@ public class BakuMutuController extends LocaleController { try { Map bakuMutu = bakuMutuService.bakuMutuById(id); mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return getJsonResponse(bakuMutu, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(bakuMutu, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got ServiceVOException {} when get Baku Mutu", e.getMessage()); + LOGGER.error("Got ServiceVOException {} when bakuMutuById", e.getMessage()); addHeaderMessage(ERROR_MESSAGE, e.getMessage()); return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got JpaSystemException {} when get Baku Mutu", jse.getMessage()); + LOGGER.error("Got JpaSystemException {} when bakuMutuById", jse.getMessage()); addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); return getJsonHttptatus(CONFLICT, mapHeaderMessage); } 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 a04c52d6..b88f70cf 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 @@ -1,34 +1,35 @@ package com.jasamedika.medifirst2000.controller; -import java.text.ParseException; -import java.util.HashMap; -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.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.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.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.BatalRegistrasiService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.BatalRegistrasiVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.HashMap; +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.getJsonHttptatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +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("/batalRegistrasi") @@ -37,47 +38,41 @@ public class BatalRegistrasiController extends LocaleController> savePembatalanRegistrasi(@Valid @RequestBody BatalRegistrasiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - Map mapHeaderMessage = new HashMap(); - + Map mapHeaderMessage = new HashMap<>(); Map result = batalRegistrasiService.saveBatalRegistrasi(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - mapHeaderMessage.put("message", result.get("message") + ""); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put("message", result.get("message") + ""); + } + 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 saveBatalRegistrasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 saveBatalRegistrasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-pembatalan/{startDate}/{endDate}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pembatalan/{startDate}/{endDate}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getObservasi(@PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, HttpServletRequest request) { - List> result = null; + List> result; try { - result = batalRegistrasiService.getBatalRegistrasi(startDate, endDate); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, HttpStatus.OK); } } 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 1aeb8bab..15335a7b 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 @@ -1,159 +1,65 @@ 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 com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +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.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; 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.entities.BentukProduk; -import com.jasamedika.medifirst2000.entities.SatuanIndikator; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.BentukProdukService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.BentukProdukVO; -import com.jasamedika.medifirst2000.vo.SatuanIndikatorVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Map; -import net.kaczmarzyk.spring.data.jpa.domain.Equal; -import net.kaczmarzyk.spring.data.jpa.web.annotation.Spec; +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.getJsonHttptatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +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(value="/bentuk-produk") -public class BentukProdukController extends LocaleController -implements IBaseRestController{ +@RequestMapping(value = "/bentuk-produk") +public class BentukProdukController extends LocaleController { @Autowired private BentukProdukService bentukProdukService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(IndikatorRensarController.class); - - @Override - public ResponseEntity> getAllVOWithQueryString(HttpServletRequest request, Integer page, - Integer limit, String sort, String dir) { - return null; - } - @Override - public ResponseEntity getVO(Integer id) { - return null; - } + private static final Logger LOGGER = LoggerFactory.getLogger(BentukProdukController.class); - @Override - public ResponseEntity addVO(BentukProdukVO vo) { - return null; - } - - @Override - public ResponseEntity editVO(BentukProdukVO vo) { - return null; - } - - @Override - public ResponseEntity deleteVO(Integer id) { - return null; - } - - @Override - public ResponseEntity> getAllVO() { - return null; - } - - @RequestMapping(value="/find-all/", method= RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> 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 id, - @Spec(path = "departemen.id", params = "departemenId", spec = Equal.class) Specification departemen) - { - Map result = new HashMap(); - Specification spec = Specifications.where(id).and(departemen); - result = bentukProdukService.findAll(page, take, sort,dir, spec); - return constructListPageResult(result); - } - - @RequestMapping(value="/save/", method= RequestMethod.POST,produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> save(@Valid @RequestBody BentukProdukVO vo,HttpServletRequest request){ - try{ + @RequestMapping(value = "/save/", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> save(@Valid @RequestBody BentukProdukVO vo, HttpServletRequest request) { + try { Map result = bentukProdukService.save(vo); - if(null!= result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 get Bentuk Produk Gizi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Bentuk Produk Gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - + } - - @RequestMapping(value="/get-bentuk-produk/", method= RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getBentukGizi( - @RequestParam(value="kodeProduk",required=true) String kode, - HttpServletRequest request){ - try{ - Map result = bentukProdukService.getBentukProduk(kode); - 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 add/update Bentuk 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 add/update BentukProduk", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - - } - - @RequestMapping(value="/get-all-produk-gizi", - method=RequestMethod.GET, - produces=MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/get-all-produk-gizi", method = GET, produces = APPLICATION_JSON_VALUE) public Map getAllProdukGizi(HttpServletRequest request) { - Map result = this.bentukProdukService.getBentukProdukGizi(); - return result; + return this.bentukProdukService.getBentukProdukGizi(); } - + } 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 e2d38b1c..371d7eb4 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 @@ -1,256 +1,163 @@ 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.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.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 org.springframework.web.bind.annotation.*; -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.IpsrsPerbaikanService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.IpsrsPelaksanaanPerbaikanVO; -import com.jasamedika.medifirst2000.vo.IpsrsPerbaikanVO; +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.getJsonHttptatus; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.getJsonResponse; +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("/ipsrs-perbaikan") -public class IpsrsPerbaikanController extends LocaleController{ - +public class IpsrsPerbaikanController extends LocaleController { + @Autowired private IpsrsPerbaikanService service; - - private static final Logger LOGGER = LoggerFactory.getLogger(IpsrsPerbaikanController.class); - - @RequestMapping(value = "/get-no-order", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getNoOrder(HttpServletRequest request) { - try { - Map result = service.getNoOrderTable(); - 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 (ServiceVOException e) { - LOGGER.error("Got exception {} when getJadwalPemeliharaan", 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 getJadwalPemeliharaan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - @RequestMapping(value = "/save-permintaan-perbaikan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + private static final Logger LOGGER = LoggerFactory.getLogger(IpsrsPerbaikanController.class); + + @RequestMapping(value = "/save-permintaan-perbaikan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePermintaanPerbaikan(@Valid @RequestBody IpsrsPerbaikanVO vo, HttpServletRequest request) { try { - Map result = service.savePermintaanPerbaikan(vo); - try{ - BroadcastMessageOther("PermintaanPerbaikan", result); - }catch (Exception ex){ - ex.printStackTrace(); + Map result = service.savePermintaanPerbaikan(vo); + try { + BroadcastMessageOther(result); + } catch (Exception ex) { + throw new ServiceVOException(ex.getMessage()); } 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 savePermintaanPerbaikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePermintaanPerbaikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when savePermintaanPerbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePermintaanPerbaikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/find-ruangan-asset", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/find-ruangan-asset", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRuanganRegistrasiAset(HttpServletRequest request) { try { - Map result = service.getRuanganPerbaikan(); - 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); + Map result = service.getRuanganPerbaikan(); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } else { + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } 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); + LOGGER.error("Got ServiceVOException {} when getRuanganPerbaikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + LOGGER.error("Got JpaSystemException {} when getRuanganPerbaikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/find-asset-by-ruangan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAsetPerbaikan(@RequestParam(value = "id", required = true) Integer id, HttpServletRequest request){ + + @RequestMapping(value = "/find-asset-by-ruangan", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAsetPerbaikan(@RequestParam(value = "id") Integer id, HttpServletRequest request) { try { - Map result = service.getAsetPerbaikan(id); - 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); + Map result = service.getAsetPerbaikan(id); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } else { + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } 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); + LOGGER.error("Got ServiceVOException {} when getAsetPerbaikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + LOGGER.error("Got JpaSystemException {} when getAsetPerbaikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-all-permintaan-perbaikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllPermintaanPerbaikan(HttpServletRequest request) { + + @RequestMapping(value = "/get-one-permintaan-perbaikan", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getOnePermintaanPerbaikan(@RequestParam(value = "noRec") String noRec, HttpServletRequest request) { try { - Map result = service.getAllPermintaanPerbaikan(); - 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); + Map result = service.getOnePermintaanPerbaikan(noRec); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } else { + return getJsonResponse(null, NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllPermintaanPerbaikan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getOnePermintaanPerbaikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllPermintaanPerbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when getOnePermintaanPerbaikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/get-one-permintaan-perbaikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getOnePermintaanPerbaikan( - @RequestParam(value = "noRec", required = true) String noRec, - HttpServletRequest request) { - try { - Map result = service.getOnePermintaanPerbaikan(noRec); - 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 (ServiceVOException e) { - LOGGER.error("Got exception {} when getOnePermintaanPerbaikan", 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 getOnePermintaanPerbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-pelaksanaan-perbaikan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/save-pelaksanaan-perbaikan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePelaksanaanPerbaikan(@Valid @RequestBody IpsrsPelaksanaanPerbaikanVO vo, HttpServletRequest request) { try { - Map result = service.savePelaksanaanPerbaikan(vo); + Map result = service.savePelaksanaanPerbaikan(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 ServiceVOException {} when savePelaksanaanPerbaikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when savePelaksanaanPerbaikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); + } + } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when savePelaksanaanPerbaikan", 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 savePelaksanaanPerbaikan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-all-ipsrs-perbaikan-by-norec", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllIpsrsPerbaikanByNoRec( - @RequestParam(value = "noRec", required = true) String noRec, - HttpServletRequest request) { - try { - Map result = service.getAllIpsrsPerbaikanByNoRec(noRec); - 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 (ServiceVOException e) { - LOGGER.error("Got exception {} when getAllIpsrsPerbaikanByNoRec", 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 getAllIpsrsPerbaikanByNoRec", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/delete-list-perbaikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity deleteListPerbaikann( - @RequestParam(value = "noRec", required = true) String noRec, - HttpServletRequest request) { - try { - Boolean status = service.deleteIpsrsPerbaikan(noRec); - if (status){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse("noRec : "+noRec, HttpStatus.OK); - } else{ - return RestUtil.getJsonResponse("noRec : null", HttpStatus.BAD_REQUEST); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when deleteListPerbaikann", 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 deleteListPerbaikann", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-data-perbaikan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-data-perbaikan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> updateDataPerbaikan(@Valid @RequestBody IpsrsPerbaikanVO vo, HttpServletRequest request) { try { Map result = service.updatePermintaanPerbaikan(vo); - if (null != result){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK,mapHeaderMessage); - } - + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, OK, mapHeaderMessage); + } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when updateJadwalPerbaikanDariRuangan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when updatePermintaanPerbaikan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getJadwalPerbaikanDariRuangan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when updatePermintaanPerbaikan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); } - + } 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 ed3ea355..3c298e68 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 @@ -66,7 +66,7 @@ public class ItPerbaikanController extends LocaleController { try { Map result = service.savePermintaanPerbaikan(vo); try { - BroadcastMessageOther("PermintaanPerbaikan", result); + BroadcastMessageOther(result); } catch (Exception ex) { throw new ServiceVOException(ex.getMessage()); } 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 64a0aa0e..df7040fc 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 @@ -1,143 +1,45 @@ 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; - -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.ResponseBody; -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.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.RuanganDao; -import com.jasamedika.medifirst2000.dao.StrukOrderDao; -import com.jasamedika.medifirst2000.dto.Antrian; -import com.jasamedika.medifirst2000.dto.AntrianPasienDiperiksaDto; -import com.jasamedika.medifirst2000.dto.EtiketPersetujuanUmum; -import com.jasamedika.medifirst2000.dto.HasilLaboratoriumDto; -import com.jasamedika.medifirst2000.dto.OrderPelayananGiziDto; -import com.jasamedika.medifirst2000.dto.SuratEligibilitasAsuransi; -import com.jasamedika.medifirst2000.entities.Alamat; -import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa; -import com.jasamedika.medifirst2000.entities.AntrianPasienRegistrasi; -import com.jasamedika.medifirst2000.entities.DokumenRekamMedis; -import com.jasamedika.medifirst2000.entities.HasilPemeriksaan; -import com.jasamedika.medifirst2000.entities.MappingKirimDokumenPasien; -import com.jasamedika.medifirst2000.entities.MappingPasienPacs; -import com.jasamedika.medifirst2000.entities.PapPengambilanSpesimen; -import com.jasamedika.medifirst2000.entities.Pasien; -import com.jasamedika.medifirst2000.entities.PasienDaftar; -import com.jasamedika.medifirst2000.entities.PelayananPasien; -import com.jasamedika.medifirst2000.entities.ProdukDetailLaboratoriumNilaiNormal; -import com.jasamedika.medifirst2000.entities.Ruangan; -import com.jasamedika.medifirst2000.entities.StrukOrder; -import com.jasamedika.medifirst2000.entities.SuratPermintaanMasuk; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.dto.*; +import com.jasamedika.medifirst2000.entities.*; 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.BridgingBpjs; -import com.jasamedika.medifirst2000.service.DaftarStrukPenjualanService; -import com.jasamedika.medifirst2000.service.DokumenRekamMedisService; -import com.jasamedika.medifirst2000.service.JadwalDpjpRawatInapService; -import com.jasamedika.medifirst2000.service.KelompokPasienService; -import com.jasamedika.medifirst2000.service.KendaliDokumenRekamMedisService; -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.PelayananPasienService; -import com.jasamedika.medifirst2000.service.PemakaianAsuransiService; -import com.jasamedika.medifirst2000.service.PersetujuanUmumService; -import com.jasamedika.medifirst2000.service.ProdukService; -import com.jasamedika.medifirst2000.service.RegistrasiPasienOnlineService; -import com.jasamedika.medifirst2000.service.RegistrasiPelayananPasienService; -import com.jasamedika.medifirst2000.service.RegistrasiPelayananService; -import com.jasamedika.medifirst2000.service.RencanaOperasiService; -import com.jasamedika.medifirst2000.service.ResumeMedisService; -import com.jasamedika.medifirst2000.service.RuanganService; -import com.jasamedika.medifirst2000.service.StatusKemandirianService; -import com.jasamedika.medifirst2000.service.StrukOrderService; -import com.jasamedika.medifirst2000.service.SuratPermintaanMasukService; +import com.jasamedika.medifirst2000.service.*; import com.jasamedika.medifirst2000.util.CommonUtil; -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.AsuransiRegistrasiPasienVO; -import com.jasamedika.medifirst2000.vo.DiagnosaVO; -import com.jasamedika.medifirst2000.vo.DokumenRekamMedisVO; -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.KendaliDokumenRekamMedisVO; -import com.jasamedika.medifirst2000.vo.KirimProdukVO; -import com.jasamedika.medifirst2000.vo.MainPelayananDetailVO; -import com.jasamedika.medifirst2000.vo.OrderPelayananCustomVO; -import com.jasamedika.medifirst2000.vo.OrderProdukGiziVO; -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.PelayananObatLuarVO; -import com.jasamedika.medifirst2000.vo.PelayananObatOnlyResepVO; -import com.jasamedika.medifirst2000.vo.PelayananObatVO; -import com.jasamedika.medifirst2000.vo.PelayananPasienVO; -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.RencanaOperasiCustomVO; -import com.jasamedika.medifirst2000.vo.RencanaOperasiVO; -import com.jasamedika.medifirst2000.vo.ResumeMedisVO; -import com.jasamedika.medifirst2000.vo.RuanganVO; -import com.jasamedika.medifirst2000.vo.SiklusGiziVO; -import com.jasamedika.medifirst2000.vo.StatusKemandirianVO; -import com.jasamedika.medifirst2000.vo.StrukOrderVO; -import com.jasamedika.medifirst2000.vo.StrukPelayananVO; -import com.jasamedika.medifirst2000.vo.SuratPermintaanMasukVO; -//import com.jasamedika.medifirst2000.vo.UploadVO; +import com.jasamedika.medifirst2000.vo.*; +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.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.net.URLDecoder; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +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.CommonUtil.isNotNullOrEmpty; +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.getJsonResponse; +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 Registrasi Pasien Business @@ -145,10 +47,9 @@ import com.jasamedika.medifirst2000.vo.SuratPermintaanMasukVO; */ @RestController @RequestMapping("/registrasi-pelayanan") -public class RegistrasiPelayananController extends LocaleController { +public class RegistrasiPelayananController extends LocaleController { - @Autowired - private ResumeMedisService resumeMedisService; + private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiPelayananController.class); @Autowired private KendaliDokumenRekamMedisService kendaliDokumenRekamMedisService; @@ -156,80 +57,9 @@ public class RegistrasiPelayananController extends LocaleController { @Autowired private RencanaOperasiService rencanaOperasiService; - @Autowired - private StrukOrderService strukOrderService; - @Autowired private BridgingBpjs bridgingBpjs; - @Autowired - private ProdukService produkService; - - @RequestMapping(value = "/save-rencana-operasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRencanaOperasi(@Valid @RequestBody RencanaOperasiCustomVO vo, - HttpServletRequest request) throws ParseException { - try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - - Map result = rencanaOperasiService.saveRencanaOperasiNew(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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/save-permintaan-operasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRencanaOperasiNew(@Valid @RequestBody RencanaOperasiCustomVO vo, - HttpServletRequest request) throws ParseException { - try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - - Map result = rencanaOperasiService.savePermintaanOperasi(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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-save-rencana-operasi/{nama}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getsaveRencanaOperasi(@PathVariable("nama") String nama, - HttpServletRequest request) { - Map result = null; - try { - if (nama.equals("-")) - nama = ""; - result = rencanaOperasiService.findByName(nama); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } catch (Exception e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - @Autowired private KelompokPasienDao kelompokPasienDao; @@ -237,7 +67,7 @@ public class RegistrasiPelayananController extends LocaleController { private KelompokPasienConverter kelompokPasienConverter; @Autowired - private RegistrasiPelayananService registrasiPelayananService; + private RegistrasiPelayananService registrasiPelayananService; @Autowired private PegawaiService pegawaiService; @@ -245,32 +75,20 @@ public class RegistrasiPelayananController extends LocaleController { @Autowired private AlamatService alamatService; - @Autowired - private PasienDaftarService pasienDaftarService; - @Autowired private AsalRujukanService asalRujukanService; @Autowired - private RuanganService ruanganService; + private RuanganService ruanganService; @Autowired - private PasienService pasienService; - - @Autowired - private AntrianPasienRegistrasiService antrianPasienRegistrasiService; - - @Autowired - private ActivityPegawaiService activityPegawaiService; + private AntrianPasienRegistrasiService antrianPasienRegistrasiService; @Autowired private KelompokPasienService kelompokPasienService; @Autowired - private RegistrasiPasienOnlineService registrasiPasienOnlineService; - - @Autowired - private StatusKemandirianService statusKemandirianService; + private RegistrasiPasienOnlineService registrasiPasienOnlineService; @Autowired private PersetujuanUmumService persetujuanUmumService; @@ -282,84 +100,107 @@ public class RegistrasiPelayananController extends LocaleController { private OrderProdukService orderProdukService; @Autowired - private PemakaianAsuransiService pemakaianAsuransiService; - - @Autowired - private RegistrasiPelayananPasienService registrasiPelayananPasienService; + private RegistrasiPelayananPasienService registrasiPelayananPasienService; @Autowired private AntrianPasienDiPeriksaService antrianPasienDiperiksaService; + @Autowired private PapInformasiIbuService papInformasiIbuService; + @Autowired private PapPengambilanSpesimenService papPengambilanSpesimenService; + @Autowired private RuanganDao ruanganDao; - private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiPelayananController.class); + @Autowired + private StrukOrderDao strukOrderDao; - @RequestMapping(value = "/save-pap-informasi-ibu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePapInformasiIbu(@Valid @RequestBody PapInformasiIbuVO vo, - HttpServletRequest request) { + @Autowired + private BaseConverterImpl strukOrderConverter; + + @Autowired + private PelayananObatService pelayananObatService; + + @Autowired + private DokumenRekamMedisService dokumenRekamMedisService; + + @Autowired + private PelayananPasienService pelayananPasienService; + + @Autowired + private MappingPasienPacsDao mappingPasienPacsDao; + + @Autowired + private PasienDaftarDao pasienDaftarDao; + + @RequestMapping(value = "/save-rencana-operasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveRencanaOperasi(@Valid @RequestBody RencanaOperasiCustomVO vo, HttpServletRequest request) { + try { + Map result = rencanaOperasiService.saveRencanaOperasiNew(vo); + if (null != result) + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got ServiceVOException {} when saveRencanaOperasiNew", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { + LOGGER.error("Got JpaSystemException {} when saveRencanaOperasiNew", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); + } + } + + @RequestMapping(value = "/save-pap-informasi-ibu", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> savePapInformasiIbu(@Valid @RequestBody PapInformasiIbuVO vo, HttpServletRequest request) { try { Map result = papInformasiIbuService.savePapInformasiIbu(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 savePapInformasiIbu", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePapInformasiIbu", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when savePapInformasiIbu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - + LOGGER.error("Got JpaSystemException {} when savePapInformasiIbu", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-kirim-produk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveKirimProduk(@Valid @RequestBody List vo, - HttpServletRequest request) throws ParseException { + @RequestMapping(value = "/save-kirim-produk", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveKirimProduk(@Valid @RequestBody List vo, HttpServletRequest request) { try { - Map result = orderProdukService.saveKirimProduk(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); BroadcastMessage("DaftarAntrianLaboratorium", "noRec"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 saveKirimProduk", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 saveKirimProduk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-order-produk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveOrderProduk(@Valid @RequestBody OrderProdukVO vo, - HttpServletRequest request) throws ParseException { + @RequestMapping(value = "/save-order-produk", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveOrderProduk(@Valid @RequestBody OrderProdukVO vo, HttpServletRequest request) throws ParseException { try { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if (vo.getTanggalPendaftaran().indexOf("-") > -1) - vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); - else - vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); - Map result = orderProdukService.saveOrderProduk(vo); + vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); + Map result = orderProdukService.saveOrderProduk(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); BroadcastMessage("DaftarAntrianLaboratorium", "noRec"); String permintaan = ""; - if (CommonUtil.isNotNullOrEmpty(vo.getRuangan())) { + if (isNotNullOrEmpty(vo.getRuangan())) { Ruangan ruangan = ruanganDao.findOne(vo.getRuangan().getId()); if (ruangan.getNamaRuangan().equals("Bank Darah")) permintaan = "Bank Darah"; @@ -368,583 +209,308 @@ public class RegistrasiPelayananController extends LocaleController { if (ruangan.getNamaRuangan().equals("Ruang Gizi")) permintaan = "Ruang Gizi"; } else { - if (CommonUtil.isNotNullOrEmpty(vo.getDetailRadiologi())) { + if (isNotNullOrEmpty(vo.getDetailRadiologi())) { permintaan = "Radiologi"; } else { permintaan = "Laboratorium"; } } - SaveLog("Order " + permintaan, "Permintaaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 saveOrderProduk", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 saveOrderProduk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @Autowired - private StrukOrderDao strukOrderDao; - - @Autowired - private BaseConverterImpl strukOrderConverter; - - @RequestMapping(value = "/struk-order", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveStrukOrder(@Valid @RequestBody StrukOrderVO vo, - HttpServletRequest request) throws ParseException { + @RequestMapping(value = "/struk-order", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> saveStrukOrder(@Valid @RequestBody StrukOrderVO vo, HttpServletRequest request) { try { - StrukOrder strukOrder = new StrukOrder(); strukOrder = strukOrderConverter.transferVOToModel(vo, strukOrder); - Map result = new HashMap(); + Map result; try { result = strukOrderDao.save(strukOrder).ToMap(); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when save", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 save", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-order-laboratorium-for-device-list", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveOrderLaboratoriumByDevice( - @Valid @RequestBody HeaderDetailHasilDeviceVO vo, - - HttpServletRequest request) throws ParseException { - try { - - Map result = orderProdukService.saveOrderLaboratoriumForDevice(vo); - BroadcastMessage("ResultLabDevice", result.get("message")); - 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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-order-from-sirs", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getOrderFromSirs( - @RequestParam(value = "dateStart", required = false) String dateStart, + @RequestMapping(value = "/get-order-from-sirs", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> getOrderFromSirs(@RequestParam(value = "dateStart", required = false) String dateStart, @RequestParam(value = "dateEnd", required = false) String dateEnd, - - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - - Date from = DateUtil.toDate(dateStart); - Date until = DateUtil.toDate(dateEnd); + Date from = toDate(dateStart); + Date until = toDate(dateEnd); Map result = orderProdukService.getOrderFromSirs(from, until); - BroadcastMessage("ResultLabDevice", result.get("message")); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + BroadcastMessage(result.get("message")); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, 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 getOrderFromSirs", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 getOrderFromSirs", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-order-laboratorium-for-device", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveOrderLaboratoriumByDevice( - @RequestParam(value = "noOrder") String noOrder, @RequestParam(value = "noSample") String noSample, - @RequestParam(value = "noDetailPemeriksaan") Integer noDetailPemeriksaan, - @RequestParam(value = "hasil") String hasil, @RequestParam(value = "komen") String komen, - - HttpServletRequest request) throws ParseException { - try { - - Map result = orderProdukService.saveOrderLaboratoriumForDevice(noOrder, noSample, - noDetailPemeriksaan, hasil, komen); - BroadcastMessage("ResultLabDevice", result.get("message")); - 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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-order-laboratorium-for-device", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getOrderLaboratoriumByDevice( - @RequestParam(value = "noOrder") String noOrder, HttpServletRequest request) throws ParseException { - try { - - Map result = orderProdukService.getOrderLaboratoriumForDevice(noOrder); - 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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/save-hasil-laboratorium", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-hasil-laboratorium", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveHasilLaboratorium(@RequestParam(value = "noOrder") String noOrder, - @Valid @RequestBody List vo, HttpServletRequest request) throws ParseException { + @Valid @RequestBody List vo, HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - for (HasilPemeriksaanVO subModel : vo) { - format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - } - Map result = orderProdukService.saveHasilPelayanan(noOrder, 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveHasilPelayanan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 saveHasilPelayanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-surat-permintaan-masuk", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-surat-permintaan-masuk", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveSuratPermintaanMasuk(@Valid @RequestBody SuratPermintaanMasukVO vo, HttpServletRequest request) throws ParseException { try { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if (vo.getTanggalPendaftaran().indexOf("-") > -1) + if (vo.getTanggalPendaftaran().contains("-")) vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); else vo.setTglRegistrasi(new Date(Long.parseLong(vo.getTanggalPendaftaran()))); Map result = suratPermintaanMasukService.saveSuratPermintaanMasuk(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveSuratPermintaanMasuk", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 saveSuratPermintaanMasuk", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-status-kemandirian", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveStatusKemandirian(@Valid @RequestBody StatusKemandirianVO vo, - HttpServletRequest request) throws ParseException { - try { - PasienDaftarVO pasienDaftar = new PasienDaftarVO(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if (vo.getTanggalPendaftaran().indexOf("-") > -1) - vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); - else - vo.setTglRegistrasi(new Date(Long.parseLong(vo.getTanggalPendaftaran()))); - Map result = statusKemandirianService.saveStatusKemandirian(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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @Autowired - private PelayananObatService pelayananObatService; - - // - @RequestMapping(value = "/save-verifikasi-pelayanan-obat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-verifikasi-pelayanan-obat/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveVerifikasiPelayananObat(@Valid @RequestBody MainPelayananDetailVO vo, HttpServletRequest request) { try { Map result = pelayananObatService.saveVerifikasiPelayananObat3(vo); - if (CommonUtil.isNotNullOrEmpty(result)) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + if (isNotNullOrEmpty(result)) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { Map headerMessageCustom = new HashMap<>(); headerMessageCustom.put("label-success", "Tidak ada stok"); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when saveVerifikasiPelayananObat", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when saveVerifikasiPelayananObat3", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when saveVerifikasiPelayananObat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when saveVerifikasiPelayananObat3", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-pengambil-order/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pengambil-order/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePengambilOrder(@Valid @RequestBody StrukOrderVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - Map result = pelayananObatService.savePengambilOrder(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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePengambilOrder", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 savePengambilOrder", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/update-status-order/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-status-order/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> updateStatusOrder(@RequestParam(value = "noOrder") String noOrder, - @RequestParam(value = "status") Byte status, HttpServletRequest request) throws ParseException { + @RequestParam(value = "status") Byte status, HttpServletRequest request) { try { Map result = orderProdukService.updateStatusOrder(noOrder, status); 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when updateStatusOrder", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 updateStatusOrder", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-pelayanan-obat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePelayananObat(PelayananObatVO vo, HttpServletRequest request) - throws ParseException { + @RequestMapping(value = "/save-pelayanan-obat/", method = POST, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> savePelayananObat(PelayananObatVO vo, HttpServletRequest request) { try { - if (CommonUtil.isNotNullOrEmpty(vo.getTanggalPendaftaran())) { - vo.setTglRegistrasi(DateUtil.toDate(vo.getTanggalPendaftaran())); - } + if (isNotNullOrEmpty(vo.getTanggalPendaftaran())) + vo.setTglRegistrasi(toDate(vo.getTanggalPendaftaran())); Map result = pelayananObatService.savePelayananObat3(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Farmasi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 savePelayananObat3", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 savePelayananObat3", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-pasien-daftar/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPasienDaftarn( - @RequestParam(value = "noCm", required = false) String noCm, - @RequestParam(value = "tanggal", required = false) String tanggal) { - PasienDaftar resultPageMap = pasienDaftarDao.findByNoRec(noCm); - - try { - return RestUtil.getJsonResponse(resultPageMap.ToMap(), HttpStatus.OK, mapHeaderMessage); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-antrian-pasien/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAntrianPasien( - @RequestParam(value = "noRec", required = false) String noRec) { - AntrianPasienDiperiksaDto resultPageMap = antrianPasienDiperiksaService.findAntrian(noRec).get(0); - - try { - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK, mapHeaderMessage); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-antrian-pasien-schedule/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getAntrianPasienSchedule( - @RequestParam(value = "idRuangan", required = false) Integer idRuangan) { - List resultPageMap = pasienDaftarService.getFindSchedule(idRuangan); - - try { - return RestUtil.getJsonResponse(JsonUtil.ToMaps(resultPageMap), HttpStatus.OK, mapHeaderMessage); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); - } - - @Autowired - private DokumenRekamMedisService dokumenRekamMedisService; - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-dokumen-rekammedis/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-dokumen-rekammedis/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDokumenRekamMedis( @RequestParam(value = "idRuangan", required = false) Integer idRuangan, @RequestParam(value = "dateStart", required = false) String dateStart, @RequestParam(value = "dateEnd", required = false) String dateEnd, @RequestParam(value = "namaPasien", required = false) String namaPasien) { - List resultPageMap = dokumenRekamMedisService.getByRuangan(idRuangan, - DateUtil.toDate(dateStart), DateUtil.toDate(dateEnd), namaPasien); - + List resultPageMap = dokumenRekamMedisService.getByRuangan(idRuangan, toDate(dateStart), toDate(dateEnd), namaPasien); try { - return RestUtil.getJsonResponse(JsonUtil.ToMaps(resultPageMap), HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(ToMaps(resultPageMap), OK, mapHeaderMessage); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/terima-dokumen-rekammedis/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> terimaDokumenRekamMedis( - @RequestParam(value = "listTerimaDokumen", required = false) String listTerimaDokumen) { - String[] dokumens = new String[listTerimaDokumen.split(",").length]; - dokumens = listTerimaDokumen.split(","); + @RequestMapping(value = "/terima-dokumen-rekammedis/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> terimaDokumenRekamMedis(@RequestParam(value = "listTerimaDokumen", required = false) String listTerimaDokumen) { + String[] dokumens = listTerimaDokumen.split(","); List resultPageMap = dokumenRekamMedisService.terimaDokumen(dokumens); - try { - return RestUtil.getJsonResponse(JsonUtil.ToMaps(resultPageMap), HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(ToMaps(resultPageMap), OK, mapHeaderMessage); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(null, HttpStatus.NOT_FOUND, mapHeaderMessage); } - @RequestMapping(value = "/kirim-dokumen-rekammedis", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> kirimDokumenRekamMedis(@Valid @RequestBody List vo, - HttpServletRequest request) { + @RequestMapping(value = "/kirim-dokumen-rekammedis", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> kirimDokumenRekamMedis(@Valid @RequestBody List vo, HttpServletRequest request) { try { - Map result = dokumenRekamMedisService.kirimDokumen(vo); - // Map - // result=registrasiPasienOnlineService.saveRegistrasiPasienOnline(vo); - if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); BroadcastMessage("DaftarAntrianPerjanjian", result.get("noRec").toString()); } - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 kirimDokumen", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 kirimDokumen", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/find-order-pelayanan-obat/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-order-pelayanan-obat/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findOrderPelayananObat( @RequestParam(value = "ruanganId", required = false) Integer ruanganId, @RequestParam(value = "dateStart", required = false) String dateStart, @RequestParam(value = "dateEnd", required = false) String dateEnd, @RequestParam(value = "noCm", required = false) String noCm) { - List resultPageMap = pelayananObatService.findOrderPelayanan(ruanganId, DateUtil.toDate(dateStart), - DateUtil.toDate(dateEnd), noCm); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + List resultPageMap = pelayananObatService.findOrderPelayanan(ruanganId, toDate(dateStart), toDate(dateEnd), noCm); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/updateStok/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity updateStok(@RequestParam(value = "noRec", required = false) String noRec) { - PelayananPasien resultPageMap = pelayananObatService.updateStok(noRec); - try { - BroadcastMessage(resultPageMap.getNoRec(), resultPageMap.ToMap().toString()); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(true, HttpStatus.CREATED, mapHeaderMessage); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-kartu-stok/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getKartuStok( - @RequestParam(value = "id", required = false) Integer id) { - List> data = null; - try { - data = JsonUtil.ToMaps(pelayananObatService.getKartuStok(id)); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(data, HttpStatus.OK); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-monitoring/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity>> getMonitoring( - @RequestParam(value = "id", required = false) Integer id) { - List> data = null; - try { - data = JsonUtil.ToMaps(activityPegawaiService.getData()); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(data, HttpStatus.OK); - } - - // - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-order-pelayanan-obat/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-pelayanan-obat/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderPelayananObat( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = pelayananObatService.getOrderPelayanan3(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-order-pelayanan-all/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-pelayanan-all/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderPelayananAll( @RequestParam(value = "noRec", required = false) String noRec) { Map resultPageMap = pelayananObatService.getPelayanan(noRec); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @Autowired - private PelayananPasienService pelayananPasienService; - - @RequestMapping(value = "/delete-order-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/delete-order-pelayanan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> deleteOrderPelayanan(@Valid @RequestBody List> vo, HttpServletRequest request) { try { Map result = pelayananPasienService.deletePelayanan(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 deleteOrderPelayanan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when deletePelayanan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when deleteOrderPelayanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when deletePelayanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-order-pelayanan-by-pegawai/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-pelayanan-by-pegawai/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderPelayananByPegawai( @RequestParam(value = "noRec", required = false) String noRec, @RequestParam(value = "idPegawai", required = false) String idPegawai) { Map resultPageMap = pelayananObatService.getPelayanan(noRec, idPegawai); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/find-ruangan-pelayanan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/find-ruangan-pelayanan/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> findRuanganPelayanan( @RequestParam(value = "noRec", required = false) String noRec) { - Map resultPageMap = new HashMap();// pelayananObatService.findRuanganPelayanan(noRec); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + Map resultPageMap = new HashMap<>(); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-order-billing/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-billing/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getBilling( @RequestParam(value = "noRec", required = false) String noRec) { Map resultPageMap = pelayananObatService.getPelayanan(noRec); - Map map = new HashMap<>(); - Double totalBiling = 0.0; - Double totalKlaim = 0.0; + double totalBiling = 0.0; for (Map item : (List>) resultPageMap.get("orders")) { Map produk = (Map) item.get("produk"); if ((Short) produk.get("nilaiNormal") != 0) @@ -953,60 +519,58 @@ public class RegistrasiPelayananController extends LocaleController { } map.put("totalBilling", totalBiling); map.put("totalDeposit", pelayananObatService.getTotalDeposite(noRec)); - map.put("totalKlaim", 0); - return RestUtil.getJsonResponse(map, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(map, CREATED, mapHeaderMessage); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-order-pelayanan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getOrderPelayanan( - @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) { + @RequestMapping(value = "/get-order-pelayanan/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getOrderPelayanan(@RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) { Map resultPageMap = pelayananObatService.getOrderPelayanan(noRegistrasi); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @RequestMapping(value = "/save-touch-screen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-touch-screen", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRegistrasiPasienOnline(@Valid @RequestBody Antrian antrian, HttpServletRequest request) { try { - - AntrianPasienRegistrasiVO vo = new AntrianPasienRegistrasiVO(); - vo.setTipePasien(TipePasienEnum.BARU.getVal()); - PasienVO pasien = new PasienVO(); - pasien.setNamaPasien("Pasien Baru"); - vo.setType("BARU"); - vo.setJenis(antrian.getJenis()); - vo.setTglReservasi(new Date()); - vo.setStatusPanggil("0"); - JenisKelaminVO jenisKelamin = new JenisKelaminVO(); - jenisKelamin.setId(0); - vo.setJenisKelamin(jenisKelamin); - PendidikanVO pendidikan = new PendidikanVO(); - pendidikan.setId(0); - vo.setPendidikan(pendidikan); - vo.setPasien(pasien); + AntrianPasienRegistrasiVO vo = getAntrianPasienRegistrasiVO(antrian); Map result = registrasiPasienOnlineService.saveRegistrasiPasienTouchScreen(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); + } + 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 saveRegistrasiPasienTouchScreen", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 saveRegistrasiPasienTouchScreen", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-touch-old-screen", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + private static AntrianPasienRegistrasiVO getAntrianPasienRegistrasiVO(Antrian antrian) { + AntrianPasienRegistrasiVO vo = new AntrianPasienRegistrasiVO(); + vo.setTipePasien(TipePasienEnum.BARU.getVal()); + PasienVO pasien = new PasienVO(); + pasien.setNamaPasien("Pasien Baru"); + vo.setType("BARU"); + vo.setJenis(antrian.getJenis()); + vo.setTglReservasi(new Date()); + vo.setStatusPanggil("0"); + JenisKelaminVO jenisKelamin = new JenisKelaminVO(); + jenisKelamin.setId(0); + vo.setJenisKelamin(jenisKelamin); + PendidikanVO pendidikan = new PendidikanVO(); + pendidikan.setId(0); + vo.setPendidikan(pendidikan); + vo.setPasien(pasien); + return vo; + } + + @RequestMapping(value = "/save-touch-old-screen", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRegistrasTouchScreen( @Valid @RequestBody AntrianPasienRegistrasiVO vo, HttpServletRequest request) { try { @@ -1021,117 +585,84 @@ public class RegistrasiPelayananController extends LocaleController { kelompokPasienDao .findById(Integer.parseInt(GetSettingDataFixed("KdKelompokPasienAsuransi"))), new KelompokPasienVO())); - } else + } else { data.setKelompokPasien(vo.getJenisPasien()); + } data.setRuangan(vo.getPoliTujuan()); data.setPasien(vo.getPasien()); - data.setPegawai(vo.getDokter()); data.setTglRegistrasi(vo.getTglReservasi()); - data.setRuangan(vo.getPoliTujuan()); - Map result = registrasiPelayananService.savePasienTouchScreen(data); - // Map - // result=registrasiPasienOnlineService.saveRegistrasiPasienOnline(vo); - if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); BroadcastMessage("DaftarAntrianPerjanjian", result.get("noRec").toString()); } - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 savePasienTouchScreen", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 savePasienTouchScreen", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pelayanan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePelayanan(@Valid @RequestBody List vo, HttpServletRequest request) { - try { - Map resultPageMap = pelayananObatService.savePelayanan2(vo); - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { - - } - return null; + Map resultPageMap = pelayananObatService.savePelayanan2(vo); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @RequestMapping(value = "/save-pelayanan-2", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePelayanan2(@Valid @RequestBody List vo, - HttpServletRequest request) { - try { - Map resultPageMap = pelayananObatService.savePelayanan(vo); - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); - } catch (ServiceVOException e) { - - } - return null; - } - - @RequestMapping(value = "/get-list-pasien-daftar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-list-pasien-daftar", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPasienDaftar(@RequestParam(value = "start") String start, @RequestParam(value = "until") String until, - HttpServletRequest request) { try { - Map result = registrasiPelayananService.getPasienDaftar(DateUtil.toDate(start), - DateUtil.toDate(until)); + Map result = registrasiPelayananService.getPasienDaftar(toDate(start), toDate(until)); 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 Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when getPasienDaftar", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 getPasienDaftar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/ambil-hasil-laboratorium", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/ambil-hasil-laboratorium", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> saveAmbilHasilLaboratorium( @RequestParam(value = "tanggal") String tanggal, @RequestParam(value = "namaPengambil") String namaPengambil, - @RequestParam(value = "noTelepon") String noTelepon, @RequestParam(value = "noOrder") String noOrder, + @RequestParam(value = "noTelepon") String noTelepon, + @RequestParam(value = "noOrder") String noOrder, HttpServletRequest request) { try { - Map result = registrasiPelayananService.ambilHasil(noOrder, namaPengambil, noTelepon, - DateUtil.toDate(tanggal)); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + Map result = registrasiPelayananService.ambilHasil(noOrder, namaPengambil, noTelepon, toDate(tanggal)); + if (null != result) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); + } + 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 ambilHasil", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 ambilHasil", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/save-registrasi-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-registrasi-pelayanan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePasien(@Valid @RequestBody RegistrasiPelayananVO vo, HttpServletRequest request) { try { @@ -1140,133 +671,108 @@ public class RegistrasiPelayananController extends LocaleController { try { BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); } catch (Exception ex) { - ex.getMessage(); + throw new ServiceVOException(ex.getMessage()); } - 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); } else { Map headerMessageCustom = new HashMap<>(); headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when savePasienDafar", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when savePasienDafar", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-persetujuan-umum", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-persetujuan-umum", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePersetujuanUmum(@Valid @RequestBody PersetujuanUmumVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - // if (vo.getTanggalPendaftaran().indexOf("-") > -1) - // vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); - // else - // vo.setTglRegistrasi(new - // Date(Long.parseLong(vo.getTanggalPendaftaran()))); Map result = persetujuanUmumService.savePersetujuanUmum(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + 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 savePersetujuanUmum", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 savePersetujuanUmum", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getData(@RequestParam(value = "noRec", required = false) String noRec) { Map resultPageMap = registrasiPasienOnlineService.getPasienDaftarByNoRec(noRec); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(resultPageMap, CREATED, mapHeaderMessage); } - @RequestMapping(value = "/get-order-laboratorium/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-laboratorium/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataOrderLaboratorium( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = registrasiPelayananService.getOrderLaboratorium(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @RequestMapping(value = "/get-order-darah/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-darah/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataOrderDarah( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = registrasiPelayananService.getOrder(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @RequestMapping(value = "/get-pelayanan-darah/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pelayanan-darah/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataPelayananDarah( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = registrasiPelayananService.getDataPelayananDarah(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @RequestMapping(value = "/get-order-radiologi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-radiologi/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataOrderRadiologi( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = registrasiPelayananService.getOrderRadiologi(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @RequestMapping(value = "/get-order-histori-laboratorium/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-histori-laboratorium/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDataOrderHistoryLaboratorium( @RequestParam(value = "tglOrder", required = false) String tglOrder, @RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "noCm", required = false) String noCm) { long val = Long.parseLong(tglOrder); Date date = new Date(val); - - List> resultPageMap = registrasiPelayananService.getOrderHistoryLaboratorium(date, id, - noCm); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + List> resultPageMap = registrasiPelayananService.getOrderHistoryLaboratorium(date, id, noCm); + return getJsonResponse(resultPageMap, CREATED); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/hasil-laporan-by-pemeriksaan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/hasil-laporan-by-pemeriksaan/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllReportPemeriksaan( @RequestParam(value = "dateStart", required = false) String dateStart, @RequestParam(value = "dateEnd", required = false) String dateEnd, @RequestParam(value = "id", required = false) Integer id) { - List> resultPageMap = registrasiPelayananService.getLaporanHailPemeriksaan(dateStart, - dateEnd, id); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + List> resultPageMap = registrasiPelayananService.getLaporanHailPemeriksaan(dateStart, dateEnd, id); + return getJsonResponse(resultPageMap, CREATED); } - @RequestMapping(value = "/get-order-detail-laboratorium/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-detail-laboratorium/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataOrderDetailLaboratorium( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = registrasiPelayananService.getOrderDetailLaboratorium(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @Autowired - private MappingPasienPacsDao mappingPasienPacsDao; - - @RequestMapping(value = "/mapaping-pasien-radiologi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/mapaping-pasien-radiologi/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> saveMappingPacs(@RequestParam(value = "id", required = false) String id, @RequestParam(value = "noMr", required = false) String noMr, @RequestParam(value = "noRec", required = false) String noRec) { @@ -1283,31 +789,20 @@ public class RegistrasiPelayananController extends LocaleController { try { resultPageMap = mappingPasienPacsDao.save(mappingPasienPacs).ToMap(); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @RequestMapping(value = "/get-order-detail-radiologi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDataOrderDetailRadioilogi( - @RequestParam(value = "noOrder", required = false) String noOrder) { - Map resultPageMap = registrasiPelayananService.getOrderRadiologi(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); - } - - @RequestMapping(value = "/get-order-detail/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-detail/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataOrderDetail( @RequestParam(value = "noOrder", required = false) String noOrder) { Map resultPageMap = registrasiPelayananService.getOrderDetail(noOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); + return getJsonResponse(resultPageMap, CREATED); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-baru-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllNewVOWithQueryString( + @RequestMapping(value = "/antrian-pasien-baru-list/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllNewVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -1318,110 +813,70 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "namaPasien", required = false) String namaPasien) { Map resultPageMap = registrasiPasienOnlineService.findAllAntrianBaruPagingList(page, limit, sort, dir, ruanganId, dateStart, dateEnd, namaPasien); - return constructListPageResult(resultPageMap); } - @RequestMapping(value = "/get-all-dokter", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-dokter", method = GET) public ResponseEntity> getAllDokter(HttpServletRequest request) { try { List listPegawaiVo = pegawaiService.getAllDokter(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listPegawaiVo, OK, mapHeaderMessage); } 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); + LOGGER.error("Got ServiceVOException {} when getAllDokter", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + LOGGER.error("Got JpaSystemException {} when getAllDokter", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-all-dokter-name", method = RequestMethod.GET) - public ResponseEntity> getAllDokterByName( - @RequestParam(value = "filter[filters][0][value]", required = false) String value, - HttpServletRequest request) { - try { - String data = request.getQueryString(); - data = URLDecoder.decode(data); - String[] arrQueries = data.split("&"); - String values = null; - for (String query : arrQueries) { - if (query.indexOf("filter[filters][0][value]") >= 0) { - if (values == null) - values = query.replace("filter[filters][0][value]=", ""); - else - values += "," + query.replace("filter[filters][0][value]=", ""); - } - } - List listPegawaiVo = pegawaiService.getAllDokter(values); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPegawaiVo, HttpStatus.OK, mapHeaderMessage); - } 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); - } 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); - } - - } - - @RequestMapping(value = "/get-all-asal-rujukan", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-asal-rujukan", method = GET) public ResponseEntity> getAllAsalRujukan(HttpServletRequest request) { try { List listAsalRujukanVO = asalRujukanService.findAll(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listAsalRujukanVO, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(listAsalRujukanVO, OK, mapHeaderMessage); } 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); + LOGGER.error("Got ServiceVOException {} when findAll", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + LOGGER.error("Got JpaSystemException {} when findAll", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-all-ruangan-rawat-inap", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-ruangan-rawat-inap", method = GET) public ResponseEntity> getAllRuanganRawatInap(HttpServletRequest request) { try { List listRuanganVO = ruanganService .findRuanganByDepartemenSettingDataFixed("KdDepartemenInstalasiRawatInap"); List listRuanganVO2 = ruanganService .findRuanganByDepartemenSettingDataFixed("KdDepartemenInstalasiRawatInapBayi"); - for (RuanganVO ruanganVo : listRuanganVO2) - listRuanganVO.add(ruanganVo); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + listRuanganVO.addAll(listRuanganVO2); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listRuanganVO, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(listRuanganVO, OK, mapHeaderMessage); } 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); + LOGGER.error("Got ServiceVOException {} when findRuanganByDepartemenSettingDataFixed", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + LOGGER.error("Got JpaSystemException {} when findRuanganByDepartemenSettingDataFixed", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-all-ruangan", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-ruangan", method = GET) public ResponseEntity> getAllRuangan(HttpServletRequest request) { try { List listRuanganVO = ruanganService.findRuanganByDepartemen(); - List list = new ArrayList(); + List list = new ArrayList<>(); RuanganVO ruanganVo; for (RuanganVO vo : listRuanganVO) { ruanganVo = new RuanganVO(); @@ -1434,147 +889,44 @@ public class RegistrasiPelayananController extends LocaleController { ruanganVo.setDepartemenId(vo.getDepartemenId()); list.add(ruanganVo); } - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(list, HttpStatus.OK, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(list, OK, mapHeaderMessage); } 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); + LOGGER.error("Got ServiceVOException {} when findRuanganByDepartemen", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + LOGGER.error("Got JpaSystemException {} when findRuanganByDepartemen", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/get-all-ruangan-detail", method = RequestMethod.GET) - public ResponseEntity> getAllRuanganDetail(HttpServletRequest request) { - try { - List listRuanganVO = ruanganService.findRuanganByDepartemenDetail(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listRuanganVO, HttpStatus.OK, mapHeaderMessage); - } 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); - } 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); - } - - } - - @RequestMapping(value = "/get-all-ruangan-penunjang", method = RequestMethod.GET) + @RequestMapping(value = "/get-all-ruangan-penunjang", method = GET) public ResponseEntity> getAllRuanganPenunjang(HttpServletRequest request) { try { - List listRuanganTemp = new ArrayList(); - List listRuanganVO = ruanganService + List listRuanganVO = ruanganService .findRuanganByDepartemenSettingDataFixed("KdDepartemenInstalasiLaboratorium"); - listRuanganTemp.addAll(listRuanganVO); + List listRuanganTemp = new ArrayList<>(listRuanganVO); listRuanganVO = ruanganService.findRuanganByDepartemenSettingDataFixed("KdDepartemenInstalasiRadiologi"); listRuanganTemp.addAll(listRuanganVO); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listRuanganTemp, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(listRuanganTemp, OK, mapHeaderMessage); } 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); + LOGGER.error("Got ServiceVOException {} when findRuanganByDepartemenSettingDataFixed", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + LOGGER.error("Got JpaSystemException {} when findRuanganByDepartemenSettingDataFixed", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-all-kelompok-pasien", method = RequestMethod.GET) - public ResponseEntity> getAllKelompokPasien(HttpServletRequest request) { - try { - List listKelompokPasienVO = kelompokPasienService.findAll(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listKelompokPasienVO, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get KelompokPasien", 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 KelompokPasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-all-alamat", method = RequestMethod.GET) - public ResponseEntity> getAllAlamat(HttpServletRequest request) { - try { - List listAlamatVO = alamatService.findAll(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listAlamatVO, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Alamat", 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 Alamat", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-cm", method = RequestMethod.GET) - public ResponseEntity getCm(HttpServletRequest request) { - try { - String noCm = pasienService.generatePasienCM(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(noCm, HttpStatus.OK, mapHeaderMessage); - - } 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); - } 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); - } - - } - - @RequestMapping(value = "/get-all-pasien", method = RequestMethod.GET) - public ResponseEntity> getAllPasien(HttpServletRequest request) { - try { - List listPasienVO = pasienService.findAll(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listPasienVO, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-list-radiologi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllRadiologiVOWithQueryString( + @RequestMapping(value = "/antrian-pasien-list-radiologi/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllRadiologiVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -1587,28 +939,21 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "asalRuanganId", required = false) Integer asalRuanganId, @RequestParam(value = "tglLahir", required = false) Date tglLahir, @RequestParam(value = "namaPasien", required = false) String namaPasien) { - if (noCm.equals("-")) { + if (noCm.equals("-")) noCm = null; - } Map resultPageMap = registrasiPelayananService.findAllAntrianPaging(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId, asalRuanganId, namaPasien, tglLahir); - return constructListPageResult(resultPageMap); } - @SuppressWarnings("unchecked") - - @RequestMapping(value = "/sum-antrian-registrasi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity sumAntrianRegistrasi( - - @RequestParam(value = "pasienId", required = false) Integer pasienId) { + @RequestMapping(value = "/sum-antrian-registrasi/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity sumAntrianRegistrasi(@RequestParam(value = "pasienId", required = false) Integer pasienId) { Integer resultPageMap = antrianPasienRegistrasiService.countAntrian(pasienId); - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK, mapHeaderMessage); - // return constructListPageResult(resultPageMap); + return getJsonResponse(resultPageMap, OK, mapHeaderMessage); } - @RequestMapping(value = "/antrian-pasien-penunjang-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVOPenunjangWithQueryString( + @RequestMapping(value = "/antrian-pasien-penunjang-list/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllVOPenunjangWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "1000") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -1620,12 +965,10 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId) { Map resultPageMap = registrasiPelayananService.findAllAntrianPagingPenunjangList(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId, null, null, null); - return constructListPageResult(resultPageMap); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/antrian-pasien-list/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @@ -1640,78 +983,21 @@ public class RegistrasiPelayananController extends LocaleController { Map result = registrasiPelayananService.findAllAntrianPaging(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId); 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 getAllVOWithQueryString", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when findAllAntrianPaging", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getAllVOWithQueryString", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when findAllAntrianPaging", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-gizi-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllAntrianPasienGizi( - @RequestParam(value = "ruanganId", required = false) Integer ruanganId, - @RequestParam(value = "namaRuangan", required = false) String namaRuangan, - @RequestParam(value = "dateStart", required = false) String dateStart, - @RequestParam(value = "dateEnd", required = false) String dateEnd, - @RequestParam(value = "noCm", required = false) String noCm, - @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId, HttpServletRequest request) { - - try { - Map result = registrasiPelayananService.findAllAntrianPasienGiziPaging(ruanganId, - namaRuangan, dateStart, dateEnd, noCm, pegawaiId); - 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 getAllAntrianPasienGizi", 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 getAllAntrianPasienGizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - // @SuppressWarnings("unchecked") - // @RequestMapping(value = "/antrian-pasien-penunjang-list/", method = - // RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - // public ResponseEntity> getAllVOWithQueryPenunjang( - // @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, - // @RequestParam(value = "dir", required = false, defaultValue = "asc") - // String dir, - // @RequestParam(value = "ruanganId", required = false) Integer ruanganId, - // @RequestParam(value = "dateStart", required = false) String dateStart, - // @RequestParam(value = "dateEnd", required = false) String dateEnd, - // @RequestParam(value = "noCm", required = false) String noCm, - // @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId) { - // Map resultPageMap = - // registrasiPelayananService.findAllAntrianPenunjangPaging(page, limit, - // sort, - // dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId); - // - // return constructListPageResult(resultPageMap); - // } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-bpjs-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getBpjsWithQueryString( + @RequestMapping(value = "/antrian-bpjs-list/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getBpjsWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -1722,189 +1008,143 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId) { Map resultPageMap = registrasiPelayananService.findBpjsAntrianPaging(page, limit, sort, dir, dateStart, dateEnd, noCm, pegawaiId); - return constructListPageResult(resultPageMap); } - @Autowired - private PasienDaftarDao pasienDaftarDao; - - /* - * @RequestMapping(value = "/save-upload-image", method = - * RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes - * = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity> saveUploadImage(@Valid @RequestBody UploadVO vo, - * - * @RequestParam(value = "noOrder", required = true) String noOrder, - * HttpServletRequest request) throws ParseException { try { - * - * return - * RestUtil.getJsonResponse(orderProdukService.saveUploadImage(noOrder,vo)); - * - * } 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); } 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); - * } - * - * } - */ - - @RequestMapping(value = "/get-nomor-registrasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-nomor-registrasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity getNoRegistrasi(@Valid @RequestBody PemakaianAsuransiVO vo, - HttpServletRequest request) throws ParseException { + HttpServletRequest request) { try { - return RestUtil.getJsonResponse(pasienDaftarDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), + return getJsonResponse(pasienDaftarDao.finByNoIdAndTglRegistrasi((short) 0, vo.getPasienDaftar().getPasien().getId(), vo.getPasienDaftar().getTglRegistrasi()) - .getNoRegistrasi(), HttpStatus.ACCEPTED); - + .getNoRegistrasi(), ACCEPTED); } 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 finByNoIdAndTglRegistrasi", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 finByNoIdAndTglRegistrasi", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-histori-pasien/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-histori-pasien/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> findHistoryRiwayatOrder( @RequestParam(value = "noRec", required = false) String noRec, @RequestParam(value = "code", required = false) String code) { List> resultPageMap = antrianPasienDiperiksaService.findAntrianByPasienDaftar(noRec, code); - return RestUtil.getJsonResponse(resultPageMap); - // return constructListPageResult(resultPageMap); + return getJsonResponse(resultPageMap); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-histori-radiolgi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-histori-radiolgi/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> findByAntrianByPasienDaftar( @RequestParam(value = "noRec", required = false) String noRec) { List> resultPageMap = antrianPasienDiperiksaService.findAntrianByPasienDaftar(noRec, "R"); - return RestUtil.getJsonResponse(resultPageMap); - // return constructListPageResult(resultPageMap); + return getJsonResponse(resultPageMap); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-pelayanan-rawat-jalan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPelayananRawatJalan( + @RequestMapping(value = "/get-pelayanan-rawat-jalan/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getPelayananRawatJalan( @RequestParam(value = "noCm", required = false) String noCm) { - List resultPageMap = registrasiPelayananService.findPealyananRawatJalan(Short.parseShort("0"), + List> resultPageMap = registrasiPelayananService.findPealyananRawatJalan((short) 0, noCm); - return RestUtil.getJsonResponse(resultPageMap); - // return constructListPageResult(resultPageMap); + return getJsonResponse(resultPageMap); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-registrasi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-registrasi/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRegistrasi( @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) { Map result = registrasiPelayananService.findPasienDaftarById(noRegistrasi); - return RestUtil.getJsonResponse(result); + return getJsonResponse(result); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/update-status-antrian/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-status-antrian/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> upateStatusAntrian( - @RequestParam(value = "noRegistrasi", required = true) String noRegistrasi, - @RequestParam(value = "statusAntrian", required = true) String statusAntrian, - @RequestParam(value = "tglDipanggilSuster", required = true) String tglDipanggilSuster, - @RequestParam(value = "tglDipanggilDokter", required = true) String tglDipanggilDokter, + @RequestParam(value = "noRegistrasi") String noRegistrasi, + @RequestParam(value = "statusAntrian") String statusAntrian, + @RequestParam(value = "tglDipanggilSuster") String tglDipanggilSuster, + @RequestParam(value = "tglDipanggilDokter") String tglDipanggilDokter, HttpServletRequest request) { - try { Map result = registrasiPelayananService.updatStatusAntrian(noRegistrasi, statusAntrian, tglDipanggilSuster, tglDipanggilDokter); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); + boolean dataFound = (boolean) result.get("dataFound"); BroadcastMessage("DashboardLaboratorium", "noRec"); BroadcastMessage("DaftarAntrian", "noRec"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } else { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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 updatStatusAntrian", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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 updatStatusAntrian", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-persetujuan-rawat-inap/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPersetujuanRawatInap( + @RequestMapping(value = "/get-persetujuan-rawat-inap/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getPersetujuanRawatInap( @RequestParam(value = "noCm", required = false) String noCm) { - List resultPageMap = registrasiPelayananService.findPersetujuanUmum(Short.parseShort("0"), + List> resultPageMap = registrasiPelayananService.findPersetujuanUmum((short) 0, noCm); - return RestUtil.getJsonResponse(resultPageMap); + return getJsonResponse(resultPageMap); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-pelayanan-rawat-inap/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getPelayananRawatInap( + @RequestMapping(value = "/get-pelayanan-rawat-inap/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity>> getPelayananRawatInap( @RequestParam(value = "noCm", required = false) String noCm) { - List resultPageMap = registrasiPelayananService.findPelayananRawatInap(Short.parseShort("0"), + List> resultPageMap = registrasiPelayananService.findPelayananRawatInap((short) 0, noCm); - return RestUtil.getJsonResponse(resultPageMap); + return getJsonResponse(resultPageMap); } - @RequestMapping(value = "/search-get-all-ruangan", method = RequestMethod.GET) + @RequestMapping(value = "/search-get-all-ruangan", method = GET) public ResponseEntity> getSearchAllRuangan( @RequestParam(value = "namaRuangan", required = false) String namaRuangan, HttpServletRequest request) { try { List listRuanganVO = ruanganService.findRuanganByDepartemenByName(namaRuangan); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listRuanganVO, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(listRuanganVO, OK, mapHeaderMessage); } 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); + LOGGER.error("Got ServiceVOException {} when findRuanganByDepartemenByName", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + LOGGER.error("Got JpaSystemException {} when findRuanganByDepartemenByName", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/search-get-all-ruangan-rehab-medik", method = RequestMethod.GET) + @RequestMapping(value = "/search-get-all-ruangan-rehab-medik", method = GET) public ResponseEntity> getSearchAllRuanganRehabMedik( @RequestParam(value = "namaRuangan", required = false) String namaRuangan, HttpServletRequest request) { try { List listRuanganVO = ruanganService.findRuanganRehamMedik(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(listRuanganVO, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(listRuanganVO, OK, mapHeaderMessage); } 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); + LOGGER.error("Got ServiceVOException {} when findRuanganRehamMedik", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + LOGGER.error("Got JpaSystemException {} when findRuanganRehamMedik", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - // Report @RequestMapping("/kartuPasien") public ModelAndView generateKartuPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, @RequestParam(value = "id") Integer id) { @@ -1913,130 +1153,73 @@ public class RegistrasiPelayananController extends LocaleController { m.addObject("tanggalReport", new Date()); m.addObject("title", "Kartu Pasien"); m.addObject("format", "pdf"); - if (format != null && !format.isEmpty()) { m.addObject("format", format); } - return m; } @RequestMapping("/reportReservasi") public ModelAndView generaterReportReservasi(ModelAndView m, @RequestParam(value = "noRec", required = false) String noRec) { - - AntrianPasienRegistrasi antrian = (AntrianPasienRegistrasi) antrianPasienRegistrasiService.findOne(noRec); - List listPasien = new ArrayList(); - listPasien.add(antrian); - - m.addObject("dataSource", listPasien); + AntrianPasienRegistrasi antrian = antrianPasienRegistrasiService.findOne(noRec); + List listAntrian = new ArrayList<>(); + listAntrian.add(antrian); + m.addObject("dataSource", listAntrian); m.addObject("tanggalReport", new Date()); m.addObject("title", "Report Registrasi Pasien"); m.addObject("tanggalReservasi", antrian.getTglReservasi()); m.addObject("format", "pdf"); - return m; } @RequestMapping("/gelangPasien") public ModelAndView generateGelangPasien(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "id", required = true) Integer id) { - + @RequestParam(value = "id") Integer id) { List list = registrasiPelayananPasienService.findPasien(id); m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "Kartu Pasien"); m.addObject("format", "pdf"); - - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - - return m; - } - - @RequestMapping("/kunjunganPelayananReport") - public ModelAndView generateKunjunganPelayanan(ModelAndView m, - @RequestParam(value = "format", required = false) String format) { - - /* - * List list = - * registrasiPelayananPasienService.findAllPasien(); - * m.addObject("dataSource", list); m.addObject("tanggalReport", new - * Date()); m.addObject("title", "Report Kunjungan Pelayanan"); - * m.addObject("format", "pdf"); - */ - - if (format != null && !format.isEmpty()) { - m.addObject("format", format); - } - return m; } @RequestMapping("/slipAntrian") public ModelAndView generateSlipAntrian(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { - + @RequestParam(value = "noRec") String noRec) { List list = registrasiPelayananPasienService.findAntrian(noRec); - m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "Slip Antrian"); m.addObject("format", "pdf"); - - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - - return m; - } - - @RequestMapping("/antrianPasienReservasi") - public ModelAndView generateAntrianPasienReservasi(ModelAndView m, - @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { - - List list = registrasiPelayananPasienService.findAntrian(noRec); - - m.addObject("dataSource", list); - m.addObject("tanggalReport", new Date()); - m.addObject("title", "Antrian Pasien Reservasi"); - m.addObject("format", "pdf"); - - if (format != null && !format.isEmpty()) { - m.addObject("format", format); - } - return m; } @RequestMapping("/etiketPersetujuanUmum") public ModelAndView generateEtiketPersetujuanUmum(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noCm", required = true) String noCm, - @RequestParam(value = "tglRegistrasi", required = true) String tglRegistrasi) { - - List list = persetujuanUmumService.findEtiket(noCm, tglRegistrasi); - + @RequestParam(value = "noCm") String noCm, + @RequestParam(value = "tglRegistrasi") String tglRegistrasi) { + List list = persetujuanUmumService.findEtiket(noCm, tglRegistrasi); m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "Etiket"); m.addObject("format", "pdf"); - - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - return m; } @RequestMapping("/antrianPasienDiperiksa") public ModelAndView generateAntrianPasienDiperiksa(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noRec", required = true) String noRec) { + @RequestParam(value = "noRec") String noRec) { List list = antrianPasienDiperiksaService.findAntrian(noRec); m.addObject("dataSource", list); @@ -2054,7 +1237,7 @@ public class RegistrasiPelayananController extends LocaleController { // ---------------------------------add by // Pratama-----------------------------// - @RequestMapping(value = "/report-detail-laboratorium/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/report-detail-laboratorium/", method = GET, produces = APPLICATION_JSON_VALUE) public ModelAndView reportOrderDetailLaboratorium(ModelAndView m, @RequestParam(value = "noOrder", required = false) String noOrder, @RequestParam(value = "format", required = false) String format) { @@ -2122,124 +1305,30 @@ public class RegistrasiPelayananController extends LocaleController { return m; } - // -------------------------------end add by - // Pratama---------------------------// - @RequestMapping("/asuransiBPJS") - public ModelAndView reportAsuransiBPJS(ModelAndView m, - @RequestParam(value = "noSep", required = true) String noSep) { - - List list = pemakaianAsuransiService.findByNoSep(noSep); - SuratEligibilitasAsuransi temp = (SuratEligibilitasAsuransi) list.get(0); - String tgl = DateUtil.formatDate(temp.getRegistrasiPelayananPasien().getPasien().getTglLahir()); - String tglReport = DateUtil.formatDate(new Date()); - m.addObject("tanggalReport", tglReport); - m.addObject("tanggalLahir", tgl); - m.addObject("title", "SURAT ELIGIBILITAS PESERTA"); - m.addObject("dataSource", list); - m.addObject("tanggalReport", new Date()); - m.addObject("title", "Asuransi BPJS"); - m.addObject("format", "pdf"); - - return m; - } - // add by askur 03112016 - @RequestMapping(value = "/get-kelompok-pasien", method = RequestMethod.GET) + @RequestMapping(value = "/get-kelompok-pasien", method = GET) public ResponseEntity> getKelompokPasien(HttpServletRequest request) { try { List list = kelompokPasienService.findKelompokPasien(); if (list != null) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(list, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(list, HttpStatus.OK, mapHeaderMessage); } 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); - } - - } - // - - // add by askur 14112016 - @RequestMapping(value = "/get-ruangan-bilik", method = RequestMethod.GET) - public ResponseEntity getRuanganBilik( - @RequestParam(value = "ruanganId", required = true) Integer ruanganId, - @RequestParam(value = "tglRegistrasi", required = false) Date tglRegistrasi, HttpServletRequest request) { - try { - Ruangan list = registrasiPelayananService.findRuanganBilik(ruanganId, tglRegistrasi); - if (list != null) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(list, HttpStatus.OK, mapHeaderMessage); - } 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); - } 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); - } - - } - // - - // add by askur 22112016 - @RequestMapping(value = "/change-pegawai-rawat-inap", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity copyRecords( - @RequestParam(value = "noRec", required = true) String noRec, - @RequestParam(value = "idPegawai", required = true) Integer idPegawai, HttpServletRequest request) - throws ParseException { - try { - AntrianPasienDiPeriksa result = registrasiPelayananService.setPegawaiRawatInap(noRec, idPegawai); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Informasi Ibu", "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); - } 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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - // - // add by askur 14112016 - @RequestMapping(value = "/get-pemeriksaan-sering-laboratorium", method = RequestMethod.GET) - public ResponseEntity> getPemeriksaanSeringLaboratorium(HttpServletRequest request) { - try { - Map list = registrasiPelayananService.getPemeriksaanSeringLaboratorium(1); - if (list != null) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(list, HttpStatus.OK, mapHeaderMessage); - } 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); - } 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); - } - - } - - // // add by askur 16122016 - @RequestMapping(value = "/antrian-pasien-pulang-list/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllAntrianPasienPulangList( + @RequestMapping(value = "/antrian-pasien-pulang-list/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllAntrianPasienPulangList( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -2251,14 +1340,11 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId) { Map resultPageMap = registrasiPelayananService.findAllAntrianPasienPulangPaging(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId); - return constructListPageResult(resultPageMap); } - // - - @RequestMapping(value = "/antrian-pasien-list-rawat-jalan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVOWithQueryStringRawatJalan( + @RequestMapping(value = "/antrian-pasien-list-rawat-jalan/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllVOWithQueryStringRawatJalan( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -2270,12 +1356,11 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "pegawaiId", required = false) Integer pegawaiId) { Map resultPageMap = registrasiPelayananService.findAllAntrianPagingRawatJalan(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId); - return constructListPageResult(resultPageMap); } - @RequestMapping(value = "/antrian-pasien-list-rawat-inap/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVOWithQueryStringRawatInap( + @RequestMapping(value = "/antrian-pasien-list-rawat-inap/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllVOWithQueryStringRawatInap( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "500") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -2288,158 +1373,102 @@ public class RegistrasiPelayananController extends LocaleController { @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi) { Map resultPageMap = registrasiPelayananService.findAllAntrianPagingRawatInap(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId, noRegistrasi); - return constructListPageResult(resultPageMap); } - @RequestMapping(value = "/get-akomodasi-rawat-inap/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAkomodasiRawatInap( - @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) { - Map list = produkService.setAkomodasiRawatInap(noRec); - if (list != null) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(list, HttpStatus.OK, mapHeaderMessage); - } - - @RequestMapping(value = "/get-history-pelayanan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getHistoryPelayanan(HttpServletRequest request) { - try { - Map result = pelayananObatService.getHistoryPelayanan(); - 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 (ServiceVOException e) { - LOGGER.error("Got exception {} when getHistoryPelayanan", 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 getHistoryPelayanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-history-pelayanan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateHistoryPelayanan( - @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) { - try { - Map result = pelayananObatService.updateHistoryPelayanan(noRec); - 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 (ServiceVOException e) { - LOGGER.error("Got exception {} when updateHistoryPelayanan", 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 updateHistoryPelayanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/get-jenis-pembiayaan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-jenis-pembiayaan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getJenisPembiayaan(HttpServletRequest request) { try { Map result = registrasiPelayananService.getKelompokPasien(); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getRekananPelayanan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when getRekananPelayanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-rekanan-by-kelompok-user", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-rekanan-by-kelompok-user", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRekananByKelompokPasien( @RequestParam(value = "id", required = false) Integer id, HttpServletRequest request) { try { Map result = registrasiPelayananService.getRekananByKelompokPasien(id); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when registrasiPelayananService", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when registrasiPelayananService", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-load-data-asuransi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-load-data-asuransi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getLoadData( @RequestParam(value = "rekananId", required = false) Integer rekananId, @RequestParam(value = "noCm", required = false) String noCm, HttpServletRequest request) { try { Map result = registrasiPelayananService.getLoadData(rekananId, noCm); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-data-asuransi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-data-asuransi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataAsuransi(@RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "noCm", required = false) String noCm, HttpServletRequest request) { try { Map result = registrasiPelayananService.getDataAsuransiPasien(id, noCm); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-data-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-data-asuransi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveAsuransiPasien(@Valid @RequestBody AsuransiRegistrasiPasienVO vo, HttpServletRequest request) { try { @@ -2450,287 +1479,159 @@ public class RegistrasiPelayananController extends LocaleController { } catch (Exception ex) { ex.getMessage(); } - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { Map headerMessageCustom = new HashMap<>(); headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when save Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());// delete // sep // that // has // been // created - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when save Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); bridgingBpjs.deleteSep(vo.getAsuransiPasien().getNoSep());// delete // sep // that // has // been // created - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-pelayanan-obat-luar", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-pelayanan-obat-luar", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePelayananObatLuar(@Valid @RequestBody PelayananObatLuarVO vo, HttpServletRequest request) { try { Map result = pelayananObatService.savePelayananObatLuar(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got exception {} when savePelayananObatLuar", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when savePelayananObatLuar", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } @Autowired private DaftarStrukPenjualanService service; - @RequestMapping(value = "/save-retur-penjualan-bebas", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-retur-penjualan-bebas", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveReturPenjualanBebas(@Valid @RequestBody StrukPelayananVO vo, HttpServletRequest request) { try { Map result = service.returStrukPenjualanBebas(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got exception {} when saveReturPenjualanBebas", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when saveReturPenjualanBebas", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-verifikasi-pelayanan-obat-luar/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveVerifikasiPelayananObatLuar(HttpServletRequest request) - throws ParseException { - try { - MainPelayananDetailVO vo = (MainPelayananDetailVO) this.getItem(request, new MainPelayananDetailVO()); - Map result = pelayananObatService.saveVerifikasiPelayananObatLuar(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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-pelayanan-obat-luar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pelayanan-obat-luar", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPenjualanBebas( @RequestParam(value = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate, HttpServletRequest request) { try { Map result = pelayananObatService.getPenjualanBebas(startDate, endDate); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-produk-penjualan-bebas", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-produk-penjualan-bebas", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getProdukPenjualanBebas( @RequestParam(value = "noRecStrukPelayanan", required = false) String noRecStrukPelayanan, HttpServletRequest request) { try { Map result = pelayananObatService.getProdukPenjualanBebas(noRecStrukPelayanan); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/find-struk-resep-obat-luar/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findStrukResepObatLuar( - @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) - throws ParseException { - try { - Map result = pelayananObatService.findStrukResepObatLuar(noRec); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Order Farmasi", "Permintaan", 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); - } 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); - } - - } - - @RequestMapping(value = "/save-ambil-obat/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveAmbilObat( - @RequestParam(value = "noRec", required = false) String noRec, - @RequestParam(value = "tglAmbilObat", required = false) String tglAmbilObat, - @RequestParam(value = "namaPengambil", required = false) String namaPengambil, - @RequestParam(value = "namaPemberi", required = false) String namaPemberi, HttpServletRequest request) - throws ParseException { - try { - Map result = pelayananObatService.saveAmbilObat(noRec, DateUtil.toDate(tglAmbilObat), - namaPengambil, namaPemberi); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Order Farmasi", "Permintaan", 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); - } 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); - } - - } - - @RequestMapping(value = "/save-pelayanan-obat-only-resep/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePelayananObatOnlyResep(HttpServletRequest request) - throws ParseException { - try { - PelayananObatOnlyResepVO vo = (PelayananObatOnlyResepVO) this.getItem(request, - new PelayananObatOnlyResepVO()); - Map result = pelayananObatService.savePelayananObatOnlyResep(vo); - boolean dataFound = (boolean) result.get("dataFound"); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Order Farmasi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, - getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, 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); - } 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); - } - - } - - @RequestMapping(value = "/get-siklus-gizi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getOrderGizi(@Valid @RequestBody SiklusGiziVO vo, - HttpServletRequest request) { - try { - Map result = orderProdukService.findSiklusGizi(vo); - 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 (ServiceVOException e) { - LOGGER.error("Got exception {} when getSiklusGizi", 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 getSiklusGizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-order-gizi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-order-gizi", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity> saveOrderGizi(HttpServletRequest request) throws ParseException { try { OrderProdukGiziVO vo = (OrderProdukGiziVO) this.getItem(request, new OrderProdukGiziVO()); Map result = orderProdukService.saveOrderPelayananGizi(vo); boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Gizi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonResponse(result, INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when order gizi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when order gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-order-pelayanan-gizi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-pelayanan-gizi/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderPelayananGizi( @RequestParam(value = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate, @@ -2739,52 +1640,24 @@ public class RegistrasiPelayananController extends LocaleController { try { Map result = orderProdukService.getOrderPelayananGizi(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Farmasi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-order-pelayanan-gizi-makanan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getOrderPelayananGiziMakanan( - @RequestParam(value = "startDate", required = false) String startDate, - @RequestParam(value = "endDate", required = false) String endDate, - @RequestParam(value = "ruanganId", required = false) Integer ruanganId, - @RequestParam(value = "jenisWaktuId", required = false) Integer jenisWaktuId, HttpServletRequest request) - throws ParseException { - try { - Map result = orderProdukService.getOrderPelayananGiziMakanan(ruanganId, jenisWaktuId, - DateUtil.toDate(startDate), DateUtil.toDate(endDate)); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Order Gizi", "Permintaan", 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); - } 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); - } - - } - - @RequestMapping(value = "/get-order-pelayanan-gizi-minuman/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-pelayanan-gizi-minuman/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderPelayananGiziMinuman( @RequestParam(value = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate, @@ -2793,47 +1666,47 @@ public class RegistrasiPelayananController extends LocaleController { throws ParseException { try { Map result = orderProdukService.getOrderPelayananGiziMinuman(ruanganId, jenisWaktuId, - DateUtil.toDate(startDate), DateUtil.toDate(endDate)); + toDate(startDate), toDate(endDate)); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Gizi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-gizi-menu-tambahan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-gizi-menu-tambahan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getGiziMenuTambahan(HttpServletRequest request) throws ParseException { try { Map result = orderProdukService.findProdukGiziMenuTambahan(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-komposisi-makanan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-komposisi-makanan/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKomposisiMakanan( @RequestParam(value = "produkId", required = false) Integer produkId, @RequestParam(value = "kelasId", required = false) Integer kelasId, HttpServletRequest request) @@ -2841,23 +1714,23 @@ public class RegistrasiPelayananController extends LocaleController { try { Map result = orderProdukService.getKomposisiMakanan(produkId, kelasId); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-kalori/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kalori/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKalori( @RequestParam(value = "produkId", required = false) Integer produkId, @RequestParam(value = "kelasId", required = false) Integer kelasId, HttpServletRequest request) @@ -2865,23 +1738,23 @@ public class RegistrasiPelayananController extends LocaleController { try { Map result = orderProdukService.getKomposisiMakanan(produkId, kelasId); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-komposisi-formula/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-komposisi-formula/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKomposisiFormula( @RequestParam(value = "produkId", required = false) Integer produkId, @RequestParam(value = "kelasId", required = false) Integer kelasId, HttpServletRequest request) @@ -2889,23 +1762,23 @@ public class RegistrasiPelayananController extends LocaleController { try { Map result = orderProdukService.getKomposisiMakanan(produkId, kelasId); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-pemesanan-bahan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-pemesanan-bahan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPemesananBahan( @RequestParam(value = "produks", required = false) String produks, HttpServletRequest request) throws ParseException { @@ -2917,23 +1790,23 @@ public class RegistrasiPelayananController extends LocaleController { } Map result = orderProdukService.getPemesananBahan(list); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-produksi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-produksi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getProduksi( @RequestParam(value = "noRecOrders", required = true) String noRecOrder, HttpServletRequest request) throws ParseException { @@ -2945,363 +1818,229 @@ public class RegistrasiPelayananController extends LocaleController { } Map result = orderProdukService.getProduksi(list); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-produksi-bahan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getProduksiBahan( - @RequestParam(value = "produks", required = false) String produks, HttpServletRequest request) - throws ParseException { - try { - List list = new ArrayList(); - String[] produkId = produks.split(","); - for (int i = 0; i < produkId.length; i++) { - list.add(Integer.valueOf(produkId[i])); - } - Map result = orderProdukService.getProduksiBahan(list); - 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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-tindakan-pelayanan", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-tindakan-pelayanan", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getTindakanPelayanan( @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) throws ParseException { try { Map result = registrasiPelayananService.getTindakanPelayanan(noRec); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Tindakan", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got exception {} getTindakanPelayanan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} getTindakanPelayanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-order-kirim-menu/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDataOrderKirimMenu( - @RequestParam(value = "noRecStrukOrder", required = false) String noRecStrukOrder) { - Map resultPageMap = orderProdukService.getOrderKirimMenu(noRecStrukOrder); - - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED); - } - - @RequestMapping(value = "/get-kirim-menu", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getKirimMenu( - @RequestParam(value = "produks", required = false) String produks, HttpServletRequest request) - throws ParseException { - try { - List list = new ArrayList(); - String[] produkId = produks.split(","); - for (int i = 0; i < produkId.length; i++) { - list.add(Integer.valueOf(produkId[i])); - } - Map result = orderProdukService.getKirimMenu(list); - 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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/get-kirim-menu-gizi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getKirimMenuGizi( - @RequestParam(value = "produks", required = false) String produks, - @RequestParam(value = "noRecOrders", required = false) String noRecOrder, - @RequestParam(value = "jenisWaktus", required = false) String jenisWaktus, HttpServletRequest request) - throws ParseException { - try { - List list = new ArrayList(); - String[] produkId = produks.split(","); - for (int i = 0; i < produkId.length; i++) { - list.add(Integer.valueOf(produkId[i])); - } - List list2 = new ArrayList(); - String[] jenisWaktuId = jenisWaktus.split(","); - for (int i = 0; i < jenisWaktuId.length; i++) { - list2.add(Integer.valueOf(jenisWaktuId[i])); - } - List list3 = new ArrayList(); - String[] noRecOrderL = noRecOrder.split(","); - for (int i = 0; i < noRecOrderL.length; i++) { - list3.add(noRecOrderL[i]); - } - Map result = orderProdukService.getKirimMenuGizi(list, list3, list2); - 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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/save-verifikasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-verifikasi", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> saveVerifikasi(@RequestBody List dtos, HttpServletRequest request) throws ParseException { try { List> result = orderProdukService.saveVerifikasiGiziAll(dtos); if (result != null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Produk Gizi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonResponse(result, INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when order gizi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when order gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-pemesanan-bahan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> savePemesananBahan( - @RequestParam(value = "noRecOrder", required = false) String noRecOrder, - @RequestParam(value = "jenisWaktuId", required = false) Integer jenisWaktuId, HttpServletRequest request) - throws ParseException { - try { - Map result = orderProdukService.savePemesananBahanGizi(noRecOrder, jenisWaktuId); - boolean dataFound = (boolean) result.get("dataFound"); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Produk Gizi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, - getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when order gizi", 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 order gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/cek-produksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/cek-produksi", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> cekProduksi(HttpServletRequest request) throws ParseException { try { OrderProdukGiziVO vo = (OrderProdukGiziVO) this.getItem(request, new OrderProdukGiziVO()); List> result = orderProdukService.cekStokGiziProduksi(vo); if (result != null) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Cek Produk Gizi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonResponse(result, INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when order gizi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when order gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-produksi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-produksi", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity> saveProduksi(HttpServletRequest request) throws ParseException { try { OrderProdukGiziVO vo = (OrderProdukGiziVO) this.getItem(request, new OrderProdukGiziVO()); Map result = orderProdukService.saveProduksi(vo); boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Produk Gizi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonResponse(result, INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when order gizi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when order gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-kirim-menu", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-kirim-menu", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity> saveKirimMenu(HttpServletRequest request) throws ParseException { try { OrderProdukGiziVO vo = (OrderProdukGiziVO) this.getItem(request, new OrderProdukGiziVO()); Map result = orderProdukService.saveKirimMenu(vo); boolean dataFound = (boolean) result.get("dataFound"); if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Kirim Menu Gizi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { mapHeaderMessage.put(WebConstants.HttpHeaderInfo.ERROR_MESSAGE, getMessage(MessageResource.LABEL_ERROR, request)); - return RestUtil.getJsonResponse(result, HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + return getJsonResponse(result, INTERNAL_SERVER_ERROR, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when order gizi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when order gizi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-kirim-menu-gizi-makanan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kirim-menu-gizi-makanan/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKirimMenuGiziMakanan( @RequestParam(value = "ruanganId", required = false) Integer ruanganId, HttpServletRequest request) throws ParseException { try { Map result = orderProdukService.getOrderPelayananKirimMenuGiziMakanan(ruanganId); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Gizi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-kirim-menu-gizi-minuman/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-kirim-menu-gizi-minuman/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKirimMenuGiziMinuman( @RequestParam(value = "ruanganId", required = false) Integer ruanganId, HttpServletRequest request) throws ParseException { try { Map result = orderProdukService.getOrderPelayananKirimMenuGiziMinuman(ruanganId); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Gizi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-order-laborat/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-order-laborat/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getOrderLaborat( @RequestParam(value = "noOrder", required = false) String noOrder, HttpServletRequest request) throws ParseException { try { Map result = orderProdukService.getOrder(noOrder); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Gizi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got exception {} when get order", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when get order", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-order-produk-lab", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-order-produk-lab", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveOrderProdukLab( @RequestParam(value = "cito", required = false, defaultValue = "0") int cito, @Valid @RequestBody OrderProdukVO vo, HttpServletRequest request) throws ParseException { @@ -3313,11 +2052,11 @@ public class RegistrasiPelayananController extends LocaleController { vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); Map result = orderProdukService.saveOrderProduklab(vo, cito); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); BroadcastMessage("DaftarAntrianLaboratorium", "noRec"); String permintaan = ""; - if (CommonUtil.isNotNullOrEmpty(vo.getRuangan())) { + if (isNotNullOrEmpty(vo.getRuangan())) { Ruangan ruangan = ruanganDao.findOne(vo.getRuangan().getId()); if (ruangan.getNamaRuangan().equals("Bank Darah")) permintaan = "Bank Darah"; @@ -3326,7 +2065,7 @@ public class RegistrasiPelayananController extends LocaleController { if (ruangan.getNamaRuangan().equals("Ruang Gizi")) permintaan = "Ruang Gizi"; } else { - if (CommonUtil.isNotNullOrEmpty(vo.getDetailRadiologi())) { + if (isNotNullOrEmpty(vo.getDetailRadiologi())) { permintaan = "Radiologi"; } else { permintaan = "Laboratorium"; @@ -3334,21 +2073,21 @@ public class RegistrasiPelayananController extends LocaleController { } SaveLog("Order " + permintaan, "Permintaaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got exception {} when add order lab", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when add order lab", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/delete-order-laborat", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/delete-order-laborat", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity> hapusOrderLab( @RequestParam(value = "noRec", required = true) String noRec, HttpServletRequest request) throws ParseException { @@ -3356,25 +2095,25 @@ public class RegistrasiPelayananController extends LocaleController { Map result = orderProdukService.deleteOrderlaboratorium(noRec); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when deleting order", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when deleting order", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/save-tambahan-order", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-tambahan-order", method = POST, produces = APPLICATION_JSON_VALUE) public ResponseEntity> saveOrderLaborat( @RequestParam(value = "cito", required = false, defaultValue = "0") int cito, @Valid @RequestBody Map map, HttpServletRequest request) throws ParseException { @@ -3382,71 +2121,71 @@ public class RegistrasiPelayananController extends LocaleController { Map result = orderProdukService.updateOrderProduklab(map, cito); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order ", "Ubah order laboratorium", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got exception {} when order", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when order", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-produk-produksi-gizi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-produk-produksi-gizi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getProdukProduksiGizi( @RequestParam(value = "menu", required = false) String menu, HttpServletRequest request) throws ParseException { try { List> result = orderProdukService.getAllProdukProduksiGizi(menu); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); SaveLog("Order Gizi", "Permintaan", request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } @SuppressWarnings("unchecked") - @RequestMapping(value = "/jenis-produk/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/jenis-produk/", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getJenisProdukRadiologi(HttpServletRequest request) { try { List> result = registrasiPelayananService.findJenisProdukRadiologi(); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getAllAntrianPasienRadiologi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when getAllAntrianPasienRadiologi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } @SuppressWarnings("unchecked") - @RequestMapping(value = "/antrian-pasien-list-radiologi-new/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllRadiologiVONewWithQueryString( + @RequestMapping(value = "/antrian-pasien-list-radiologi-new/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllRadiologiVONewWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, @RequestParam(value = "sort", required = false, defaultValue = "noRec") String sort, @@ -3466,11 +2205,10 @@ public class RegistrasiPelayananController extends LocaleController { Map resultPageMap = registrasiPelayananService.findAllAntrianPagingByPemeriksaan(page, limit, sort, dir, ruanganId, dateStart, dateEnd, noCm, pegawaiId, asalRuanganId, namaPasien, tglLahir, jenisProduk); - return constructListPageResult(resultPageMap); } - @RequestMapping(value = "/save-operasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-operasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveRencanaOperasi(@Valid @RequestBody RencanaOperasiVO vo, HttpServletRequest request) throws ParseException { try { @@ -3478,66 +2216,24 @@ public class RegistrasiPelayananController extends LocaleController { Map result = rencanaOperasiService.saveOperasi(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-rencana-operasi/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getRencanaOperasi(@PathVariable("noRec") String noRec, - HttpServletRequest request) { - - Map result = null; - try { - - result = rencanaOperasiService.getRencanaOperasiByNorec(noRec); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } catch (Exception e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/save-batal-operasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveBatalOperasi(@Valid @RequestBody RencanaOperasiVO vo, - HttpServletRequest request) throws ParseException { - try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - - Map result = rencanaOperasiService.savePembatalanOperasi(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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-all-permintaan-operasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-permintaan-operasi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllPermintaanOperasi(HttpServletRequest request) { List> result = null; @@ -3545,32 +2241,32 @@ public class RegistrasiPelayananController extends LocaleController { result = rencanaOperasiService.getPermintaanOperasi(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { e.printStackTrace(); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, HttpStatus.OK); } @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-all-rencana-operasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-rencana-operasi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getAllRencanaOperasi(HttpServletRequest request) { List> result = null; try { result = rencanaOperasiService.getRencanaOperasi(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { e.printStackTrace(); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, HttpStatus.OK); } @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-permintaan-operasi-by-nocm-and-date/{startDate}/{endDate}/{noCm}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-permintaan-operasi-by-nocm-and-date/{startDate}/{endDate}/{noCm}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getPermintaanOperasiByNoCmAndDate( @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, @PathVariable("noCm") String noCm, HttpServletRequest request) { @@ -3580,16 +2276,16 @@ public class RegistrasiPelayananController extends LocaleController { result = rencanaOperasiService.getPermintaanOperasi(startDate, endDate, noCm); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { e.printStackTrace(); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, HttpStatus.OK); } @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-rencana-operasi-by-nocm-and-date/{startDate}/{endDate}/{noCm}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-rencana-operasi-by-nocm-and-date/{startDate}/{endDate}/{noCm}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getRencanaOperasiByNoCmAndDate( @PathVariable("startDate") String startDate, @PathVariable("endDate") String endDate, @PathVariable("noCm") String noCm, HttpServletRequest request) { @@ -3599,16 +2295,16 @@ public class RegistrasiPelayananController extends LocaleController { result = rencanaOperasiService.getRencanaOperasi(startDate, endDate, noCm); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { e.printStackTrace(); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, HttpStatus.OK); } @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-permintaan-operasi/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-permintaan-operasi/{noRec}", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getPermintaanOperasi(@PathVariable("noRec") String noRec, HttpServletRequest request) { @@ -3617,54 +2313,31 @@ public class RegistrasiPelayananController extends LocaleController { result = rencanaOperasiService.getPermintaanOperasiByNorec(noRec); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { e.printStackTrace(); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, HttpStatus.OK); } - @RequestMapping(value = "/update-order-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> saveRencanaOperasi(@Valid @RequestBody List vo, - HttpServletRequest request) throws ParseException { - try { - SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy"); - - Map result = strukOrderService.updateOrderPelayanan(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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/update-dokter-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-dokter-pelayanan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> updateDokterPelayanan(@Valid @RequestBody Map vo, HttpServletRequest request) throws ParseException { try { Map result = registrasiPelayananService.updatePelayananDokter(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } @@ -3683,46 +2356,8 @@ public class RegistrasiPelayananController extends LocaleController { return jadwalDpjpRawatInapService.deleteDokterDpjp(noRec); } - @RequestMapping(value = "/save-resume-medis", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addResumeMedis(@Valid @RequestBody ResumeMedisVO vo, - HttpServletRequest request) throws ParseException { - try { - Map result = resumeMedisService.saveResumeMedis(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 add Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-resume-medis/{noRec}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getResumeMedis(@PathVariable("noRec") String noRec, - HttpServletRequest request) { - - Map result = null; - try { - - result = resumeMedisService.getResumeMedis(noRec); - - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } catch (Exception e) { - e.printStackTrace(); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @SuppressWarnings("unchecked") - @RequestMapping(value = "/get-all-ruangan-igd", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-all-ruangan-igd", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getResumeMedis(HttpServletRequest request) { List> result = null; @@ -3730,38 +2365,38 @@ public class RegistrasiPelayananController extends LocaleController { result = registrasiPelayananService.getRuanganIGD(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); } catch (Exception e) { e.printStackTrace(); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, HttpStatus.OK); } - @RequestMapping(value = "/get-data-pasien-daftar", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-data-pasien-daftar", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDataPasienDaftar( @RequestParam(value = "noRec", required = false) String noRec, HttpServletRequest request) { try { Map result = registrasiPelayananService.getDataRegistrasiPelayanan(noRec); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } 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); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(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); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/edit-registrasi-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/edit-registrasi-pelayanan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> editPasien(@Valid @RequestBody RegistrasiPelayananVO vo, HttpServletRequest request) { try { @@ -3772,26 +2407,26 @@ public class RegistrasiPelayananController extends LocaleController { } catch (Exception ex) { ex.getMessage(); } - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { Map headerMessageCustom = new HashMap<>(); headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when save Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when save Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/edit-data-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/edit-data-asuransi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> editAsuransiPasien(@Valid @RequestBody AsuransiRegistrasiPasienVO vo, HttpServletRequest request) { try { @@ -3802,36 +2437,27 @@ public class RegistrasiPelayananController extends LocaleController { } catch (Exception ex) { ex.getMessage(); } - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { Map headerMessageCustom = new HashMap<>(); headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when save Pasien", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when save Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/test-antrian/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> testNoAntrian( - @RequestParam(value = "idRuangan", required = false) Integer idRuangan) { - Integer result = antrianPasienDiperiksaService.getFormatNumberByMonthYearBilik(idRuangan); - Map resultPageMap = new HashMap(); - resultPageMap.put("noAntrian", result); - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.CREATED, mapHeaderMessage); - } - @SuppressWarnings("deprecation") - @RequestMapping(value = "/find-obat", method = RequestMethod.GET) + @RequestMapping(value = "/find-obat", method = GET) public ResponseEntity> findObatProduk( @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, HttpServletRequest request) { String data = request.getQueryString(); @@ -3853,58 +2479,35 @@ public class RegistrasiPelayananController extends LocaleController { } } List resultPageMap = registrasiPelayananService.findDiagnosaByKode(kodeDiagnosa); - return RestUtil.getJsonResponse(resultPageMap, HttpStatus.OK); + return getJsonResponse(resultPageMap, HttpStatus.OK); } - @RequestMapping(value = "/get-data-mapping", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getDataMapping( - @RequestParam(value = "idKelas", required = false) Integer idKelas, HttpServletRequest request) { - try { - Map result = registrasiPelayananService.getListProduk(idKelas); - 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 (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); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when getDataAsuransiPasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-kendali-dokumen-rekam-medis", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-kendali-dokumen-rekam-medis", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveKendaliDokumenRekamMedis( @Valid @RequestBody KendaliDokumenRekamMedisVO vo, HttpServletRequest request) { try { Map result = kendaliDokumenRekamMedisService.saveKendaliDokumenRekamMedis(vo); - if (CommonUtil.isNotNullOrEmpty(result.get("norec"))) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + if (isNotNullOrEmpty(result.get("norec"))) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { Map headerMessageCustom = new HashMap<>(); headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when save kendali dokumen rekam medis", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when save kendali dokumen rekam medis", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-antrian-kendali-dokumen-RM", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-antrian-kendali-dokumen-RM", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getDataMapping( @RequestParam(value = "noCm", required = false) String noCm, @RequestParam(value = "startDate", required = false) String startDate, @@ -3913,24 +2516,24 @@ public class RegistrasiPelayananController extends LocaleController { List> result = registrasiPelayananService.getListAntrian(noCm, startDate, endDate); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataAntriankendaliDokumenRM", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when getDataAntriankendaliDokumenRM", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-daftar-kendali-dokumen-RM", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-daftar-kendali-dokumen-RM", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getDaftarKendaliDokumen( @RequestParam(value = "noCm", required = false) String noCm, @RequestParam(value = "start", required = false) String start, @@ -3941,24 +2544,24 @@ public class RegistrasiPelayananController extends LocaleController { Map result = registrasiPelayananService.findAllKendaliDokumenRekamMedis(noCm, start, end, ruangan, idStatus); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataAntriankendaliDokumenRM", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when getDataAntriankendaliDokumenRM", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-riwayat-registrasi-pasien", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-riwayat-registrasi-pasien", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity>> getRiwayatRegistrasiPasien( @RequestParam(value = "noCm", required = false) String noCm, @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi, @@ -3969,100 +2572,70 @@ public class RegistrasiPelayananController extends LocaleController { startDate, endDate); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataAntriankendaliDokumenRM", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when getDataAntriankendaliDokumenRM", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/get-riwayat-antrian-pasien", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/get-riwayat-antrian-pasien", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getRiwayatAntrianPasien( @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi, HttpServletRequest request) { try { Map result = registrasiPelayananService.riwayatAntrianPasien(noRegistrasi); if (null != result) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); } else { - return RestUtil.getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); + return getJsonResponse(result, HttpStatus.NOT_FOUND, mapHeaderMessage); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when getDataAntriankendaliDokumenRM", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when getDataAntriankendaliDokumenRM", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - @RequestMapping(value = "/update-kelas-pelayanan", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateKelasPelayanan(@Valid @RequestBody RegistrasiPelayananVO vo, - HttpServletRequest request) { - try { - Map result = registrasiPelayananService.updateKelas(vo); - if (CommonUtil.isNullOrEmpty(result.get("statusPasien"))) { - try { - BroadcastMessage("DaftarAntrian", result.get("noRec").toString()); - } catch (Exception ex) { - ex.getMessage(); - } - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - } else { - Map headerMessageCustom = new HashMap<>(); - headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); - } - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Pasien", 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 Pasien", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - } - - @RequestMapping(value = "/save-akomodasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-akomodasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> saveAkomodasi( @RequestParam(value = "noRecPasienDaftar", required = false) String noRecPasienDaftar, HttpServletRequest request) { try { Map result = registrasiPelayananService.trigerringSaveAkomodasi(noRecPasienDaftar); - if (CommonUtil.isNotNullOrEmpty(result.get("norec"))) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + if (isNotNullOrEmpty(result.get("norec"))) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); + return getJsonResponse(result, CREATED, mapHeaderMessage); } else { Map headerMessageCustom = new HashMap<>(); headerMessageCustom.put("label-success", (String) result.get("statusPasien")); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, headerMessageCustom); + return getJsonResponse(result, CREATED, headerMessageCustom); } } catch (ServiceVOException e) { LOGGER.error("Got exception {} when save akomodasi", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { LOGGER.error("Got exception {} when save akomodasi", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java index 5efb497c..ec6b7d99 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/base/LocaleController.java @@ -1,28 +1,23 @@ package com.jasamedika.medifirst2000.controller.base; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.reflect.Type; -import java.net.URISyntaxException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonDeserializer; +import com.jasamedika.medifirst2000.base.vo.BaseModelVO; +import com.jasamedika.medifirst2000.constants.Constants; +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.core.web.WebConstants; +import com.jasamedika.medifirst2000.entities.Pegawai; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.ActivityPegawaiService; +import com.jasamedika.medifirst2000.service.LoginUserService; +import com.jasamedika.medifirst2000.service.ModelService; +import com.jasamedika.medifirst2000.util.rest.RestUtil; +import com.jasamedika.medifirst2000.vo.ModelVO; +import com.jasamedika.medifirst2000.vo.PasienVO; +import com.jasamedika.medifirst2000.vo.PegawaiVO; +import io.socket.client.IO; +import io.socket.client.Socket; import org.json.JSONException; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; @@ -34,27 +29,14 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonParseException; -import com.jasamedika.medifirst2000.base.vo.BaseModelVO; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.entities.Pegawai; -import com.jasamedika.medifirst2000.service.ActivityPegawaiService; -import com.jasamedika.medifirst2000.service.AgamaService; -import com.jasamedika.medifirst2000.service.LoginUserService; -import com.jasamedika.medifirst2000.service.ModelService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.ModelVO; -import com.jasamedika.medifirst2000.vo.PasienVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; - -import io.socket.client.IO; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URISyntaxException; +import java.util.*; /** * Base Controller Class for handling messaga resource for internationalization @@ -63,31 +45,27 @@ import io.socket.client.IO; * @author Roberto */ public abstract class LocaleController { + /* * messageSource bean injected for each controller for accessing message * source */ - @Autowired private ActivityPegawaiService activityPegawaiServiceImpl; - - + @Autowired private BaseConverterImpl pegawaiConverter; - + @Autowired private LoginUserService loginUserService; - + @Autowired private MessageSource messageSource; @Autowired - private ModelService modelService; - + private ModelService modelService; - @Autowired - private AgamaService agamaService; - protected Map mapHeaderMessage = new HashMap(); + protected Map mapHeaderMessage = new HashMap<>(); /* * code locale @@ -95,72 +73,54 @@ public abstract class LocaleController { protected String getMessage(String code, HttpServletRequest request) { return messageSource.getMessage(code, null, new Locale(getCoociesLanguage(request))); } - - protected void SaveLog(String keterangan,String group, HttpServletRequest request) { - activityPegawaiServiceImpl.record(pegawaiConverter.transferModelToVO(loginUserService.getLoginUser().getPegawai(), new PegawaiVO()) , new Date(), keterangan,group); - } - protected Object getItem(HttpServletRequest request,Object vo) - { - BufferedReader reader; - String read = null; - String resultData = ""; - Gson gson = new Gson(); - try { - reader = new BufferedReader(new InputStreamReader(request.getInputStream())); - - - while ((read = reader.readLine()) != null) { - resultData += read; - System.out.println(read); - } - - gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss")//.excludeFieldsWithoutExposeAnnotation() - .create(); + protected void SaveLog(String keterangan, String group, HttpServletRequest request) { + activityPegawaiServiceImpl.record( + pegawaiConverter.transferModelToVO(loginUserService.getLoginUser().getPegawai(), new PegawaiVO()), + new Date(), keterangan, group); + } + + protected Object getItem(HttpServletRequest request, Object vo) { + try { + StringBuilder resultData = new StringBuilder(); + BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream())); + String read; + while ((read = reader.readLine()) != null) + resultData.append(read); + Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create(); + return gson.fromJson(resultData.toString(), vo.getClass()); } catch (IOException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return vo= gson.fromJson(resultData, vo.getClass()); } - protected Object getItem2(HttpServletRequest request,Object vo) - { - BufferedReader reader; - String read = null; - String resultData = ""; - Gson gson = new Gson(); + protected Object getItem2(HttpServletRequest request, Object vo) { try { - reader = new BufferedReader(new InputStreamReader(request.getInputStream())); - - while ((read = reader.readLine()) != null) { - resultData += read; - System.out.println(read); - } + String read; + StringBuilder resultData = new StringBuilder(); + BufferedReader reader = new BufferedReader(new InputStreamReader(request.getInputStream())); + while ((read = reader.readLine()) != null) + resultData.append(read); GsonBuilder gsonBuilder = new GsonBuilder(); - gsonBuilder.registerTypeAdapter(Date.class, new JsonDeserializer() { - @Override - public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException { - if(json.getAsString() instanceof String){ - return new Date(); - }else{ - return new Date(json.getAsJsonPrimitive().getAsLong()); - } - } - }); - gson = gsonBuilder.create(); + gsonBuilder.registerTypeAdapter(Date.class, (JsonDeserializer) (json, typeOfT, context) -> { + if (json.getAsString() != null) { + return new Date(); + } else { + return new Date(json.getAsJsonPrimitive().getAsLong()); + } + }); + Gson gson = gsonBuilder.create(); + return gson.fromJson(resultData.toString(), vo.getClass()); } catch (IOException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return vo= gson.fromJson(resultData, vo.getClass()); } @RequestMapping(value = "/lang/{lang}", method = RequestMethod.GET) public boolean preHandle(HttpServletRequest request, HttpServletResponse response, - @PathVariable("lang") String lang) throws Exception { - + @PathVariable("lang") String lang) { Cookie[] cookies = request.getCookies(); - List cookieList = new ArrayList(); + List cookieList; if (cookies != null) { cookieList = Arrays.asList(cookies); for (Cookie cookie : cookieList) { @@ -172,7 +132,6 @@ public abstract class LocaleController { } } } - if (lang.equalsIgnoreCase("en")) { Cookie c = new Cookie("lang", "en"); c.setPath("/"); @@ -189,7 +148,6 @@ public abstract class LocaleController { c.setDomain("localhost"); response.addCookie(c); } - return true; } @@ -211,134 +169,101 @@ public abstract class LocaleController { } public String getCoociesLanguage(HttpServletRequest request) { - Cookie cookie[] = request.getCookies(); + Cookie[] cookie = request.getCookies(); Cookie cook; String lang = Constants.Locale.INA; if (cookie != null) { - for (int i = 0; i < cookie.length; i++) { - cook = cookie[i]; + for (Cookie value : cookie) { + cook = value; if (cook.getName().equalsIgnoreCase("lang")) lang = cook.getValue(); } } - return lang; - } - @SuppressWarnings("rawtypes") - protected ResponseEntity constructListPageResult(Map map) { - + protected ResponseEntity> constructListPageResult(Map map) { if (map == null) { - Map mapHeaderMessage = new HashMap(); + Map mapHeaderMessage = new HashMap<>(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_PAGE_HEADER, "0"); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_COUNT_HEADER, "0"); mapHeaderMessage.put(Constants.MessageInfo.ERROR_MESSAGE, "Data not found."); return RestUtil.getJsonResponse(null, HttpStatus.BAD_REQUEST, mapHeaderMessage); } else { - @SuppressWarnings("unchecked") Collection vos = (Collection) map.get(WebConstants.PageParameter.LIST_DATA); - - Map mapHeaderMessage = new HashMap(); + Map mapHeaderMessage = new HashMap<>(); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_PAGE_HEADER, String.valueOf(map.get(WebConstants.PageParameter.TOTAL_PAGES))); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.TOTAL_COUNT_HEADER, String.valueOf(map.get(WebConstants.PageParameter.TOTAL_ELEMENTS))); - return RestUtil.getJsonResponse(vos, HttpStatus.OK, mapHeaderMessage); } } -// @PersistenceContext -// protected EntityManager em; - public String GetSettingDataFixed(String prefix) { return activityPegawaiServiceImpl.GetSettingDataFixed(prefix); -// StringBuffer buffer = new StringBuffer(); -// buffer.append("select model.nilaiField from SettingDataFixed ") -// .append(" model where model.namaField ='" + prefix + "' "); -// Query query = em.createQuery(buffer.toString()); -// -// return (String) query.getSingleResult(); } - protected void BroadcastMessage(final String to, final Object data) { - final io.socket.client.Socket socket; - try { - String url =GetSettingDataFixed("UrlSocketMessaging"); - socket = IO.socket(url); - socket.on(io.socket.client.Socket.EVENT_CONNECT, new io.socket.emitter.Emitter.Listener() { - - @Override - public void call(Object... args) { - - try { - Gson gson = new Gson(); - String json = gson.toJson(data); - JSONObject item= new JSONObject("{\"to\":\""+to+"\",\"message\":\""+json.replace("\"", "'")+"\"}"); - socket.emit("subscribe", item); - } catch (JSONException e) { - e.printStackTrace(); - } - } - - }); - socket.connect(); - } catch (URISyntaxException e) { - e.printStackTrace(); - } - } - protected void BroadcastMessage(final String to, final String data) { - final io.socket.client.Socket socket; + protected void BroadcastMessage(final Object data) { + final Socket socket; try { - socket = IO.socket(GetSettingDataFixed("UrlSocketMessaging")); - - socket.on(io.socket.client.Socket.EVENT_CONNECT, new io.socket.emitter.Emitter.Listener() { - - @Override - public void call(Object... args) { - - try { - JSONObject item= new JSONObject("{\"to\":\""+to+"\",\"message\":\""+data+"\"}"); - socket.emit("subscribe", item); - } catch (JSONException e) { - e.printStackTrace(); - } - } - - }); - socket.connect(); - } catch (URISyntaxException e) { - e.printStackTrace(); - } - } - - protected void BroadcastMessageOther(final String to, final Object data) { - final io.socket.client.Socket socket; - try { String url = GetSettingDataFixed("UrlSocketMessaging"); socket = IO.socket(url); - - socket.on(io.socket.client.Socket.EVENT_CONNECT, new io.socket.emitter.Emitter.Listener() { - - @Override - public void call(Object... args) { - try { - Map result = new HashMap<>(); - result.put("message", data); - result.put("to", to); - - Gson gson = new Gson(); - JSONObject item = new JSONObject(gson.toJson(result)); - socket.emit("subscribe", item); - } catch (JSONException e) { - e.printStackTrace(); - } + socket.on(Socket.EVENT_CONNECT, args -> { + try { + Gson gson = new Gson(); + String json = gson.toJson(data); + JSONObject item = new JSONObject( + "{\"to\":\"" + "ResultLabDevice" + "\",\"message\":\"" + json.replace("\"", "'") + "\"}"); + socket.emit("subscribe", item); + } catch (JSONException e) { + throw new ServiceVOException(e.getMessage()); } }); socket.connect(); } catch (URISyntaxException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); + } + } + + protected void BroadcastMessage(final String to, final String data) { + final Socket socket; + try { + socket = IO.socket(GetSettingDataFixed("UrlSocketMessaging")); + socket.on(Socket.EVENT_CONNECT, args -> { + try { + JSONObject item = new JSONObject("{\"to\":\"" + to + "\",\"message\":\"" + data + "\"}"); + socket.emit("subscribe", item); + } catch (JSONException e) { + throw new ServiceVOException(e.getMessage()); + } + }); + socket.connect(); + } catch (URISyntaxException e) { + throw new ServiceVOException(e.getMessage()); + } + } + + protected void BroadcastMessageOther(final Object data) { + final Socket socket; + try { + String url = GetSettingDataFixed("UrlSocketMessaging"); + socket = IO.socket(url); + socket.on(Socket.EVENT_CONNECT, args -> { + try { + Map result = new HashMap<>(); + result.put("message", data); + result.put("to", "PermintaanPerbaikan"); + Gson gson = new Gson(); + JSONObject item = new JSONObject(gson.toJson(result)); + socket.emit("subscribe", item); + } catch (JSONException e) { + throw new ServiceVOException(e.getMessage()); + } + }); + socket.connect(); + } catch (URISyntaxException e) { + throw new ServiceVOException(e.getMessage()); } }