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 b117cf7e..9c36b169 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
@@ -681,8 +681,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			 */
 			List<Map<String, Object>> listEpisode = new ArrayList<>();
 			for (Map<String, Object> d : rawDataBpjs2) {
-				if ((Master.Ruangan.ICU_PICU.equals(d.get("idRuangan"))
-						|| Master.Ruangan.NICU.equals(d.get("idRuangan")))
+				if (Arrays.asList(Master.Ruangan.ICU_NICU).contains(d.get("idRuangan"))
 						&& Master.GolonganProduk.VISIT.equals(d.get("idGolonganProduk"))) {
 					boolean existEpisode = false;
 					for (Map<String, Object> e : listEpisode)
@@ -707,8 +706,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			for (Map<String, Object> d : rawDataBpjs2) {
 				int count = 1;
 				for (Map<String, Object> e : listEpisode)
-					if ((Master.Ruangan.ICU_PICU.equals(d.get("idRuangan"))
-							|| Master.Ruangan.NICU.equals(d.get("idRuangan")))
+					if (Arrays.asList(Master.Ruangan.ICU_NICU).contains(d.get("idRuangan"))
 							&& Master.GolonganProduk.VISIT.equals(d.get("idGolonganProduk"))) {
 						if (d.get("idPasienDaftar").toString().equals(e.get("id"))
 								&& Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk"))
@@ -723,8 +721,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					} else {
 						break;
 					}
-				if ((!Master.Ruangan.ICU_PICU.equals(d.get("idRuangan"))
-						&& !Master.Ruangan.NICU.equals(d.get("idRuangan")))
+				if (!Arrays.asList(Master.Ruangan.ICU_NICU).contains(d.get("idRuangan"))
 						|| !Master.GolonganProduk.VISIT.equals(d.get("idGolonganProduk")) && count == 1)
 					rawDataBpjs3.add(d);
 			}
@@ -743,8 +740,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			 */
 			List<Map<String, Object>> listEpisode = new ArrayList<>();
 			for (Map<String, Object> d : rawDataBpjs3) {
-				if ((Master.Ruangan.ICU_PICU.equals(d.get("idRuangan"))
-						|| Master.Ruangan.NICU.equals(d.get("idRuangan")))
+				if (Arrays.asList(Master.Ruangan.ICU_NICU).contains(d.get("idRuangan"))
 						&& idsMonitoringHemodinamikGagalOrgan.contains(d.get("idProduk"))) {
 					boolean existEpisode = false;
 					for (Map<String, Object> e : listEpisode)
@@ -769,8 +765,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			for (Map<String, Object> d : rawDataBpjs3) {
 				int count = 1;
 				for (Map<String, Object> e : listEpisode)
-					if ((Master.Ruangan.ICU_PICU.equals(d.get("idRuangan"))
-							|| Master.Ruangan.NICU.equals(d.get("idRuangan")))
+					if (Arrays.asList(Master.Ruangan.ICU_NICU).contains(d.get("idRuangan"))
 							&& idsMonitoringHemodinamikGagalOrgan.contains(d.get("idProduk"))) {
 						if (d.get("idPasienDaftar").toString().equals(e.get("id"))
 								&& Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk"))
@@ -785,8 +780,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					} else {
 						break;
 					}
-				if ((!Master.Ruangan.ICU_PICU.equals(d.get("idRuangan"))
-						&& !Master.Ruangan.NICU.equals(d.get("idRuangan")))
+				if (!Arrays.asList(Master.Ruangan.ICU_NICU).contains(d.get("idRuangan"))
 						|| !idsMonitoringHemodinamikGagalOrgan.contains(d.get("idProduk")) && count == 1)
 					rawDataBpjs4.add(d);
 			}
@@ -805,7 +799,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			 */
 			List<Map<String, Object>> listEpisode = new ArrayList<>();
 			for (Map<String, Object> d : rawDataBpjs4) {
-				if (Master.Ruangan.NICU.equals(d.get("idRuangan"))
+				if ((Master.Ruangan.NICU.equals(d.get("idRuangan"))
+						|| Master.Ruangan.NICU_COVID.equals(d.get("idRuangan")))
 						&& idsMonitoringIntervensi.contains(d.get("idProduk"))) {
 					boolean existEpisode = false;
 					for (Map<String, Object> e : listEpisode)
@@ -830,7 +825,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			for (Map<String, Object> d : rawDataBpjs4) {
 				int count = 1;
 				for (Map<String, Object> e : listEpisode)
-					if (Master.Ruangan.NICU.equals(d.get("idRuangan"))
+					if ((Master.Ruangan.NICU.equals(d.get("idRuangan"))
+							|| Master.Ruangan.NICU_COVID.equals(d.get("idRuangan")))
 							&& idsMonitoringIntervensi.contains(d.get("idProduk"))) {
 						if (d.get("idPasienDaftar").toString().equals(e.get("id"))
 								&& Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk"))
@@ -845,7 +841,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					} else {
 						break;
 					}
-				if ((!Master.Ruangan.NICU.equals(d.get("idRuangan"))
+				if (((!Master.Ruangan.NICU.equals(d.get("idRuangan"))
+						&& !Master.Ruangan.NICU_COVID.equals(d.get("idRuangan")))
 						|| !idsMonitoringIntervensi.contains(d.get("idProduk"))) && count == 1)
 					rawDataBpjs5.add(d);
 			}
@@ -881,7 +878,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			for (Map<String, Object> e : listEpisode) {
 				if (!Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS).contains(d.get("idKelompokPasien"))
 						&& Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
-						&& d.get("idPasienDaftar").equals(e.get("id"))
+						&& d.get("idPasienDaftar").toString().equals(e.get("id"))
 						&& Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk"))) {
 					if (e.get("count").equals(1)) {
 						/*
@@ -1099,7 +1096,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			/*
 			 * Dokter luar hanya mendapatkan ffs
 			 */
-			for (Map<String, Object> next = queuePelayanan.poll(); next != null; next = queuePelayanan.poll()) {
+			for (Map<String, Object> next = queuePelayanan.poll(); next != null; next = queuePelayanan.poll())
 				if (Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS).contains(next.get("idKelompokPasien"))
 						&& idsDokterBPJSffs.contains(idPegawai)) {
 					/*
@@ -1109,7 +1106,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				} else if (!Arrays.asList(Master.JenisProduk.NONTINDAKAN).contains(next.get("idJenisProduk"))) {
 					listPelayananFfs.add(next);
 				}
-			}
 		} else {
 			for (Map<String, Object> next = queuePelayanan.poll(); next != null; next = queuePelayanan.poll())
 				if (Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS).contains(next.get("idKelompokPasien"))) {
@@ -1826,7 +1822,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			for (Map<String, Object> e : listEpisode) {
 				if (!Arrays.asList(Master.KelompokPasien.KELOMPOK_BPJS).contains(d.get("idKelompokPasien"))
 						&& Master.Departemen.BEDAH_SENTRAL.equals(d.get("idDepartemen"))
-						&& d.get("idPasienDaftar").equals(e.get("id"))
+						&& d.get("idPasienDaftar").toString().equals(e.get("id"))
 						&& Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk"))) {
 					if (e.get("count").equals(1)) {
 						/*