salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'prod/base'

Browse Source
This commit is contained in:
adesyawal 2025-06-18 08:54:13 +07:00
commit b8ed331571
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
View File

@ -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 {

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
View File

@ -148,6 +148,8 @@ 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) "
@ -170,7 +172,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("produkFarmasi") List<Integer> produkFarmasi, @Param("produkMpp") List<Integer> produkMpp, @Param("gizi") Integer gizi, @Param("produkGizi") List<Integer> 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 "

3
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
View File

@ -358,6 +358,7 @@ 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");
@ -367,7 +368,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);
listProdukMpp, POLI_GIZI, listProdukGizi);
List<PelayananPasien> models = new ArrayList<>();
for (Map<String, Object> map : data) {