diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java index 5660a32c..52a9f27b 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java @@ -324,6 +324,7 @@ public class Master { public static final Integer[] PERISTI = { 45, 75, 76, 463, 464 }; public static final Integer[] TANJUNG = { 72, 551 }; + public static final int KLINIK_FALSE_EMERGENCY = 309; public static final int KLINIK_KARYAWAN = 70; public static final int LABORATORIUM_PATOLOGI_ANATOMI = 39; public static final int LABORATORIUM_PATOLOGI_KLINIK = 276; 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 a7b3b506..08f4d28b 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 @@ -6456,8 +6456,9 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK rawResult.add(map); } else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString())) && map.get("departemenId").equals(Master.Departemen.IGD) - && drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD) - .contains(Integer.parseInt(map.get("idProduk").toString()))) { + && map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && drKsmUmumList.contains(idPegawai) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { rawResult.add(map); } else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException) && listDetailJenisProdukException @@ -6594,7 +6595,13 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -6628,7 +6635,13 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK || dateTimePelayanan.isAfter(datePulang))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -6677,7 +6690,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -6714,7 +6732,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -6725,8 +6748,9 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK } } else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString())) && map.get("departemenId").equals(Master.Departemen.IGD) - && drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD) - .contains(Integer.parseInt(map.get("idProduk").toString()))) { + && map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && drKsmUmumList.contains(idPegawai) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) { Date tanggalPelayanan = (Date) map.get("tanggalPelayanan"); String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan); @@ -6850,7 +6874,13 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -6884,7 +6914,13 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK || dateTimePelayanan.isAfter(datePulang))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -6933,7 +6969,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -6970,7 +7011,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -7105,7 +7151,13 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -7139,7 +7191,13 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK || dateTimePelayanan.isAfter(datePulang))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -7188,7 +7246,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -7225,7 +7288,12 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -7607,10 +7675,21 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK map.get("detailId").toString()))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN).contains( Integer.parseInt(map.get("departemenId").toString()))) { - ffs = ffs + (new Double( - Double.parseDouble(map.get("count").toString()))) - .longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals( + Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double(Double + .parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId") + .equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double(Double + .parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer .parseInt(map.get("departemenId").toString())) @@ -7658,10 +7737,21 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK map.get("detailId").toString()))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN).contains( Integer.parseInt(map.get("departemenId").toString()))) { - ffs = ffs + (new Double( - Double.parseDouble(map.get("count").toString()))) - .longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals( + Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double(Double + .parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId") + .equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double(Double + .parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer .parseInt(map.get("departemenId").toString())) @@ -7709,10 +7799,20 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && (dateTimePelayanan.isBefore(dateMasukFfs) || dateTimePelayanan.isEqual(datePulangFfs) || dateTimePelayanan.isAfter(datePulangFfs))) { - ffs = ffs + (new Double( - Double.parseDouble(map.get("count").toString()))) - .longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP).contains( @@ -7767,10 +7867,20 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK Integer.parseInt(map.get("detailId").toString()))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN).contains( Integer.parseInt(map.get("departemenId").toString()))) { - ffs = ffs + (new Double( - Double.parseDouble(map.get("count").toString()))) - .longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP).contains( @@ -7795,9 +7905,16 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK } } } else if (dokterLuar.contains(idPegawai)) { - ffs = ffs - + (new Double(Double.parseDouble(map.get("count").toString()))).longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double(Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double(Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } if ((dataCountRemun == 1 && dataCountFfs == 0) @@ -8058,10 +8175,21 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN).contains( Integer.parseInt(map.get("departemenId").toString()))) { - ffs = ffs + (new Double( - Double.parseDouble(map.get("count").toString()))) - .longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId") + .equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer .parseInt(map.get("departemenId").toString())) @@ -8100,10 +8228,21 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK || dateTimePelayanan.isAfter(datePulangFfs))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN).contains( Integer.parseInt(map.get("departemenId").toString()))) { - ffs = ffs + (new Double( - Double.parseDouble(map.get("count").toString()))) - .longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId") + .equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer .parseInt(map.get("departemenId").toString())) @@ -8144,10 +8283,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && (dateTimePelayanan.isBefore(dateMasukFfs) || dateTimePelayanan.isEqual(datePulangFfs) || dateTimePelayanan.isAfter(datePulangFfs))) { - ffs = ffs - + (new Double(Double.parseDouble(map.get("count").toString()))) - .longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -8194,10 +8342,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - ffs = ffs - + (new Double(Double.parseDouble(map.get("count").toString()))) - .longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP).contains( @@ -8220,9 +8377,16 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK } } } else if (dokterLuar.contains(idPegawai)) { - ffs = ffs - + (new Double(Double.parseDouble(map.get("count").toString()))).longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double(Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double(Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } if ((dataCountRemun == 1 && dataCountFfs == 0) @@ -8495,10 +8659,21 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK map.get("detailId").toString()))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN).contains( Integer.parseInt(map.get("departemenId").toString()))) { - ffs = ffs + (new Double( - Double.parseDouble(map.get("count").toString()))) - .longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals( + Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double(Double + .parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId") + .equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double(Double + .parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer .parseInt(map.get("departemenId").toString())) @@ -8546,10 +8721,21 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK map.get("detailId").toString()))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN).contains( Integer.parseInt(map.get("departemenId").toString()))) { - ffs = ffs + (new Double( - Double.parseDouble(map.get("count").toString()))) - .longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals( + Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double(Double + .parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId") + .equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double(Double + .parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer .parseInt(map.get("departemenId").toString())) @@ -8597,10 +8783,20 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && (dateTimePelayanan.isBefore(dateMasukFfs) || dateTimePelayanan.isEqual(datePulangFfs) || dateTimePelayanan.isAfter(datePulangFfs))) { - ffs = ffs + (new Double( - Double.parseDouble(map.get("count").toString()))) - .longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP).contains( @@ -8655,10 +8851,20 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK Integer.parseInt(map.get("detailId").toString()))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN).contains( Integer.parseInt(map.get("departemenId").toString()))) { - ffs = ffs + (new Double( - Double.parseDouble(map.get("count").toString()))) - .longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double( + Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP).contains( @@ -8683,9 +8889,16 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK } } } else if (dokterLuar.contains(idPegawai)) { - ffs = ffs - + (new Double(Double.parseDouble(map.get("count").toString()))).longValue(); - dataCountFfs = dataCountFfs + 1; + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + ffs = ffs + (new Double(Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + ffs = ffs + (new Double(Double.parseDouble(map.get("count").toString()))) + .longValue(); + dataCountFfs = dataCountFfs + 1; + } } if ((dataCountRemun == 1 && dataCountFfs == 0) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java index 6bd03c2d..a7901c4f 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PendapatanServiceImpl.java @@ -576,8 +576,9 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat rawResult.add(map); } else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString())) && map.get("departemenId").equals(Master.Departemen.IGD) - && drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD) - .contains(Integer.parseInt(map.get("idProduk").toString()))) { + && map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && drKsmUmumList.contains(idPegawai) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { rawResult.add(map); } else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException) && listDetailJenisProdukException @@ -714,7 +715,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat if (map.get("namaShift").toString().contains("Pagi Sore Malam")) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -727,7 +734,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -758,7 +771,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -795,7 +813,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -931,7 +954,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat if (map.get("namaShift").toString().contains("Pagi Sore Malam")) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -944,7 +973,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -975,7 +1010,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -1012,7 +1052,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -1147,7 +1192,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat if (map.get("namaShift").toString().contains("Pagi Sore Malam")) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -1160,7 +1211,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -1191,7 +1248,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -1228,7 +1290,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -1763,8 +1830,9 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat } } else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString())) && map.get("departemenId").equals(Master.Departemen.IGD) - && drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD) - .contains(Integer.parseInt(map.get("idProduk").toString()))) { + && map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && drKsmUmumList.contains(idPegawai) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) { if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) @@ -1946,7 +2014,15 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } + } } else { if (Double.valueOf(map.get("diskon").toString()) == 0 @@ -1954,7 +2030,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) @@ -2012,7 +2095,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } else { if (Double.valueOf(map.get("diskon").toString()) == 0 @@ -2020,7 +2110,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) @@ -2108,7 +2205,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer .valueOf(map.get("statusDiskon").toString()).equals(0))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } else { if (Double.valueOf(map.get("diskon").toString()) == 0 @@ -2116,7 +2219,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) @@ -2175,7 +2284,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer .valueOf(map.get("statusDiskon").toString()).equals(0))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } else { if (Double.valueOf(map.get("diskon").toString()) == 0 @@ -2183,7 +2298,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) @@ -2211,8 +2332,9 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat } } else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString())) && map.get("departemenId").equals(Master.Departemen.IGD) - && drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD) - .contains(Integer.parseInt(map.get("idProduk").toString()))) { + && map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && drKsmUmumList.contains(idPegawai) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) { Date tanggalPelayanan = (Date) map.get("tanggalPelayanan"); String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan); @@ -2342,7 +2464,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } else { if (Double.valueOf(map.get("diskon").toString()) == 0 @@ -2350,7 +2479,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) @@ -2408,7 +2544,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } else { if (Double.valueOf(map.get("diskon").toString()) == 0 @@ -2416,7 +2559,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) @@ -2504,7 +2654,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer .valueOf(map.get("statusDiskon").toString()).equals(0))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } else { if (Double.valueOf(map.get("diskon").toString()) == 0 @@ -2512,7 +2668,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) @@ -2571,7 +2733,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer .valueOf(map.get("statusDiskon").toString()).equals(0))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } else { if (Double.valueOf(map.get("diskon").toString()) == 0 @@ -2579,7 +2747,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) @@ -2737,7 +2911,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } else { if (Double.valueOf(map.get("diskon").toString()) == 0 @@ -2745,7 +2926,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) @@ -2803,7 +2991,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } else { if (Double.valueOf(map.get("diskon").toString()) == 0 @@ -2811,7 +3006,14 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId") + .equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) @@ -2899,7 +3101,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer .valueOf(map.get("statusDiskon").toString()).equals(0))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } else { if (Double.valueOf(map.get("diskon").toString()) == 0 @@ -2907,7 +3115,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) @@ -2966,7 +3180,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer .valueOf(map.get("statusDiskon").toString()).equals(0))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } else { if (Double.valueOf(map.get("diskon").toString()) == 0 @@ -2974,7 +3194,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNotNullOrEmpty(map.get("statusDiskon")) && !Integer.valueOf(map.get("statusDiskon").toString()) .equals(0))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) @@ -3350,8 +3576,9 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat rawResult.add(map); } else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString())) && map.get("departemenId").equals(Master.Departemen.IGD) - && drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD) - .contains(Integer.parseInt(map.get("idProduk").toString()))) { + && map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && drKsmUmumList.contains(idPegawai) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { rawResult.add(map); } else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException) && listDetailJenisProdukException @@ -3488,7 +3715,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -3522,7 +3755,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat || dateTimePelayanan.isAfter(datePulang))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -3571,7 +3810,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -3608,7 +3852,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -3619,8 +3868,9 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat } } else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString())) && map.get("departemenId").equals(Master.Departemen.IGD) - && drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD) - .contains(Integer.parseInt(map.get("idProduk").toString()))) { + && map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && drKsmUmumList.contains(idPegawai) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { if (CommonUtil.isNotNullOrEmpty(map.get("jamMasuk"))) { Date tanggalPelayanan = (Date) map.get("tanggalPelayanan"); String tglPelayanan = new SimpleDateFormat("yyyy-MM-dd").format(tanggalPelayanan); @@ -3744,7 +3994,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -3778,7 +4034,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat || dateTimePelayanan.isAfter(datePulang))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -3828,7 +4090,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -3866,7 +4133,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -4001,7 +4273,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -4035,7 +4313,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat || dateTimePelayanan.isAfter(datePulang))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -4084,7 +4368,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -4121,7 +4410,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - rawResult.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + rawResult.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + rawResult.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -4604,8 +4898,9 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat result.add(map); } else if (!listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString())) && map.get("departemenId").equals(Master.Departemen.IGD) - && drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD) - .contains(Integer.parseInt(map.get("idProduk").toString()))) { + && map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && drKsmUmumList.contains(idPegawai) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { result.add(map); } else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException) && listDetailJenisProdukException @@ -4739,7 +5034,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -4773,7 +5074,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat || dateTimePelayanan.isAfter(datePulang))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -4822,7 +5129,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -4859,7 +5171,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -4995,7 +5312,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -5029,7 +5352,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat || dateTimePelayanan.isAfter(datePulang))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -5078,7 +5407,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -5115,7 +5449,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -5250,7 +5589,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -5284,7 +5629,13 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat || dateTimePelayanan.isAfter(datePulang))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk") + .equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -5333,7 +5684,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang) || dateTimePelayanan.isAfter(datePulang))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP) @@ -5370,7 +5726,12 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat && CommonUtil.isNullOrEmpty(map.get("rekananId")))) { if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN) .contains(Integer.parseInt(map.get("departemenId").toString()))) { - result.add(map); + if (map.get("ruanganId").equals(Master.Ruangan.KLINIK_FALSE_EMERGENCY) + && map.get("idProduk").equals(Master.Produk.KONSULTASI_DOKTER_JAGA)) { + result.add(map); + } else if (!map.get("departemenId").equals(Master.Departemen.IGD)) { + result.add(map); + } } else if (Arrays.asList(Master.Departemen.GRUP_RAWAT_INAP) .contains(Integer.parseInt(map.get("departemenId").toString())) && Arrays.asList(Master.Kelas.KELAS_SATU_VIP)