diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PemakaianAsuransiService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PemakaianAsuransiService.java index 3b021b1b..6310d053 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PemakaianAsuransiService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PemakaianAsuransiService.java @@ -1,15 +1,15 @@ package com.jasamedika.medifirst2000.service; +import com.jasamedika.medifirst2000.dto.SuratEligibilitasAsuransi; +import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO; + import java.util.List; import java.util.Map; -import com.jasamedika.medifirst2000.entities.PemakaianAsuransi; -import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO; - public interface PemakaianAsuransiService { - Map savePemakaianAsuransi(PemakaianAsuransiVO vo); - List findByNoSep(String noSep); - - + Map savePemakaianAsuransi(PemakaianAsuransiVO vo); + + List findByNoSep(String noSep); + } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemakaianAsuransiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemakaianAsuransiServiceImpl.java index 20a01b0d..86e46177 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemakaianAsuransiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemakaianAsuransiServiceImpl.java @@ -1,92 +1,66 @@ package com.jasamedika.medifirst2000.service.impl; +import com.jasamedika.medifirst2000.converter.BaseConverterImpl; +import com.jasamedika.medifirst2000.dao.*; +import com.jasamedika.medifirst2000.dto.SuratEligibilitasAsuransi; +import com.jasamedika.medifirst2000.entities.*; +import com.jasamedika.medifirst2000.service.PemakaianAsuransiService; +import com.jasamedika.medifirst2000.util.CommonUtil; +import com.jasamedika.medifirst2000.vo.DiagnosaVO; +import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.UUID; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.jasamedika.medifirst2000.vo.DataAsuransiVO; -import com.jasamedika.medifirst2000.vo.DiagnosaVO; - -import com.jasamedika.medifirst2000.entities.DataAsuransi; -import com.jasamedika.medifirst2000.entities.Departemen; -import com.jasamedika.medifirst2000.entities.DetailKamar; -import com.jasamedika.medifirst2000.entities.Diagnosa; - -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.PemakaianAsuransiService; -import com.jasamedika.medifirst2000.service.RegistrasiPelayananPasienService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.entities.PemakaianAsuransi; -import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien; -import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO; -import com.jasamedika.medifirst2000.converter.BaseConverterImpl; -import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; -import com.jasamedika.medifirst2000.dao.DepartemenDao; -import com.jasamedika.medifirst2000.dao.DetailKamarDao; -import com.jasamedika.medifirst2000.dao.PasienDaftarDao; -import com.jasamedika.medifirst2000.dao.PemakaianAsuransiDao; -import com.jasamedika.medifirst2000.dao.RegistrasiPelayananPasienDao; -import com.jasamedika.medifirst2000.dto.SuratEligibilitasAsuransi; /** * Implement class for PemakaianAsuransiService * * @author Generator - * @param */ @Service("pemakaianAsuransiService") public class PemakaianAsuransiServiceImpl extends BaseVoServiceImpl implements PemakaianAsuransiService { + @Autowired private BaseConverterImpl pemakaianAsuransiConverter; - @Autowired - private BaseConverterImpl dataAsuransiConverter; @Autowired private BaseConverterImpl diagnosaConverter; @Autowired private PemakaianAsuransiDao pemakaianAsuransiDao; - + @Autowired private DetailKamarDao detailKamarDao; @Autowired private DepartemenDao departemenDao; - + @Autowired - private PasienDaftarDao pasienDaftarDao; - @Autowired - private com.jasamedika.medifirst2000.dao.DataAsuransiDao dataAsuransiDao; + private DataAsuransiDao dataAsuransiDao; + @Autowired private AntrianPasienDiPeriksaDao antrianPasienDiPeriksaDao; - @Autowired - private RegistrasiPelayananPasienService registrasiPelayananPasienService; - + @Override public Map savePemakaianAsuransi(PemakaianAsuransiVO vo) { - Map result = new HashMap(); + Map result = new HashMap<>(); PemakaianAsuransi model = new PemakaianAsuransi(); model = pemakaianAsuransiConverter.transferVOToModel(vo, model); - model.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasienDaftar().getPasien().getId(), - vo.getPasienDaftar().getTglRegistrasi()).getPasienDaftar()); + model.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi((short) 0, + vo.getPasienDaftar().getPasien().getId(), vo.getPasienDaftar().getTglRegistrasi()).getPasienDaftar()); if (CommonUtil.isNotNullOrEmpty(vo.getAsuransi())) { - List list=dataAsuransiDao.findByNoKepesertaan(vo.getNoKepesertaan()); - + List list = dataAsuransiDao.findByNoKepesertaan(vo.getNoKepesertaan()); + DataAsuransi dataAsuransi = new DataAsuransi(); - if(list.size()!=0) - dataAsuransi=list.get(0); + if (!list.isEmpty()) + dataAsuransi = list.get(0); dataAsuransi.setNoKepesertaan(vo.getNoKepesertaan()); dataAsuransi.setPasien(model.getPasienDaftar().getPasien()); - dataAsuransi = dataAsuransiDao.save(dataAsuransi); - //model.setAsuransi(dataAsuransi); + dataAsuransiDao.save(dataAsuransi); } if (CommonUtil.isNotNullOrEmpty(vo.getDiagnosis())) { model.setDiagnosis(diagnosaConverter.transferVOToModel(vo.getDiagnosis(), new Diagnosa())); @@ -99,10 +73,9 @@ public class PemakaianAsuransiServiceImpl extends BaseVoServiceImpl implements P return result; } - @Autowired - private RegistrasiPelayananPasienDao registrasiPelayananPasienDao; + @Override - public List findByNoSep(String noSep) { + public List findByNoSep(String noSep) { SuratEligibilitasAsuransi suratEligibilitasAsuransi = new SuratEligibilitasAsuransi(); PemakaianAsuransi pemakaianAsuransi = pemakaianAsuransiDao.finByNoSep(noSep); RegistrasiPelayananPasien registrasiPelayananPasien = new RegistrasiPelayananPasien(); @@ -110,13 +83,11 @@ public class PemakaianAsuransiServiceImpl extends BaseVoServiceImpl implements P DetailKamar detailKamar = new DetailKamar(); if (CommonUtil.isNotNullOrEmpty(pemakaianAsuransi)) { suratEligibilitasAsuransi.setPemakaianAsuransi(pemakaianAsuransi); -// registrasiPelayananPasien = registrasiPelayananPasienService -// .find(pemakaianAsuransi.getPasien().getPasienDaftar().getPasien().getNoCm()); - departemen = departemenDao.findById(pemakaianAsuransi.getPasienDaftar().getRuangan().getDepartemen().getId()); + departemen = departemenDao + .findById(pemakaianAsuransi.getPasienDaftar().getRuangan().getDepartemen().getId()); } if (CommonUtil.isNotNullOrEmpty(pemakaianAsuransi.getPasienDaftar())) { detailKamar = detailKamarDao.findById(pemakaianAsuransi.getPasienDaftar().getKelas().getId()); - //registrasiPelayananPasien=registrasiPelayananPasienDao.finByNoRecs(pemakaianAsuransi.getPasien().getPasienDaftar().getNoRec()).get(0); registrasiPelayananPasien.setPasien(pemakaianAsuransi.getPasienDaftar().getPasien()); suratEligibilitasAsuransi.setRegistrasiPelayananPasien(registrasiPelayananPasien); } @@ -126,8 +97,9 @@ public class PemakaianAsuransiServiceImpl extends BaseVoServiceImpl implements P if (CommonUtil.isNotNullOrEmpty(departemen)) { suratEligibilitasAsuransi.setDetailKamar(detailKamar); } - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(suratEligibilitasAsuransi); return list; } -} \ No newline at end of file + +} diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AgamaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AgamaController.java index 03f2fae9..34d292b9 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AgamaController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AgamaController.java @@ -1,42 +1,44 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.IBaseRestController; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.entities.Agama; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.AgamaService; +import com.jasamedika.medifirst2000.vo.AgamaVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.IBaseRestController; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.entities.Agama; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.AgamaService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AgamaVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Collection; +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("/agama") public class AgamaController extends LocaleController implements IBaseRestController { @Autowired - private AgamaService agamaService; + private AgamaService agamaService; private static final Logger LOGGER = LoggerFactory.getLogger(AgamaController.class); @@ -51,74 +53,67 @@ public class AgamaController extends LocaleController implements IBaseR return null; } - @RequestMapping(value = "/save-agama/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/save-agama/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity addVO(@Valid @RequestBody AgamaVO vo, HttpServletRequest request) { try { - AgamaVO result = (AgamaVO) agamaService.add(vo); - + AgamaVO result = agamaService.add(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse("", HttpStatus.CREATED, mapHeaderMessage); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse("", CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when add Agama", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when save Agama", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Agama", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when save Agama", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/update-agama/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/update-agama/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity editVO(@Valid @RequestBody AgamaVO vo) { try { - AgamaVO result = (AgamaVO) agamaService.update(vo); - + AgamaVO result = agamaService.update(vo); if (null != result) - return RestUtil.getJsonResponse("", HttpStatus.OK); + return getJsonResponse("", OK); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when update Agama", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when update Agama", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update Agama", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when update Agama", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttptatus(NOT_ACCEPTABLE); } - @RequestMapping(value = "/delete-agama/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/delete-agama/", method = GET, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity deleteVO(Integer id) { try { - if (agamaService.delete(id) == true) - return RestUtil.getJsonResponse("", HttpStatus.CREATED); - + if (agamaService.delete(id)) + return getJsonResponse("", CREATED); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when delete Agama", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when delete Agama", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when delete Agama", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when delete Agama", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); + return getJsonHttptatus(NOT_ACCEPTABLE); } @Override public ResponseEntity> getAllVO() { List agamaList = agamaService.findAll(); - return RestUtil.getJsonResponse(agamaList, HttpStatus.OK); + return getJsonResponse(agamaList, HttpStatus.OK); } @SuppressWarnings("unchecked") - @RequestMapping(value = "/search-agama", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + @RequestMapping(value = "/search-agama", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getAllVOWithQueryString( @RequestParam(value = "page", required = false, defaultValue = "0") Integer page, @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit, @@ -126,18 +121,9 @@ public class AgamaController extends LocaleController implements IBaseR @RequestParam(value = "dir", required = false, defaultValue = "asc") String dir) { Map resultPageMap = agamaService.findAllWithPageAndLimitAndSortByAndDirectionParameter(page, limit, sort, dir); - return constructListPageResult(resultPageMap); } - @SuppressWarnings("unchecked") - @RequestMapping(value = "/find-agama", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity getAllVOWithQueryString(@RequestParam(value = "id", required = true) Integer id) { - Agama agama = agamaService.findByIdAgama(id); - - return RestUtil.getJsonResponse(agama.getAgama(), HttpStatus.OK); - } - @Override public ResponseEntity addVO(AgamaVO vo) { return null; diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java index 400512c9..5953f5c9 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ApresiasiAtasLayananController.java @@ -1,133 +1,79 @@ package com.jasamedika.medifirst2000.controller; -import java.util.Date; -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.ApresiasiAtasLayananService; +import com.jasamedika.medifirst2000.vo.ApresiasiAtasLayananVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.ApresiasiAtasLayananService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.ApresiasiAtasLayananVO; +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.util.Map; + +import static com.jasamedika.medifirst2000.constants.Constants.MessageInfo.ERROR_MESSAGE; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_ERROR; +import static com.jasamedika.medifirst2000.core.web.WebConstants.HttpHeaderInfo.LABEL_SUCCESS; +import static com.jasamedika.medifirst2000.util.rest.RestUtil.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("/apresiasi-atas-layanan") -public class ApresiasiAtasLayananController extends LocaleController{ - +public class ApresiasiAtasLayananController extends LocaleController { + @Autowired private ApresiasiAtasLayananService apresiasiAtasLayananService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(ApresiasiAtasLayananController.class); - - @RequestMapping(value = "/save-apresiasi-atas-layanan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody ApresiasiAtasLayananVO vo, HttpServletRequest request) { - + + private static final Logger LOGGER = LoggerFactory.getLogger(ApresiasiAtasLayananController.class); + + @RequestMapping(value = "/save-apresiasi-atas-layanan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> addVO(@Valid @RequestBody ApresiasiAtasLayananVO vo, + HttpServletRequest request) { try { - Map result=apresiasiAtasLayananService.addApresiasiAtasLayanan(vo); + Map result = apresiasiAtasLayananService.addApresiasiAtasLayanan(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 Apresiasi Atas Layanan", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when save Apresiasi Atas Layanan", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Apresiasi Atas Layanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when save Apresiasi Atas Layanan", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/update-apresiasi-atas-layanan/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateVO(@Valid @RequestBody ApresiasiAtasLayananVO vo, HttpServletRequest request) { - - try { - Map result=apresiasiAtasLayananService.updateApresiasiAtasLayanan(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 Apresiasi Atas Layanan", 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 Apresiasi Atas Layanan", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/find-all-apresiasi-atas-layanan/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVO(HttpServletRequest request) { - - try { - Map result=apresiasiAtasLayananService.findAllApresiasiAtasLayanan(); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all sasaran strategis", 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 sasaran strategis", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/rekap-apresiasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) + + @RequestMapping(value = "/rekap-apresiasi", method = GET, produces = APPLICATION_JSON_VALUE) public ResponseEntity> getKelasByRuangan( @RequestParam(value = "from", required = false) String from, - @RequestParam(value = "to", required = false) String to, - HttpServletRequest request) { - Map result = null; - try{ - result =apresiasiAtasLayananService.rekapApresiasi(from, to); - Boolean dataFound=new Boolean((boolean) result.get("dataFound")); - - if(dataFound){ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); + @RequestParam(value = "to", required = false) String to, HttpServletRequest request) { + Map result; + try { + result = apresiasiAtasLayananService.rekapApresiasi(from, to); + boolean dataFound = (boolean) result.get("dataFound"); + if (dataFound) { + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + } else { + mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request)); } - else{ - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,getMessage(MessageResource.LABEL_ERROR,request )); - } - }catch (Exception e){ - e.printStackTrace(); + } catch (Exception e) { + throw new ServiceVOException(e.getMessage()); } - return RestUtil.getJsonResponse(result, HttpStatus.OK); + return getJsonResponse(result, OK); } - + } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsesmenGiziLanjutController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsesmenGiziLanjutController.java index 974f6047..3aa858cc 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsesmenGiziLanjutController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsesmenGiziLanjutController.java @@ -1,32 +1,31 @@ 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.AsesmenGiziLanjutService; +import com.jasamedika.medifirst2000.vo.AsesmenGiziLanjutVO; +import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.orm.jpa.JpaSystemException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.AsesmenGiziLanjutService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AsesmenGiziLanjutVO; -import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO; +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.POST; @RestController @RequestMapping("/asesmen-gizi-lanjut") @@ -37,65 +36,24 @@ public class AsesmenGiziLanjutController extends LocaleController> saveAsesmenGiziLanjut(@Valid @RequestBody AsesmenGiziLanjutVO vo, HttpServletRequest request) { try { Map result = asesmenGiziLanjutService.saveAsesmenGiziLanjut(vo); if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - SaveLog("Assesment Gizi Lanjut", "Pemeriksaan Khusus",request); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + SaveLog("Assesment Gizi Lanjut", "Pemeriksaan Khusus", request); + return getJsonResponse(result, CREATED, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when save Asesmen Gizi Lanjut", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when save Asesmen Gizi Lanjut", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when save Asesmen Gizi Lanjut", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when save Asesmen Gizi Lanjut", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - - } - - @RequestMapping(value = "/update-asesmen-gizi-lanjut", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateAsesmenGiziLanjut(@Valid @RequestBody AsesmenGiziLanjutVO vo, - HttpServletRequest request) { - try { - Map result = asesmenGiziLanjutService.updateAsesmenGiziLanjut(vo); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage); - - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when update Asesmen Gizi Lanjut", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); - } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update Asesmen Gizi Lanjut", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - - @RequestMapping(value = "/find-by-noRegistrasi/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> findByNoRegistrasi( - @RequestParam(value = "noRegistrasi", required = false) String noRegistrasi, HttpServletRequest request) { - - Map result = asesmenGiziLanjutService.findByNoRegistrasi(noRegistrasi); - Boolean dataFound = new Boolean((boolean) result.get("dataFound")); - if (dataFound) { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - } else { - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR, - getMessage(MessageResource.LABEL_ERROR, request)); - } - return RestUtil.getJsonResponse(result, HttpStatus.OK); } } diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuransiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuransiController.java index 5df5bac3..148bee3e 100644 --- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuransiController.java +++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AsuransiController.java @@ -1,302 +1,197 @@ package com.jasamedika.medifirst2000.controller; +import com.jasamedika.medifirst2000.constants.MessageResource; +import com.jasamedika.medifirst2000.controller.base.LocaleController; +import com.jasamedika.medifirst2000.dto.SuratEligibilitasAsuransi; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.BridgingBpjs; +import com.jasamedika.medifirst2000.service.PemakaianAsuransiService; +import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.orm.jpa.JpaSystemException; +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 org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.orm.jpa.JpaSystemException; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.ModelAndView; - -import com.jasamedika.medifirst2000.base.vo.BaseModelVO; -import com.jasamedika.medifirst2000.constants.Constants; -import com.jasamedika.medifirst2000.constants.MessageResource; -import com.jasamedika.medifirst2000.controller.base.LocaleController; -import com.jasamedika.medifirst2000.core.web.WebConstants; -import com.jasamedika.medifirst2000.dao.DepartemenDao; -import com.jasamedika.medifirst2000.dao.DetailKamarDao; -import com.jasamedika.medifirst2000.dao.PemakaianAsuransiDao; -import com.jasamedika.medifirst2000.dto.SuratEligibilitasAsuransi; -import com.jasamedika.medifirst2000.entities.Departemen; -import com.jasamedika.medifirst2000.entities.DetailKamar; -import com.jasamedika.medifirst2000.entities.PemakaianAsuransi; -import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien; -import com.jasamedika.medifirst2000.exception.ServiceVOException; -import com.jasamedika.medifirst2000.service.AlamatService; -import com.jasamedika.medifirst2000.service.BridgingBpjs; -import com.jasamedika.medifirst2000.service.PemakaianAsuransiService; -import com.jasamedika.medifirst2000.service.RegistrasiPelayananPasienService; -import com.jasamedika.medifirst2000.service.RegistrasiPelayananService; -import com.jasamedika.medifirst2000.util.CommonUtil; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.AlamatVO; -import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO; +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("/asuransi") public class AsuransiController extends LocaleController { - + @Autowired - private BridgingBpjs bridgingBpjs; - - @Autowired - private PemakaianAsuransiDao pemakaianAsuransiDao; - + private BridgingBpjs bridgingBpjs; + @Autowired private PemakaianAsuransiService pemakaianAsuransiService; - @Autowired - private RegistrasiPelayananPasienService registrasiPelayananPasienService; - - @Autowired - private RegistrasiPelayananService registrasiPelayananService; - - public AsuransiController() { + public AsuransiController() { } - private static final Logger LOGGER = LoggerFactory.getLogger(RegistrasiPelayananController.class); - - @RequestMapping(value = "/save-pemakaian-asuransi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) + + private static final Logger LOGGER = LoggerFactory.getLogger(AsuransiController.class); + + @RequestMapping(value = "/save-pemakaian-asuransi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) public ResponseEntity> savePemakaianAsuransi(@Valid @RequestBody PemakaianAsuransiVO vo, HttpServletRequest request) throws ParseException { try { - Map mapHeaderMessage = new HashMap(); + Map mapHeaderMessage = new HashMap<>(); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); vo.setTglRegistrasi(format.parse(vo.getTanggalPendaftaran())); Map result = pemakaianAsuransiService.savePemakaianAsuransi(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 add Pasien", 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 add Pasien", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - @RequestMapping(value = "/check-kepesertaan/{id}", method = RequestMethod.GET) + @RequestMapping(value = "/check-kepesertaan/{id}", method = GET) public ResponseEntity checkKepesertaaan(@RequestParam(value = "id", required = false) String id) { Object peserta = bridgingBpjs.CekKepesertaan(id); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + return getJsonResponse(peserta, OK); } - - @RequestMapping(value = "/detail-sep-peserta/", method = RequestMethod.GET) - public ResponseEntity getDetailSEPPeserta(@RequestParam(value = "noSep", required = true) String noSep) { + + @RequestMapping(value = "/detail-sep-peserta/", method = GET) + public ResponseEntity getDetailSEPPeserta(@RequestParam(value = "noSep") String noSep) { Object peserta = bridgingBpjs.getDetailSEP(noSep); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + return getJsonResponse(peserta, OK); } - - @RequestMapping(value = "/data-kunjungan-peserta/", method = RequestMethod.GET) - public ResponseEntity getDataKunjunganPeserta(@RequestParam(value = "noSep", required = true) String noSep) { + + @RequestMapping(value = "/data-kunjungan-peserta/", method = GET) + public ResponseEntity getDataKunjunganPeserta(@RequestParam(value = "noSep") String noSep) { Object peserta = bridgingBpjs.getDataKunjunganPeserta(noSep); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + return getJsonResponse(peserta, OK); } - - @RequestMapping(value = "/data-riwayat-pelayanan-peserta/", method = RequestMethod.GET) - public ResponseEntity getDataRiwayatPelayananPeserta(@RequestParam(value = "noKartu", required = true) String noKartu) { + + @RequestMapping(value = "/data-riwayat-pelayanan-peserta/", method = GET) + public ResponseEntity getDataRiwayatPelayananPeserta(@RequestParam(value = "noKartu") String noKartu) { Object peserta = bridgingBpjs.getDataRiwayatPelayananPeserta(noKartu); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + return getJsonResponse(peserta, OK); } - - @RequestMapping(value = "/check-rujukan/{id}", method = RequestMethod.GET) - public ResponseEntity cekRujukan(@RequestParam(value = "noRujukan", required = false) String noRujukan) { - Object rujukan = bridgingBpjs.CekNoRujukan(noRujukan); - return RestUtil.getJsonResponse(rujukan, HttpStatus.OK); - } - - @RequestMapping(value = "/generate-sep", method = RequestMethod.GET) - public ResponseEntity generateSep( - - @RequestParam(value = "noBpjs", required = false) String noBpjs, - @RequestParam(value = "tanggalRujukan", required = false) String tanggalRujuakn, - @RequestParam(value = "tanggalSep", required = false) String tanggalSep, - @RequestParam(value = "noRujukan", required = false) String noRujukan, + @RequestMapping(value = "/generate-sep", method = GET) + public ResponseEntity generateSep(@RequestParam(value = "noBpjs", required = false) String noBpjs, + @RequestParam(value = "tanggalRujukan", required = false) String tanggalRujuakn, + @RequestParam(value = "tanggalSep", required = false) String tanggalSep, + @RequestParam(value = "noRujukan", required = false) String noRujukan, @RequestParam(value = "ppkRujukan", required = false) String ppkRujukan, - @RequestParam(value = "isRawatJalan", required = false) String isRawatJalan, - @RequestParam(value = "catatan", required = false) String catatan, - @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, - @RequestParam(value = "poliTujuan", required = false) String poliTujuan, + @RequestParam(value = "isRawatJalan", required = false) String isRawatJalan, + @RequestParam(value = "catatan", required = false) String catatan, + @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, + @RequestParam(value = "poliTujuan", required = false) String poliTujuan, @RequestParam(value = "kelasRawat", required = false) String kelasRawat, - @RequestParam(value = "lakaLantas", required = false) String lakaLantas, - @RequestParam(value = "lokasiLaka", required = false) String lokasiLaka, + @RequestParam(value = "lakaLantas", required = false) String lakaLantas, + @RequestParam(value = "lokasiLaka", required = false) String lokasiLaka, @RequestParam(value = "noCm", required = false) String noCm) { - Object rujukan = bridgingBpjs.GenerateSep(noBpjs, tanggalRujuakn, tanggalSep,noRujukan, ppkRujukan, isRawatJalan.equals("T"), catatan, kodeDiagnosa, poliTujuan, kelasRawat, lakaLantas,lokasiLaka, noCm); - - return RestUtil.getJsonResponse(rujukan, HttpStatus.OK); + Object rujukan = bridgingBpjs.GenerateSep(noBpjs, tanggalRujuakn, tanggalSep, noRujukan, ppkRujukan, + isRawatJalan.equals("T"), catatan, kodeDiagnosa, poliTujuan, kelasRawat, lakaLantas, lokasiLaka, noCm); + return getJsonResponse(rujukan, OK); } - + @RequestMapping("/asuransiBPJS") public ModelAndView generateAsuransiBPJS(ModelAndView m, @RequestParam(value = "format", required = false) String format, - @RequestParam(value = "noSep", required = true) String noSep) { - - List list = pemakaianAsuransiService.findByNoSep(noSep); + @RequestParam(value = "noSep") String noSep) { + List list = pemakaianAsuransiService.findByNoSep(noSep); m.addObject("dataSource", list); m.addObject("tanggalReport", new Date()); m.addObject("title", "SURAT ELIGIBILITAS PESERTA"); m.addObject("format", "pdf"); - - if (format != null && !format.isEmpty()) { + if (format != null && !format.isEmpty()) m.addObject("format", format); - } - return m; } - - @RequestMapping(value = "/update-tanggal-pulang-sep", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> generateSep(@Valid @RequestBody Map vo, HttpServletRequest request){ - Map result = bridgingBpjs.UpdateTanggalPulang( - (String)vo.get("noSep"), (String)vo.get("tglPlg"), (String)vo.get("ppkPelayanan")); - return RestUtil.getJsonResponse(result, HttpStatus.OK); - } - - @RequestMapping(value = "/mapping-sep", method = RequestMethod.GET) - public ResponseEntity mappingSep( - - @RequestParam(value = "noSep", required = false) String noSep, - @RequestParam(value = "noTrans", required = false) String noTrans) { - Object rujukan = bridgingBpjs.mappingTransaksiSep(noSep, noTrans); - return RestUtil.getJsonResponse(rujukan, HttpStatus.OK); - } - - @RequestMapping(value = "/update-tglPulang", method = RequestMethod.GET) - public ResponseEntity updateTglPulang( - - @RequestParam(value = "noSep", required = false) String noSep, + @RequestMapping(value = "/update-tglPulang", method = GET) + public ResponseEntity updateTglPulang(@RequestParam(value = "noSep", required = false) String noSep, @RequestParam(value = "tglPulang", required = false) String tglPulang) { Object rujukan = bridgingBpjs.updateTglPulang(noSep, tglPulang); - - return RestUtil.getJsonResponse(rujukan, HttpStatus.OK); + return getJsonResponse(rujukan, OK); } - - @RequestMapping(value = "/update-sep", method = RequestMethod.GET) - public ResponseEntity> generateSep( - @RequestParam(value = "noSep", required = false) String noSep, - @RequestParam(value = "noBpjs", required = false) String noBpjs, - @RequestParam(value = "tanggalRujukan", required = false) String tanggalRujukan, - @RequestParam(value = "tanggalSep", required = false) String tanggalSep, - @RequestParam(value = "noRujukan", required = false) String noRujukan, + + @RequestMapping(value = "/update-sep", method = GET) + public ResponseEntity> generateSep( + @RequestParam(value = "noSep", required = false) String noSep, + @RequestParam(value = "noBpjs", required = false) String noBpjs, + @RequestParam(value = "tanggalRujukan", required = false) String tanggalRujukan, + @RequestParam(value = "tanggalSep", required = false) String tanggalSep, + @RequestParam(value = "noRujukan", required = false) String noRujukan, @RequestParam(value = "ppkRujukan", required = false) String ppkRujukan, - @RequestParam(value = "isRawatJalan", required = false) String isRawatJalan, - @RequestParam(value = "catatan", required = false) String catatan, - @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, - @RequestParam(value = "poliTujuan", required = false) String poliTujuan, + @RequestParam(value = "isRawatJalan", required = false) String isRawatJalan, + @RequestParam(value = "catatan", required = false) String catatan, + @RequestParam(value = "kodeDiagnosa", required = false) String kodeDiagnosa, + @RequestParam(value = "poliTujuan", required = false) String poliTujuan, @RequestParam(value = "kelasRawat", required = false) String kelasRawat, - @RequestParam(value = "lakaLantas", required = false) String lakaLantas, - @RequestParam(value = "lokasiLaka", required = false) String lokasiLaka, + @RequestParam(value = "lakaLantas", required = false) String lakaLantas, + @RequestParam(value = "lokasiLaka", required = false) String lokasiLaka, @RequestParam(value = "noCm", required = false) String noCm) { - - Map updateSep = bridgingBpjs.updateSep(noSep, noBpjs, tanggalRujukan, tanggalSep, noRujukan, ppkRujukan, isRawatJalan.equals("T"), catatan, kodeDiagnosa, poliTujuan, kelasRawat, lakaLantas, lokasiLaka, noCm); - return RestUtil.getJsonResponse(updateSep, HttpStatus.OK); + Map updateSep = bridgingBpjs.updateSep(noSep, noBpjs, tanggalRujukan, tanggalSep, noRujukan, + ppkRujukan, isRawatJalan.equals("T"), catatan, kodeDiagnosa, poliTujuan, kelasRawat, lakaLantas, + lokasiLaka, noCm); + return getJsonResponse(updateSep, OK); } - - @RequestMapping(value = "/data-rujukan-rs/", method = RequestMethod.GET) - public ResponseEntity getDataRujukanRS(@RequestParam(value = "noRujukan", required = true) String noRujukan) { + + @RequestMapping(value = "/data-rujukan-rs/", method = GET) + public ResponseEntity getDataRujukanRS(@RequestParam(value = "noRujukan") String noRujukan) { Object peserta = bridgingBpjs.getDataRujukanByNoRujukanRS(noRujukan); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + return getJsonResponse(peserta, OK); } - - @RequestMapping(value = "/data-rujukan-pcare/", method = RequestMethod.GET) - public ResponseEntity getDataRujukanPCare(@RequestParam(value = "noRujukan", required = true) String noRujukan) { - Object peserta = bridgingBpjs.getDataRujukanByNoRujukanPcare(noRujukan); - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); - } - - @RequestMapping(value = "/data-rujukan-byNoKartu-rs/", method = RequestMethod.GET) - public ResponseEntity getDataRujukanByNoKartuRS(@RequestParam(value = "noKartu", required = true) String noKartu) { + @RequestMapping(value = "/data-rujukan-byNoKartu-rs/", method = GET) + public ResponseEntity getDataRujukanByNoKartuRS(@RequestParam(value = "noKartu") String noKartu) { Object peserta = bridgingBpjs.getDataRujukanByNoKartuRS(noKartu); + return getJsonResponse(peserta, OK); + } - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + @RequestMapping(value = "/check-kepesertaan-by-nik/", method = GET) + public ResponseEntity> checkKepesertaanByNIK(@RequestParam(value = "nik") String nik) { + Map peserta = bridgingBpjs.checkKepesertaanByNIK(nik); + return getJsonResponse(peserta, OK); } - - @RequestMapping(value = "/data-rujukan-byNoKartu-pcare/", method = RequestMethod.GET) - public ResponseEntity getDataRujukanByNoKartuPCare(@RequestParam(value = "noKartu", required = true) String noKartu) { - Object peserta = bridgingBpjs.getDataRujukanByKartuPcare(noKartu); - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + @RequestMapping(value = "/get-monitor-klaim/", method = GET) + public ResponseEntity> getMonitorKlaim(@RequestParam(value = "tglMasuk") String tglMasuk, + @RequestParam(value = "tglKeluar") String tglKeluar, @RequestParam(value = "kelasRawat") String kelasRawat, + @RequestParam(value = "jnsPelayanan") String jnsPelayanan, @RequestParam(value = "cari") String cari, + @RequestParam(value = "status") String status) { + Map peserta = bridgingBpjs.getMonitoringVerifikasiKlaim(tglMasuk, tglKeluar, kelasRawat, + jnsPelayanan, cari, status); + return getJsonResponse(peserta, OK); } - @RequestMapping(value = "/check-kepesertaan-by-nik/", method = RequestMethod.GET) - public ResponseEntity> checkKepesertaanByNIK(@RequestParam(value = "nik", required = true) String nik) { - Map peserta = bridgingBpjs.checkKepesertaanByNIK(nik); - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); + @RequestMapping(value = "/delete-sep/", method = GET) + public ResponseEntity> deleteSep(@RequestParam(value = "noSep") String noSep) { + Map dataIntegrasi = bridgingBpjs.deleteSep(noSep); + return getJsonResponse(dataIntegrasi, OK); } - - @RequestMapping(value = "/get-referensi-diagnosa/", method = RequestMethod.GET) - public ResponseEntity> getReferensiDiagnosa(@RequestParam(value = "nama", required = true) String nama) { - Map peserta = bridgingBpjs.getReferensiDiagnosa(nama); - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); - } - - @RequestMapping(value = "/get-referensi-faskes/", method = RequestMethod.GET) - public ResponseEntity> getReferensiFaskes(@RequestParam(value = "nama", required = true) String nama, - @RequestParam(value = "start", required = true) Integer start, - @RequestParam(value = "limit", required = true) Integer limit) { - Map peserta = bridgingBpjs.getReferensiFaskes(nama, start, limit); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); - } - @RequestMapping(value = "/get-monitor-klaim/", method = RequestMethod.GET) - public ResponseEntity> getMonitorKlaim(@RequestParam(value = "tglMasuk", required = true) String tglMasuk, - @RequestParam(value = "tglKeluar", required = true) String tglKeluar, - @RequestParam(value = "kelasRawat", required = true) String kelasRawat, - @RequestParam(value = "jnsPelayanan", required = true) String jnsPelayanan, - @RequestParam(value = "cari", required = true) String cari, - @RequestParam(value = "status", required = true) String status) { - Map peserta = bridgingBpjs.getMonitoringVerifikasiKlaim(tglMasuk, tglKeluar, kelasRawat, jnsPelayanan, cari, status); - - return RestUtil.getJsonResponse(peserta, HttpStatus.OK); - } - @RequestMapping(value = "/get-integrasi-inacbg/", method = RequestMethod.GET) - public ResponseEntity> getIntegrasiSepInacbg(@RequestParam(value = "noSep", required = true) String noSep) { - Map dataIntegrasi = bridgingBpjs.getDataIntegrasiSepInacbg(noSep); - - return RestUtil.getJsonResponse(dataIntegrasi, HttpStatus.OK); - } - - @RequestMapping(value = "/delete-sep/", method = RequestMethod.GET) - public ResponseEntity> deleteSep(@RequestParam(value = "noSep", required = true) String noSep) { - Map dataIntegrasi = bridgingBpjs.deleteSep(noSep); - - return RestUtil.getJsonResponse(dataIntegrasi, HttpStatus.OK); - } - - @RequestMapping(value = "/get-poli", method = RequestMethod.GET) - public ResponseEntity> getPoli() { - Map dataIntegrasi = bridgingBpjs.pencarianDataPoli(); - return RestUtil.getJsonResponse(dataIntegrasi, HttpStatus.OK); - } } 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 6fc7fe66..11079579 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 @@ -1,193 +1,129 @@ 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.entities.BakuMutu; +import com.jasamedika.medifirst2000.exception.ServiceVOException; +import com.jasamedika.medifirst2000.service.BakuMutuService; +import com.jasamedika.medifirst2000.vo.BakuMutuVO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.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.BakuMutuService; -import com.jasamedika.medifirst2000.util.rest.RestUtil; -import com.jasamedika.medifirst2000.vo.BakuMutuVO; +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("/baku-mutu") public class BakuMutuController extends LocaleController { - + @Autowired - private BakuMutuService bakuMutuService; - - private static final Logger LOGGER = LoggerFactory - .getLogger(BakuMutuController.class); - - @RequestMapping(value = "/save-baku-mutu/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> addVO(@Valid @RequestBody BakuMutuVO vo,HttpServletRequest request) { - - try{ + private BakuMutuService bakuMutuService; + + private static final Logger LOGGER = LoggerFactory.getLogger(BakuMutuController.class); + + @RequestMapping(value = "/save-baku-mutu/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE) + public ResponseEntity> addVO(@Valid @RequestBody BakuMutuVO vo, HttpServletRequest request) { + try { Map result = bakuMutuService.addBakuMutu(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 Baku Mutu", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when add Baku Mutu", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); + } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when add Baku Mutu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when add Baku Mutu", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/update-baku-mutu/", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> updateVO(@Valid @RequestBody BakuMutuVO vo,HttpServletRequest request) { - - try{ - Map result = bakuMutuService.addBakuMutu(vo); + + @RequestMapping(value = "/find-all-baku-mutu/", method = GET, produces = APPLICATION_JSON_VALUE) + public ResponseEntity> getAllVO(HttpServletRequest request) { + try { + Map result = bakuMutuService.findAllBakuMutu(); 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 update Baku Mutu", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); - + LOGGER.error("Got ServiceVOException {} when get all baku mutu", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when update Baku Mutu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when get all baku mutu", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } } - - @RequestMapping(value = "/find-all-baku-mutu/", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity> getAllVO(HttpServletRequest request) { - - try { - Map result=bakuMutuService.findAllBakuMutu(); - if (null != result) - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS,request )); - return RestUtil.getJsonResponse(result, HttpStatus.CREATED,mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get all baku mutu", 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 baku mutu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); - } - } - - @RequestMapping(value = "/delete-baku-mutu", method = RequestMethod.GET) - public ResponseEntity deleteBakuMutu(@RequestParam(value = "id", required = true) Integer id) { - + + @RequestMapping(value = "/get-baku-mutu-parent", method = GET) + public ResponseEntity> getBakuMutuParent(HttpServletRequest request) { try { - if (bakuMutuService.deleteBakuMutu(id) == true) - return RestUtil.getJsonResponse(id +" Dihapus", HttpStatus.CREATED); - + Map bakuMutu = bakuMutuService.getBakuMutuParent(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(bakuMutu, OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when delete BakuMutu", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, - mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when get Baku Mutu parent", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when delete BakuMutu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, - jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, - mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when get Baku Mutu parent", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE); } - - - @RequestMapping(value = "/get-baku-mutu-parent", method = RequestMethod.GET) - public ResponseEntity> getBakuMutuParent(HttpServletRequest request) { + + @RequestMapping(value = "/get-baku-mutu-child", method = GET) + public ResponseEntity> getBakuMutuChild(HttpServletRequest request) { try { - Map bakuMutu = bakuMutuService.getBakuMutuParent(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(bakuMutu, HttpStatus.OK, mapHeaderMessage); + Map bakuMutu = bakuMutuService.getBakuMutuChild(); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(bakuMutu, HttpStatus.OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Baku Mutu", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when get Baku Mutu child", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Baku Mutu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when get Baku Mutu child", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/get-baku-mutu-child", method = RequestMethod.GET) - public ResponseEntity> getBakuMutuChild(HttpServletRequest request) { + + @RequestMapping(value = "/get-baku-mutu-by-id", method = GET) + public ResponseEntity> bakuMutuById(HttpServletRequest request, + @RequestParam(value = "id") Integer id) { try { - Map bakuMutu = bakuMutuService.getBakuMutuChild(); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, - getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(bakuMutu, HttpStatus.OK, mapHeaderMessage); + Map bakuMutu = bakuMutuService.bakuMutuById(id); + mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); + return getJsonResponse(bakuMutu, HttpStatus.OK, mapHeaderMessage); } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Baku Mutu", e.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage); + LOGGER.error("Got ServiceVOException {} when get Baku Mutu", e.getMessage()); + addHeaderMessage(ERROR_MESSAGE, e.getMessage()); + return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage); } catch (JpaSystemException jse) { - LOGGER.error("Got exception {} when get Baku Mutu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + LOGGER.error("Got JpaSystemException {} when get Baku Mutu", jse.getMessage()); + addHeaderMessage(ERROR_MESSAGE, jse.getMessage()); + return getJsonHttptatus(CONFLICT, mapHeaderMessage); } - } - - @RequestMapping(value = "/get-baku-mutu-by-id", method = RequestMethod.GET) - public ResponseEntity> bakuMutuById(HttpServletRequest request,@RequestParam(value = "id", required = true) Integer id) { - try { - Map bakuMutu = bakuMutuService.bakuMutuById(id); - mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,getMessage(MessageResource.LABEL_SUCCESS, request)); - return RestUtil.getJsonResponse(bakuMutu, HttpStatus.OK, mapHeaderMessage); - } catch (ServiceVOException e) { - LOGGER.error("Got exception {} when get Baku Mutu", 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 Baku Mutu", jse.getMessage()); - addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); - return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); - } - - } - }