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 0ae3da22..2ce7f8ac 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,7 +633,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					boolean existEpisode = false;
 					for (Map<String, Object> e : listEpisode)
 						if (e.get("id").toString().equals(d.get("idPasienDaftar"))
-								&& e.get("idProduk").toString().equals(d.get("idProduk")))
+								&& Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk")))
 							existEpisode = true;
 					if (!existEpisode) {
 						Map<String, Object> episode = new HashMap<>();
@@ -652,7 +652,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				int count = 1;
 				for (Map<String, Object> e : listEpisode)
 					if (Master.GolonganProduk.VISIT.equals(d.get("idGolonganProduk"))) {
-						if (d.get("idPasienDaftar").equals(e.get("id")) && d.get("idProduk").equals(e.get("idProduk"))
+						if (d.get("idPasienDaftar").equals(e.get("id"))
+								&& Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk"))
 								&& Integer.parseInt(e.get("count").toString()) <= maxVisit) {
 							rawDataBpjs2.add(d);
 							count = Integer.parseInt(e.get("count").toString());
@@ -687,7 +688,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					boolean existEpisode = false;
 					for (Map<String, Object> e : listEpisode)
 						if (e.get("id").toString().equals(d.get("idPasienDaftar"))
-								&& e.get("idProduk").toString().equals(d.get("idProduk")))
+								&& Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk")))
 							existEpisode = true;
 					if (!existEpisode) {
 						Map<String, Object> episode = new HashMap<>();
@@ -708,7 +709,8 @@ 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")) && d.get("idProduk").equals(e.get("idProduk"))
+						if (d.get("idPasienDaftar").equals(e.get("id"))
+								&& Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk"))
 								&& Integer.parseInt(e.get("count").toString()) <= maxVisit) {
 							rawDataBpjs3.add(d);
 							count = Integer.parseInt(e.get("count").toString());
@@ -745,7 +747,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					boolean existEpisode = false;
 					for (Map<String, Object> e : listEpisode)
 						if (e.get("id").toString().equals(d.get("idPasienDaftar"))
-								&& e.get("idProduk").toString().equals(d.get("idProduk")))
+								&& Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk")))
 							existEpisode = true;
 					if (!existEpisode) {
 						Map<String, Object> episode = new HashMap<>();
@@ -766,7 +768,8 @@ 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")) && d.get("idProduk").equals(e.get("idProduk"))
+						if (d.get("idPasienDaftar").equals(e.get("id"))
+								&& Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk"))
 								&& Integer.parseInt(e.get("count").toString()) <= maxMonitoring) {
 							rawDataBpjs4.add(d);
 							count = Integer.parseInt(e.get("count").toString());
@@ -802,7 +805,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					boolean existEpisode = false;
 					for (Map<String, Object> e : listEpisode)
 						if (e.get("id").toString().equals(d.get("idPasienDaftar"))
-								&& e.get("idProduk").toString().equals(d.get("idProduk")))
+								&& Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk")))
 							existEpisode = true;
 					if (!existEpisode) {
 						Map<String, Object> episode = new HashMap<>();
@@ -822,7 +825,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				for (Map<String, Object> e : listEpisode)
 					if (Master.Ruangan.NICU.equals(d.get("idRuangan"))
 							&& idsMonitoringIntervensi.contains(d.get("idProduk"))) {
-						if (d.get("idPasienDaftar").equals(e.get("id")) && d.get("idProduk").equals(e.get("idProduk"))
+						if (d.get("idPasienDaftar").equals(e.get("id"))
+								&& Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk"))
 								&& Integer.parseInt(e.get("count").toString()) <= maxMonitoring) {
 							rawDataBpjs5.add(d);
 							count = Integer.parseInt(e.get("count").toString());
@@ -850,7 +854,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				boolean existEpisode = false;
 				for (Map<String, Object> e : listEpisode)
 					if (e.get("id").toString().equals(d.get("idPasienDaftar"))
-							&& e.get("idProduk").toString().equals(d.get("idProduk")))
+							&& Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk")))
 						existEpisode = true;
 				if (!existEpisode) {
 					Map<String, Object> episode = new HashMap<>();
@@ -869,7 +873,8 @@ 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("idProduk").equals(e.get("idProduk"))) {
+						&& d.get("idPasienDaftar").equals(e.get("id"))
+						&& Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk"))) {
 					if (e.get("count").equals(1)) {
 						/*
 						 * Mendapatkan 100% dari tarif
@@ -1790,7 +1795,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				boolean existEpisode = false;
 				for (Map<String, Object> e : listEpisode)
 					if (e.get("id").toString().equals(d.get("idPasienDaftar"))
-							&& e.get("idProduk").toString().equals(d.get("idProduk")))
+							&& Integer.valueOf(e.get("idProduk").toString()).equals(d.get("idProduk")))
 						existEpisode = true;
 				if (!existEpisode) {
 					Map<String, Object> episode = new HashMap<>();
@@ -1809,7 +1814,8 @@ 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("idProduk").equals(e.get("idProduk"))) {
+						&& d.get("idPasienDaftar").equals(e.get("id"))
+						&& Integer.valueOf(d.get("idProduk").toString()).equals(e.get("idProduk"))) {
 					if (e.get("count").equals(1)) {
 						/*
 						 * Mendapatkan 100% dari tarif