From 58dfef9d35c7c66b4212e9e5b02c56d748ce7568 Mon Sep 17 00:00:00 2001 From: salmanoe Date: Tue, 19 Jul 2022 15:43:11 +0700 Subject: [PATCH] Update IndekKinerjaServiceImpl.java Perbaikan null handling harga netto by komponen harga --- .../service/impl/IndekKinerjaServiceImpl.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java index 5325f45c..a15bd6cc 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IndekKinerjaServiceImpl.java @@ -3165,21 +3165,24 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK Master.KomponenHarga.JASA_DOKTER, Integer.parseInt(mapResult1.get("idProduk").toString()), Integer.parseInt(mapResult1.get("idKelas").toString())); - formatRpKontribusi = totalProduk1 * nettoKomponen.orElse(0.0); + formatRpKontribusi = totalProduk1 + * (nettoKomponen != null ? nettoKomponen.orElse(0.0) : 0.0); } else if (Master.JenisPetugasPelaksana.DOKTER_ANASTESI .equals(mapResult1.get("idJenisPelaksana"))) { Optional nettoKomponen = detailHargaNettoDao.findHargetNetto1Komponen( Master.KomponenHarga.JASA_DOKTER_ANASTESI, Integer.parseInt(mapResult1.get("idProduk").toString()), Integer.parseInt(mapResult1.get("idKelas").toString())); - formatRpKontribusi = totalProduk1 * nettoKomponen.orElse(0.0); + formatRpKontribusi = totalProduk1 + * (nettoKomponen != null ? nettoKomponen.orElse(0.0) : 0.0); } else if (Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS .equals(mapResult1.get("idJenisPelaksana"))) { Optional nettoKomponen = detailHargaNettoDao.findHargetNetto1Komponen( Master.KomponenHarga.JASA_ASISTEN_SPESIALIS, Integer.parseInt(mapResult1.get("idProduk").toString()), Integer.parseInt(mapResult1.get("idKelas").toString())); - formatRpKontribusi = totalProduk1 * nettoKomponen.orElse(0.0); + formatRpKontribusi = totalProduk1 + * (nettoKomponen != null ? nettoKomponen.orElse(0.0) : 0.0); } mapResult1.put("totalKonsul", totalKonsul1.longValue()); @@ -3245,21 +3248,24 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK Master.KomponenHarga.JASA_DOKTER, Integer.parseInt(mapResult2.get("idProduk").toString()), Integer.parseInt(mapResult2.get("idKelas").toString())); - formatRpKontribusi = totalProduk2 * nettoKomponen.orElse(0.0); + formatRpKontribusi = totalProduk2 + * (nettoKomponen != null ? nettoKomponen.orElse(0.0) : 0.0); } else if (Master.JenisPetugasPelaksana.DOKTER_ANASTESI .equals(mapResult2.get("idJenisPelaksana"))) { Optional nettoKomponen = detailHargaNettoDao.findHargetNetto1Komponen( Master.KomponenHarga.JASA_DOKTER_ANASTESI, Integer.parseInt(mapResult2.get("idProduk").toString()), Integer.parseInt(mapResult2.get("idKelas").toString())); - formatRpKontribusi = totalProduk2 * nettoKomponen.orElse(0.0); + formatRpKontribusi = totalProduk2 + * (nettoKomponen != null ? nettoKomponen.orElse(0.0) : 0.0); } else if (Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS .equals(mapResult2.get("idJenisPelaksana"))) { Optional nettoKomponen = detailHargaNettoDao.findHargetNetto1Komponen( Master.KomponenHarga.JASA_ASISTEN_SPESIALIS, Integer.parseInt(mapResult2.get("idProduk").toString()), Integer.parseInt(mapResult2.get("idKelas").toString())); - formatRpKontribusi = totalProduk2 * nettoKomponen.orElse(0.0); + formatRpKontribusi = totalProduk2 + * (nettoKomponen != null ? nettoKomponen.orElse(0.0) : 0.0); } mapResult2.put("totalKonsul", totalKonsul2.longValue());