Compare commits
No commits in common. "8b7c2e044ef08fcda789c4fc73c32b4d2ec4fbf7" and "1aa20c9312ca573c282f80bab4c55c115aa3878a" have entirely different histories.
8b7c2e044e
...
1aa20c9312
@ -1939,7 +1939,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|
|||||||
? byDetailTarifNonKelas.get().getHargaNetto1()
|
? byDetailTarifNonKelas.get().getHargaNetto1()
|
||||||
: byDetailTarifNonKelas.get().getHargaSatuan()));
|
: byDetailTarifNonKelas.get().getHargaSatuan()));
|
||||||
}
|
}
|
||||||
} else if (DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
|
} else if (!drKsmObgyn.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
|
||||||
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
|
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
|
||||||
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
|
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
|
||||||
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
|
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
|
||||||
@ -1957,7 +1957,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|
|||||||
? byDetailTarifNonKelas.get().getHargaNetto1()
|
? byDetailTarifNonKelas.get().getHargaNetto1()
|
||||||
: byDetailTarifNonKelas.get().getHargaSatuan()));
|
: 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()
|
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
|
||||||
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
|
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
|
||||||
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
|
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
|
||||||
@ -1975,7 +1975,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|
|||||||
? byDetailTarifNonKelas.get().getHargaNetto1()
|
? byDetailTarifNonKelas.get().getHargaNetto1()
|
||||||
: byDetailTarifNonKelas.get().getHargaSatuan()));
|
: 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()
|
Optional<HargaNettoProdukByKelasD> byDetailTarif = tarifDetailReguler.stream()
|
||||||
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
|
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
|
||||||
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
|
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user