From 0bf9e811536cb542cbc28df4f7009f0582add5b7 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Fri, 22 Sep 2023 12:43:12 +0700 Subject: [PATCH] Update service pelayanan pasien Perbaikan relasi mapping produk paket dan list paket saat daftar tagihan --- .../dao/MapProdukPaketToProdukDao.java | 4 +- .../medifirst2000/dao/VoucherPaketDao.java | 8 +- .../MapProdukPaketToProdukServiceImpl.java | 6 +- .../impl/PelayananPasienServiceImpl.java | 2 +- .../entities/MapProdukPaketToProduk.java | 4 +- .../src/main/resources/hibernate.cfg.xml | 1595 +++++++++-------- 6 files changed, 888 insertions(+), 731 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketToProdukDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketToProdukDao.java index 5458b388..f9019756 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketToProdukDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapProdukPaketToProdukDao.java @@ -18,7 +18,7 @@ public interface MapProdukPaketToProdukDao extends JpaRepository findAllByPaketId(@Param("paketId") Integer paketId); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/VoucherPaketDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/VoucherPaketDao.java index 35615af9..d71ceda2 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/VoucherPaketDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/VoucherPaketDao.java @@ -23,10 +23,10 @@ public interface VoucherPaketDao extends JpaRepository { */ VoucherPaket findByKode(String kode); - @Query("select new Map(vp.noRec as idVoucher,vp.paketId as idPaket," + "mpaket.produkId as idProduk," - + "mproduk.produkPaketId as idProdukPaket," + "mproduk.jenisMapping as jenisMapping) " - + "from MapProdukPaketToProduk mpaket " + "inner join mpaket.produkPaket mproduk, VoucherPaket vp " - + "where vp.paketId = mproduk.paketId " + "and vp.isSelesai is true and vp.isBatal is false " + @Query("select new Map(vp.noRec as idVoucher,vp.paketId as idPaket," + "mproduk.produkId as idProduk," + + "mpaket.produkPaketId as idProdukPaket," + "mpaket.jenisMapping as jenisMapping) " + + "from MapProdukPaketToProduk mproduk " + "inner join mproduk.mapProdukPaket mpaket, VoucherPaket vp " + + "where vp.paketId = mpaket.paketId " + "and vp.isSelesai is true and vp.isBatal is false " + "and vp.noRec in (:listNorec)") List> findPelayananPaket(@Param("listNorec") List listIdVoucherPaket); } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketToProdukServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketToProdukServiceImpl.java index e5ade9a4..04cc2598 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketToProdukServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketToProdukServiceImpl.java @@ -48,7 +48,7 @@ public class MapProdukPaketToProdukServiceImpl implements MapProdukPaketToProduk { MapProdukPaket mapProdukPaket = new MapProdukPaket(); mapProdukPaket.setNoRec(vo.getProdukPaket().getNoRec()); - model.setProdukPaket(mapProdukPaket); + model.setMapProdukPaket(mapProdukPaket); } { Produk produk = new Produk(); @@ -68,7 +68,7 @@ public class MapProdukPaketToProdukServiceImpl implements MapProdukPaketToProduk { MapProdukPaket mapProdukPaket = new MapProdukPaket(); mapProdukPaket.setNoRec(vo.getProdukPaket().getNoRec()); - model.setProdukPaket(mapProdukPaket); + model.setMapProdukPaket(mapProdukPaket); } { Produk produk = new Produk(); @@ -96,7 +96,7 @@ public class MapProdukPaketToProdukServiceImpl implements MapProdukPaketToProduk return null; MapProdukPaketToProdukVO result = mapPaketProdukConverter.transferModelToVO(model, new MapProdukPaketToProdukVO()); - MapProdukPaket mapProdukPaket = model.getProdukPaket(); + MapProdukPaket mapProdukPaket = model.getMapProdukPaket(); MapProdukPaketVO mapProdukPaketVO = mapProdukPaketConverter.transferModelToVO(mapProdukPaket, new MapProdukPaketVO()); { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java index beea14d8..a51aafb7 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java @@ -2584,7 +2584,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List idProdukPaketDto = dtoList.stream().map(TagihanPendaftaranDto::getIdProduk) .filter(dto -> !dto.equals(voucher.getPaketId())).collect(Collectors.toList()); mappingProdukPaket.stream().filter(d -> idProdukPaketDto.contains(d.getProdukId())).forEach(d -> { - Produk produkPaket = d.getProdukPaket().getProdukPaket(); + Produk produkPaket = d.getMapProdukPaket().getProdukPaket(); List> tarifProdukPaket = hargaNettoProdukByKelasDao .checkExisting(voucher.getKelasId(), produkPaket.getId()); if (CommonUtil.isNullOrEmpty(tarifProdukPaket) && tarifProdukPaket.isEmpty()) diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaketToProduk.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaketToProduk.java index 6334bf46..2ec8054a 100644 --- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaketToProduk.java +++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaketToProduk.java @@ -26,10 +26,10 @@ public class MapProdukPaketToProduk extends BaseTransaction { @JoinColumn(name = "mappaketfk") @NotNull(message = "Mapping produk paket tidak boleh kosong") @Caption(value = "Mapping produk paket") - private MapProdukPaket produkPaket; + private MapProdukPaket mapProdukPaket; @Column(name = "mappaketfk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false) - private String produkPaketId; + private String mapProdukPaketId; @ManyToOne(fetch = LAZY) @JoinColumn(name = "produkfk") diff --git a/jasamedika-domain/src/main/resources/hibernate.cfg.xml b/jasamedika-domain/src/main/resources/hibernate.cfg.xml index f78e1a80..63871bd3 100644 --- a/jasamedika-domain/src/main/resources/hibernate.cfg.xml +++ b/jasamedika-domain/src/main/resources/hibernate.cfg.xml @@ -2,723 +2,880 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +