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

Merge branch 'dev/remun/persalinan-total-tarif' into prod/base

Browse Source
This commit is contained in:
Salman Manoe 2025-03-19 11:00:31 +07:00
commit 31d07e10ce
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
View File

@ -1822,6 +1822,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
}
private List<Map<String, Object>> transformPelayananPaket(Integer idPegawai, List<Map<String, Object>> listData) {
Date tmtPersalinanTotalTarif = new Date(1738342800000L);
List<Integer> drKsmObgyn = pegawaiDao.getDokterByKsm(KSM_OBGYN);
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
SimpleDateFormat month = new SimpleDateFormat("MMM-yyyy", new Locale("in", "ID"));
@ -1939,7 +1940,11 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
? byDetailTarifNonKelas.get().getHargaNetto1()
: byDetailTarifNonKelas.get().getHargaSatuan()));
}
} else if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
} else if ((!drKsmObgyn.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
&& ((Date) d.get("tglPelayanan")).before(tmtPersalinanTotalTarif))
|| (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
&& (d.get("tglPelayanan").equals(tmtPersalinanTotalTarif)
|| ((Date) d.get("tglPelayanan")).after(tmtPersalinanTotalTarif)))) {
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
@ -1957,7 +1962,11 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
? byDetailTarifNonKelas.get().getHargaNetto1()
: byDetailTarifNonKelas.get().getHargaSatuan()));
}
} else if (ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
} else if ((!drKsmObgyn.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
&& ((Date) d.get("tglPelayanan")).before(tmtPersalinanTotalTarif))
|| (ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
&& (d.get("tglPelayanan").equals(tmtPersalinanTotalTarif)
|| ((Date) d.get("tglPelayanan")).after(tmtPersalinanTotalTarif)))) {
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
@ -1975,7 +1984,11 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
? byDetailTarifNonKelas.get().getHargaNetto1()
: byDetailTarifNonKelas.get().getHargaSatuan()));
}
} else if (DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
} else if ((!drKsmObgyn.contains(idPegawai) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
&& ((Date) d.get("tglPelayanan")).before(tmtPersalinanTotalTarif))
|| (DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
&& (d.get("tglPelayanan").equals(tmtPersalinanTotalTarif)
|| ((Date) d.get("tglPelayanan")).after(tmtPersalinanTotalTarif)))) {
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))