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

Update PelayananPasienServiceImpl.java

Browse Source 
Perbaikan filter tanggal pulang ranap ibu untuk seluruh dokter dibayar fixed-pay
This commit is contained in:
Salman Manoe 2023-11-02 16:03:12 +07:00
parent b8fcffb452
commit f48ab9d26c
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1657,12 +1657,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
d.put("bulanPulangIbu", month.format(f.get("tglKeluar")));
d.put("isBatalPaket", f.get("isBatal"));
});
if (first.isPresent() && drKsmObgyn.contains(idPegawai) && !PERAWAT.name().equals(d.get("paketType"))
if (first.isPresent()
&& (tglAwal.equals(first.get().get("tglKeluar"))
|| ((Date) first.get().get("tglKeluar")).after(tglAwal))
&& !PERAWAT.name().equals(d.get("paketType"))
&& !Boolean.parseBoolean(d.get("isBatalPaket").toString())) {
d.put("tglPulangIbu", first.get().get("tglKeluar"));
if ((tglAwal.equals(first.get().get("tglKeluar"))
|| ((Date) first.get().get("tglKeluar")).after(tglAwal))
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
if (drKsmObgyn.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
&& TINDAKAN_UTAMA.name().equals(d.get("paketType"))) {
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
.filter(dt -> dt.getProdukId().equals(d.get("paketId")))
@ -1681,9 +1682,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
? byDetailTarifNonKelas.get().getHargaNetto1()
: byDetailTarifNonKelas.get().getHargaSatuan()));
}
} else if ((tglAwal.equals(first.get().get("tglKeluar"))
|| ((Date) first.get().get("tglKeluar")).after(tglAwal))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
} else if (drKsmObgyn.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
&& TINDAKAN_UTAMA.name().equals(d.get("paketType"))) {
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
.filter(dt -> dt.getProdukId().equals(d.get("paketId")))
@ -1702,10 +1701,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
? byDetailTarifNonKelas.get().getHargaNetto1()
: byDetailTarifNonKelas.get().getHargaSatuan()));
}
}
} else if (!drKsmObgyn.contains(idPegawai) && !PERAWAT.name().equals(d.get("paketType"))
&& !Boolean.parseBoolean(d.get("isBatalPaket").toString())) {
if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
} else if (!drKsmObgyn.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
@ -1723,7 +1719,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
? 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"))) {
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
@ -1741,7 +1737,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
? 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"))) {
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))