Update PelayananPasienService
Pemasangan kembali fitur diskon mpp
This commit is contained in:
parent
e1b2a02304
commit
717043ecba
@ -167,6 +167,8 @@ public interface PelayananPasienDao extends PagingAndSortingRepository<Pelayanan
|
||||
+ "when :jenisDiskon = 1 and ru.id = :gigi and pr.id in (:produkGigi) and coalesce(pp.hargaDiscount,0) < pp.hargaJual then pp.hargaJual "
|
||||
+ "when :jenisDiskon = 1 and pp.strukResepId is not null and pr.id in (:produkFarmasi) and coalesce(pp.hargaDiscount,0) >= 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<Pelayanan
|
||||
@Param("produkKlinik") List<Integer> produkKlinik, @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("produkFarmasi") List<Integer> produkFarmasi, @Param("produkMpp") List<Integer> produkMpp);
|
||||
|
||||
}
|
||||
|
||||
@ -267,10 +267,11 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
||||
List<Integer> listProdukGigi = splitDataSettingDatafixed("listProdukDiskonGigiPegawai");
|
||||
List<Integer> listProdukLabRadiologi = splitDataSettingDatafixed("listProdukDiskonLabRadiologiPasien");
|
||||
List<Integer> listProdukFarmasi = splitDataSettingDatafixed("listProdukDiskonObatPegawai");
|
||||
List<Integer> listProdukMpp = splitDataSettingDatafixed("listProdukDiskonPasien");
|
||||
|
||||
List<Map<String, Object>> data = pelayananPasienDao.findLayananTagihan(noRegistrasi, jenisDiskon,
|
||||
Master.Ruangan.KLINIK_KARYAWAN, listProdukKlinik, Master.Ruangan.KLINIK_GIGI_KARYAWAN, listProdukGigi,
|
||||
labRadiologi, listProdukLabRadiologi, listProdukFarmasi);
|
||||
labRadiologi, listProdukLabRadiologi, listProdukFarmasi, listProdukMpp);
|
||||
|
||||
List<PelayananPasien> models = new ArrayList<>();
|
||||
for (Map<String, Object> map : data) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user