Compare commits

..

No commits in common. "bfe3d9b4ea9ba8d0f80fcd5d3ec1f2bbaa31b9da" and "a529a2b1bd5ecb39d4c9e18865cffd27393521ad" have entirely different histories.

3 changed files with 2 additions and 6 deletions

View File

@ -368,7 +368,6 @@ 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 {

View File

@ -148,8 +148,6 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
+ "when :jenisDiskon = 1 and ru.id = :tht and pr.id in (:produkTht) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
+ "when :jenisDiskon = 1 and ru.id = :mata and pr.id in (:produkMata) and coalesce(pp.hargaDiscount,0) >= 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) "
@ -172,7 +170,7 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
@Param("produkMata") List<Integer> produkMata, @Param("gigi") Integer gigi,
@Param("produkGigi") List<Integer> produkGigi, @Param("labRadiologi") List<Integer> labRadiologi,
@Param("produkLabRadiologi") List<Integer> produkLabRadiologi,
@Param("produkFarmasi") List<Integer> produkFarmasi, @Param("produkMpp") List<Integer> produkMpp, @Param("gizi") Integer gizi, @Param("produkGizi") List<Integer> produkGizi);
@Param("produkFarmasi") List<Integer> produkFarmasi, @Param("produkMpp") List<Integer> produkMpp);
@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 "

View File

@ -358,7 +358,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
List<Integer> listProdukKlinik = splitDataSettingDatafixed("listProdukDiskonPegawai");
List<Integer> listProdukTht = splitDataSettingDatafixed("listProdukDiskonThtPegawai");
List<Integer> listProdukGizi = splitDataSettingDatafixed("listProdukDiskonGiziPegawai");
List<Integer> listProdukMata = splitDataSettingDatafixed("listProdukDiskonMataPegawai");
List<Integer> listProdukGigi = splitDataSettingDatafixed("listProdukDiskonGigiPegawai");
List<Integer> listProdukLabRadiologi = splitDataSettingDatafixed("listProdukDiskonLabRadiologiPasien");
@ -368,7 +367,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
List<Map<String, Object>> data = pelayananPasienDao.findLayananTagihan(noRegistrasi, jenisDiskon,
KLINIK_KARYAWAN, listProdukKlinik, POLI_THT, listProdukTht, POLI_MATA, listProdukMata,
KLINIK_GIGI_KARYAWAN, listProdukGigi, labRadiologi, listProdukLabRadiologi, listProdukFarmasi,
listProdukMpp, POLI_GIZI, listProdukGizi);
listProdukMpp);
List<PelayananPasien> models = new ArrayList<>();
for (Map<String, Object> map : data) {