diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
index 0b74e16f..35201df0 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
@@ -103,7 +103,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "pp.noRec as noRec,pp.tglPelayanan as tglPelayanan,pp.hargaDiscount as hargaDiskon,pp.jumlah as jumlahTindakan,"
 			+ "su.id as idKelompokKerja,su.name as kelompokKerja,"
 			+ "pr.id as idTindakan,pr.namaProduk as namaTindakan,djp.id as djpId,"
-			+ "ru.departemenId as idDepartemen,ru.id as idRuangan," + "pd.isDiskonPegawai as statusDiskon) "
+			+ "ru.departemenId as idDepartemen,ru.id as idRuangan," + "pd.diskonPegawai as statusDiskon) "
 			+ "from PelayananPasienPetugas ppp, MapRuanganToProduk mrtp, MapPegawaiJabatanToUnitKerja mpju, PegawaiJadwalKerja pjk "
 			+ "left join ppp.pelayananPasien pp " + "left join ppp.kdpegawai pg " + "left join pp.produk pr "
 			+ "left join pp.pasienDaftar apd " + "left join pr.detailJenisProduk djp "
@@ -135,7 +135,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "pp.noRec as noRec,pp.tglPelayanan as tglPelayanan,pp.hargaDiscount as hargaDiskon,pp.jumlah as jumlahTindakan,"
 			+ "pg.id as pegawaiId,pg.namaLengkap as namaLengkap," + "jb.id as jabatanId,jb.namaJabatan as namaJabatan,"
 			+ "pr.id as idTindakan,pr.namaProduk as namaTindakan,djp.id as djpId,"
-			+ "ru.departemenId as idDepartemen,ru.id as idRuangan," + "pd.isDiskonPegawai as statusDiskon) "
+			+ "ru.departemenId as idDepartemen,ru.id as idRuangan," + "pd.diskonPegawai as statusDiskon) "
 			+ "from PelayananPasienPetugas ppp, MapRuanganToProduk mrtp, MapPegawaiJabatanToUnitKerja mpju, PegawaiJadwalKerja pjk "
 			+ "left join ppp.pelayananPasien pp " + "left join ppp.kdpegawai pg " + "left join mpju.jabatan jb "
 			+ "left join pp.produk pr " + "left join pp.pasienDaftar apd " + "left join pr.detailJenisProduk djp "
@@ -167,7 +167,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 	String KinerjaJamKerjaDokter = "select distinct new Map(ppp.ObjectJenisPetugasPeId as jenisPetugasId,"
 			+ "pg.id as pegawaiId," + "pr.id as produkId,pr.namaProduk as namaProduk, djp.id as detailJenisProdukId,"
 			+ "pp.noRec as noRec,pp.tglPelayanan as tglPelayanan,pp.jumlah as jumlah,pp.hargaDiscount as hargaDiskon,"
-			+ "ru.departemenId as departemenId,ru.id as ruanganId," + "pd.isDiskonPegawai as statusDiskon) "
+			+ "ru.departemenId as departemenId,ru.id as ruanganId," + "pd.diskonPegawai as statusDiskon) "
 			+ "from PelayananPasienPetugas ppp, MapRuanganToProduk mrtp, PegawaiJadwalKerja pjk "
 			+ "left join ppp.pelayananPasien pp " + "left join ppp.kdpegawai pg " + "left join pp.produk pr "
 			+ "left join pp.pasienDaftar apd " + "left join pr.detailJenisProduk djp "
@@ -211,7 +211,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 	@Query("select distinct new Map(ppp.ObjectJenisPetugasPeId as jenisPetugasId,"
 			+ "pr.id as produkId,pr.namaProduk as namaProduk,"
 			+ "pp.noRec as noRec,pp.tglPelayanan as tglPelayanan,pp.jumlah as jumlah,pp.hargaDiscount as hargaDiskon,"
-			+ "ru.departemenId as departemenId,ru.id as ruanganId," + "pd.isDiskonPegawai as statusDiskon) "
+			+ "ru.departemenId as departemenId,ru.id as ruanganId," + "pd.diskonPegawai as statusDiskon) "
 			+ "from PelayananPasienPetugas ppp, MapRuanganToProduk mrtp, PegawaiJadwalKerja pjk "
 			+ "left join ppp.pelayananPasien pp " + "left join ppp.kdpegawai pg " + "left join pp.produk pr "
 			+ "left join pp.pasienDaftar apd " + "left join pr.detailJenisProduk djp "
@@ -244,7 +244,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "pr.id as produkId,pr.namaProduk as namaProduk,"
 			+ "pp.noRec as noRec,pp.tglPelayanan as tglPelayanan,to_char(pp.tglPelayanan,'dd-MM-yyyy HH24:MI:ss') as tglPelayananFormatted,pp.jumlah as jumlah,pp.hargaDiscount as hargaDiskon,"
 			+ "ru.departemenId as departemenId,ru.id as ruanganId,ru.namaRuangan as namaRuangan,"
-			+ "pd.noRegistrasi as noRegistrasi,pd.isDiskonPegawai as statusDiskon,"
+			+ "pd.noRegistrasi as noRegistrasi,pd.diskonPegawai as statusDiskon,"
 			+ "ps.namaPasien as namaPasien, ps.noCm as noCm, " + "kp.kelompokPasien as kelompokPasien) "
 			+ "from PelayananPasienPetugas ppp, MapRuanganToProduk mrtp, PegawaiJadwalKerja pjk "
 			+ "left join ppp.pelayananPasien pp " + "left join ppp.kdpegawai pg "
@@ -277,7 +277,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "pr.id as produkId,pr.namaProduk as namaProduk,"
 			+ "pp.noRec as noRec,pp.tglPelayanan as tglPelayanan,to_char(pp.tglPelayanan,'dd-MM-yyyy HH24:MI:ss') as tglPelayananFormatted,pp.jumlah as jumlah,pp.hargaDiscount as hargaDiskon,"
 			+ "ru.departemenId as departemenId,ru.id as ruanganId,ru.namaRuangan as namaRuangan,"
-			+ "pd.noRegistrasi as noRegistrasi,pd.isDiskonPegawai as statusDiskon,"
+			+ "pd.noRegistrasi as noRegistrasi,pd.diskonPegawai as statusDiskon,"
 			+ "ps.namaPasien as namaPasien, ps.noCm as noCm, kp.kelompokPasien as kelompokPasien) "
 			+ "from PelayananPasienPetugas ppp, MapRuanganToProduk mrtp, PegawaiJadwalKerja pjk "
 			+ "left join ppp.pelayananPasien pp " + "left join ppp.kdpegawai pg "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PendapatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PendapatanDao.java
index d06d22be..44fb4bf1 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PendapatanDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PendapatanDao.java
@@ -35,7 +35,7 @@ public interface PendapatanDao extends PagingAndSortingRepository<PelayananPasie
 			+ "coalesce(pelayananPasienDetail.hargaJual, 0) as hargaJual,"
 			+ "coalesce(pelayananPasienDetail.hargaDiscount, 0) as hargaDiskon,"
 			+ "pelayananPasienDetail.komponenHargaId as idJasa," + "pasienDaftar.kelompokPasienId as kelompokPasienId, "
-			+ "pasienDaftar.isDiskonPegawai as statusDiskon, " + "kategoryPegawai.id as kategoryPegawaiId, "
+			+ "pasienDaftar.diskonPegawai as statusDiskon, " + "kategoryPegawai.id as kategoryPegawaiId, "
 			+ "departemen.id as departemenId, " + "ruangan.id as ruanganId, "
 			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " + "shift.jamMasuk as jamMasuk, "
 			+ "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
@@ -73,7 +73,7 @@ public interface PendapatanDao extends PagingAndSortingRepository<PelayananPasie
 			+ "coalesce(pelayananPasienDetail.hargaDiscount, 0) as hargaDiskon,"
 			+ "pelayananPasienDetail.komponenHargaId as idKomponenHarga," + "pasienDaftar.noRegistrasi as noRegistrasi,"
 			+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pasienDaftar.tglPulang as tglPulang,"
-			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.isDiskonPegawai as statusDiskon, "
+			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.diskonPegawai as statusDiskon, "
 			+ "produk.id as idProduk," + "produk.namaProduk as namaProduk," + "dokter.id as idPegawai,"
 			+ "pelayananPasien.noRec as noRecPelayananPasien," + "pelayananPasien.jumlah as jumlah,"
 			+ "pelayananPasien.hargaSatuan as harga," + "pelayananPasien.hargaDiscount as diskon,"
@@ -169,7 +169,7 @@ public interface PendapatanDao extends PagingAndSortingRepository<PelayananPasie
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, " + "kelas.id as idKelas,"
 			+ "kelas.namaKelas as namaKelas," + "pasienDaftar.noRegistrasi as noRegistrasi,"
 			+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pasienDaftar.tglPulang as tglPulang,"
-			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.isDiskonPegawai as statusDiskon, "
+			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.diskonPegawai as statusDiskon, "
 			+ "produk.id as idProduk," + "produk.namaProduk as namaProduk," + "dokter.id as idPegawai,"
 			+ "kategoryPegawai.id as kategoryPegawaiId, " + "jenisPetugas.id as idJenisPelaksana, "
 			+ "jenisPetugas.jenisPetugasPe as jenisPetugas, " + "departemen.id as departemenId, "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
index 40f2ff6e..9a14231c 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/RevIndekKinerjaDao.java
@@ -129,7 +129,7 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "coalesce(pelayananPasien.hargaSatuan, 0) as harga, " + "pelayananPasien.hargaDiscount as diskon, "
 			+ "pelayananPasien.jumlah as count, " + "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tanggal, "
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
-			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.isDiskonPegawai as statusDiskon, "
+			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.diskonPegawai as statusDiskon, "
 			+ "kategoryPegawai.id as kategoryPegawaiId, " + "departemen.id as departemenId, "
 			+ "ruangan.id as ruanganId, " + "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, "
 			+ "shift.jamMasuk as jamMasuk, " + "shift.jamPulang as jamPulang, " + "shift.namaShift as namaShift) "
@@ -183,7 +183,7 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "pasienDaftar.tglPulang as tglPulang," + "produk.id as idProduk," + "dokter.id as idPegawai,"
 			+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglpel,"
 			+ "cast(pelayananPasien.tglPelayanan as timestamp) as tanggalPelayanan, "
-			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.isDiskonPegawai as statusDiskon, "
+			+ "pasienDaftar.kelompokPasienId as kelompokPasienId, " + "pasienDaftar.diskonPegawai as statusDiskon, "
 			+ "kategoryPegawai.id as kategoryPegawaiId, " + "kelas.id as idKelas,"
 			+ "jenisPetugas.jenisPetugasPe as jenisPetugas, " + "departemen.id as departemenId, "
 			+ "to_char(kalender.tanggal, 'yyyy-MM-dd') as tanggalKalender, " + "shift.jamMasuk as jamMasuk, "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/IndekKinerjaService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/IndekKinerjaService.java
index fb58a023..a66aa80a 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/IndekKinerjaService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/IndekKinerjaService.java
@@ -90,7 +90,7 @@ public interface IndekKinerjaService {
 			String tgl, Boolean ffs);
 
 	List<Map<String, Object>> findPatientDetailForEveryTindakanReview(Integer idProduk, Integer idKelas,
-			Integer idPegawai, String tgl, Boolean ffs, Double diskon, Boolean statusDiskon);
+			Integer idPegawai, String tgl, Boolean ffs, Double diskon, Integer statusDiskon);
 
 	List<Map<String, Object>> findPatientDetailForEveryTindakanReview(Integer idPegawai, String tgl, Boolean ffs);
 
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PendapatanService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PendapatanService.java
index 974b4a15..89204107 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PendapatanService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PendapatanService.java
@@ -22,7 +22,7 @@ public interface PendapatanService {
 	List<Map<String, Object>> getFeeForServiceDokter(String periode, Integer idPegawai);
 
 	List<Map<String, Object>> getDetailFeeForServiceDokter(Integer idProduk, Integer idKelas, Integer idKomponenHarga,
-			Integer idPegawai, String tgl, Double diskon, Boolean statusDiskon);
+			Integer idPegawai, String tgl, Double diskon, Integer statusDiskon);
 
 	List<Map<String, Object>> getCetakLaporanFeeForServiceDokter(String periode, Integer idDepartemen);
 
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java
index 6b42613b..526b1630 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/IkiDanRemunerasiServiceImpl.java
@@ -700,7 +700,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik
 
 					if (Double.valueOf(layanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(layanan.get("statusDiskon"))
-									|| !Boolean.valueOf(layanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(layanan.get("statusDiskon").toString()).equals(0))) {
 						layanan.put("jumlahTindakan", 0.0);
 					} else if (listRuangEks.contains(layanan.get("idRuangan"))
 							&& !layanan.get("namaTindakan").toString().toLowerCase().contains(Master.KONSUL)
@@ -1210,7 +1210,7 @@ public class IkiDanRemunerasiServiceImpl extends BaseVoServiceImpl implements Ik
 
 					if (Double.valueOf(layanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(layanan.get("statusDiskon"))
-									|| !Boolean.valueOf(layanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(layanan.get("statusDiskon").toString()).equals(0))) {
 						layanan.put("jumlahTindakan", 0.0);
 					} else if (listRuangEks.contains(layanan.get("idRuangan"))
 							&& !layanan.get("namaTindakan").toString().toLowerCase().contains(Master.KONSUL)
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 3ce9def6..3c322ce1 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
@@ -2983,8 +2983,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										&& Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana
 										&& map.get("tanggal").toString().equals(tanggal)
 										&& (Double.parseDouble(map.get("diskon").toString()) > 0
-												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString())))) {
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0)))) {
 									count1 = count1 + Double.parseDouble(map.get("count").toString());
 									dataCount1 = dataCount1 + 1;
 									if (dataCount1 == 1) {
@@ -3039,8 +3039,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									&& Integer.parseInt(map.get("idKelas").toString()) == idKelas
 									&& Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana
 									&& (Double.parseDouble(map.get("diskon").toString()) > 0
-											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString())))) {
+											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+													.valueOf(map.get("statusDiskon").toString()).equals(0)))) {
 								countMap.put("count", map.get("count"));
 								if (CommonUtil.isNotNullOrEmpty(map.get("hargaKelas1"))) {
 									countMap.put("harga", map.get("hargaKelas1"));
@@ -3105,8 +3105,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
 									if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
-											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon"))
-													|| !Boolean.valueOf(mapResult1.get("statusDiskon").toString()))) {
+											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer
+													.valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) {
 										isDiskonJasamedis1 = true;
 									}
 								} else {
@@ -3119,8 +3119,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
 									if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
-											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon"))
-													|| !Boolean.valueOf(mapResult1.get("statusDiskon").toString()))) {
+											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer
+													.valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) {
 										isDiskonJasamedis1 = true;
 									}
 								}
@@ -3161,8 +3161,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
 									if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
-											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon"))
-													|| !Boolean.valueOf(mapResult2.get("statusDiskon").toString()))) {
+											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer
+													.valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) {
 										isDiskonJasamedis2 = true;
 									}
 								} else {
@@ -3175,8 +3175,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
 									if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
-											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon"))
-													|| !Boolean.valueOf(mapResult2.get("statusDiskon").toString()))) {
+											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer
+													.valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) {
 										isDiskonJasamedis2 = true;
 									}
 								}
@@ -4026,8 +4026,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										&& Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana
 										&& map.get("tanggal").toString().equals(tanggal)
 										&& (Double.valueOf(map.get("diskon").toString()) > 0
-												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString())))) {
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0)))) {
 									count1 = count1 + Double.parseDouble(map.get("count").toString());
 									dataCount1 = dataCount1 + 1;
 									if (dataCount1 == 1) {
@@ -4076,8 +4076,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									&& Integer.parseInt(map.get("idKelas").toString()) == idKelas
 									&& Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana
 									&& (Double.valueOf(map.get("diskon").toString()) > 0
-											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString())))) {
+											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+													.valueOf(map.get("statusDiskon").toString()).equals(0)))) {
 								countMap.put("count", map.get("count"));
 								if (CommonUtil.isNotNullOrEmpty(map.get("hargaKelas1"))) {
 									countMap.put("harga", map.get("hargaKelas1"));
@@ -4138,8 +4138,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
 									if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
-											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon"))
-													|| !Boolean.valueOf(mapResult1.get("statusDiskon").toString()))) {
+											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer
+													.valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) {
 										isDiskonJasamedis1 = true;
 									}
 								} else {
@@ -4152,8 +4152,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
 									if (Double.parseDouble(mapResult1.get("diskon").toString()) > 0
-											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon"))
-													|| !Boolean.valueOf(mapResult1.get("statusDiskon").toString()))) {
+											&& (CommonUtil.isNullOrEmpty(mapResult1.get("statusDiskon")) || Integer
+													.valueOf(mapResult1.get("statusDiskon").toString()).equals(0))) {
 										isDiskonJasamedis1 = true;
 									}
 								}
@@ -4200,8 +4200,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										.get("idJenisPelaksana") == Master.JenisPetugasPelaksana.DOKTER_PEMERIKSA) {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
 									if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
-											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon"))
-													|| !Boolean.valueOf(mapResult2.get("statusDiskon").toString()))) {
+											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer
+													.valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) {
 										isDiskonJasamedis2 = true;
 									}
 								} else {
@@ -4214,8 +4214,8 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								} else {
 									percentage = Master.LogbookDokter.PERSENTASE_TINDAKAN_DOKTER_PEMERIKSA;
 									if (Double.parseDouble(mapResult2.get("diskon").toString()) > 0
-											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon"))
-													|| !Boolean.valueOf(mapResult2.get("statusDiskon").toString()))) {
+											&& (CommonUtil.isNullOrEmpty(mapResult2.get("statusDiskon")) || Integer
+													.valueOf(mapResult2.get("statusDiskon").toString()).equals(0))) {
 										isDiskonJasamedis2 = true;
 									}
 								}
@@ -4709,7 +4709,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 
 	@Override
 	public List<Map<String, Object>> findPatientDetailForEveryTindakanReview(Integer idProduk, Integer idKelas,
-			Integer idPegawai, String tgl, Boolean ffs, Double diskon, Boolean statusDiskon) {
+			Integer idPegawai, String tgl, Boolean ffs, Double diskon, Integer statusDiskon) {
 		List<Map<String, Object>> result = new ArrayList<>();
 		List<Map<String, Object>> listData = new ArrayList<>();
 
@@ -4761,33 +4761,37 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								.contains(Integer.parseInt(map.get("detailId").toString()))
 								|| Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_KLINIK)
 										.contains(Integer.parseInt(map.get("detailId").toString()))) {
-							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 								if (Double.valueOf(map.get("diskon").toString()) > 0
 										&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-												|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 									result.add(map);
 								}
 							} else {
 								if (Double.valueOf(map.get("diskon").toString()) == 0
 										|| (Double.valueOf(map.get("diskon").toString()) > 0
 												&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-												&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+														|| Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(2)))) {
 									result.add(map);
 								}
 							}
 						} else if (Master.KelompokPasien.BPJS
 								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
-							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 								if (Double.valueOf(map.get("diskon").toString()) > 0
 										&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-												|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 									result.add(map);
 								}
 							} else {
 								if (Double.valueOf(map.get("diskon").toString()) == 0
 										|| (Double.valueOf(map.get("diskon").toString()) > 0
 												&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-												&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+														|| Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(2)))) {
 									result.add(map);
 								}
 							}
@@ -4835,17 +4839,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("departemenId").toString()))
 									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
 											&& dateTimePelayanan.isBefore(datePulang))) {
-								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 									if (Double.valueOf(map.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 										result.add(map);
 									}
 								} else {
 									if (Double.valueOf(map.get("diskon").toString()) == 0
 											|| (Double.valueOf(map.get("diskon").toString()) > 0
 													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-													&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 										result.add(map);
 									}
 								}
@@ -4855,17 +4861,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
 											|| dateTimePelayanan.isAfter(datePulang))) {
-								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 									if (Double.valueOf(map.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 										result.add(map);
 									}
 								} else {
 									if (Double.valueOf(map.get("diskon").toString()) == 0
 											|| (Double.valueOf(map.get("diskon").toString()) > 0
 													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-													&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 										result.add(map);
 									}
 								}
@@ -4875,17 +4883,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											|| dateTimePelayanan.isAfter(datePulang))
 									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 									if (Double.valueOf(map.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 										result.add(map);
 									}
 								} else {
 									if (Double.valueOf(map.get("diskon").toString()) == 0
 											|| (Double.valueOf(map.get("diskon").toString()) > 0
 													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-													&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 										result.add(map);
 									}
 								}
@@ -4896,17 +4906,21 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
 								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
 										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
-									if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 										if (Double.valueOf(map.get("diskon").toString()) > 0
-												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 											result.add(map);
 										}
 									} else {
 										if (Double.valueOf(map.get("diskon").toString()) == 0
 												|| (Double.valueOf(map.get("diskon").toString()) > 0
 														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-														&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 											result.add(map);
 										}
 									}
@@ -4915,17 +4929,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("departemenId").toString()))
 									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
 											&& dateTimePelayanan.isBefore(datePulang))) {
-								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 									if (Double.valueOf(map.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 										result.add(map);
 									}
 								} else {
 									if (Double.valueOf(map.get("diskon").toString()) == 0
 											|| (Double.valueOf(map.get("diskon").toString()) > 0
 													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-													&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 										result.add(map);
 									}
 								}
@@ -4935,17 +4951,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										.contains(Integer.parseInt(map.get("departemenId").toString()))
 								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 								if (Double.valueOf(map.get("diskon").toString()) > 0
 										&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-												|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 									result.add(map);
 								}
 							} else {
 								if (Double.valueOf(map.get("diskon").toString()) == 0
 										|| (Double.valueOf(map.get("diskon").toString()) > 0
 												&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-												&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+														|| Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(2)))) {
 									result.add(map);
 								}
 							}
@@ -4956,17 +4974,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("idProduk").toString()))) {
 						if (Master.KelompokPasien.BPJS
 								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
-							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 								if (Double.valueOf(map.get("diskon").toString()) > 0
 										&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-												|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 									result.add(map);
 								}
 							} else {
 								if (Double.valueOf(map.get("diskon").toString()) == 0
 										|| (Double.valueOf(map.get("diskon").toString()) > 0
 												&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-												&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+														|| Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(2)))) {
 									result.add(map);
 								}
 							}
@@ -5014,17 +5034,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("departemenId").toString()))
 									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
 											&& dateTimePelayanan.isBefore(datePulang))) {
-								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 									if (Double.valueOf(map.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 										result.add(map);
 									}
 								} else {
 									if (Double.valueOf(map.get("diskon").toString()) == 0
 											|| (Double.valueOf(map.get("diskon").toString()) > 0
 													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-													&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 										result.add(map);
 									}
 								}
@@ -5034,17 +5056,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
 											|| dateTimePelayanan.isAfter(datePulang))) {
-								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 									if (Double.valueOf(map.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 										result.add(map);
 									}
 								} else {
 									if (Double.valueOf(map.get("diskon").toString()) == 0
 											|| (Double.valueOf(map.get("diskon").toString()) > 0
 													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-													&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 										result.add(map);
 									}
 								}
@@ -5054,17 +5078,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											|| dateTimePelayanan.isAfter(datePulang))
 									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 									if (Double.valueOf(map.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 										result.add(map);
 									}
 								} else {
 									if (Double.valueOf(map.get("diskon").toString()) == 0
 											|| (Double.valueOf(map.get("diskon").toString()) > 0
 													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-													&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 										result.add(map);
 									}
 								}
@@ -5075,17 +5101,21 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
 								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
 										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
-									if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 										if (Double.valueOf(map.get("diskon").toString()) > 0
-												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 											result.add(map);
 										}
 									} else {
 										if (Double.valueOf(map.get("diskon").toString()) == 0
 												|| (Double.valueOf(map.get("diskon").toString()) > 0
 														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-														&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 											result.add(map);
 										}
 									}
@@ -5094,17 +5124,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("departemenId").toString()))
 									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
 											&& dateTimePelayanan.isBefore(datePulang))) {
-								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 									if (Double.valueOf(map.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 										result.add(map);
 									}
 								} else {
 									if (Double.valueOf(map.get("diskon").toString()) == 0
 											|| (Double.valueOf(map.get("diskon").toString()) > 0
 													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-													&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 										result.add(map);
 									}
 								}
@@ -5114,17 +5146,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										.contains(Integer.parseInt(map.get("departemenId").toString()))
 								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 								if (Double.valueOf(map.get("diskon").toString()) > 0
 										&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-												|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 									result.add(map);
 								}
 							} else {
 								if (Double.valueOf(map.get("diskon").toString()) == 0
 										|| (Double.valueOf(map.get("diskon").toString()) > 0
 												&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-												&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+														|| Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(2)))) {
 									result.add(map);
 								}
 							}
@@ -5136,33 +5170,37 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 								.contains(Integer.parseInt(map.get("detailId").toString()))
 								|| Arrays.asList(Master.DetailJenisProduk.PENUNJANG_PATOLOGI_KLINIK)
 										.contains(Integer.parseInt(map.get("detailId").toString()))) {
-							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 								if (Double.valueOf(map.get("diskon").toString()) > 0
 										&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-												|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 									result.add(map);
 								}
 							} else {
 								if (Double.valueOf(map.get("diskon").toString()) == 0
 										|| (Double.valueOf(map.get("diskon").toString()) > 0
 												&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-												&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+														|| Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(2)))) {
 									result.add(map);
 								}
 							}
 						} else if (Master.KelompokPasien.BPJS
 								.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
-							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 								if (Double.valueOf(map.get("diskon").toString()) > 0
 										&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-												|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 									result.add(map);
 								}
 							} else {
 								if (Double.valueOf(map.get("diskon").toString()) == 0
 										|| (Double.valueOf(map.get("diskon").toString()) > 0
 												&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-												&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+														|| Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(2)))) {
 									result.add(map);
 								}
 							}
@@ -5210,17 +5248,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("departemenId").toString()))
 									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
 											&& dateTimePelayanan.isBefore(datePulang))) {
-								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 									if (Double.valueOf(map.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 										result.add(map);
 									}
 								} else {
 									if (Double.valueOf(map.get("diskon").toString()) == 0
 											|| (Double.valueOf(map.get("diskon").toString()) > 0
 													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-													&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 										result.add(map);
 									}
 								}
@@ -5230,17 +5270,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											.anyMatch(map.get("namaProduk").toString().toLowerCase()::contains)
 									&& (dateTimePelayanan.isBefore(dateMasuk) || dateTimePelayanan.isEqual(datePulang)
 											|| dateTimePelayanan.isAfter(datePulang))) {
-								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 									if (Double.valueOf(map.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 										result.add(map);
 									}
 								} else {
 									if (Double.valueOf(map.get("diskon").toString()) == 0
 											|| (Double.valueOf(map.get("diskon").toString()) > 0
 													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-													&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 										result.add(map);
 									}
 								}
@@ -5250,17 +5292,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 											|| dateTimePelayanan.isAfter(datePulang))
 									&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 											.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 									if (Double.valueOf(map.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 										result.add(map);
 									}
 								} else {
 									if (Double.valueOf(map.get("diskon").toString()) == 0
 											|| (Double.valueOf(map.get("diskon").toString()) > 0
 													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-													&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 										result.add(map);
 									}
 								}
@@ -5271,17 +5315,21 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									&& (dateTimePelayanan.isBefore(PSBBEnd) || dateTimePelayanan.isEqual(PSBBEnd))) {
 								if (((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
 										&& dateTimePelayanan.isBefore(datePulangPSBB))) {
-									if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 										if (Double.valueOf(map.get("diskon").toString()) > 0
-												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 											result.add(map);
 										}
 									} else {
 										if (Double.valueOf(map.get("diskon").toString()) == 0
 												|| (Double.valueOf(map.get("diskon").toString()) > 0
 														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-														&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 											result.add(map);
 										}
 									}
@@ -5290,17 +5338,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 									.contains(Integer.parseInt(map.get("departemenId").toString()))
 									&& ((dateTimePelayanan.isEqual(dateMasuk) || dateTimePelayanan.isAfter(dateMasuk))
 											&& dateTimePelayanan.isBefore(datePulang))) {
-								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+								if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 									if (Double.valueOf(map.get("diskon").toString()) > 0
 											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 										result.add(map);
 									}
 								} else {
 									if (Double.valueOf(map.get("diskon").toString()) == 0
 											|| (Double.valueOf(map.get("diskon").toString()) > 0
 													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-													&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 										result.add(map);
 									}
 								}
@@ -5310,17 +5360,19 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 										.contains(Integer.parseInt(map.get("departemenId").toString()))
 								&& Arrays.asList(Master.Kelas.KELAS_DUA_TIGA_NONKELAS)
 										.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+							if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 								if (Double.valueOf(map.get("diskon").toString()) > 0
 										&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-												|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 									result.add(map);
 								}
 							} else {
 								if (Double.valueOf(map.get("diskon").toString()) == 0
 										|| (Double.valueOf(map.get("diskon").toString()) > 0
 												&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-												&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+														|| Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(2)))) {
 									result.add(map);
 								}
 							}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
index b731b0df..ca071f27 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java
@@ -709,7 +709,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		for (Map<String, Object> mapLayanan : dataLayanan) {
 			if (Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 					&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-							|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+							|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 				// tidak_dapat_skor_untuk_diskon_dpjp
 				mapLayanan.put("skor", 0.000);
 				mapLayanan.put("tSkor", 0.000);
@@ -938,7 +938,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		for (Map<String, Object> mapLayanan : dataLayanan) {
 			if (Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 					&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-							|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+							|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 				// tidak_dapat_skor_untuk_diskon_dpjp
 				mapLayanan.put("skor", 0.000);
 				mapLayanan.put("tSkor", 0.000);
@@ -1146,7 +1146,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1165,7 +1165,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1188,7 +1188,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1207,7 +1207,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1230,7 +1230,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1249,7 +1249,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1271,7 +1271,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1290,7 +1290,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1312,7 +1312,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1331,7 +1331,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1353,7 +1353,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1372,7 +1372,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1394,7 +1394,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1413,7 +1413,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1440,7 +1440,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1459,7 +1459,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1533,7 +1533,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1552,7 +1552,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1575,7 +1575,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1594,7 +1594,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1617,7 +1617,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1636,7 +1636,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1658,7 +1658,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1677,7 +1677,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1699,7 +1699,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1718,7 +1718,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1740,7 +1740,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1759,7 +1759,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1781,7 +1781,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1800,7 +1800,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1827,7 +1827,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -1846,7 +1846,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 						&& !mapLayanan.get("jenisPetugasId").equals(Master.JenisPetugasPelaksana.ASISTEN_SPESIALIS)) {
 					if (skor.equals(0.0) && Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 							&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-									|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+									|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 						mapLayanan.remove("noRec");
 						mapLayanan.remove("statusDiskon");
 						mapLayanan.remove("departemenId");
@@ -2151,7 +2151,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
 		for (Map<String, Object> mapLayanan : dataLayanan) {
 			if (Double.valueOf(mapLayanan.get("hargaDiskon").toString()) > 0.0
 					&& (CommonUtil.isNullOrEmpty(mapLayanan.get("statusDiskon"))
-							|| !Boolean.valueOf(mapLayanan.get("statusDiskon").toString()))) {
+							|| Integer.valueOf(mapLayanan.get("statusDiskon").toString()).equals(0))) {
 				// tidak_dapat_skor_untuk_diskon_dpjp
 				mapLayanan.put("skor", 0.0);
 				mapLayanan.put("tSkor", 0.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 e0fa0582..7d037991 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
@@ -1101,8 +1101,8 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										&& Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana
 										&& map.get("tanggal").toString().equals(tanggal)
 										&& (Double.valueOf(map.get("diskon").toString()) > 0
-												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString())))) {
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0)))) {
 									count1 = count1 + Double.parseDouble(map.get("count").toString());
 									dataCount1 = dataCount1 + 1;
 									if (dataCount1 == 1) {
@@ -1150,8 +1150,8 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									&& Integer.parseInt(map.get("idKelas").toString()) == idKelas
 									&& Integer.parseInt(map.get("idJenisPelaksana").toString()) == idPelaksana
 									&& (Double.valueOf(map.get("diskon").toString()) > 0
-											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-													|| !Boolean.valueOf(map.get("statusDiskon").toString())))) {
+											&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+													.valueOf(map.get("statusDiskon").toString()).equals(0)))) {
 								countMap.put("count", map.get("count"));
 								countMap.put("harga", map.get("harga"));
 								countMap.put("tanggal", map.get("tanggal"));
@@ -1253,7 +1253,7 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 
 	@Override
 	public List<Map<String, Object>> getDetailFeeForServiceDokter(Integer idProduk, Integer idKelas,
-			Integer idKomponenHarga, Integer idPegawai, String tgl, Double diskon, Boolean statusDiskon) {
+			Integer idKomponenHarga, Integer idPegawai, String tgl, Double diskon, Integer statusDiskon) {
 		List<Map<String, Object>> result = new ArrayList<>();
 		List<Map<String, Object>> rawData = new ArrayList<>();
 		List<Map<String, Object>> listData = new ArrayList<>();
@@ -1499,17 +1499,18 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 					.contains(idPegawai)) {
 				for (Map<String, Object> map : listData) {
 					if (listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))) {
-						if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+						if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 							if (Double.valueOf(map.get("diskon").toString()) > 0
 									&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-											|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 								result.add(map);
 							}
 						} else {
 							if (Double.valueOf(map.get("diskon").toString()) == 0
 									|| (Double.valueOf(map.get("diskon").toString()) > 0
 											&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-											&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1) || Integer
+													.valueOf(map.get("statusDiskon").toString()).equals(2)))) {
 								result.add(map);
 							}
 						}
@@ -1517,50 +1518,53 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 							&& map.get("departemenId").equals(Master.Departemen.IGD)
 							&& drKsmUmumList.contains(idPegawai) && Arrays.asList(Master.Produk.DOKTER_UMUM_IGD)
 									.contains(Integer.parseInt(map.get("idProduk").toString()))) {
-						if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+						if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 							if (Double.valueOf(map.get("diskon").toString()) > 0
 									&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-											|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 								result.add(map);
 							}
 						} else {
 							if (Double.valueOf(map.get("diskon").toString()) == 0
 									|| (Double.valueOf(map.get("diskon").toString()) > 0
 											&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-											&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1) || Integer
+													.valueOf(map.get("statusDiskon").toString()).equals(2)))) {
 								result.add(map);
 							}
 						}
 					} else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProdukException)
 							&& listDetailJenisProdukException
 									.contains(Integer.parseInt(map.get("detailId").toString()))) {
-						if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+						if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 							if (Double.valueOf(map.get("diskon").toString()) > 0
 									&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-											|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 								result.add(map);
 							}
 						} else {
 							if (Double.valueOf(map.get("diskon").toString()) == 0
 									|| (Double.valueOf(map.get("diskon").toString()) > 0
 											&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-											&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1) || Integer
+													.valueOf(map.get("statusDiskon").toString()).equals(2)))) {
 								result.add(map);
 							}
 						}
 					} else if (CommonUtil.isNotNullOrEmpty(listDetailJenisProduk)
 							&& listDetailJenisProduk.contains(Integer.parseInt(map.get("detailId").toString()))) {
-						if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+						if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 							if (Double.valueOf(map.get("diskon").toString()) > 0
 									&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-											|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											|| Integer.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 								result.add(map);
 							}
 						} else {
 							if (Double.valueOf(map.get("diskon").toString()) == 0
 									|| (Double.valueOf(map.get("diskon").toString()) > 0
 											&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-											&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1) || Integer
+													.valueOf(map.get("statusDiskon").toString()).equals(2)))) {
 								result.add(map);
 							}
 						}
@@ -1674,19 +1678,22 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -1694,19 +1701,22 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 												.contains(Integer.parseInt(map.get("departemenId").toString()))
 												&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
 														.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -1720,19 +1730,22 @@ 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()))) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -1742,19 +1755,22 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 														.contains(Integer.parseInt(map.get("idKelas").toString()))
 												&& !Arrays.stream(Master.KONSUL_VISIT).anyMatch(
 														map.get("namaProduk").toString().toLowerCase()::contains)) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -1774,19 +1790,22 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										if (dateTimePelayanan.isBefore(dateMasuk)
 												|| dateTimePelayanan.isEqual(datePulangPSBB)
 												|| dateTimePelayanan.isAfter(datePulangPSBB)) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -1796,17 +1815,20 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
-										if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+										if (diskon > 0
+												&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 											if (Double.valueOf(map.get("diskon").toString()) > 0
-													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-															|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+															.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 												result.add(map);
 											}
 										} else {
-											if (Double.valueOf(map.get("diskon").toString()) == 0
-													|| (Double.valueOf(map.get("diskon").toString()) > 0
-															&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-															&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+													.valueOf(map.get("diskon").toString()) > 0
+													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 												result.add(map);
 											}
 										}
@@ -1819,17 +1841,20 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
-										if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+										if (diskon > 0
+												&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 											if (Double.valueOf(map.get("diskon").toString()) > 0
-													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-															|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+															.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 												result.add(map);
 											}
 										} else {
-											if (Double.valueOf(map.get("diskon").toString()) == 0
-													|| (Double.valueOf(map.get("diskon").toString()) > 0
-															&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-															&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+													.valueOf(map.get("diskon").toString()) > 0
+													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 												result.add(map);
 											}
 										}
@@ -1841,17 +1866,21 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
-									if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 										if (Double.valueOf(map.get("diskon").toString()) > 0
-												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 											result.add(map);
 										}
 									} else {
 										if (Double.valueOf(map.get("diskon").toString()) == 0
 												|| (Double.valueOf(map.get("diskon").toString()) > 0
 														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-														&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 											result.add(map);
 										}
 									}
@@ -1859,17 +1888,21 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										.contains(Integer.parseInt(map.get("departemenId").toString()))
 										&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
 												.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-									if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 										if (Double.valueOf(map.get("diskon").toString()) > 0
-												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 											result.add(map);
 										}
 									} else {
 										if (Double.valueOf(map.get("diskon").toString()) == 0
 												|| (Double.valueOf(map.get("diskon").toString()) > 0
 														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-														&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 											result.add(map);
 										}
 									}
@@ -1985,19 +2018,22 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -2005,19 +2041,22 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 												.contains(Integer.parseInt(map.get("departemenId").toString()))
 												&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
 														.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -2031,19 +2070,22 @@ 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()))) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -2053,19 +2095,22 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 														.contains(Integer.parseInt(map.get("idKelas").toString()))
 												&& !Arrays.stream(Master.KONSUL_VISIT).anyMatch(
 														map.get("namaProduk").toString().toLowerCase()::contains)) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -2085,19 +2130,22 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										if (dateTimePelayanan.isBefore(dateMasuk)
 												|| dateTimePelayanan.isEqual(datePulangPSBB)
 												|| dateTimePelayanan.isAfter(datePulangPSBB)) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -2107,17 +2155,20 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
-										if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+										if (diskon > 0
+												&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 											if (Double.valueOf(map.get("diskon").toString()) > 0
-													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-															|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+															.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 												result.add(map);
 											}
 										} else {
-											if (Double.valueOf(map.get("diskon").toString()) == 0
-													|| (Double.valueOf(map.get("diskon").toString()) > 0
-															&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-															&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+													.valueOf(map.get("diskon").toString()) > 0
+													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 												result.add(map);
 											}
 										}
@@ -2130,17 +2181,20 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
-										if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+										if (diskon > 0
+												&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 											if (Double.valueOf(map.get("diskon").toString()) > 0
-													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-															|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+															.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 												result.add(map);
 											}
 										} else {
-											if (Double.valueOf(map.get("diskon").toString()) == 0
-													|| (Double.valueOf(map.get("diskon").toString()) > 0
-															&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-															&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+													.valueOf(map.get("diskon").toString()) > 0
+													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 												result.add(map);
 											}
 										}
@@ -2152,17 +2206,21 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
-									if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 										if (Double.valueOf(map.get("diskon").toString()) > 0
-												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 											result.add(map);
 										}
 									} else {
 										if (Double.valueOf(map.get("diskon").toString()) == 0
 												|| (Double.valueOf(map.get("diskon").toString()) > 0
 														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-														&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 											result.add(map);
 										}
 									}
@@ -2170,17 +2228,21 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										.contains(Integer.parseInt(map.get("departemenId").toString()))
 										&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
 												.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-									if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 										if (Double.valueOf(map.get("diskon").toString()) > 0
-												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 											result.add(map);
 										}
 									} else {
 										if (Double.valueOf(map.get("diskon").toString()) == 0
 												|| (Double.valueOf(map.get("diskon").toString()) > 0
 														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-														&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 											result.add(map);
 										}
 									}
@@ -2295,19 +2357,22 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 											.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
 										if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 												.contains(Integer.parseInt(map.get("departemenId").toString()))) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -2315,19 +2380,22 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 												.contains(Integer.parseInt(map.get("departemenId").toString()))
 												&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
 														.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -2341,19 +2409,22 @@ 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()))) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -2363,19 +2434,22 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 														.contains(Integer.parseInt(map.get("idKelas").toString()))
 												&& !Arrays.stream(Master.KONSUL_VISIT).anyMatch(
 														map.get("namaProduk").toString().toLowerCase()::contains)) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -2395,19 +2469,22 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										if (dateTimePelayanan.isBefore(dateMasuk)
 												|| dateTimePelayanan.isEqual(datePulangPSBB)
 												|| dateTimePelayanan.isAfter(datePulangPSBB)) {
-											if (diskon > 0
-													&& (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
-												if (Double.valueOf(map.get("diskon").toString()) > 0 && (CommonUtil
-														.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon)
+													|| statusDiskon.equals(0))) {
+												if (Double.valueOf(map.get("diskon").toString()) > 0
+														&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
+																|| Integer.valueOf(map.get("statusDiskon").toString())
+																		.equals(0))) {
 													result.add(map);
 												}
 											} else {
-												if (Double.valueOf(map.get("diskon").toString()) == 0
-														|| (Double.valueOf(map.get("diskon").toString()) > 0
-																&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-																&& Boolean
-																		.valueOf(map.get("statusDiskon").toString()))) {
+												if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+														.valueOf(map.get("diskon").toString()) > 0
+														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 													result.add(map);
 												}
 											}
@@ -2417,17 +2494,20 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
-										if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+										if (diskon > 0
+												&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 											if (Double.valueOf(map.get("diskon").toString()) > 0
-													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-															|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+															.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 												result.add(map);
 											}
 										} else {
-											if (Double.valueOf(map.get("diskon").toString()) == 0
-													|| (Double.valueOf(map.get("diskon").toString()) > 0
-															&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-															&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+													.valueOf(map.get("diskon").toString()) > 0
+													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 												result.add(map);
 											}
 										}
@@ -2440,17 +2520,20 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 											&& (dateTimePelayanan.isBefore(dateMasuk)
 													|| dateTimePelayanan.isEqual(datePulang)
 													|| dateTimePelayanan.isAfter(datePulang))) {
-										if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+										if (diskon > 0
+												&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 											if (Double.valueOf(map.get("diskon").toString()) > 0
-													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-															|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+													&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+															.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 												result.add(map);
 											}
 										} else {
-											if (Double.valueOf(map.get("diskon").toString()) == 0
-													|| (Double.valueOf(map.get("diskon").toString()) > 0
-															&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-															&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+											if (Double.valueOf(map.get("diskon").toString()) == 0 || (Double
+													.valueOf(map.get("diskon").toString()) > 0
+													&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
+													&& (Integer.valueOf(map.get("statusDiskon").toString()).equals(1)
+															|| Integer.valueOf(map.get("statusDiskon").toString())
+																	.equals(2)))) {
 												result.add(map);
 											}
 										}
@@ -2462,17 +2545,21 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 									.equals(Integer.parseInt(map.get("kelompokPasienId").toString()))) {
 								if (Arrays.asList(Master.Departemen.GRUP_RAWAT_JALAN)
 										.contains(Integer.parseInt(map.get("departemenId").toString()))) {
-									if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 										if (Double.valueOf(map.get("diskon").toString()) > 0
-												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 											result.add(map);
 										}
 									} else {
 										if (Double.valueOf(map.get("diskon").toString()) == 0
 												|| (Double.valueOf(map.get("diskon").toString()) > 0
 														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-														&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 											result.add(map);
 										}
 									}
@@ -2480,17 +2567,21 @@ public class PendapatanServiceImpl extends BaseVoServiceImpl implements Pendapat
 										.contains(Integer.parseInt(map.get("departemenId").toString()))
 										&& Arrays.asList(Master.Kelas.KELAS_SATU_VIP)
 												.contains(Integer.parseInt(map.get("idKelas").toString()))) {
-									if (diskon > 0 && (CommonUtil.isNullOrEmpty(statusDiskon) || !statusDiskon)) {
+									if (diskon > 0
+											&& (CommonUtil.isNullOrEmpty(statusDiskon) || statusDiskon.equals(0))) {
 										if (Double.valueOf(map.get("diskon").toString()) > 0
-												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon"))
-														|| !Boolean.valueOf(map.get("statusDiskon").toString()))) {
+												&& (CommonUtil.isNullOrEmpty(map.get("statusDiskon")) || Integer
+														.valueOf(map.get("statusDiskon").toString()).equals(0))) {
 											result.add(map);
 										}
 									} else {
 										if (Double.valueOf(map.get("diskon").toString()) == 0
 												|| (Double.valueOf(map.get("diskon").toString()) > 0
 														&& CommonUtil.isNotNullOrEmpty(map.get("statusDiskon"))
-														&& Boolean.valueOf(map.get("statusDiskon").toString()))) {
+														&& (Integer.valueOf(map.get("statusDiskon").toString())
+																.equals(1) || Integer
+																		.valueOf(map.get("statusDiskon").toString())
+																		.equals(2)))) {
 											result.add(map);
 										}
 									}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java
index 8ca55b08..6e60ab3e 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PasienDaftar.java
@@ -244,9 +244,9 @@ public class PasienDaftar extends BaseTransaction {
 	@Column(name = "NoSbmLastFk", insertable = false, updatable = false)
 	private Integer strukBuktiPenerimaanId;
 
-	@Caption(value = "Status Diskon Pegawai")
-	@Column(name = "isdiskonpegawai", nullable = true)
-	private Boolean isDiskonPegawai;
+	@Caption(value = "Kode Status Diskon Pegawai")
+	@Column(name = "diskonpegawai", nullable = true)
+	private Integer diskonPegawai;
 
 	public Rekanan getRekanan() {
 		return rekanan;
@@ -688,12 +688,12 @@ public class PasienDaftar extends BaseTransaction {
 		this.pemakaianAsuransiSet = pemakaianAsuransiSet;
 	}
 
-	public Boolean getIsDiskonPegawai() {
-		return isDiskonPegawai;
+	public Integer getDiskonPegawai() {
+		return diskonPegawai;
 	}
 
-	public void setIsDiskonPegawai(Boolean isDiskonPegawai) {
-		this.isDiskonPegawai = isDiskonPegawai;
+	public void setDiskonPegawai(Integer diskonPegawai) {
+		this.diskonPegawai = diskonPegawai;
 	}
 
 }
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienDaftarVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienDaftarVO.java
index 6cf2d8e9..47f6aa4c 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienDaftarVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienDaftarVO.java
@@ -137,8 +137,8 @@ public class PasienDaftarVO extends BaseTransactionVO {
 	@Caption(value = "emergensi")
 	private Boolean emergensi;
 
-	@Caption(value = "Status Diskon Pegawai")
-	private Boolean isDiskonPegawai;
+	@Caption(value = "Kode Status Diskon Pegawai")
+	private Integer diskonPegawai;
 
 	public RekananVO getRekanan() {
 		return rekanan;
@@ -404,12 +404,12 @@ public class PasienDaftarVO extends BaseTransactionVO {
 		this.emergensi = emergensi;
 	}
 
-	public Boolean getIsDiskonPegawai() {
-		return isDiskonPegawai;
+	public Integer getDiskonPegawai() {
+		return diskonPegawai;
 	}
 
-	public void setIsDiskonPegawai(Boolean isDiskonPegawai) {
-		this.isDiskonPegawai = isDiskonPegawai;
+	public void setDiskonPegawai(Integer diskonPegawai) {
+		this.diskonPegawai = diskonPegawai;
 	}
 
 }
diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
index 03171e18..c06b11d3 100644
--- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
+++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
@@ -4861,7 +4861,7 @@ public class SdmController extends LocaleController<AkunVO> {
 			@PathVariable("tgl") String tgl, @PathVariable("ffs") Boolean ffs,
 			@PathVariable("idPegawai") Integer idPegawai,
 			@RequestParam(value = "diskon", required = true) Double diskon,
-			@RequestParam(value = "statusDiskon", required = true) Boolean statusDiskon) {
+			@RequestParam(value = "statusDiskon", required = true) Integer statusDiskon) {
 		List<Map<String, Object>> result = null;
 		try {
 			result = indekKinerjaService.findPatientDetailForEveryTindakanReview(idProduk, idKelas, idPegawai, tgl, ffs,
@@ -4880,7 +4880,7 @@ public class SdmController extends LocaleController<AkunVO> {
 			@PathVariable("idKomponenHarga") Integer idKomponenHarga, @PathVariable("tgl") String tgl,
 			@PathVariable("idPegawai") Integer idPegawai,
 			@RequestParam(value = "diskon", required = true) Double diskon,
-			@RequestParam(value = "statusDiskon", required = true) Boolean statusDiskon) {
+			@RequestParam(value = "statusDiskon", required = true) Integer statusDiskon) {
 		List<Map<String, Object>> result = null;
 		try {
 			result = pendapatanService.getDetailFeeForServiceDokter(idProduk, idKelas, idKomponenHarga, idPegawai, tgl,