diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndekKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndekKinerjaDao.java
index 4653c4d5..77988942 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndekKinerjaDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IndekKinerjaDao.java
@@ -53,7 +53,10 @@ public interface IndekKinerjaDao extends PagingAndSortingRepository<IndekKinerja
 	// detail.id as detailId,
 	@Query(" select distinct new map (case when pelayananPasienPetugas.kdjenispetugaspe.id in (6,13) then pelayananPasienPetugas.kdjenispetugaspe.id else 4 end as idJenisPelaksana, produk.namaProduk as namaProduk, produk.id as idProduk, "
 			+ " pelayananPasien.hargaSatuan as harga, kelas.namaKelas as namaKelas, kelas.id as idKelas, detail.id as detailId, "
-			+ " (select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga where harga.produkId = produk.id and harga.statusEnabled is false and harga.kelasId = 3) as hargaKelas1, "
+			+ " (select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga where harga.produkId = produk.id "
+			+ "and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov') "
+			+ "or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov')) "
+			+ "and harga.kelasId = 3) as hargaKelas1, "
 			+ " dokter.id as idPegawai) " + " from PelayananPasienPetugas pelayananPasienPetugas"
 			+ " left join pelayananPasienPetugas.kdpegawai dokter"
 			+ " left join pelayananPasienPetugas.pelayananPasien pelayananPasien"
@@ -68,7 +71,10 @@ public interface IndekKinerjaDao extends PagingAndSortingRepository<IndekKinerja
 
 	@Query(" select distinct new map (case when pelayananPasienPetugas.kdjenispetugaspe.id in (6,13) then pelayananPasienPetugas.kdjenispetugaspe.id else 4 end as idJenisPelaksana, produk.namaProduk as namaProduk, produk.id as idProduk, "
 			+ " pelayananPasien.hargaSatuan as harga, kelas.namaKelas as namaKelas, kelas.id as idKelas, detail.id as detailId, "
-			+ " (select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga where harga.produkId = produk.id and harga.statusEnabled is false and harga.kelasId = 3) as hargaKelas1, "
+			+ " (select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga where harga.produkId = produk.id"
+			+ " and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov') "
+			+ "or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov')) "
+			+ "and harga.kelasId = 3) as hargaKelas1, "
 			+ " dokter.id as idPegawai) " + " from PelayananPasienPetugas pelayananPasienPetugas"
 			+ " left join pelayananPasienPetugas.kdpegawai dokter"
 			+ " left join pelayananPasienPetugas.pelayananPasien pelayananPasien"
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 f9ae4536..95d89305 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
@@ -70,7 +70,10 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "detail.id as detailId,detail.detailJenisProduk as detailJenisProduk"
 			+ ",produk.namaProduk as namaProduk, produk.id as idProduk , kelas.namaKelas as namaKelas, kelas.id as idKelas"
 			+ ",(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
-			+ "where harga.produkId = produk.id and harga.statusEnabled is false and harga.kelasId = 3) as hargaKelas1"
+			+ "where harga.produkId = produk.id "
+			+ "and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov') "
+			+ "or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov')) "
+			+ "and harga.kelasId = 3) as hargaKelas1"
 			+ ",pelayananPasien.hargaSatuan as harga) from PelayananPasienPetugas pelayananPasienPetugas "
 			+ " left join pelayananPasienPetugas.pelayananPasien pelayananPasien "
 			+ " left join pelayananPasien.produk produk " + " left join produk.detailJenisProduk detail"
@@ -124,8 +127,11 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "detail.id as detailId, " + "detail.detailJenisProduk as detailJenisProduk, " + "produk.id as idProduk, "
 			+ "produk.namaProduk as namaProduk, " + "kelas.id as idKelas, " + "kelas.namaKelas as namaKelas, "
 			+ "(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
-			+ "where harga.produkId = produk.id and harga.statusEnabled is false and harga.kelasId = :idKelasSatu) as hargaKelas1, "
-			+ "pelayananPasien.noRec as noRec, " + "coalesce(pelayananPasien.hargaSatuan, 0) as harga, "
+			+ "where harga.produkId = produk.id "
+			+ "and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov') "
+			+ "or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov')) "
+			+ "and harga.kelasId = :idKelasSatu) as hargaKelas1, " + "pelayananPasien.noRec as noRec, "
+			+ "coalesce(pelayananPasien.hargaSatuan, 0) as harga, "
 			+ "(select coalesce(ppd.hargaJual,0) from PelayananPasienDetail ppd "
 			+ "where ppd.pelayananPasienId = pelayananPasien.noRec "
 			+ "and ((ppd.komponenHargaId = 35 and jenisPetugas.id = 4) "
@@ -184,7 +190,10 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pelayananPasien.hargaSatuan as harga,"
 			+ "coalesce(pelayananPasien.hargaDiscount,0) as diskon," + "pelayananPasien.jumlah as jumlah, "
 			+ "(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
-			+ "where harga.produkId = produk.id and harga.statusEnabled is false and harga.kelasId = :idKelasSatu) as hargaKelas1,"
+			+ "where harga.produkId = produk.id "
+			+ "and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov') "
+			+ "or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov')) "
+			+ "and harga.kelasId = :idKelasSatu) as hargaKelas1,"
 			+ "pelayananPasien.tglPelayanan as tglpelayanan," + "kelas.namaKelas as namaKelas,"
 			+ "pasienDaftar.tglPulang as tglPulang," + "produk.id as idProduk," + "dokter.id as idPegawai,"
 			+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglpel,"
@@ -225,7 +234,10 @@ public interface RevIndekKinerjaDao extends PagingAndSortingRepository<IndekKine
 			+ "pasienDaftar.tglRegistrasi as tglRegistrasi," + "pelayananPasien.hargaSatuan as harga,"
 			+ "coalesce(pelayananPasien.hargaDiscount,0) as diskon," + "pelayananPasien.jumlah as jumlah, "
 			+ "(select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "
-			+ "where harga.produkId = produk.id and harga.statusEnabled is false and harga.kelasId = :idKelasSatu) as hargaKelas1,"
+			+ "where harga.produkId = produk.id "
+			+ "and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov') "
+			+ "or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov')) "
+			+ "and harga.kelasId = :idKelasSatu) as hargaKelas1,"
 			+ "pelayananPasien.tglPelayanan as tglpelayanan," + "kelas.namaKelas as namaKelas,"
 			+ "pasienDaftar.tglPulang as tglPulang," + "produk.id as idProduk," + "dokter.id as idPegawai,"
 			+ "to_char(pelayananPasien.tglPelayanan,'yyyy-MM-dd') as tglpel,"
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/RevIndeksKinerjaDaoCustomImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/RevIndeksKinerjaDaoCustomImpl.java
index 1ddf16de..21ae858f 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/RevIndeksKinerjaDaoCustomImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/RevIndeksKinerjaDaoCustomImpl.java
@@ -2594,8 +2594,11 @@ public class RevIndeksKinerjaDaoCustomImpl extends BaseVoServiceImpl implements
 				" pasienDaftar.noRegistrasi as noRegistrasi,"+ 
 				" pasienDaftar.tglRegistrasi as tglRegistrasi,"+
 				" pelayananPasien.hargaSatuan as harga,"+ 
-				" (select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "+
-				" where harga.produkId = produk.id and harga.statusEnabled is false and harga.kelasId = 3) as hargaKelas1,"+
+				" (select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga"+
+				" where harga.produkId = produk.id"+
+				" and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov')"+
+				" or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov'))"+
+				" and harga.kelasId = 3) as hargaKelas1,"+
 				" pelayananPasien.tglPelayanan as tglpelayanan,"+
 				" kelas.namaKelas as namaKelas,"+ 
 				" pasienDaftar.tglPulang as tglPulang,"+
@@ -2688,7 +2691,10 @@ public class RevIndeksKinerjaDaoCustomImpl extends BaseVoServiceImpl implements
 				" pasienDaftar.tglRegistrasi as tglRegistrasi,"+
 				" pelayananPasien.hargaSatuan as harga,"+ 
 				" (select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "+
-				" where harga.produkId = produk.id and harga.statusEnabled is false and harga.kelasId = 3) as hargaKelas1,"+
+				" where harga.produkId = produk.id"+
+				" and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov')"+
+				" or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov'))"+
+				" and harga.kelasId = 3) as hargaKelas1,"+
 				" pelayananPasien.tglPelayanan as tglpelayanan,"+
 				" kelas.namaKelas as namaKelas,"+ 
 				" pasienDaftar.tglPulang as tglPulang,"+
@@ -2789,7 +2795,10 @@ public class RevIndeksKinerjaDaoCustomImpl extends BaseVoServiceImpl implements
 				" pasienDaftar.tglRegistrasi as tglRegistrasi,"+
 				" pelayananPasien.hargaSatuan as harga,"+ 
 				" (select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "+
-				" where harga.produkId = produk.id and harga.statusEnabled is false and harga.kelasId = 3) as hargaKelas1,"+
+				" where harga.produkId = produk.id"+
+				" and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov')"+
+				" or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov'))"+
+				" and harga.kelasId = 3) as hargaKelas1,"+
 				" pelayananPasien.tglPelayanan as tglpelayanan,"+
 				" kelas.namaKelas as namaKelas,"+ 
 				" pasienDaftar.tglPulang as tglPulang,"+
@@ -2909,7 +2918,10 @@ public class RevIndeksKinerjaDaoCustomImpl extends BaseVoServiceImpl implements
 				" pasienDaftar.tglRegistrasi as tglRegistrasi,"+
 				" pelayananPasien.hargaSatuan as harga,"+ 
 				" (select distinct harga.hargaNetto1 from HargaNettoProdukByKelas harga "+
-				" where harga.produkId = produk.id and harga.statusEnabled is false and harga.kelasId = 3) as hargaKelas1,"+
+				" where harga.produkId = produk.id"+
+				" and ((harga.statusEnabled is true and harga.reportDisplay = 'tarif_2022_Nov')"+
+				" or (harga.statusEnabled is false and harga.reportDisplay <> 'tarif_2022_Nov'))"+
+				" and harga.kelasId = 3) as hargaKelas1,"+
 				" pelayananPasien.tglPelayanan as tglpelayanan,"+
 				" kelas.namaKelas as namaKelas,"+ 
 				" pasienDaftar.tglPulang as tglPulang,"+
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 8e226d3c..95113b82 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
@@ -2658,7 +2658,7 @@ public class IndekKinerjaServiceImpl extends BaseVoServiceImpl implements IndekK
 	public Date batasAkhirTarifLama() {
 		DateFormat dateFormat = new SimpleDateFormat("yyyy-MM");
 		try {
-			return dateFormat.parse(GetSettingDataFixed("psbbperiod"));
+			return dateFormat.parse(GetSettingDataFixed("batasAkhirTarif2017"));
 		} catch (ParseException e) {
 			e.printStackTrace();