From 2726849491e8774b2ae18a89f1f19de8e293a49e Mon Sep 17 00:00:00 2001 From: Salman Manoe Date: Wed, 7 Jun 2023 11:14:57 +0700 Subject: [PATCH] Update PelayananPasienServiceImpl.java Penambahan kondisi filter per tanggal --- .../impl/PelayananPasienServiceImpl.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java index 2ce7f8ac..7fb83873 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java @@ -633,12 +633,14 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel boolean existEpisode = false; for (Map e : listEpisode) if (e.get("id").toString().equals(d.get("idPasienDaftar")) - && Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk"))) + && Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk")) + && e.get("tanggal").toString().equals(d.get("tanggal"))) existEpisode = true; if (!existEpisode) { Map episode = new HashMap<>(); episode.put("id", d.get("idPasienDaftar")); episode.put("idProduk", d.get("idProduk")); + episode.put("tanggal", d.get("tanggal")); episode.put("count", 1); listEpisode.add(episode); } @@ -652,8 +654,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel int count = 1; for (Map e : listEpisode) if (Master.GolonganProduk.VISIT.equals(d.get("idGolonganProduk"))) { - if (d.get("idPasienDaftar").equals(e.get("id")) + if (d.get("idPasienDaftar").toString().equals(e.get("id")) && Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk")) + && d.get("tanggal").toString().equals(e.get("tanggal")) && Integer.parseInt(e.get("count").toString()) <= maxVisit) { rawDataBpjs2.add(d); count = Integer.parseInt(e.get("count").toString()); @@ -688,12 +691,14 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel boolean existEpisode = false; for (Map e : listEpisode) if (e.get("id").toString().equals(d.get("idPasienDaftar")) - && Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk"))) + && Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk")) + && e.get("tanggal").toString().equals(d.get("tanggal"))) existEpisode = true; if (!existEpisode) { Map episode = new HashMap<>(); episode.put("id", d.get("idPasienDaftar")); episode.put("idProduk", d.get("idProduk")); + episode.put("tanggal", d.get("tanggal")); episode.put("count", 1); listEpisode.add(episode); } @@ -709,8 +714,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel if ((Master.Ruangan.ICU_PICU.equals(d.get("idRuangan")) || Master.Ruangan.NICU.equals(d.get("idRuangan"))) && Master.GolonganProduk.VISIT.equals(d.get("idGolonganProduk"))) { - if (d.get("idPasienDaftar").equals(e.get("id")) + if (d.get("idPasienDaftar").toString().equals(e.get("id")) && Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk")) + && d.get("tanggal").toString().equals(e.get("tanggal")) && Integer.parseInt(e.get("count").toString()) <= maxVisit) { rawDataBpjs3.add(d); count = Integer.parseInt(e.get("count").toString()); @@ -747,12 +753,14 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel boolean existEpisode = false; for (Map e : listEpisode) if (e.get("id").toString().equals(d.get("idPasienDaftar")) - && Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk"))) + && Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk")) + && e.get("tanggal").toString().equals(d.get("tanggal"))) existEpisode = true; if (!existEpisode) { Map episode = new HashMap<>(); episode.put("id", d.get("idPasienDaftar")); episode.put("idProduk", d.get("idProduk")); + episode.put("tanggal", d.get("tanggal")); episode.put("count", 1); listEpisode.add(episode); } @@ -768,8 +776,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel if ((Master.Ruangan.ICU_PICU.equals(d.get("idRuangan")) || Master.Ruangan.NICU.equals(d.get("idRuangan"))) && idsMonitoringHemodinamikGagalOrgan.contains(d.get("idProduk"))) { - if (d.get("idPasienDaftar").equals(e.get("id")) + if (d.get("idPasienDaftar").toString().equals(e.get("id")) && Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk")) + && d.get("tanggal").toString().equals(e.get("tanggal")) && Integer.parseInt(e.get("count").toString()) <= maxMonitoring) { rawDataBpjs4.add(d); count = Integer.parseInt(e.get("count").toString()); @@ -805,12 +814,14 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel boolean existEpisode = false; for (Map e : listEpisode) if (e.get("id").toString().equals(d.get("idPasienDaftar")) - && Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk"))) + && Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk")) + && e.get("tanggal").toString().equals(d.get("tanggal"))) existEpisode = true; if (!existEpisode) { Map episode = new HashMap<>(); episode.put("id", d.get("idPasienDaftar")); episode.put("idProduk", d.get("idProduk")); + episode.put("tanggal", d.get("tanggal")); episode.put("count", 1); listEpisode.add(episode); } @@ -825,8 +836,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel for (Map e : listEpisode) if (Master.Ruangan.NICU.equals(d.get("idRuangan")) && idsMonitoringIntervensi.contains(d.get("idProduk"))) { - if (d.get("idPasienDaftar").equals(e.get("id")) + if (d.get("idPasienDaftar").toString().equals(e.get("id")) && Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk")) + && d.get("tanggal").toString().equals(e.get("tanggal")) && Integer.parseInt(e.get("count").toString()) <= maxMonitoring) { rawDataBpjs5.add(d); count = Integer.parseInt(e.get("count").toString());