From c197f2c381b847d5e2c885dc45ef97db72eb1d2f Mon Sep 17 00:00:00 2001 From: salmanoe Date: Tue, 10 Jan 2023 09:42:14 +0700 Subject: [PATCH] Update IndekKinerjaServiceImpl.java Rollback aturan pembatasan 2 kali visite di hari dan pasien yang sama --- .../service/impl/IndekKinerjaServiceImpl.java | 68 ++----------------- 1 file changed, 4 insertions(+), 64 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 684db3bb..8b423667 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 @@ -3225,22 +3225,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && (Double.parseDouble(map.get("diskon").toString()) > 0 && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer .valueOf(map.get("statusDiskon").toString()).equals(0)))) { - if (drKkPerinatologiList.contains(idPegawai)) { - if ((Arrays.asList(Master.Produk.MONITORING_INTERVENSI) - .contains(map.get("idProduk")) - || map.get("namaProduk").toString().toLowerCase() - .contains(Master.VISIT)) - && count1 < 2) { - count1 = count1 + Double.parseDouble(map.get("count").toString()); - } else if (!Arrays.asList(Master.Produk.MONITORING_INTERVENSI) - .contains(map.get("idProduk")) - && !map.get("namaProduk").toString().toLowerCase() - .contains(Master.VISIT)) { - count1 = count1 + Double.parseDouble(map.get("count").toString()); - } - } else { - count1 = count1 + Double.parseDouble(map.get("count").toString()); - } + count1 = count1 + Double.parseDouble(map.get("count").toString()); dataCount1 = dataCount1 + 1; if (dataCount1 == 1) { mapResult1.putAll(map); @@ -3249,22 +3234,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && Integer.parseInt(map.get("idKelas").toString()) == idKelas && Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana && map.get("tanggal").toString().equals(tanggal)) { - if (drKkPerinatologiList.contains(idPegawai)) { - if ((Arrays.asList(Master.Produk.MONITORING_INTERVENSI) - .contains(map.get("idProduk")) - || map.get("namaProduk").toString().toLowerCase() - .contains(Master.VISIT)) - && count2 < 2) { - count2 = count2 + Double.parseDouble(map.get("count").toString()); - } else if (!Arrays.asList(Master.Produk.MONITORING_INTERVENSI) - .contains(map.get("idProduk")) - && !map.get("namaProduk").toString().toLowerCase() - .contains(Master.VISIT)) { - count2 = count2 + Double.parseDouble(map.get("count").toString()); - } - } else { - count2 = count2 + Double.parseDouble(map.get("count").toString()); - } + count2 = count2 + Double.parseDouble(map.get("count").toString()); dataCount2 = dataCount2 + 1; if (dataCount2 == 1) { mapResult2.putAll(map); @@ -4599,22 +4569,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer .valueOf(map.get("statusDiskon").toString()).equals(0)))) { - if (drKkPerinatologiList.contains(idPegawai)) { - if ((Arrays.asList(Master.Produk.MONITORING_INTERVENSI) - .contains(map.get("idProduk")) - || map.get("namaProduk").toString().toLowerCase() - .contains(Master.VISIT)) - && count1 < 2) { - count1 = count1 + Double.parseDouble(map.get("count").toString()); - } else if (!Arrays.asList(Master.Produk.MONITORING_INTERVENSI) - .contains(map.get("idProduk")) - && !map.get("namaProduk").toString().toLowerCase() - .contains(Master.VISIT)) { - count1 = count1 + Double.parseDouble(map.get("count").toString()); - } - } else { - count1 = count1 + Double.parseDouble(map.get("count").toString()); - } + count1 = count1 + Double.parseDouble(map.get("count").toString()); dataCount1 = dataCount1 + 1; if (dataCount1 == 1) { mapResult1.putAll(map); @@ -4623,22 +4578,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK && Integer.parseInt(map.get("idKelas").toString()) == idKelas && Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana && map.get("tanggal").toString().equals(tanggal)) { - if (drKkPerinatologiList.contains(idPegawai)) { - if ((Arrays.asList(Master.Produk.MONITORING_INTERVENSI) - .contains(map.get("idProduk")) - || map.get("namaProduk").toString().toLowerCase() - .contains(Master.VISIT)) - && count2 < 2) { - count2 = count2 + Double.parseDouble(map.get("count").toString()); - } else if (!Arrays.asList(Master.Produk.MONITORING_INTERVENSI) - .contains(map.get("idProduk")) - && !map.get("namaProduk").toString().toLowerCase() - .contains(Master.VISIT)) { - count2 = count2 + Double.parseDouble(map.get("count").toString()); - } - } else { - count2 = count2 + Double.parseDouble(map.get("count").toString()); - } + count2 = count2 + Double.parseDouble(map.get("count").toString()); dataCount2 = dataCount2 + 1; if (dataCount2 == 1) { mapResult2.putAll(map);