diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java index 03654a4e..d9cb51e8 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java @@ -278,6 +278,10 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera */ Date tglAwal = DateUtil.startMonth(date); Date tglAkhir = DateUtil.endMonth(date); + { + tglAwal = new Date(1727370000000L); + tglAkhir = new Date(1727456399000L); + } List> listJadwalKerja = pegawaiJadwalKerjaDao.findJamMasukJamPulang(idPegawai, tglAwal, tglAkhir); /* @@ -2333,7 +2337,10 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera d.put("hargaJasa", persenRehabMedik / 100 * hargaJual); } else if (KONSULTASI.equals(d.get("idGolonganProduk"))) { d.put("persenJasa", persenKonsultasi + "%"); - d.put("hargaJasa", persenKonsultasi / 100 * hargaJual); + d.put("hargaJasa", + persenKonsultasi / 100 * hargaJual + * (1 - Double.parseDouble(d.get("persenDiskonPegawai").toString()) / 100) + * (1 - (Double.parseDouble(d.get("persenDiskonD").toString()) / 100))); } else if (VISIT.equals(d.get("idGolonganProduk"))) { d.put("persenJasa", persenVisite + "%"); d.put("hargaJasa", persenVisite / 100 * hargaJual);