diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HargaNettoProdukByKelasDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HargaNettoProdukByKelasDao.java index 2f26c08b..70f29901 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HargaNettoProdukByKelasDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HargaNettoProdukByKelasDao.java @@ -32,7 +32,7 @@ public interface HargaNettoProdukByKelasDao extends PagingAndSortingRepository> checkExisting(@Param("kelasId") Integer kelasId, - @Param("produkId") Integer produkId); + public List> checkExisting(@Param("kelasId") Integer idKelas, + @Param("produkId") Integer idProduk); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ProdukService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ProdukService.java index 2e7faa27..8d362745 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ProdukService.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ProdukService.java @@ -105,9 +105,11 @@ public interface ProdukService extends BaseVoService List> findTarifLayanan(Integer idRuangan, Integer idKelas, Integer idProduk); Map validateNamaProduk(Integer idProduk, String namaProduk); - + Map getMappingPaketToProduk(Integer idMapping); - + List> getAllPaketToProduk(); + List> findExistingMapHargaKelas(Integer idKelas, Integer idProduk); + } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukServiceImpl.java index bf28aa57..963554b7 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukServiceImpl.java @@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional; import com.jasamedika.medifirst2000.constants.Master; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao; +import com.jasamedika.medifirst2000.dao.HargaNettoProdukByKelasDao; import com.jasamedika.medifirst2000.dao.LogAccDao; import com.jasamedika.medifirst2000.dao.MapDiagnosisToProdukDao; import com.jasamedika.medifirst2000.dao.MapPaketToProdukDao; @@ -187,18 +188,33 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS @Autowired private BaseConverterImpl produkDetailHasilConverter; + @Autowired + private BaseConverterImpl pelayananPetugasConverter; + @Autowired private PelayananPiutangRekananService pelayananPiutangRekananService; @Autowired private MapRuanganToProdukDao mapRuanganToProdukDao; - + @Autowired private MapPaketToProdukDao mapPaketToProdukDao; @Autowired private SettingDataFixedDao settingDataFixedDao; + @Autowired + private PelayananPasienPetugasDao pelayananPasienPetugasDao; + + @Autowired + private com.jasamedika.medifirst2000.service.LoginUserService LoginUserService; + + @Autowired + private PasienDaftarDao pasienDaftarDao; + + @Autowired + private HargaNettoProdukByKelasDao hargaNettoProdukByKelasDao; + @Override public ProdukVO add(ProdukVO vo) throws JpaSystemException, ServiceVOException { return null; @@ -461,21 +477,6 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS } - // private boolean checkKarcis(Integer produkId,String noRec) { - // boolean isKarcis=false; - // List list=pelayananPasienDao.findKarcis(noRec,produkId); - // if(list.isEmpty()) - // isKarcis=true; - // else - // isKarcis=false; - // return isKarcis; - // } - - @Autowired - private PelayananPasienPetugasDao pelayananPasienPetugasDao; - @Autowired - private BaseConverterImpl pelayananPetugasConverter; - @Override @Transactional(readOnly = false) public Map addBarangMedis(ProdukVO vo) { @@ -943,12 +944,6 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS return data; } - @Autowired - private com.jasamedika.medifirst2000.service.LoginUserService LoginUserService; - - @Autowired - private PasienDaftarDao pasienDaftarDao; - @Override public Map saveTotalBiaya(String noRec, Double total) { AntrianPasienDiPeriksa pasienDaftar = antrianPasienDiPeriksaDao.findByNoRec(noRec); @@ -1192,18 +1187,27 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS @Override public Map getMappingPaketToProduk(Integer idMapping) { Map result = new HashMap<>(); - + result = produkDao.getMappingPaketToProduk(idMapping); - + return result; } @Override public List> getAllPaketToProduk() { List> result = new ArrayList<>(); - + result = mapPaketToProdukDao.getAllData(); - + + return result; + } + + @Override + public List> findExistingMapHargaKelas(Integer idKelas, Integer idProduk) { + List> result = new ArrayList<>(); + + result = hargaNettoProdukByKelasDao.checkExisting(idKelas, idProduk); + return result; } diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java index 8d27ac97..b7740511 100644 --- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java +++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/PelayananController.java @@ -378,6 +378,27 @@ public class PelayananController extends LocaleController { addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); } + } + + @RequestMapping(value = "/check-existing-harga-produk-kelas", method = RequestMethod.GET) + public ResponseEntity>> checkExistingHargaProdukKelas(HttpServletRequest request, + @RequestParam(value = "kelasId", required = true) Integer idKelas, + @RequestParam(value = "produkId", required = true) Integer idProduk) { + try { + List> result = produkService.findExistingMapHargaKelas(idKelas, idProduk); + + mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, + getMessage(MessageResource.LABEL_SUCCESS, request)); + return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage); + } catch (ServiceVOException e) { + LOGGER.error("Got exception {} when check existing harga produk kelas", 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 check existing harga produk kelas", jse.getMessage()); + addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage()); + return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage); + } }