diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiKomponenDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiKomponenDao.java
index aa4a8da9..b7cd6ee0 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiKomponenDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SlipGajiKomponenDao.java
@@ -22,9 +22,9 @@ public interface SlipGajiKomponenDao extends JpaRepository<SlipGajiKomponen, Str
 			+ "when sgk.komponen.jenisKomponen = 5 then 'Potongan Remunerasi' "
 			+ "when sgk.komponen.jenisKomponen = 6 then 'Potongan Uang Makan' end as jenisKomponen,"
 			+ "sgk.komponen.id as idKomponen," + "sgk.komponen.namaKomponen as namaKomponen,"
-			+ "sgk.nominal as nominal) " + "from SlipGajiKomponen sgk " + "where sgk.slipGaji.pegawai.id = :pegawaiId "
-			+ "and sgk.slipGaji.bulan between :start and :end "
-			+ "order by sgk.komponen.jenisKomponen, sgk.komponen.id")
+			+ "sgk.komponen.urutan as urutan," + "sgk.nominal as nominal) " + "from SlipGajiKomponen sgk "
+			+ "where sgk.slipGaji.pegawai.id = :pegawaiId " + "and sgk.slipGaji.bulan between :start and :end "
+			+ "order by sgk.komponen.jenisKomponen, sgk.komponen.urutan")
 	List<Map<String, Object>> findAll(@Param("pegawaiId") Integer pegawaiId, @Param("start") Date start,
 			@Param("end") Date end);
 
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
index 894fde13..8d2a0171 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SlipGajiServiceImpl.java
@@ -379,6 +379,7 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 						kBuilder.idKomponen(Integer.valueOf(first.get().get("idKomponen").toString()));
 						kBuilder.namaKomponen(first.get().get("namaKomponen").toString());
 						kBuilder.nominal(new BigDecimal(first.get().get("nominal").toString()));
+						kBuilder.urutan(Integer.parseInt(first.get().get("urutan").toString()));
 					} else {
 						kBuilder.id(null);
 						kBuilder.idJenisKomponen(e.getJenisKomponen());
@@ -386,11 +387,12 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 						kBuilder.idKomponen(e.getId());
 						kBuilder.namaKomponen(e.getNamaKomponen());
 						kBuilder.nominal(null);
+						kBuilder.urutan(e.getUrutan());
 					}
 					dtoList.add(kBuilder.build());
 				});
 				List<SlipGajiKomponenDto> collectDto = dtoList.stream()
-						.sorted(Comparator.comparing(SlipGajiKomponenDto::getIdKomponen))
+						.sorted(Comparator.comparing(SlipGajiKomponenDto::getUrutan))
 						.sorted(Comparator.comparing(SlipGajiKomponenDto::getIdJenisKomponen))
 						.collect(Collectors.toList());
 				dto.komponen(collectDto);
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiKomponenDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiKomponenDto.java
index f29685de..48d83f08 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiKomponenDto.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiKomponenDto.java
@@ -28,4 +28,7 @@ public class SlipGajiKomponenDto {
 
 	@Caption(value = "Nominal")
 	private BigDecimal nominal;
+
+	@Caption(value = "Urutan")
+	private Integer urutan;
 }