diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HabsenDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HabsenDao.java
index 4dc1b522..62443d7d 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HabsenDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HabsenDao.java
@@ -72,9 +72,9 @@ public interface HabsenDao extends PagingAndSortingRepository<Habsen, Integer> {
 
 	@Query("select new Map(concat(absen.empl_code,'_',to_char(absen.tr_date,'yyyy-MM-dd'),'_',to_char(absen.tr_time,'HH24.MI.ss'),'#',absen.tr_no,'.jpg') as filePath,"
 			+ "concat(to_char(absen.tr_date,'dd/MM/yyyy'),' ',to_char(absen.tr_time,'HH24:MI:ss')) as tanggal,"
-			+ "absen.latitude as lintang,absen.longitude as bujur,absen.akurasi as akurasi,"
-			+ "absen.lokasi as lokasi) " + "from Habsen absen " + "where absen.tr_no in (:listTrNo) "
-			+ "and absen.loc_code = '99999' " + "and absen.remoteno = 99")
+			+ "to_char(absen.tr_date,'yyyyMM') as trdate," + "absen.latitude as lintang,absen.longitude as bujur,"
+			+ "absen.akurasi as akurasi,absen.lokasi as lokasi) " + "from Habsen absen "
+			+ "where absen.tr_no in (:listTrNo) " + "and absen.loc_code = '99999' " + "and absen.remoteno = 99")
 	List<Map<String, Object>> getDetailPresensi(@Param("listTrNo") List<Integer> listTrNo);
 
 	String strQryHabsen = "select new Map(pg.id as id,pg.namaLengkap as namaLengkap,"
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AbsensiPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AbsensiPegawaiServiceImpl.java
index 4fcacb58..113d7135 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AbsensiPegawaiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AbsensiPegawaiServiceImpl.java
@@ -286,8 +286,8 @@ public class AbsensiPegawaiServiceImpl extends BaseVoServiceImpl implements Abse
 		for (Map<String, Object> map : data) {
 			Map<String, Object> mapRs = new HashMap<>();
 			String imageURLData = "";
-			String encodeRs = encodeFileToBase64Binary(
-					new File(getImageAbsoluteFilePath(map.get("filePath").toString())));
+			String encodeRs = encodeFileToBase64Binary(new File(getImageAbsoluteFilePath(
+					getDirPath(map.get("trdate").toString()) + map.get("filePath").toString())));
 			if (CommonUtil.isNotNullOrEmpty(encodeRs)) {
 				imageURLData = "data:image/jpg;base64," + encodeRs;
 			}