From b1f53cc9d89ed7132713445c222fc73d4d536b85 Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Mon, 13 Jan 2025 07:52:51 +0700 Subject: [PATCH] Update RemunerasiServiceImpl.java Penyesuaian lepas validasi detail jenis produk nonpk untuk logbook dokter dipakai terapis --- .../service/impl/RemunerasiServiceImpl.java | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java index 1d5abaca..ecb4321d 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java @@ -1089,10 +1089,11 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera listPelayananRemun.add(next); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); } - } else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException) - && CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) - && listDetailJenisProdukException - .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { + } else if (CommonUtil.isNullOrEmpty(listDetailJenisProdukException) + || (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException) + && CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) + && listDetailJenisProdukException.contains( + Integer.parseInt(next.get("idDetailJenisProduk").toString())))) { /* * Diluar pembatasan jenis produk */ @@ -1228,10 +1229,11 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera listPelayananRemun.add(next); capaianRemun += Double.parseDouble(next.get("hargaJasa").toString()); } - } else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException) - && CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) - && listDetailJenisProdukException - .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { + } else if (CommonUtil.isNullOrEmpty(listDetailJenisProdukException) + || (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException) + && CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) + && listDetailJenisProdukException.contains( + Integer.parseInt(next.get("idDetailJenisProduk").toString())))) { /* * Diluar pembatasan jenis produk */ @@ -1396,10 +1398,11 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera listPelayananNonJknLuarJamKerja.add(next); } } - } else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException) - && CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) - && listDetailJenisProdukException - .contains(Integer.parseInt(next.get("idDetailJenisProduk").toString()))) { + } else if (CommonUtil.isNullOrEmpty(listDetailJenisProdukException) + || (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException) + && CommonUtil.isNotNullOrEmpty(next.get("idDetailJenisProduk")) + && listDetailJenisProdukException.contains( + Integer.parseInt(next.get("idDetailJenisProduk").toString())))) { /* * Diluar pembatasan jenis produk */