diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index a5c730c9..3eacfdca 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -368,6 +368,7 @@ public final class Master { public static final int POLI_MATA = 5; public static final int POLI_THT = 6; public static final int RADIOLOGI = 35; + public static final int POLI_GIZI = 717; } public static final class SatuanIndikator { 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 b97c823c..1892600e 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 @@ -148,6 +148,8 @@ public interface PelayananPasienDao extends JpaRepository= pp.hargaJual then coalesce(pp.hargaDiscount,0) " + "when :jenisDiskon = 1 and ru.id = :mata and pr.id in (:produkMata) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual " + + "when :jenisDiskon = 1 and ru.id = :gizi and pr.id in (:produkGizi) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) " + + "when :jenisDiskon = 1 and ru.id = :gizi and pr.id in (:produkGizi) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual " + "when :jenisDiskon = 1 and ru.id = :klinik and lower(pr.namaProduk) like '%konsul%dokter%' and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) " + "when :jenisDiskon = 1 and ru.id = :klinik and lower(pr.namaProduk) like '%konsul%dokter%' and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual " + "when :jenisDiskon = 1 and ru.id in (:labRadiologi) and pr.id in (:produkLabRadiologi) and coalesce(pp.hargaDiscount,0) >= pp.hargaJual then coalesce(pp.hargaDiscount,0) " @@ -170,7 +172,7 @@ public interface PelayananPasienDao extends JpaRepository produkMata, @Param("gigi") Integer gigi, @Param("produkGigi") List produkGigi, @Param("labRadiologi") List labRadiologi, @Param("produkLabRadiologi") List produkLabRadiologi, - @Param("produkFarmasi") List produkFarmasi, @Param("produkMpp") List produkMpp); + @Param("produkFarmasi") List produkFarmasi, @Param("produkMpp") List produkMpp, @Param("gizi") Integer gizi, @Param("produkGizi") List produkGizi); @Query("select ppd from PelayananPasienDetail ppd " + "inner join ppd.pelayananPasien pp " + "inner join pp.pasienDaftar apd " + "inner join apd.pasienDaftar pd " + "where apd.statusEnabled is true " 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 61ad190a..7906a824 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 @@ -358,6 +358,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List listProdukKlinik = splitDataSettingDatafixed("listProdukDiskonPegawai"); List listProdukTht = splitDataSettingDatafixed("listProdukDiskonThtPegawai"); + List listProdukGizi = splitDataSettingDatafixed("listProdukDiskonGiziPegawai"); List listProdukMata = splitDataSettingDatafixed("listProdukDiskonMataPegawai"); List listProdukGigi = splitDataSettingDatafixed("listProdukDiskonGigiPegawai"); List listProdukLabRadiologi = splitDataSettingDatafixed("listProdukDiskonLabRadiologiPasien"); @@ -367,7 +368,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel List> data = pelayananPasienDao.findLayananTagihan(noRegistrasi, jenisDiskon, KLINIK_KARYAWAN, listProdukKlinik, POLI_THT, listProdukTht, POLI_MATA, listProdukMata, KLINIK_GIGI_KARYAWAN, listProdukGigi, labRadiologi, listProdukLabRadiologi, listProdukFarmasi, - listProdukMpp); + listProdukMpp, POLI_GIZI, listProdukGizi); List models = new ArrayList<>(); for (Map map : data) {