diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AnggaranRemunerasiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AnggaranRemunerasiDao.java
index 42e9fdf6..fff180a8 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AnggaranRemunerasiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AnggaranRemunerasiDao.java
@@ -15,9 +15,9 @@ public interface AnggaranRemunerasiDao extends PagingAndSortingRepository<Anggar
 
 	@Query("select distinct new Map(" + "ar.anggaranRemunTahun as anggaranTahun,"
 			+ "ar.anggaranRemunBulan as anggaranBulan," + "ar.poinIndeksRupiah as pir,"
-			+ "ar.tanggalPembaharuanData as tglPembaharuanData) " + "from AnggaranRemunerasi ar "
-			+ "where ar.statusEnabled is true " + "and to_char(ar.tahun,'yyyy') = to_char(now(),'yyyy') "
-			+ "order by ar.tanggalPembaharuanData desc")
+			+ "ar.totalNilaiJabatan as totNilaiJabatan," + "ar.tanggalPembaharuanData as tglPembaharuanData) "
+			+ "from AnggaranRemunerasi ar " + "where ar.statusEnabled is true "
+			+ "and to_char(ar.tahun,'yyyy') = to_char(now(),'yyyy') " + "order by ar.tanggalPembaharuanData desc")
 	List<Map<String, Object>> findTahunIni();
 
 	@Query("select new Map(ar.anggaranRemunTahun as anggaranTahun," + "ar.anggaranRemunBulan as anggaranBulan,"
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java
index e5ecc0f6..981f2623 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java
@@ -41,9 +41,10 @@ public interface EvaluasiJabatanDao extends PagingAndSortingRepository<EvaluasiJ
 	NilaiKelompokJabatan findDetailKelompokJabatan(@Param("idJabatan") Integer idJabatan,
 			@Param("totalNilai") Integer totalNilai);
 
-	@Query("select distinct new Map(j.id as idJabatan,j.namaExternal as unitKerja,j.namaJabatan as namaJabatan) "
-			+ "from EvaluasiJabatan ej " + "left join ej.jabatan j " + "where ej.statusEnabled is true "
-			+ "order by j.namaExternal, j.namaJabatan asc")
+	@Query("select distinct new Map(j.id as idJabatan," + "uk.name as unitKerja," + "j.namaJabatan as namaJabatan) "
+			+ "from EvaluasiJabatan ej " + "left join ej.jabatan j with j.statusEnabled is true "
+			+ "left join j.unitKerja uk with uk.statusEnabled is true " + "where ej.statusEnabled is true "
+			+ "order by uk.name, j.namaJabatan asc")
 	List<Map<String, Object>> findDistinctEvaluasiJabatan();
 
 	@Query("select new Map(ej.tahun as tahun,ej.bulan as bulan,ej.tahun || '-' || ej.bulan as periodePerhitungan,"
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java
index c4537ddd..b26289a1 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/LogbookKinerjaDao.java
@@ -67,18 +67,21 @@ public interface LogbookKinerjaDao extends PagingAndSortingRepository<LogbookKin
 			+ "inner join lk.indikatorKinerja ik " + "where ik.id = :indikatorId")
 	List<Map<String, Object>> findKontrakKinerja(@Param("indikatorId") Integer idIndikator);
 
-	@Query("select new Map(lk.noRec as noRec,"
-			+ "pg.id as idPegawai,pg.namaLengkap as namaPegawai,coalesce(pg.nilaiJabatan,0) as nilaiJabatan,"
-			+ "jb.id as idJabatan,jb.namaJabatan as namaJabatan," + "ik.jenisIndikator as idJenisIndikator,"
-			+ "(case when ik.jenisIndikator = 1 then 'Kuantitas' " + "when ik.jenisIndikator = 2 then 'Kualitas'"
-			+ " when ik.jenisIndikator = 3 then 'Perilaku' end) as jenisIndikator,"
+	@Query("select new Map(lk.noRec as noRec," + "pg.id as idPegawai,pg.namaLengkap as namaPegawai,"
+			+ "coalesce(mj.nilaiJabatan,0) as nilaiJabatan," + "jb.id as idJabatan,jb.namaJabatan as namaJabatan,"
+			+ "ik.jenisIndikator as idJenisIndikator," + "(case when ik.jenisIndikator = 1 then 'Kuantitas' "
+			+ "when ik.jenisIndikator = 2 then 'Kualitas' "
+			+ "when ik.jenisIndikator = 3 then 'Perilaku' end) as jenisIndikator,"
 			+ "ik.id as idIndikator,ik.namaIndikator as namaIndikator,"
-			+ "si.id as satuanId,si.satuanIndikator as satuanIndikator," + "lk.capaian/lk.target as fragCapaian,"
-			+ "lk.bobot as bobot) " + "from LogbookKinerja lk " + "inner join lk.indikatorKinerja ik "
+			+ "si.id as satuanId,si.satuanIndikator as satuanIndikator,"
+			+ "lk.capaian/lk.target as fragCapaian,lk.bobot as bobot) "
+			+ "from LogbookKinerja lk, MapPegawaiJabatanToUnitKerja mj " + "inner join lk.indikatorKinerja ik "
 			+ "inner join ik.satuanIndikator si " + "inner join lk.pegawai pg " + "inner join lk.jabatan jb "
-			+ "where lk.statusEnabled is true " + "and ik.statusEnabled is true " + "and lk.statusVerifikasi is true "
-			+ "and ik.statusVerifikasi is true " + "and si.statusEnabled is true " + "and lk.pegawaiId = :pegawaiId "
-			+ "and lk.jabatanId = :jabatanId " + "and to_char(lk.bulan,'yyyy-MM') = :bulan")
+			+ "where lk.pegawaiId = mj.pegawaiId " + "and lk.jabatanId = mj.jabatanId " + "and mj.pegawaiId = pg.id "
+			+ "and mj.jabatanId = jb.id " + "and lk.statusEnabled is true " + "and ik.statusEnabled is true "
+			+ "and lk.statusVerifikasi is true " + "and ik.statusVerifikasi is true " + "and si.statusEnabled is true "
+			+ "and mj.statusEnabled is true " + "and lk.pegawaiId = :pegawaiId " + "and lk.jabatanId = :jabatanId "
+			+ "and to_char(lk.bulan,'yyyy-MM') = :bulan")
 	List<Map<String, Object>> findLogbookKinerja(@Param("pegawaiId") Integer idPegawai,
 			@Param("jabatanId") Integer idJabatan, @Param("bulan") String bulan);