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 70f29901..f2fd6ff3 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 @@ -35,4 +35,10 @@ public interface HargaNettoProdukByKelasDao extends PagingAndSortingRepository> checkExisting(@Param("kelasId") Integer idKelas, @Param("produkId") Integer idProduk); + @Query("select new Map(hnk.produkId as produkId,hnk.kelasId as kelasId) " + "from HargaNettoProdukByKelas hnk " + + "where hnk.produkId = :produkId " + "and hnk.kelasId = :kelasId " + "and hnk.id <> mappingId " + + "and hnk.statusEnabled is true") + public List> checkExisting(@Param("kelasId") Integer idKelas, + @Param("produkId") Integer idProduk, @Param("mappingId") Integer idMapping); + } 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 8d362745..4aa774ce 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 @@ -110,6 +110,6 @@ public interface ProdukService extends BaseVoService List> getAllPaketToProduk(); - List> findExistingMapHargaKelas(Integer idKelas, Integer idProduk); + List> findExistingMapHargaKelas(Integer idKelas, Integer idProduk, Integer idMapping); } 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 963554b7..8e636d47 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 @@ -1203,10 +1203,14 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS } @Override - public List> findExistingMapHargaKelas(Integer idKelas, Integer idProduk) { + public List> findExistingMapHargaKelas(Integer idKelas, Integer idProduk, Integer idMapping) { List> result = new ArrayList<>(); - result = hargaNettoProdukByKelasDao.checkExisting(idKelas, idProduk); + if (CommonUtil.isNotNullOrEmpty(idMapping)) { + result = hargaNettoProdukByKelasDao.checkExisting(idKelas, idProduk, idMapping); + } else { + 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 b7740511..02444a89 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 @@ -383,9 +383,10 @@ public class PelayananController extends LocaleController { @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) { + @RequestParam(value = "produkId", required = true) Integer idProduk, + @RequestParam(value = "mappingId", required = false) Integer idMapping) { try { - List> result = produkService.findExistingMapHargaKelas(idKelas, idProduk); + List> result = produkService.findExistingMapHargaKelas(idKelas, idProduk, idMapping); mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));