diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanNakesDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanNakesDao.java
index f45aef98..8780320f 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanNakesDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanNakesDao.java
@@ -18,9 +18,13 @@ public interface SkoringTindakanNakesDao extends PagingAndSortingRepository<Skor
 			+ "(case when stn.statusVerifikasi is false then 'Belum Verifikasi' "
 			+ "when stn.statusVerifikasi is true then 'Terverifikasi' end) as stVerif,"
 			+ "stn.tanggalMulaiBerlaku as tglMulaiBerlaku," + "stn.tanggalPembaharuanData as tglPembaharuanData,"
-			+ "prn.id as produkId,prn.namaProduk as namaProduk,"
-			+ "pfs.id as profesiId,pfs.namaProfesi as namaProfesi) " + "from SkoringTindakanNakes stn "
-			+ "inner join stn.produk prn " + "inner join prn.profesi pfs " + "where stn.statusEnabled is true "
+			+ "prn.id as produkId," + "prn.namaProduk as namaProduk,"
+			+ "(case when prn.kdProduk = 1 then 'Pelayanan Pasien' "
+			+ "when prn.kdProduk = 2 then 'Nonpelayanan Pasien' end) as jenisProduk," + "pfs.id as profesiId,"
+			+ "(case when pfs.jenisProfesi = 1 then concat(pfs.namaProfesi, ' (PPA)') "
+			+ "when pfs.jenisProfesi = 2 then concat(pfs.namaProfesi, ' (Non-PPA)') end) as namaProfesi) "
+			+ "from SkoringTindakanNakes stn " + "inner join stn.produk prn " + "inner join prn.profesi pfs "
+			+ "where stn.statusEnabled is true "
 			+ "and to_char(stn.tanggalMulaiBerlaku,'yyyy-MM-dd') <= to_char(now(),'yyyy-MM-dd') ";
 
 	String produk = "and lower(prn.namaProduk) like %:namaProduk% ";