Merge branch 'dev/base' into dev/integrasi/minio
This commit is contained in:
commit
bc28361a12
@ -1939,7 +1939,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|
||||
? byDetailTarifNonKelas.get().getHargaNetto1()
|
||||
: byDetailTarifNonKelas.get().getHargaSatuan()));
|
||||
}
|
||||
} else if (!drKsmObgyn.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
|
||||
} else if (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")))
|
||||
@ -1957,7 +1957,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|
||||
? byDetailTarifNonKelas.get().getHargaNetto1()
|
||||
: byDetailTarifNonKelas.get().getHargaSatuan()));
|
||||
}
|
||||
} else if (!drKsmObgyn.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
|
||||
} else if (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")))
|
||||
@ -1975,7 +1975,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
|
||||
? byDetailTarifNonKelas.get().getHargaNetto1()
|
||||
: byDetailTarifNonKelas.get().getHargaSatuan()));
|
||||
}
|
||||
} else if (!drKsmObgyn.contains(idPegawai) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
|
||||
} else if (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")))
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user