diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java
index 4f889106..311f4484 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java
@@ -3,10 +3,14 @@ package com.jasamedika.medifirst2000.dao;
 import com.jasamedika.medifirst2000.entities.GolonganPPPK;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 /**
  * @author Salman
  * @version 1.0.0
  * @since 2/21/2025
  */
 public interface GolonganPPPKDao extends JpaRepository<GolonganPPPK, String> {
+
+	Optional<GolonganPPPK> findById(String id);
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java
index c6de4aaf..0d9736b3 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java
@@ -868,7 +868,8 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "pegawai.noBPJS as noBPJS, " + "pegawai.noHandphone as noHandphone, "
 			+ "pegawai.noIdentitas as noIdentitas, " + "pegawai.noSip as noSip, " + "pegawai.noStr as noStr, "
 			+ "pegawai.noTlp as noTlp, " + "pegawai.npwp as npwp, " + "pegawai.negaraId as negaraId, "
-			+ "pegawai.pensiun as pensiun, " + "pegawai.pangkatId as pangkatId, " + "pegawai.ruanganId as ruanganId, "
+			+ "pegawai.pensiun as pensiun, " + "pegawai.pangkatId as pangkatId, "
+			+ "pegawai.golonganPPPKId as golonganPPPKId, " + "pegawai.ruanganId as ruanganId, "
 			+ "pegawai.rekananId as rekananId," + "pegawai.statusRhesus as statusRhesus, "
 			+ "pegawai.shiftKerjaId as shiftKerjaId, " + "pegawai.statusKawinId as statusKawinId, "
 			+ "pegawai.sukuId as sukuId, " + "pegawai.tempatLahir as tempatLahir, "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
index 851d7869..d608bf5e 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
@@ -147,6 +147,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 	@Autowired
 	private RekananDao rekananDao;
 
+	@Autowired
+	private GolonganPPPKDao golonganPPPKDao;
+
 	@Autowired
 	private PegawaiDaoCustom pegawaiDaoCustom;
 
@@ -1895,6 +1898,10 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 			}
 			result.remove("pangkatId");
 		}
+		if (CommonUtil.isNotNullOrEmpty(result.get("golonganPPPKId"))) {
+			Optional<GolonganPPPK> byId = golonganPPPKDao.findById(result.get("golonganPPPKId").toString());
+            byId.ifPresent(golonganPPPK -> result.put("golonganPPPK", golonganPPPK));
+		}
 		if (CommonUtil.isNotNullOrEmpty(result.get("rekananId"))) {
 			Map<String, Object> rekanan = rekananDao
 					.getRekananById(Integer.parseInt(result.get("rekananId").toString()));