diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java index e943284a..03c34328 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java @@ -167,6 +167,8 @@ public interface PelayananPasienDao extends PagingAndSortingRepository= pp.hargaJual then coalesce(pp.hargaDiscount,0) " + "when :jenisDiskon = 1 and pp.strukResepId is not null and pr.id in (:produkFarmasi) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual " + + "when :jenisDiskon in (3,4) and pr.id in (:produkMpp) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) " + + "when :jenisDiskon in (3,4) and pr.id in (:produkMpp) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual " + "else coalesce(pp.hargaDiscount,0) end) as hargaDiskon," + "(case when :jenisDiskon = 1 and pp.strukResepId is not null and pr.id in (:produkFarmasi) then 0.0 else pp.jasa end) as jasa) " + "from PelayananPasien pp " + "left join pp.pasienDaftar apd " + "left join apd.pasienDaftar pd " @@ -177,6 +179,6 @@ public interface PelayananPasienDao extends PagingAndSortingRepository produkKlinik, @Param("gigi") Integer gigi, @Param("produkGigi") List produkGigi, @Param("labRadiologi") List labRadiologi, @Param("produkLabRadiologi") List produkLabRadiologi, - @Param("produkFarmasi") List produkFarmasi); + @Param("produkFarmasi") List produkFarmasi, @Param("produkMpp") List produkMpp); } 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 1efb3de6..154b7db5 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 @@ -267,10 +267,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List listProdukGigi = splitDataSettingDatafixed("listProdukDiskonGigiPegawai"); List listProdukLabRadiologi = splitDataSettingDatafixed("listProdukDiskonLabRadiologiPasien"); List listProdukFarmasi = splitDataSettingDatafixed("listProdukDiskonObatPegawai"); + List listProdukMpp = splitDataSettingDatafixed("listProdukDiskonPasien"); List> data = pelayananPasienDao.findLayananTagihan(noRegistrasi, jenisDiskon, Master.Ruangan.KLINIK_KARYAWAN, listProdukKlinik, Master.Ruangan.KLINIK_GIGI_KARYAWAN, listProdukGigi, - labRadiologi, listProdukLabRadiologi, listProdukFarmasi); + labRadiologi, listProdukLabRadiologi, listProdukFarmasi, listProdukMpp); List models = new ArrayList<>(); for (Map map : data) {