diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
index d5876c94..96d5d3c9 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
@@ -99,8 +99,12 @@ public final class Master {
 	}
 
 	public static final class JenisKomponenGaji {
-		public static final Integer PEMOTONGAN = 2;
-		public static final Integer PENERIMAAN = 1;
+		public static final Integer GAJI = 1;
+		public static final Integer REMUNERASI = 2;
+		public static final Integer UANG_MAKAN = 3;
+		public static final Integer POTONGAN_GAJI = 4;
+		public static final Integer POTONGAN_REMUNERASI = 5;
+		public static final Integer POTONGAN_UANG_MAKAN = 6;
 	}
 
 	public static final class JenisPegawai {
@@ -176,29 +180,37 @@ public final class Master {
 	}
 
 	public static final class KomponenGaji {
-		public static final Integer BIAYA_OBAT_ALKES = 16;
-		public static final Integer BIAYA_RAWAT_INAP = 17;
-		public static final Integer BIAYA_RAWAT_JALAN = 18;
-		public static final Integer FEE_FOR_ONSITE = 5;
-		public static final Integer FEE_FOR_SERVICE = 4;
-		public static final Integer GAJI = 1;
-		public static final Integer IURAN_WAJIB_KOPERASI = 14;
-		public static final Integer PINJAMAN_KOPERASI = 15;
+		public static final Integer GAJI_POKOK = 1;
+		public static final Integer SIMPANAN_WAJIB_KOPERASI_GAJI = 14;
+		public static final Integer SIMPANAN_WAJIB_KOPERASI_REMUNERASI = 38;
+		public static final Integer KELEBIHAN_TUNJANGAN = 40;
+		public static final Integer PINJAMAN_KOPERASI_GAJI = 15;
+		public static final Integer PINJAMAN_KOPERASI_REMUNERASI = 35;
 		public static final Integer POTONGAN_BPJSK = 20;
 		public static final Integer POTONGAN_BPJSTK = 21;
-		public static final Integer POTONGAN_TOKO_KOPERASI = 19;
-		public static final Integer PPH_FEE_FOR_ONSITE = 11;
-		public static final Integer PPH_FEE_FOR_SERVICE = 10;
-		public static final Integer PPH_GAJI = 8;
-		public static final Integer PPH_REMUNERASI = 9;
-		public static final Integer PPH_UANG_MAKAN = 12;
-		public static final Integer PPH_UANG_LEMBUR = 13;
-		public static final Integer REMUNERASI_KINERJA = 2;
-		public static final Integer REMUNERASI_TAMBAHAN_MANAJERIAL = 3;
-		public static final Integer UANG_LEMBUR = 7;
+		public static final Integer POTONGAN_LAIN = 33;
+		public static final Integer POTONGAN_OBAT = 16;
+		public static final Integer POTONGAN_PPH_21_REMUNERASI = 9;
+		public static final Integer POTONGAN_PPH_21_REMUNERASI_OPERASIONAL = 10;
+		public static final Integer POTONGAN_PPH_21_UANG_MAKAN = 12;
+		public static final Integer POTONGAN_RAWAT_INAP = 17;
+		public static final Integer POTONGAN_RAWAT_JALAN = 18;
+		public static final Integer PFK = 31;
+		public static final Integer PPH = 8;
+		public static final Integer REMUNERASI = 2;
+		public static final Integer REMUNERASI_OPERASIONAL = 3;
+		public static final Integer SEWA_RUMAH = 32;
+		public static final Integer TABUNGAN_RUMAH = 34;
+		public static final Integer TOKO_KOPERASI = 19;
+		public static final Integer TUNJANGAN_ANAK = 25;
+		public static final Integer TUNJANGAN_BERAS = 29;
+		public static final Integer TUNJANGAN_FUNGSIONAL = 28;
+		public static final Integer TUNJANGAN_ISTRI_SUAMI = 24;
+		public static final Integer TUNJANGAN_PNS = 26;
+		public static final Integer TUNJANGAN_PPH = 30;
+		public static final Integer TUNJANGAN_STRUKTURAL = 27;
 		public static final Integer UANG_MAKAN = 6;
-		public static final Integer REMUNERASI_TAMBAHAN_DIKLITJAR = 22;
-		public static final Integer REMUNERASI_TAMBAHAN_LAIN = 23;
+		public static final Integer WAKAF_DLL = 39;
 	}
 
 	public static final class KomponenHarga {
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KomponenGajiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KomponenGajiDao.java
index c2f77996..c299bb51 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KomponenGajiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KomponenGajiDao.java
@@ -1,12 +1,11 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.KomponenGaji;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
-import com.jasamedika.medifirst2000.entities.KomponenGaji;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author salmanoe
@@ -15,6 +14,9 @@ import com.jasamedika.medifirst2000.entities.KomponenGaji;
  */
 public interface KomponenGajiDao extends JpaRepository<KomponenGaji, Integer> {
 	@Query("select new Map(kg.id as id,kg.namaKomponen as namaKomponen) " + "from KomponenGaji kg "
-			+ "order by kg.jenisKomponen,kg.id")
-	List<Map<String, Object>> getAll();
+			+ "where kg.urutan is not null " + "order by kg.urutan")
+	List<Map<String, Object>> findLabelByUrutan();
+
+	@Query("select kg from KomponenGaji kg " + "where kg.urutan is not null " + "order by kg.urutan")
+	List<KomponenGaji> findByUrutan();
 }
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 1033f9da..aa4a8da9 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
@@ -1,14 +1,13 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.SlipGajiKomponen;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import com.jasamedika.medifirst2000.entities.SlipGajiKomponen;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author salmanoe
@@ -16,8 +15,12 @@ import com.jasamedika.medifirst2000.entities.SlipGajiKomponen;
  */
 public interface SlipGajiKomponenDao extends JpaRepository<SlipGajiKomponen, String> {
 	@Query("select new Map(sgk.id as id," + "sgk.komponen.jenisKomponen as idJenisKomponen,"
-			+ "case when sgk.komponen.jenisKomponen = 1 then 'Penerimaan' "
-			+ "when sgk.komponen.jenisKomponen = 2 then 'Pemotongan' end as jenisKomponen,"
+			+ "case when sgk.komponen.jenisKomponen = 1 then 'Gaji' "
+			+ "when sgk.komponen.jenisKomponen = 2 then 'Remunerasi' "
+			+ "when sgk.komponen.jenisKomponen = 3 then 'Uang Makan' "
+			+ "when sgk.komponen.jenisKomponen = 4 then 'Potongan Gaji' "
+			+ "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 "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/StrukBuktiPenerimaanDetailDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/StrukBuktiPenerimaanDetailDao.java
deleted file mode 100644
index 4df62a7a..00000000
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/StrukBuktiPenerimaanDetailDao.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.jasamedika.medifirst2000.dao;
-
-import com.jasamedika.medifirst2000.entities.StrukBuktiPenerimaanDetail;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-/**
- * @author salmanoe
- * @version 1.0.0
- * @since 16/11/2023
- */
-public interface StrukBuktiPenerimaanDetailDao extends JpaRepository<StrukBuktiPenerimaanDetail, String> {
-}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ReportService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ReportService.java
index 2e71747f..bb82f287 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ReportService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ReportService.java
@@ -1,138 +1,121 @@
 package com.jasamedika.medifirst2000.service;
 
+import com.jasamedika.medifirst2000.dto.*;
+import com.jasamedika.medifirst2000.entities.Pasien;
+import com.jasamedika.medifirst2000.vo.PasienVO;
+
 import java.util.List;
 import java.util.Map;
 
-import com.jasamedika.medifirst2000.dto.BuktiPenerimaanBarangDto;
-import com.jasamedika.medifirst2000.dto.HPSDto;
-import com.jasamedika.medifirst2000.dto.HeadDto;
-import com.jasamedika.medifirst2000.dto.HeadKasirDto;
-import com.jasamedika.medifirst2000.dto.KartuPengendaliDto;
-import com.jasamedika.medifirst2000.dto.KartuPulangPasienDto;
-import com.jasamedika.medifirst2000.dto.KwitansiDto;
-import com.jasamedika.medifirst2000.dto.LampiranSPPHDto;
-import com.jasamedika.medifirst2000.dto.RekapPendapatanHarianPoliklinikDto;
-import com.jasamedika.medifirst2000.dto.SlipHeaderDto;
-import com.jasamedika.medifirst2000.dto.SuratPesananSementaraDto;
-import com.jasamedika.medifirst2000.entities.Pasien;
-import com.jasamedika.medifirst2000.vo.PasienVO;
-
 public interface ReportService extends BaseVoService<Pasien, PasienVO, Integer> {
 
-	public KwitansiDto generateKwitansi(String noKwitansi, String token);
+	KwitansiDto generateKwitansi(String noKwitansi, String token);
 
-	public KartuPulangPasienDto generateKartuPasienPulang(String noRegistrasi, String token);
+	KartuPulangPasienDto generateKartuPasienPulang(String noRegistrasi, String token);
 
-	public List<RekapPendapatanHarianPoliklinikDto> generateRekapPendapatanHarianPoliklinik(String noRegistrasi);
+	List<RekapPendapatanHarianPoliklinikDto> generateRekapPendapatanHarianPoliklinik(String noRegistrasi);
 
-	public KartuPengendaliDto generateKartuPengendali(String noRec);
+	KartuPengendaliDto generateKartuPengendali(String noRec);
 
-	public HPSDto generateHPS(String noRec);
+	HPSDto generateHPS(String noRec);
 
-	public SuratPesananSementaraDto generateSPS(String noRecKartuPengendaliId, Integer supplierId);
+	SuratPesananSementaraDto generateSPS(String noRecKartuPengendaliId, Integer supplierId);
 
-	public LampiranSPPHDto generateLampiranSPPH(String noRec);
+	LampiranSPPHDto generateLampiranSPPH(String noRec);
 
-	public HeadKasirDto generateBilling(String noRegistrasi, String token);
+	HeadKasirDto generateBilling(String noRegistrasi, String token);
 
-	public BuktiPenerimaanBarangDto generateBuktiPenerimaan(String noRec);
+	BuktiPenerimaanBarangDto generateBuktiPenerimaan(String noRec);
 
-	public BuktiPenerimaanBarangDto generateBuktiPengeluaranBarang(String noRec);
+	BuktiPenerimaanBarangDto generateBuktiPengeluaranBarang(String noRec);
 
-	public HeadDto generateQRCode(String noRec);
+	HeadDto generateQRCode(String noRec);
 
-	public HeadDto generateQRCodeAset(String noRec);
+	HeadDto generateQRCodeAset(String noRec);
 
-	public Map<String, Object> generateSlipPenghasilan(Integer idPegawai, String periode);
+	Map<String, Object> generateSlipPenghasilan(Integer idPegawai, String periode);
 
-	public List<Map<String, Object>> generateLapRekapitulasiKehadiran(Integer idRuangan, String startDate,
-			String endDate);
+	List<Map<String, Object>> generateLapRekapitulasiKehadiran(Integer idRuangan, String startDate, String endDate);
 
-	public Map<String, Object> generateRekapitulasiStok(Integer kelompokProdukId, Integer produkId,
-			Integer asalProdukId, Integer ruanganId, Integer jenisProdukId);
+	Map<String, Object> generateSPMRS(String noRegistrasi);
 
-	public Map<String, Object> generateSPMRS(String noRegistrasi);
-
-	public Map<String, Object> generateSasaranMutuPoliklinik(String startDate, String endDate, Integer ruanganId,
+	Map<String, Object> generateSasaranMutuPoliklinik(String startDate, String endDate, Integer ruanganId,
 			Integer dokterId);
 
-	public Map<String, Object> pengkajianAwalNeonatusRawatJalan(String kdPap, String noRec);
+	Map<String, Object> pengkajianAwalNeonatusRawatJalan(String kdPap, String noRec);
 
-	public Map<String, Object> pengkajianAwalNeonatusRawatInap(String kdPap, String noRec);
+	Map<String, Object> pengkajianAwalNeonatusRawatInap(String kdPap, String noRec);
 
-	public Map<String, Object> pengkajianAwalAnakRawatInap(String kdPap, String noRec);
+	Map<String, Object> pengkajianAwalAnakRawatInap(String kdPap, String noRec);
 
-	public Map<String, Object> pengkajianAwalAnakRawatJalan(String kdPap, String noRec);
+	Map<String, Object> pengkajianAwalAnakRawatJalan(String kdPap, String noRec);
 
-	public Map<String, Object> pengkajianAwalDewasaRawatJalan(String kdPap, String noRec);
+	Map<String, Object> pengkajianAwalDewasaRawatJalan(String kdPap, String noRec);
 
-	public Map<String, Object> resumeMedis(String noRec);
+	Map<String, Object> resumeMedis(String noRec);
 
-	public Map<String, Object> tracer(String noRegistrasi);
+	Map<String, Object> tracer(String noRegistrasi);
 
-	public Map<String, Object> ringkasanKeluarMasuk(String noRegistrasi);
+	Map<String, Object> ringkasanKeluarMasuk(String noRegistrasi);
 
-	public Map<String, Object> labelPasien(String noRegistrasi);
+	Map<String, Object> labelPasien(String noRegistrasi);
 
-	public List<Map<String, Object>> generateLapRekapitulasiIndexKehadiran(String periode);
+	List<Map<String, Object>> generateLapRekapitulasiIndexKehadiran(String periode);
 
-	public List<Map<String, Object>> generateSuratPermohonanCuti(String noRec);
-
-	public Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, Integer idJabatan, Integer idAtasan1,
+	Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, Integer idJabatan, Integer idAtasan1,
 			Integer idAtasan2, Integer kaRu);
 
-	public Map<String, Object> generateSuratIzinSementara(String noRecPlanning, Integer idJabatan, Integer idUnitKerja,
+	Map<String, Object> generateSuratIzinSementara(String noRecPlanning, Integer idJabatan, Integer idUnitKerja,
 			Integer idAtasan1, Integer idAtasan2, Integer kaRu, Integer idJabatanAtasan1, Integer idJabatanAtasan2);
 
-	public Map<String, Object> generateSuratIzinSementara(String noRecPlanning, Integer idJabatan, Integer idUnitKerja,
+	Map<String, Object> generateSuratIzinSementara(String noRecPlanning, Integer idJabatan, Integer idUnitKerja,
 			Integer idAtasan1, Integer idJabatanAtasan1);
 
-	public Map<String, Object> generateSuratTugas(String noRecPlanning, Integer idJabatan, Integer idUnitKerja,
+	Map<String, Object> generateSuratTugas(String noRecPlanning, Integer idJabatan, Integer idUnitKerja,
 			Integer idAtasan1, Integer idAtasan2, Integer kaRu, Integer idJabatanAtasan1, Integer idJabatanAtasan2);
 
-	public Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, Integer idJabatan, Integer idUnitKerja,
+	Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, Integer idJabatan, Integer idUnitKerja,
 			Integer idAtasan1, Integer idAtasan2, Integer kaRu, Integer idJabatanAtasan1, Integer idJabatanAtasan2,
 			String atasanDireksi);
 
-	public Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, String atasan1, String nipPnsAtasan1,
+	Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, String atasan1, String nipPnsAtasan1,
 			String jabatanAtasan1, String atasan2, String nipPnsAtasan2, String jabatanAtasan2, Integer idKaRu);
 
-	public Map<String, Object> generateLapSuratIzinCuti(String noRecPlanning, Integer idJabatan, Integer atasanId,
+	Map<String, Object> generateLapSuratIzinCuti(String noRecPlanning, Integer idJabatan, Integer atasanId,
 			Integer jabatanAtasanId);
 
-	public Map<String, Object> generateLapPelayanan(String startDate, String endDate, Integer idproduk,
-			Integer idRuangan, Integer jenisPasien);
+	Map<String, Object> generateLapPelayanan(String startDate, String endDate, Integer idproduk, Integer idRuangan,
+			Integer jenisPasien);
 
-	public Map<String, Object> generateLapPelayananByDokter(String startDate, String endDate, Integer idproduk,
+	Map<String, Object> generateLapPelayananByDokter(String startDate, String endDate, Integer idproduk,
 			Integer idRuangan, Integer jenisPasien, Integer idDokter);
 
-	public Map<String, Object> generateLapPelayananByDokterWithKarcis(String startDate, String endDate,
-			Integer idproduk, Integer idRuangan, Integer jenisPasien, Integer idDokter, Integer idDepartemen);
+	Map<String, Object> generateLapPelayananByDokterWithKarcis(String startDate, String endDate, Integer idproduk,
+			Integer idRuangan, Integer jenisPasien, Integer idDokter, Integer idDepartemen);
 
-	public Map<String, Object> generatelapLogbookLimbahB3Report(String startDate, String endDate);
+	Map<String, Object> generatelapLogbookLimbahB3Report(String startDate, String endDate);
 
-	public Map<String, Object> generateFormulirLaporanKecelakaanKerja(String noRec);
+	Map<String, Object> generateFormulirLaporanKecelakaanKerja(String noRec);
 
-	public Map<String, Object> generateJadwalPerUnitKerja(Integer ruangan, Integer tahun, Integer bulan);
+	Map<String, Object> generateJadwalPerUnitKerja(Integer ruangan, Integer tahun, Integer bulan);
 
-	public Map<String, Object> generateRekapitulasiCorrectiveMaintenance(String startDate, String endDate,
+	Map<String, Object> generateRekapitulasiCorrectiveMaintenance(String startDate, String endDate,
 			Integer idJenisProduk);
 
-	public Map<String, Object> generateSuratPelimpahanTugas(String noRecPlanning, Integer idPegawaiPelimpah,
+	Map<String, Object> generateSuratPelimpahanTugas(String noRecPlanning, Integer idPegawaiPelimpah,
 			Integer idJabatanPelimpah, Integer idPegawaiDilimpah);
 
-	public Map<String, Object> generateReportPencatatanSuhuMesin(Integer idMesin, Integer idMappingMesin,
+	Map<String, Object> generateReportPencatatanSuhuMesin(Integer idMesin, Integer idMappingMesin,
 			String tglCatSuhuMesin, Integer idSupervisor);
 
-	public List<Map<String, Object>> generateReportGrafikSuhuMesin(Integer idMesin, Integer idMappingMesin,
+	List<Map<String, Object>> generateReportGrafikSuhuMesin(Integer idMesin, Integer idMappingMesin,
 			String tglCatSuhuMesin);
 
-	public Map<String, Object> findDataCetakLuarNegeri(String norec);
+	Map<String, Object> findDataCetakLuarNegeri(String norec);
 
-	public List<Map<String, Object>> getHistoriUsulanRincianKegiatan(Integer idPelaksanaanTugas,
-			Integer idRincianKegiatan);
+	List<Map<String, Object>> getHistoriUsulanRincianKegiatan(Integer idPelaksanaanTugas, Integer idRincianKegiatan);
 
 	Map<String, Object> defineSlipGajiDataSource(Integer pegawaiId, Long bulan);
-	
+
 	List<SlipHeaderDto> allSlipGajiDataSource(Long bulan);
 }
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 4104377a..586c20af 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
@@ -1,25 +1,5 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.text.DateFormat;
-import java.text.NumberFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.codec.binary.Base64;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
 import com.jasamedika.medifirst2000.constants.Master;
 import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
 import com.jasamedika.medifirst2000.converter.PresensiConverter;
@@ -37,6 +17,19 @@ import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.util.ImageUtil;
 import com.jasamedika.medifirst2000.vo.AbsensiPegawaiVO;
 import com.jasamedika.medifirst2000.vo.HabsenVO;
+import org.apache.commons.codec.binary.Base64;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.text.DateFormat;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * Implement class for AbsensiPegawaiService
@@ -46,8 +39,6 @@ import com.jasamedika.medifirst2000.vo.HabsenVO;
 @Service("absensiPegawaiService")
 public class AbsensiPegawaiServiceImpl extends BaseVoServiceImpl implements AbsensiPegawaiService {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AbsensiPegawaiServiceImpl.class);
-
 	@Value("${systemDirectory}")
 	String systemDirectory;
 
@@ -174,9 +165,6 @@ public class AbsensiPegawaiServiceImpl extends BaseVoServiceImpl implements Abse
 		String path = systemDirectory + "presensi-pegawai/" + dirname + "/";
 		if (osName.contains("win"))
 			path = systemDirectory.replace("/", "\\") + "presensi-pegawai\\" + dirname + "\\";
-
-		LOGGER.info("Path presensi pegawai {}", path);
-
 		return path;
 	}
 
@@ -194,14 +182,9 @@ public class AbsensiPegawaiServiceImpl extends BaseVoServiceImpl implements Abse
 		byte[] imagedata = Base64.decodeBase64(str.substring(str.indexOf(",") + 1));
 		try {
 			File dire = new File(directory);
-			if (!dire.exists()) {
+			if (!dire.exists())
 				dire.mkdirs();
-			}
-
 			File outputFile = new File(filename);
-
-			LOGGER.info("Path presensi pegawai {}", outputFile.getAbsolutePath());
-
 			OutputStream stream = new FileOutputStream(outputFile);
 			stream.write(imagedata);
 			stream.close();
@@ -264,8 +247,6 @@ public class AbsensiPegawaiServiceImpl extends BaseVoServiceImpl implements Abse
 			File file = new File(
 					getDirPathPresensiPegawai(map.get("trdate").toString()) + map.get("filePath").toString());
 
-			LOGGER.info("Path presensi pegawai {}", file.getAbsolutePath());
-
 			String encodeRs = ImageUtil.encodeFileToBase64Binary(file);
 			if (CommonUtil.isNotNullOrEmpty(encodeRs)) {
 				imageURLData = "data:image/jpg;base64," + encodeRs;
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java
index 67882af3..de4c9825 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiJadwalKerjaServiceImpl.java
@@ -1,5 +1,30 @@
 package com.jasamedika.medifirst2000.service.impl;
 
+import com.jasamedika.medifirst2000.constants.Master;
+import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
+import com.jasamedika.medifirst2000.dao.*;
+import com.jasamedika.medifirst2000.dao.custom.PegawaiDaoCustom;
+import com.jasamedika.medifirst2000.entities.*;
+import com.jasamedika.medifirst2000.service.PegawaiJadwalKerjaService;
+import com.jasamedika.medifirst2000.service.PegawaiService;
+import com.jasamedika.medifirst2000.util.CommonUtil;
+import com.jasamedika.medifirst2000.util.DateUtil;
+import com.jasamedika.medifirst2000.vo.*;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.joda.time.Chronology;
+import org.joda.time.LocalDate;
+import org.joda.time.chrono.ISOChronology;
+import org.joda.time.chrono.IslamicChronology;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -10,72 +35,10 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.joda.time.Chronology;
-import org.joda.time.LocalDate;
-import org.joda.time.chrono.ISOChronology;
-import org.joda.time.chrono.IslamicChronology;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.UrlResource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.jasamedika.medifirst2000.constants.Master;
-import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
-import com.jasamedika.medifirst2000.dao.KalenderDao;
-import com.jasamedika.medifirst2000.dao.ListTanggalCutiDao;
-import com.jasamedika.medifirst2000.dao.MapKalenderToHariLiburDao;
-import com.jasamedika.medifirst2000.dao.MapPegawaiJabatanToUnitKerjaDao;
-import com.jasamedika.medifirst2000.dao.MonitoringAbsenDao;
-import com.jasamedika.medifirst2000.dao.PegawaiDao;
-import com.jasamedika.medifirst2000.dao.PegawaiJadwalKerjaDao;
-import com.jasamedika.medifirst2000.dao.ShiftKerjaDao;
-import com.jasamedika.medifirst2000.dao.SubUnitKerjaDao;
-import com.jasamedika.medifirst2000.dao.UnitKerjaDao;
-import com.jasamedika.medifirst2000.dao.custom.PegawaiDaoCustom;
-import com.jasamedika.medifirst2000.entities.Kalender;
-import com.jasamedika.medifirst2000.entities.Pegawai;
-import com.jasamedika.medifirst2000.entities.PegawaiJadwalKerja;
-import com.jasamedika.medifirst2000.entities.Ruangan;
-import com.jasamedika.medifirst2000.entities.ShiftKerja;
-import com.jasamedika.medifirst2000.service.PegawaiJadwalKerjaService;
-import com.jasamedika.medifirst2000.service.PegawaiService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.util.DateUtil;
-import com.jasamedika.medifirst2000.vo.KalenderVO;
-import com.jasamedika.medifirst2000.vo.KelompokShiftVO;
-import com.jasamedika.medifirst2000.vo.ListTanggalCutiVO;
-import com.jasamedika.medifirst2000.vo.PegawaiJadwalKerjaCustomVO;
-import com.jasamedika.medifirst2000.vo.PegawaiJadwalKerjaExcelVO;
-import com.jasamedika.medifirst2000.vo.PegawaiJadwalKerjaVO;
-import com.jasamedika.medifirst2000.vo.PegawaiVO;
-import com.jasamedika.medifirst2000.vo.PlanningPegawaiStatusVO;
-import com.jasamedika.medifirst2000.vo.RuanganVO;
-import com.jasamedika.medifirst2000.vo.ShiftKerjaVO;
+import java.util.*;
 
 @Service("PegawaiJadwalKerjaService")
 public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements PegawaiJadwalKerjaService {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(PegawaiJadwalKerjaServiceImpl.class);
 
 	@Value("${systemDirectory}")
 	String systemDirectory;
@@ -1026,9 +989,6 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 		String path = systemDirectory + "jadwal-pegawai/" + filename + "/";
 		if (osName.contains("win"))
 			path = systemDirectory.replace("/", "\\") + "jadwal-pegawai\\" + filename + "\\";
-		
-		LOGGER.info("Path jadwal pegawai {}", path);
-		
 		return path;
 	}
 
@@ -1106,9 +1066,6 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 
 			absoluteFilePath = getDirPathJadwalPegawai(filename);
 			File file = new File(absoluteFilePath);
-			
-			LOGGER.info("Path jadwal pegawai {}", file.getAbsolutePath());
-			
 			FileOutputStream out = new FileOutputStream(file);
 			workbook.write(out);
 
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
index 360f18ec..1405504a 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
@@ -1653,11 +1653,10 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 			d.put("bulanPulangIbu", "");
 			d.put("hargaJasa", 0.0);
 			d.put("isBatalPaket", false);
-			first.ifPresent(f -> {
-				d.put("bulanPulangIbu", month.format(f.get("tglKeluar")));
-				d.put("isBatalPaket", f.get("isBatal"));
-			});
-			if (first.isPresent()
+			if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().get("tglKeluar")))
+				d.put("bulanPulangIbu", month.format((Date) first.get().get("tglKeluar")));
+			first.ifPresent(f -> d.put("isBatalPaket", f.get("isBatal")));
+			if (first.isPresent() && CommonUtil.isNotNullOrEmpty(first.get().get("tglKeluar"))
 					&& (tglAwal.equals(first.get().get("tglKeluar"))
 							|| ((Date) first.get().get("tglKeluar")).after(tglAwal))
 					&& !PERAWAT.name().equals(d.get("paketType"))
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
index 636bd234..1e4f8f9c 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ReportServiceImpl.java
@@ -15,7 +15,6 @@ import com.jasamedika.medifirst2000.util.DateUtil;
 import com.jasamedika.medifirst2000.vo.PasienVO;
 import org.apache.commons.lang.time.DurationFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.*;
 import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.stereotype.Service;
@@ -33,6 +32,8 @@ import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 
+import static java.math.BigDecimal.ZERO;
+
 @Service("ReportService")
 public class ReportServiceImpl extends BaseVoServiceImpl implements ReportService {
 
@@ -376,27 +377,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 		return listkehadiran;
 	}
 
-	@Override
-	public Map<String, Object> generateRekapitulasiStok(Integer kelompokProdukId, Integer produkId,
-			Integer asalProdukId, Integer ruanganId, Integer jenisProdukId) {
-		String url = getUrlServiceSarPras();
-		final String uri = url + "stok-produk-global/cetak-list-stok?kelompokProdukId=" + kelompokProdukId
-				+ "&jenisProdukId=" + jenisProdukId + "&ruanganId=" + ruanganId + "&produkId=" + produkId
-				+ "&asalProdukId=" + asalProdukId;
-
-		RestTemplate template = new RestTemplate();
-		HttpHeaders headers = new HttpHeaders();
-		headers.setContentType(MediaType.APPLICATION_JSON);
-		headers.set("X-AUTH-TOKEN",
-				"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ0b3RvLndpc251In0.sLuqDN6gc1eiOdxgQyEQnYAQvqaaxCxRuOIpXgBW5NRLoP4Q52fu3YuW-FylY8WEbextxHzcu79Egkldyvadyg");
-		HttpEntity<Map<String, Object>> httpEntity = new HttpEntity<>(headers);
-		ResponseEntity<Map<String, Object>> data = template.exchange(uri, HttpMethod.GET, httpEntity,
-				new ParameterizedTypeReference<Map<String, Object>>() {
-				});
-
-		return data.getBody();
-	}
-
 	@Override
 	public Map<String, Object> generateSPMRS(String noRegistrasi) {
 		Map<String, Object> result;
@@ -984,33 +964,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 		return result;
 	}
 
-	public List<Map<String, Object>> sortedMap(List<Map<String, Object>> list) {
-		List<Map<String, Object>> result = new ArrayList<>();
-		List<Map<String, String>> listMap = new ArrayList<>();
-		List<Map<String, String>> listMap1 = new ArrayList<>();
-		// convert into Map<String,String>
-		for (Map<String, Object> temp : list) {
-			Map<String, String> newMap = new HashMap<>();
-			for (Map.Entry<String, Object> entry : temp.entrySet()) {
-				if (entry.getValue() instanceof String) {
-					newMap.put(entry.getKey(), entry.getValue().toString());
-				}
-			}
-			listMap.add(newMap);
-		}
-		// compare map
-		Comparator<Map<String, String>> mapComparator = Comparator.comparing(m -> m.get("id"));
-
-		listMap.sort(mapComparator);
-
-		// convert into Map<String,String>
-		for (Map<String, String> tempMap : listMap) {
-			Map<String, Object> newMap = new HashMap<>(tempMap);
-			result.add(newMap);
-		}
-		return result;
-	}
-
 	@SuppressWarnings("unchecked")
 	public Map<String, Object> resikoJatuh(Map<String, Object> result, String noRecPengkajian) {
 		// PenilaianResikoJatuh
@@ -1218,26 +1171,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 		return result;
 	}
 
-	@SuppressWarnings("unchecked")
-	public Map<String, Object> pengkajianKebutuhanDasar(Map<String, Object> result, String noRecPengkajian) {
-		// pengkajianKebutuhanDasar
-		StringBuilder pengkajianKebutuhanDasar = new StringBuilder();
-		StringBuilder pengkajianKebutuhanDasarValue = new StringBuilder();
-		Map<String, Object> perencanaanPulang = (Map<String, Object>) pengkajianAwalTransaksiService
-				.loadPengkajianBaru(713, noRecPengkajian).get("pengkajianAwal");
-		for (Map<String, Object> data : (List<Map<String, Object>>) perencanaanPulang.get("detail")) {
-			pengkajianKebutuhanDasar.append(" ").append(data.get("nama")).append("\n");
-			Map<String, Object> dataChild = (Map<String, Object>) pengkajianAwalTransaksiService
-					.loadPengkajianBaru(Integer.valueOf(String.valueOf(data.get("value"))), noRecPengkajian)
-					.get("pengkajianAwal");
-			pengkajianKebutuhanDasarValue.append(" ").append(dataChild.get("nama")).append(", ")
-					.append(dataChild.get("value")).append("\n");
-		}
-		result.put("pengkajianKebutuhanDasar", pengkajianKebutuhanDasar.toString());
-		result.put("pengkajianKebutuhanDasarValue", pengkajianKebutuhanDasarValue.toString());
-		return result;
-	}
-
 	@SuppressWarnings("unchecked")
 	public void riwayatKelahiranRawatInap(Map<String, Object> result, String noRecPengkajian) {
 
@@ -1637,7 +1570,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 
 			this.diagnosisKeperawatan(result, noRec);
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
 		return result;
 	}
@@ -1656,7 +1589,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			this.skriningKekhususanNeonatus(result, noRecPengkajian);
 			this.diagnosisKeperawatan(result, noRecPengkajian);
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
 		return result;
 	}
@@ -1677,7 +1610,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			this.resikoJatuh(result, noRecPengkajian);
 
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
 		return result;
 	}
@@ -1697,7 +1630,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			this.obstetrikDanGinekologi(result, noRecPengkajian);
 			this.diagnosisKeperawatan(result, noRec);
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
 		return result;
 	}
@@ -1756,7 +1689,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			result.put("diagnosaSekunder", diagnosisSekunder.toString());
 			result.put("tindakanProsedur", tindakanProsedur.toString());
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
 		return result;
 	}
@@ -1778,7 +1711,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			this.diagnosisKeperawatan(result, noRecPengkajian);
 			this.perencanaanPulang(result, noRecPengkajian);
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
 		return result;
 	}
@@ -1829,12 +1762,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 		return nilaiIndexKinerjaIndividuDao.findRekapitulasiIndeksKehadiran(periode);
 	}
 
-	@Override
-	public List<Map<String, Object>> generateSuratPermohonanCuti(String noRec) {
-		PlanningPegawaiStatus planningPegawaiStatus = planningPegawaiStatusDao.findOne(noRec);
-		return null;
-	}
-
 	@Override
 	public Map<String, Object> generateLapPermohonanCuti(String noRecPlanning, Integer idJabatan, Integer idAtasan1,
 			Integer idAtasan2, Integer idKaRu) {
@@ -2002,7 +1929,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			if (Master.StatusPegawai.CUTI_TAHUNAN.equals(statusPegawaiId)
 					|| Master.StatusPegawai.CUTI_SAKIT.equals(statusPegawaiId)
 					|| Master.StatusPegawai.CUTI_MELAHIRKAN.equals(statusPegawaiId)) {
-				if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA).contains(pegawai.get("idGolongan"))) {
+				if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA)
+						.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
 					String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1");
 					String[] arrCutiA1 = cutiA1.split("_");
 					labelTtdMenkes = arrCutiA1[0];
@@ -2025,7 +1953,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 				}
 			} else if (Master.StatusPegawai.CUTI_BESAR.equals(statusPegawaiId)
 					|| Master.StatusPegawai.CUTI_ALASAN_PENTING.equals(statusPegawaiId)) {
-				if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA).contains(pegawai.get("idGolongan"))) {
+				if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA)
+						.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
 					String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1");
 					String[] arrCutiA1 = cutiA1.split("_");
 					labelTtdMenkes = arrCutiA1[0];
@@ -2209,7 +2138,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			if (Master.StatusPegawai.CUTI_TAHUNAN.equals(statusPegawaiId)
 					|| Master.StatusPegawai.CUTI_SAKIT.equals(statusPegawaiId)
 					|| Master.StatusPegawai.CUTI_MELAHIRKAN.equals(statusPegawaiId)) {
-				if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA).contains(pegawai.get("idGolongan"))) {
+				if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA)
+						.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
 					String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiA1");
 					String[] arrCutiA1 = cutiA1.split("_");
 					labelTtdMenkes = arrCutiA1[0];
@@ -2232,7 +2162,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 				}
 			} else if (Master.StatusPegawai.CUTI_BESAR.equals(statusPegawaiId)
 					|| Master.StatusPegawai.CUTI_ALASAN_PENTING.equals(statusPegawaiId)) {
-				if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA).contains(pegawai.get("idGolongan"))) {
+				if (Arrays.asList(Master.GolonganPegawai.JF_AHLI_UTAMA)
+						.contains(Integer.parseInt(pegawai.get("idGolongan").toString()))) {
 					String cutiA1 = settingDataFixedDao.getSettingDataFixed("cutiB1");
 					String[] arrCutiA1 = cutiA1.split("_");
 					labelTtdMenkes = arrCutiA1[0];
@@ -2866,7 +2797,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 				c.setTime(sdf.parse(date));
 				newDate = c.getTime();
 			} catch (ParseException e) {
-				e.printStackTrace();
+				throw new ServiceVOException(e.getMessage());
 			}
 		}
 		return newDate;
@@ -2966,7 +2897,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			data.put("periode", DateUtil.getIndonesianStringDate(formatter2.parse(startDate)).toUpperCase() + " s/d "
 					+ DateUtil.getIndonesianStringDate(formatter2.parse(endDate)).toUpperCase());
 		} catch (ParseException e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
 
 		return data;
@@ -3029,12 +2960,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 		return result;
 	}
 
-	private String getMonthYearString(Date date) {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		return DateUtil.INDONESIAN_MONTH[cal.get(Calendar.MONTH)] + " " + cal.get(Calendar.YEAR);
-	}
-
 	private String getDayOfWeekString(Date date) {
 		Calendar cal = Calendar.getInstance();
 		cal.setTime(date);
@@ -3121,7 +3046,7 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 					+ new SimpleDateFormat("dd-MMM-yyyy").format(dEndDate);
 			result.put("periode", periode);
 		} catch (ParseException e) {
-			e.printStackTrace();
+			throw new ServiceVOException(e.getMessage());
 		}
 
 		result.put("tglCetak", tglCetak);
@@ -3221,8 +3146,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			}
 		}
 		Collections.sort(listTglPeriode);
-		if (Arrays.asList(Master.StatusPegawai.PERIODIK_PENGAJUAN_KETIDAKHADIRAN).contains(result.get("idPlanning"))
-				&& countTglCuti == 2) {
+		if (Arrays.asList(Master.StatusPegawai.PERIODIK_PENGAJUAN_KETIDAKHADIRAN)
+				.contains(Integer.parseInt(result.get("idPlanning").toString())) && countTglCuti == 2) {
 			List<Date> listDetailTglPeriode = kalenderDao
 					.getDateFromPeriodicParameter(sdf.format(listTglPeriode.get(0)), sdf.format(listTglPeriode.get(1)));
 			Collections.sort(listDetailTglPeriode);
@@ -3268,7 +3193,6 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 		Locale indonesia = new Locale("in", "ID");
 		NumberFormat nf = NumberFormat.getCurrencyInstance(indonesia);
 		SimpleDateFormat df = new SimpleDateFormat("MMMM yyyy", indonesia);
-		SimpleDateFormat tglLahir = new SimpleDateFormat("dd-MM-yyyy", indonesia);
 		Map<String, Object> result = new HashMap<>();
 		SlipGajiDto dto = slipGajiService.get(pegawaiId, bulan);
 		Date tglLahirPegawai = pegawaiDao.findTglLahirById(pegawaiId);
@@ -3279,95 +3203,155 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 		result.put("periode", df.format(new Date(bulan)));
 		result.put("unitKerja", CommonUtil.isNotNullOrEmpty(dto.getUnitKerja()) ? dto.getUnitKerja() : "-");
 		result.put("subUnitKerja", CommonUtil.isNotNullOrEmpty(dto.getSubUnitKerja()) ? dto.getSubUnitKerja() : "-");
-		result.put("gaji", "-");
-		result.put("remunerasiKinerja", "-");
-		result.put("remunerasiTambahanManajerial", "-");
-		result.put("remunerasiTambahanDiklitjar", "-");
-		result.put("remunerasiTambahanLain", "-");
-		result.put("feeForService", "-");
-		result.put("feeForOnSite", "-");
+		result.put("gajiPokok", "-");
+		result.put("tunjanganIstriSuami", "-");
+		result.put("tunjanganAnak", "-");
+		result.put("tunjanganPns", "-");
+		result.put("tunjanganStruktural", "-");
+		result.put("tunjanganFungsional", "-");
+		result.put("tunjanganBeras", "-");
+		result.put("tunjanganPph", "-");
+		result.put("remunerasi", "-");
+		result.put("remunerasiOperasional", "-");
 		result.put("uangMakan", "-");
-		result.put("uangLembur", "-");
-		result.put("pphGaji", "-");
-		result.put("pphRemunerasi", "-");
-		result.put("pphFeeForService", "-");
-		result.put("pphFeeForOnSite", "-");
-		result.put("pphUangMakan", "-");
-		result.put("pphUangLembur", "-");
-		result.put("iuranWajibKoperasi", "-");
-		result.put("pinjamanKoperasi", "-");
-		result.put("biayaObatAlkes", "-");
-		result.put("biayaRawatInap", "-");
-		result.put("biayaRawatJalan", "-");
-		result.put("potonganTokoKoperasi", "-");
-		result.put("potonganBpjsK", "-");
-		result.put("potonganBpjsTK", "-");
-		BigDecimal jumlahPenerimaan = BigDecimal.ZERO;
-		BigDecimal jumlahPemotongan = BigDecimal.ZERO;
+		result.put("pfk", "-");
+		result.put("pph", "-");
+		result.put("sewaRumah", "-");
+		result.put("kelebihanTunjangan", "-");
+		result.put("potonganLain", "-");
+		result.put("tabunganRumah", "-");
+		result.put("potonganBpjsKetenagakerjaan", "-");
+		result.put("potonganBpjsKesehatan", "-");
+		result.put("simpananWajibKoperasiGaji", "-");
+		result.put("pinjamanKoperasiGaji", "-");
+		result.put("potonganPph21Remunerasi", "-");
+		result.put("potonganPph21RemunerasiOperasional", "-");
+		result.put("potonganObat", "-");
+		result.put("potonganRawatInap", "-");
+		result.put("potonganRawatJalan", "-");
+		result.put("simpananWajibKoperasiRemunerasi", "-");
+		result.put("pinjamanKoperasiRemunerasi", "-");
+		result.put("tokoKoperasi", "-");
+		result.put("wakafDanLainLain", "-");
+		result.put("potonganPph21UangMakan", "-");
+		BigDecimal jumlahGaji = ZERO;
+		BigDecimal jumlahRemunerasi = ZERO;
+		BigDecimal jumlahUangMakan = ZERO;
+		BigDecimal jumlahPotonganGaji = ZERO;
+		BigDecimal jumlahPotonganRemunerasi = ZERO;
+		BigDecimal jumlahPotonganUangMakan = ZERO;
+		BigDecimal jumlahGajiBersih;
+		BigDecimal jumlahRemunerasiBersih;
+		BigDecimal jumlahUangMakanBersih;
 		BigDecimal jumlahPenerimaanBersih;
 		List<SlipGajiKomponenDto> komponenDto = new ArrayList<>();
 		if (CommonUtil.isNotNullOrEmpty(dto.getKomponen()))
 			komponenDto = dto.getKomponen();
 		for (SlipGajiKomponenDto k : komponenDto) {
 			if (CommonUtil.isNotNullOrEmpty(k.getNominal())) {
-				if (Master.JenisKomponenGaji.PENERIMAAN.equals(k.getIdJenisKomponen())) {
-					jumlahPenerimaan = jumlahPenerimaan.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
-				} else if (Master.JenisKomponenGaji.PEMOTONGAN.equals(k.getIdJenisKomponen())) {
-					jumlahPemotongan = jumlahPemotongan.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
+				if (Master.JenisKomponenGaji.GAJI.equals(k.getIdJenisKomponen())) {
+					jumlahGaji = jumlahGaji.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
+				} else if (Master.JenisKomponenGaji.REMUNERASI.equals(k.getIdJenisKomponen())) {
+					jumlahRemunerasi = jumlahRemunerasi.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
+				} else if (Master.JenisKomponenGaji.UANG_MAKAN.equals(k.getIdJenisKomponen())) {
+					jumlahUangMakan = jumlahUangMakan.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
+				} else if (Master.JenisKomponenGaji.POTONGAN_GAJI.equals(k.getIdJenisKomponen())) {
+					jumlahPotonganGaji = jumlahPotonganGaji.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
+				} else if (Master.JenisKomponenGaji.POTONGAN_REMUNERASI.equals(k.getIdJenisKomponen())) {
+					jumlahPotonganRemunerasi = jumlahPotonganRemunerasi
+							.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
+				} else if (Master.JenisKomponenGaji.POTONGAN_UANG_MAKAN.equals(k.getIdJenisKomponen())) {
+					jumlahPotonganUangMakan = jumlahPotonganUangMakan
+							.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
 				}
-				if (Master.KomponenGaji.GAJI.equals(k.getIdKomponen())) {
-					result.put("gaji", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.REMUNERASI_KINERJA.equals(k.getIdKomponen())) {
-					result.put("remunerasiKinerja", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_MANAJERIAL.equals(k.getIdKomponen())) {
-					result.put("remunerasiTambahanManajerial", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_DIKLITJAR.equals(k.getIdKomponen())) {
-					result.put("remunerasiTambahanDiklitjar", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_LAIN.equals(k.getIdKomponen())) {
-					result.put("remunerasiTambahanLain", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) {
-					result.put("feeForService", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.FEE_FOR_ONSITE.equals(k.getIdKomponen())) {
-					result.put("feeForOnSite", nf.format(k.getNominal()));
+				if (Master.KomponenGaji.GAJI_POKOK.equals(k.getIdKomponen())) {
+					result.put("gajiPokok", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.TUNJANGAN_ISTRI_SUAMI.equals(k.getIdKomponen())) {
+					result.put("tunjanganIstriSuami", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.TUNJANGAN_ANAK.equals(k.getIdKomponen())) {
+					result.put("tunjanganAnak", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.TUNJANGAN_PNS.equals(k.getIdKomponen())) {
+					result.put("tunjanganPns", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.TUNJANGAN_STRUKTURAL.equals(k.getIdKomponen())) {
+					result.put("tunjanganStruktural", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.TUNJANGAN_FUNGSIONAL.equals(k.getIdKomponen())) {
+					result.put("tunjanganFungsional", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.TUNJANGAN_BERAS.equals(k.getIdKomponen())) {
+					result.put("tunjanganBeras", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.TUNJANGAN_PPH.equals(k.getIdKomponen())) {
+					result.put("tunjanganPph", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.REMUNERASI.equals(k.getIdKomponen())) {
+					result.put("remunerasi", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
+					result.put("remunerasiOperasional", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) {
 					result.put("uangMakan", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.UANG_LEMBUR.equals(k.getIdKomponen())) {
-					result.put("uangLembur", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH_GAJI.equals(k.getIdKomponen())) {
-					result.put("pphGaji", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH_REMUNERASI.equals(k.getIdKomponen())) {
-					result.put("pphRemunerasi", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH_FEE_FOR_SERVICE.equals(k.getIdKomponen())) {
-					result.put("pphFeeForService", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH_FEE_FOR_ONSITE.equals(k.getIdKomponen())) {
-					result.put("pphFeeForOnSite", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH_UANG_MAKAN.equals(k.getIdKomponen())) {
-					result.put("pphUangMakan", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH_UANG_LEMBUR.equals(k.getIdKomponen())) {
-					result.put("pphUangLembur", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.IURAN_WAJIB_KOPERASI.equals(k.getIdKomponen())) {
-					result.put("iuranWajibKoperasi", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PINJAMAN_KOPERASI.equals(k.getIdKomponen())) {
-					result.put("pinjamanKoperasi", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.BIAYA_OBAT_ALKES.equals(k.getIdKomponen())) {
-					result.put("biayaObatAlkes", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.BIAYA_RAWAT_INAP.equals(k.getIdKomponen())) {
-					result.put("biayaRawatInap", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.BIAYA_RAWAT_JALAN.equals(k.getIdKomponen())) {
-					result.put("biayaRawatJalan", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.POTONGAN_TOKO_KOPERASI.equals(k.getIdKomponen())) {
-					result.put("potonganTokoKoperasi", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.POTONGAN_BPJSK.equals(k.getIdKomponen())) {
-					result.put("potonganBpjsK", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.PFK.equals(k.getIdKomponen())) {
+					result.put("pfk", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.PPH.equals(k.getIdKomponen())) {
+					result.put("pph", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.SEWA_RUMAH.equals(k.getIdKomponen())) {
+					result.put("sewaRumah", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.KELEBIHAN_TUNJANGAN.equals(k.getIdKomponen())) {
+					result.put("kelebihanTunjangan", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.POTONGAN_LAIN.equals(k.getIdKomponen())) {
+					result.put("potonganLain", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.TABUNGAN_RUMAH.equals(k.getIdKomponen())) {
+					result.put("tabunganRumah", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.POTONGAN_BPJSTK.equals(k.getIdKomponen())) {
-					result.put("potonganBpjsTK", nf.format(k.getNominal()));
+					result.put("potonganBpjsKetenagakerjaan", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.POTONGAN_BPJSK.equals(k.getIdKomponen())) {
+					result.put("potonganBpjsKesehatan", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.SIMPANAN_WAJIB_KOPERASI_GAJI.equals(k.getIdKomponen())) {
+					result.put("simpananWajibKoperasiGaji", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.PINJAMAN_KOPERASI_GAJI.equals(k.getIdKomponen())) {
+					result.put("pinjamanKoperasiGaji", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.POTONGAN_PPH_21_REMUNERASI.equals(k.getIdKomponen())) {
+					result.put("potonganPph21Remunerasi", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.POTONGAN_PPH_21_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
+					result.put("potonganPph21RemunerasiOperasional", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) {
+					result.put("potonganObat", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) {
+					result.put("potonganRawatInap", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.POTONGAN_RAWAT_JALAN.equals(k.getIdKomponen())) {
+					result.put("potonganRawatJalan", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.SIMPANAN_WAJIB_KOPERASI_REMUNERASI.equals(k.getIdKomponen())) {
+					result.put("simpananWajibKoperasiRemunerasi", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.PINJAMAN_KOPERASI_REMUNERASI.equals(k.getIdKomponen())) {
+					result.put("pinjamanKoperasiRemunerasi", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.TOKO_KOPERASI.equals(k.getIdKomponen())) {
+					result.put("tokoKoperasi", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.WAKAF_DLL.equals(k.getIdKomponen())) {
+					result.put("wakafDanLainLain", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.POTONGAN_PPH_21_UANG_MAKAN.equals(k.getIdKomponen())) {
+					result.put("potonganPph21UangMakan", nf.format(k.getNominal()));
 				}
 			}
 		}
-		result.put("jumlahPenerimaan", nf.format(jumlahPenerimaan));
-		result.put("jumlahPemotongan", nf.format(jumlahPemotongan));
-		jumlahPenerimaanBersih = jumlahPenerimaan.subtract(BigDecimal.valueOf(jumlahPemotongan.doubleValue()));
-		result.put("jumlahPenerimaanBersih", nf.format(jumlahPenerimaanBersih));
+		{
+			result.put("jumlahGaji", nf.format(jumlahGaji));
+			result.put("jumlahPotonganGaji", nf.format(jumlahPotonganGaji));
+			jumlahGajiBersih = jumlahGaji.subtract(BigDecimal.valueOf(jumlahPotonganGaji.doubleValue()));
+			result.put("jumlahGajiBersih", nf.format(jumlahGajiBersih));
+		}
+		{
+			result.put("jumlahRemunerasi", nf.format(jumlahRemunerasi));
+			result.put("jumlahPotonganRemunerasi", nf.format(jumlahPotonganRemunerasi));
+			jumlahRemunerasiBersih = jumlahRemunerasi
+					.subtract(BigDecimal.valueOf(jumlahPotonganRemunerasi.doubleValue()));
+			result.put("jumlahRemunerasiBersih", nf.format(jumlahRemunerasiBersih));
+		}
+		{
+			result.put("jumlahUangMakan", nf.format(jumlahUangMakan));
+			result.put("jumlahPotonganUangMakan", nf.format(jumlahPotonganUangMakan));
+			jumlahUangMakanBersih = jumlahUangMakan.subtract(BigDecimal.valueOf(jumlahPotonganUangMakan.doubleValue()));
+			result.put("jumlahUangMakanBersih", nf.format(jumlahUangMakanBersih));
+		}
+		{
+			jumlahPenerimaanBersih = jumlahGajiBersih.add(jumlahRemunerasiBersih).add(jumlahUangMakanBersih);
+			result.put("jumlahPenerimaanBersih", nf.format(jumlahPenerimaanBersih));
+		}
 		return result;
 	}
 
@@ -3392,93 +3376,146 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 		NumberFormat nf = NumberFormat.getCurrencyInstance(indonesia);
 		SimpleDateFormat df = new SimpleDateFormat("MMMM-yyyy", indonesia);
 		SimpleDateFormat tglLahir = new SimpleDateFormat("dd-MM-yyyy", indonesia);
-		SimpleDateFormat tglPrint = new SimpleDateFormat("dd MMMM yyyy", indonesia);
 		SlipGajiDto dto = slipGajiService.get(pegawaiId, bulan);
 		Date tglLahirPegawai = pegawaiDao.findTglLahirById(pegawaiId);
 		List<SlipGajiKomponenDto> komponenDto = new ArrayList<>();
 		if (CommonUtil.isNotNullOrEmpty(dto.getKomponen()))
 			komponenDto = dto.getKomponen();
-		if (komponenDto.size() > 0) {
+		if (!komponenDto.isEmpty()) {
 			SlipPegawaiDto.SlipPegawaiDtoBuilder pegawaiDtoBuilder = SlipPegawaiDto.builder();
 			pegawaiDtoBuilder.title("Slip Gaji");
 			pegawaiDtoBuilder.nama(CommonUtil.isNotNullOrEmpty(dto.getNamaPegawai()) ? dto.getNamaPegawai() : "-");
 			pegawaiDtoBuilder.nip(CommonUtil.isNotNullOrEmpty(dto.getNip()) ? dto.getNip() : "-");
 			pegawaiDtoBuilder.periode(df.format(new Date(bulan)));
 			pegawaiDtoBuilder
-					.tgl_lahir(CommonUtil.isNotNullOrEmpty(tglLahirPegawai) ? tglLahir.format(tglLahirPegawai) : "-");
+					.tglLahir(CommonUtil.isNotNullOrEmpty(tglLahirPegawai) ? tglLahir.format(tglLahirPegawai) : "-");
 			pegawaiDtoBuilder.jabatan(CommonUtil.isNotNullOrEmpty(dto.getJabatan()) ? dto.getJabatan() : "-");
-			pegawaiDtoBuilder.unit_kerja(CommonUtil.isNotNullOrEmpty(dto.getJabatan()) ? dto.getJabatan() : "-");
+			pegawaiDtoBuilder.unitKerja(CommonUtil.isNotNullOrEmpty(dto.getJabatan()) ? dto.getJabatan() : "-");
 			pegawaiDtoBuilder
-					.sub_unit(CommonUtil.isNotNullOrEmpty(dto.getSubUnitKerja()) ? dto.getSubUnitKerja() : "-");
+					.subUnitKerja(CommonUtil.isNotNullOrEmpty(dto.getSubUnitKerja()) ? dto.getSubUnitKerja() : "-");
 			SlipPenerimaanDto.SlipPenerimaanDtoBuilder penerimaanDtoBuilder = SlipPenerimaanDto.builder();
 			SlipPotonganDto.SlipPotonganDtoBuilder potonganDtoBuilder = SlipPotonganDto.builder();
 			SlipJumlahDto.SlipJumlahDtoBuilder jumlahDtoBuilder = SlipJumlahDto.builder();
-			BigDecimal jumlahPenerimaan = BigDecimal.ZERO;
-			BigDecimal jumlahPemotongan = BigDecimal.ZERO;
+			BigDecimal jumlahGaji = ZERO;
+			BigDecimal jumlahRemunerasi = ZERO;
+			BigDecimal jumlahUangMakan = ZERO;
+			BigDecimal jumlahPotonganGaji = ZERO;
+			BigDecimal jumlahPotonganRemunerasi = ZERO;
+			BigDecimal jumlahPotonganUangMakan = ZERO;
+			BigDecimal jumlahGajiBersih;
+			BigDecimal jumlahRemunerasiBersih;
+			BigDecimal jumlahUangMakanBersih;
 			BigDecimal jumlahPenerimaanBersih;
 			for (SlipGajiKomponenDto k : komponenDto) {
-				if (Master.JenisKomponenGaji.PENERIMAAN.equals(k.getIdJenisKomponen())) {
-					jumlahPenerimaan = jumlahPenerimaan.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
-				} else if (Master.JenisKomponenGaji.PEMOTONGAN.equals(k.getIdJenisKomponen())) {
-					jumlahPemotongan = jumlahPemotongan.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
-				}
-				if (Master.KomponenGaji.GAJI.equals(k.getIdKomponen())) {
-					penerimaanDtoBuilder.gaji(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.REMUNERASI_KINERJA.equals(k.getIdKomponen())) {
-					penerimaanDtoBuilder.remun_kinerja(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_MANAJERIAL.equals(k.getIdKomponen())) {
-					penerimaanDtoBuilder.remun_tambahan_manajerial(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_DIKLITJAR.equals(k.getIdKomponen())) {
-					penerimaanDtoBuilder.remun_tambahan_diklitjar(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_LAIN.equals(k.getIdKomponen())) {
-					penerimaanDtoBuilder.remun_tambahan_lain(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) {
-					penerimaanDtoBuilder.ffs(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.FEE_FOR_ONSITE.equals(k.getIdKomponen())) {
-					penerimaanDtoBuilder.ffo(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) {
-					penerimaanDtoBuilder.uang_makan(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.UANG_LEMBUR.equals(k.getIdKomponen())) {
-					penerimaanDtoBuilder.uang_lembur(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH_GAJI.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.pph_gaji(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH_REMUNERASI.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.pph_remun(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH_FEE_FOR_SERVICE.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.pph_ffs(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH_FEE_FOR_ONSITE.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.pph_ffo(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH_UANG_MAKAN.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.pph_um(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH_UANG_LEMBUR.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.pph_ul(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.IURAN_WAJIB_KOPERASI.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.iuran_koperasi(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PINJAMAN_KOPERASI.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.pinjam_koperasi(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.BIAYA_OBAT_ALKES.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.biaya_obat(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.BIAYA_RAWAT_INAP.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.biaya_ri(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.BIAYA_RAWAT_JALAN.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.biaya_rj(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.POTONGAN_TOKO_KOPERASI.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.potongan_koperasi(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.POTONGAN_BPJSK.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.potongan_bpjsk(nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.POTONGAN_BPJSTK.equals(k.getIdKomponen())) {
-					potonganDtoBuilder.potongan_bpjstk(nf.format(k.getNominal()));
+				if (CommonUtil.isNotNullOrEmpty(k.getNominal())) {
+					if (Master.JenisKomponenGaji.GAJI.equals(k.getIdJenisKomponen())) {
+						jumlahGaji = jumlahGaji.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
+					} else if (Master.JenisKomponenGaji.REMUNERASI.equals(k.getIdJenisKomponen())) {
+						jumlahRemunerasi = jumlahRemunerasi.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
+					} else if (Master.JenisKomponenGaji.UANG_MAKAN.equals(k.getIdJenisKomponen())) {
+						jumlahUangMakan = jumlahUangMakan.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
+					} else if (Master.JenisKomponenGaji.POTONGAN_GAJI.equals(k.getIdJenisKomponen())) {
+						jumlahPotonganGaji = jumlahPotonganGaji.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
+					} else if (Master.JenisKomponenGaji.POTONGAN_REMUNERASI.equals(k.getIdJenisKomponen())) {
+						jumlahPotonganRemunerasi = jumlahPotonganRemunerasi
+								.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
+					} else if (Master.JenisKomponenGaji.POTONGAN_UANG_MAKAN.equals(k.getIdJenisKomponen())) {
+						jumlahPotonganUangMakan = jumlahPotonganUangMakan
+								.add(BigDecimal.valueOf(k.getNominal().doubleValue()));
+					}
+					if (Master.KomponenGaji.GAJI_POKOK.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.gajiPokok(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.TUNJANGAN_ISTRI_SUAMI.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.tunjanganIstriSuami(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.TUNJANGAN_ANAK.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.tunjanganAnak(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.TUNJANGAN_PNS.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.tunjanganPns(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.TUNJANGAN_STRUKTURAL.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.tunjanganStruktural(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.TUNJANGAN_FUNGSIONAL.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.tunjanganFungsional(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.TUNJANGAN_BERAS.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.tunjanganBeras(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.TUNJANGAN_PPH.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.tunjanganPph(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.REMUNERASI.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.remunerasi(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.remunerasiOperasional(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.uangMakan(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.PFK.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.pfk(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.PPH.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.pph(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.SEWA_RUMAH.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.sewaRumah(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.KELEBIHAN_TUNJANGAN.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.kelebihanTunjangan(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.POTONGAN_LAIN.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.potonganLain(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.TABUNGAN_RUMAH.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.tabunganRumah(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.POTONGAN_BPJSTK.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.potonganBpjsKetenagakerjaan(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.POTONGAN_BPJSK.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.potonganBpjsKesehatan(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.SIMPANAN_WAJIB_KOPERASI_GAJI.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.simpananWajibKoperasiGaji(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.PINJAMAN_KOPERASI_GAJI.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.pinjamanKoperasiGaji(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.POTONGAN_PPH_21_REMUNERASI.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.potonganPph21Remunerasi(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.POTONGAN_PPH_21_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.potonganPph21RemunerasiOperasional(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.potonganObat(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.potonganRawatInap(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.POTONGAN_RAWAT_JALAN.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.potonganRawatJalan(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.SIMPANAN_WAJIB_KOPERASI_REMUNERASI.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.simpananWajibKoperasiRemunerasi(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.PINJAMAN_KOPERASI_REMUNERASI.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.pinjamanKoperasiRemunerasi(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.TOKO_KOPERASI.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.tokoKoperasi(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.WAKAF_DLL.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.wakafDanLainLain(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.POTONGAN_PPH_21_UANG_MAKAN.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.potonganPph21UangMakan(nf.format(k.getNominal()));
+					}
 				}
 			}
-			jumlahDtoBuilder.jumlah_gross(nf.format(jumlahPenerimaan));
-			jumlahDtoBuilder.jumlah_potongan(nf.format(jumlahPemotongan));
-			jumlahPenerimaanBersih = jumlahPenerimaan.subtract(BigDecimal.valueOf(jumlahPemotongan.doubleValue()));
-			jumlahDtoBuilder.jumlah_nett(nf.format(jumlahPenerimaanBersih));
+			{
+				jumlahDtoBuilder.jumlahGaji(nf.format(jumlahGaji));
+				jumlahDtoBuilder.jumlahPotonganGaji(nf.format(jumlahPotonganGaji));
+				jumlahGajiBersih = jumlahGaji.subtract(BigDecimal.valueOf(jumlahPotonganGaji.doubleValue()));
+				jumlahDtoBuilder.jumlahGajiBersih(nf.format(jumlahGajiBersih));
+			}
+			{
+				jumlahDtoBuilder.jumlahRemunerasi(nf.format(jumlahRemunerasi));
+				jumlahDtoBuilder.jumlahPotonganRemunerasi(nf.format(jumlahPotonganRemunerasi));
+				jumlahRemunerasiBersih = jumlahRemunerasi
+						.subtract(BigDecimal.valueOf(jumlahPotonganRemunerasi.doubleValue()));
+				jumlahDtoBuilder.jumlahRemunerasiBersih(nf.format(jumlahRemunerasiBersih));
+			}
+			{
+				jumlahDtoBuilder.jumlahUangMakan(nf.format(jumlahUangMakan));
+				jumlahDtoBuilder.jumlahPotonganUangMakan(nf.format(jumlahPotonganUangMakan));
+				jumlahUangMakanBersih = jumlahUangMakan
+						.subtract(BigDecimal.valueOf(jumlahPotonganUangMakan.doubleValue()));
+				jumlahDtoBuilder.jumlahUangMakanBersih(nf.format(jumlahUangMakanBersih));
+			}
+			{
+				jumlahPenerimaanBersih = jumlahGajiBersih.add(jumlahRemunerasiBersih).add(jumlahUangMakanBersih);
+				jumlahDtoBuilder.jumlahPenerimaanBersih(nf.format(jumlahPenerimaanBersih));
+			}
 			resultBuilder.pegawaiDto(pegawaiDtoBuilder.build());
 			resultBuilder.penerimaanDto(penerimaanDtoBuilder.build());
 			resultBuilder.potonganDto(potonganDtoBuilder.build());
 			resultBuilder.jumlahDto(jumlahDtoBuilder.build());
-			resultBuilder.print("dicetak melalui aplikasi SMART pada " + tglPrint.format(new Date()));
 		}
 		SlipHeaderDto result = resultBuilder.build();
 		if (CommonUtil.isNullOrEmpty(result.getPegawai())) {
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 64bed1b4..f2a57889 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
@@ -13,11 +13,8 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Row;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -37,8 +34,6 @@ import java.util.stream.Collectors;
 @Transactional
 public class SlipGajiServiceImpl implements SlipGajiService {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(SlipGajiServiceImpl.class);
-
 	@Value("${systemDirectory}")
 	String systemDirectory;
 
@@ -370,7 +365,7 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 			}
 			{
 				List<SlipGajiKomponenDto> dtoList = new ArrayList<>();
-				List<KomponenGaji> komponenGajiList = komponenGajiDao.findAll();
+				List<KomponenGaji> komponenGajiList = komponenGajiDao.findByUrutan();
 				List<Map<String, Object>> listKomponen = slipGajiKomponenDao.findAll(pegawaiId, start, end);
 				komponenGajiList.forEach(e -> {
 					Optional<Map<String, Object>> first = listKomponen.stream()
@@ -386,7 +381,7 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 					} else {
 						kBuilder.id(null);
 						kBuilder.idJenisKomponen(e.getJenisKomponen());
-						kBuilder.jenisKomponen(e.getJenisKomponen() == 1 ? "Penerimaan" : "Pemotongan");
+						kBuilder.jenisKomponen(labelJenisKomponeGaji(e.getJenisKomponen()));
 						kBuilder.idKomponen(e.getId());
 						kBuilder.namaKomponen(e.getNamaKomponen());
 						kBuilder.nominal(null);
@@ -403,14 +398,36 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		return dto.build();
 	}
 
+	private String labelJenisKomponeGaji(Integer idJenisKomponenGaji) {
+		String label = "";
+		switch (idJenisKomponenGaji) {
+		case 1:
+			label = "Gaji";
+			break;
+		case 2:
+			label = "Remunerasi";
+			break;
+		case 3:
+			label = "Uang Makan";
+			break;
+		case 4:
+			label = "Potongan Gaji";
+			break;
+		case 5:
+			label = "Potongan Remunerasi";
+			break;
+		case 6:
+			label = "Potongan Uang Makan";
+			break;
+		}
+		return label;
+	}
+
 	private String getDirPathSlipGaji() {
 		String osName = System.getProperty("os.name").toLowerCase();
 		String path = systemDirectory + "slip-gaji" + "/";
 		if (osName.contains("win"))
 			path = systemDirectory.replace("/", "\\") + "slip-gaji" + "\\";
-
-		LOGGER.info("Path slip gaji {}", path);
-
 		return path;
 	}
 
@@ -421,7 +438,7 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		Date start = DateUtil.startMonth(month);
 		Date end = DateUtil.endMonth(month);
 		List<Map<String, Object>> listSlipPegawai = slipGajiDao.findAllByBulan(start, end);
-		List<Map<String, Object>> allKomponen = komponenGajiDao.getAll();
+		List<Map<String, Object>> allKomponen = komponenGajiDao.findLabelByUrutan();
 		List<Map<String, Object>> listAllKomponen = new ArrayList<>();
 		{
 			List<Map<String, Object>> listSlipKomponen = slipGajiKomponenDao.findAll(start, end);
@@ -468,10 +485,11 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		for (Map<String, Object> d : listAllKomponen) {
 			data.put(i++,
 					new Object[] { d.get("id"), d.get("idPegawai"), d.get("namaPegawai"), d.get("nip"), d.get("1"),
-							d.get("2"), d.get("3"), d.get("4"), d.get("5"), d.get("6"), d.get("7"), d.get("22"),
-							d.get("23"), d.get("8"), d.get("9"), d.get("10"), d.get("11"), d.get("12"), d.get("13"),
-							d.get("14"), d.get("15"), d.get("16"), d.get("17"), d.get("18"), d.get("19"), d.get("20"),
-							d.get("21") });
+							d.get("24"), d.get("25"), d.get("26"), d.get("27"), d.get("28"), d.get("29"), d.get("30"),
+							d.get("2"), d.get("3"), d.get("6"), d.get("31"), d.get("8"), d.get("32"), d.get("40"),
+							d.get("33"), d.get("34"), d.get("21"), d.get("20"), d.get("14"), d.get("15"), d.get("9"),
+							d.get("10"), d.get("16"), d.get("17"), d.get("18"), d.get("38"), d.get("35"), d.get("19"),
+							d.get("39"), d.get("12") });
 		}
 		TreeMap<Integer, Object[]> sorted = new TreeMap<>(data);
 		Set<Integer> keyset = sorted.keySet();
@@ -507,9 +525,6 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		String filename = "Template_Slip_Gaji_" + timestampToString + ".xls";
 		String absoluteFilePath = getDirPathSlipGaji() + filename;
 		File file = new File(absoluteFilePath);
-
-		LOGGER.info("Path foto profil {}", file.getAbsolutePath());
-
 		try (FileOutputStream out = new FileOutputStream(file)) {
 			workbook.write(out);
 		} catch (Exception e) {
@@ -533,10 +548,9 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 	@Override
 	public List<KomponenGajiDto> listKomponen() {
 		List<KomponenGajiDto> result = new ArrayList<>();
-		Sort sort = new Sort(Sort.Direction.ASC, "id");
-		List<KomponenGaji> listKomponenGaji = komponenGajiDao.findAll(sort);
-		listKomponenGaji
-				.forEach(k -> result.add(new KomponenGajiDto(k.getId(), k.getNamaKomponen(), k.getJenisKomponen())));
+		List<KomponenGaji> listKomponenGaji = komponenGajiDao.findByUrutan();
+		listKomponenGaji.forEach(
+				k -> result.add(new KomponenGajiDto(k.getId(), k.getNamaKomponen(), k.getJenisKomponen(), null)));
 		return result;
 	}
 }
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/KomponenGajiDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/KomponenGajiDto.java
index 27bf07dc..5323018b 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/KomponenGajiDto.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/KomponenGajiDto.java
@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author Salman
  *
@@ -15,10 +17,15 @@ import lombok.Setter;
 public class KomponenGajiDto {
 	@Caption(value = "ID")
 	protected Integer id;
-	
+
+	@NotNull(message = "Nama komponen tidak boleh kosong")
 	@Caption(value = "Nama Komponen")
 	private String namaKomponen;
 
+	@NotNull(message = "Jenis komponen tidak boleh kosong")
 	@Caption(value = "Jenis Komponen")
 	private Integer jenisKomponen;
+
+	@Caption(value = "Urutan")
+	private Integer urutan;
 }
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipJumlahDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipJumlahDto.java
index 10430f50..0ce2e2e6 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipJumlahDto.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipJumlahDto.java
@@ -4,84 +4,55 @@
 package com.jasamedika.medifirst2000.dto;
 
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.*;
 
 /**
  * @author Salman
  * @since May 16th, 2023
  */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class SlipJumlahDto {
-	@Caption(value = "Jumlah Gross")
-	private String jumlah_gross;
+	@Caption(value = "Jumlah Gaji")
+	@Builder.Default
+	private String jumlahGaji = "Rp0,00";
 
-	@Caption(value = "Jumlah Potongan")
-	private String jumlah_potongan;
+	@Caption(value = "Jumlah Remunerasi")
+	@Builder.Default
+	private String jumlahRemunerasi = "Rp0,00";
 
-	@Caption(value = "Jumlah Nett")
-	private String jumlah_nett;
+	@Caption(value = "Jumlah Uang Makan")
+	@Builder.Default
+	private String jumlahUangMakan = "Rp0,00";
 
-	public SlipJumlahDto() {
-	}
+	@Caption(value = "Jumlah Potongan Gaji")
+	@Builder.Default
+	private String jumlahPotonganGaji = "Rp0,00";
 
-	public SlipJumlahDto(String jumlah_gross, String jumlah_potongan, String jumlah_nett) {
-		super();
-		this.jumlah_gross = jumlah_gross;
-		this.jumlah_potongan = jumlah_potongan;
-		this.jumlah_nett = jumlah_nett;
-	}
+	@Caption(value = "Jumlah Potongan Remunerasi")
+	@Builder.Default
+	private String jumlahPotonganRemunerasi = "Rp0,00";
 
-	public String getJumlah_gross() {
-		return jumlah_gross;
-	}
+	@Caption(value = "Jumlah Potongan Uang Makan")
+	@Builder.Default
+	private String jumlahPotonganUangMakan = "Rp0,00";
 
-	public void setJumlah_gross(String jumlah_gross) {
-		this.jumlah_gross = jumlah_gross;
-	}
+	@Caption(value = "Jumlah Gaji Bersih")
+	@Builder.Default
+	private String jumlahGajiBersih = "Rp0,00";
 
-	public String getJumlah_potongan() {
-		return jumlah_potongan;
-	}
+	@Caption(value = "Jumlah Remunerasi Bersih")
+	@Builder.Default
+	private String jumlahRemunerasiBersih = "Rp0,00";
 
-	public void setJumlah_potongan(String jumlah_potongan) {
-		this.jumlah_potongan = jumlah_potongan;
-	}
+	@Caption(value = "Jumlah Uang Makan Bersih")
+	@Builder.Default
+	private String jumlahUangMakanBersih = "Rp0,00";
 
-	public String getJumlah_nett() {
-		return jumlah_nett;
-	}
-
-	public void setJumlah_nett(String jumlah_nett) {
-		this.jumlah_nett = jumlah_nett;
-	}
-
-	public static SlipJumlahDtoBuilder builder() {
-		return new SlipJumlahDtoBuilder();
-	}
-
-	public static class SlipJumlahDtoBuilder {
-		private String jumlah_gross = "Rp0,00";
-		private String jumlah_potongan = "Rp0,00";
-		private String jumlah_nett = "Rp0,00";
-
-		public SlipJumlahDtoBuilder() {
-		}
-
-		public SlipJumlahDtoBuilder jumlah_gross(final String jumlah_gross) {
-			this.jumlah_gross = jumlah_gross;
-			return this;
-		}
-
-		public SlipJumlahDtoBuilder jumlah_potongan(final String jumlah_potongan) {
-			this.jumlah_potongan = jumlah_potongan;
-			return this;
-		}
-
-		public SlipJumlahDtoBuilder jumlah_nett(final String jumlah_nett) {
-			this.jumlah_nett = jumlah_nett;
-			return this;
-		}
-
-		public SlipJumlahDto build() {
-			return new SlipJumlahDto(this.jumlah_gross, this.jumlah_potongan, this.jumlah_nett);
-		}
-	}
+	@Caption(value = "Jumlah Penerimaan Bersih")
+	@Builder.Default
+	private String jumlahPenerimaanBersih = "Rp0,00";
 }
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPegawaiDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPegawaiDto.java
index 385743ad..7489c00c 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPegawaiDto.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPegawaiDto.java
@@ -4,176 +4,47 @@
 package com.jasamedika.medifirst2000.dto;
 
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.*;
 
 /**
  * @author Salman
  * @since May 16th, 2023
  */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class SlipPegawaiDto {
 	@Caption(value = "Title")
-	private String title;
+	@Builder.Default
+	private String title = "-";
 
 	@Caption(value = "Nama")
-	private String nama;
+	@Builder.Default
+	private String nama = "-";
 
 	@Caption(value = "NIP")
-	private String nip;
+	@Builder.Default
+	private String nip = "-";
 
 	@Caption(value = "Periode")
-	private String periode;
+	@Builder.Default
+	private String periode = "-";
 
 	@Caption(value = "Tanggal Lahir")
-	private String tgl_lahir;
+	@Builder.Default
+	private String tglLahir = "-";
 
 	@Caption(value = "Jabatan")
-	private String jabatan;
+	@Builder.Default
+	private String jabatan = "-";
 
 	@Caption(value = "Unit Kerja")
-	private String unit_kerja;
+	@Builder.Default
+	private String unitKerja = "-";
 
 	@Caption(value = "Subunit Kerja")
-	private String sub_unit;
-
-	public SlipPegawaiDto() {
-	}
-
-	public SlipPegawaiDto(String title, String nama, String nip, String periode, String tgl_lahir, String jabatan,
-			String unit_kerja, String sub_unit) {
-		super();
-		this.title = title;
-		this.nama = nama;
-		this.nip = nip;
-		this.periode = periode;
-		this.tgl_lahir = tgl_lahir;
-		this.jabatan = jabatan;
-		this.unit_kerja = unit_kerja;
-		this.sub_unit = sub_unit;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public String getNama() {
-		return nama;
-	}
-
-	public void setNama(String nama) {
-		this.nama = nama;
-	}
-
-	public String getNip() {
-		return nip;
-	}
-
-	public void setNip(String nip) {
-		this.nip = nip;
-	}
-
-	public String getPeriode() {
-		return periode;
-	}
-
-	public void setPeriode(String periode) {
-		this.periode = periode;
-	}
-
-	public String getTgl_lahir() {
-		return tgl_lahir;
-	}
-
-	public void setTgl_lahir(String tgl_lahir) {
-		this.tgl_lahir = tgl_lahir;
-	}
-
-	public String getJabatan() {
-		return jabatan;
-	}
-
-	public void setJabatan(String jabatan) {
-		this.jabatan = jabatan;
-	}
-
-	public String getUnit_kerja() {
-		return unit_kerja;
-	}
-
-	public void setUnit_kerja(String unit_kerja) {
-		this.unit_kerja = unit_kerja;
-	}
-
-	public String getSub_unit() {
-		return sub_unit;
-	}
-
-	public void setSub_unit(String sub_unit) {
-		this.sub_unit = sub_unit;
-	}
-
-	public static SlipPegawaiDtoBuilder builder() {
-		return new SlipPegawaiDtoBuilder();
-	}
-
-	public static class SlipPegawaiDtoBuilder {
-		private String title = "-";
-		private String nama = "-";
-		private String nip = "-";
-		private String periode = "-";
-		private String tgl_lahir = "-";
-		private String jabatan = "-";
-		private String unit_kerja = "-";
-		private String sub_unit = "-";
-
-		public SlipPegawaiDtoBuilder() {
-		}
-
-		public SlipPegawaiDtoBuilder title(final String title) {
-			this.title = title;
-			return this;
-		}
-
-		public SlipPegawaiDtoBuilder nama(final String nama) {
-			this.nama = nama;
-			return this;
-		}
-
-		public SlipPegawaiDtoBuilder nip(final String nip) {
-			this.nip = nip;
-			return this;
-		}
-
-		public SlipPegawaiDtoBuilder periode(final String periode) {
-			this.periode = periode;
-			return this;
-		}
-
-		public SlipPegawaiDtoBuilder tgl_lahir(final String tgl_lahir) {
-			this.tgl_lahir = tgl_lahir;
-			return this;
-		}
-
-		public SlipPegawaiDtoBuilder jabatan(final String jabatan) {
-			this.jabatan = jabatan;
-			return this;
-		}
-
-		public SlipPegawaiDtoBuilder unit_kerja(final String unit_kerja) {
-			this.unit_kerja = unit_kerja;
-			return this;
-		}
-
-		public SlipPegawaiDtoBuilder sub_unit(final String sub_unit) {
-			this.sub_unit = sub_unit;
-			return this;
-		}
-
-		public SlipPegawaiDto build() {
-			return new SlipPegawaiDto(this.title, this.nama, this.nip, this.periode, this.tgl_lahir, this.jabatan,
-					this.unit_kerja, this.sub_unit);
-		}
-	}
+	@Builder.Default
+	private String subUnitKerja = "-";
 }
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java
index 5e125e1b..3c909735 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java
@@ -1,197 +1,59 @@
-/**
- *
- */
 package com.jasamedika.medifirst2000.dto;
 
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.*;
 
 /**
  * @author Salman
  * @since May 16th, 2023
  */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class SlipPenerimaanDto {
-	@Caption(value = "Gaji")
-	private String gaji;
+	@Caption(value = "Gaji Pokok")
+	@Builder.Default
+	private String gajiPokok = "-";
 
-	@Caption(value = "Remunerasi Kinerja")
-	private String remun_kinerja;
+	@Caption(value = "Tunjangan Istri/Suami")
+	@Builder.Default
+	private String tunjanganIstriSuami = "-";
 
-	@Caption(value = "Remunerasi Tambahan Manajerial")
-	private String remun_tambahan_manajerial;
+	@Caption(value = "Tunjangan Anak")
+	@Builder.Default
+	private String tunjanganAnak = "-";
 
-	@Caption(value = "Remunerasi Tambahan Pendidikan/Pelatihan/Pengajaran")
-	private String remun_tambahan_diklitjar;
+	@Caption(value = "Tunjangan PNS")
+	@Builder.Default
+	private String tunjanganPns = "-";
 
-	@Caption(value = "Remunerasi Tambahan Lain")
-	private String remun_tambahan_lain;
+	@Caption(value = "Tunjangan Struktural")
+	@Builder.Default
+	private String tunjanganStruktural = "-";
 
-	@Caption(value = "Fee for Service")
-	private String ffs;
+	@Caption(value = "Tunjangan Fungsional")
+	@Builder.Default
+	private String tunjanganFungsional = "-";
 
-	@Caption(value = "Fee for On-Site")
-	private String ffo;
+	@Caption(value = "Tunjangan Beras")
+	@Builder.Default
+	private String tunjanganBeras = "-";
+
+	@Caption(value = "Tunjangan PPH")
+	@Builder.Default
+	private String tunjanganPph = "-";
+
+	@Caption(value = "Remunerasi")
+	@Builder.Default
+	private String remunerasi = "-";
+
+	@Caption(value = "Remunerasi Operasional")
+	@Builder.Default
+	private String remunerasiOperasional = "-";
 
 	@Caption(value = "Uang Makan")
-	private String uang_makan;
-
-	@Caption(value = "Uang Lembur")
-	private String uang_lembur;
-
-	public SlipPenerimaanDto() {
-	}
-
-	public SlipPenerimaanDto(String gaji, String remun_kinerja, String remun_tambahan_manajerial, String remun_tambahan_diklitjar, String remun_tambahan_lain, String ffs,
-			String ffo, String uang_makan, String uang_lembur) {
-		super();
-		this.gaji = gaji;
-		this.remun_kinerja = remun_kinerja;
-		this.remun_tambahan_manajerial = remun_tambahan_manajerial;
-		this.remun_tambahan_diklitjar = remun_tambahan_diklitjar;
-		this.remun_tambahan_lain = remun_tambahan_lain;
-		this.ffs = ffs;
-		this.ffo = ffo;
-		this.uang_makan = uang_makan;
-		this.uang_lembur = uang_lembur;
-	}
-
-	public String getGaji() {
-		return gaji;
-	}
-
-	public void setGaji(String gaji) {
-		this.gaji = gaji;
-	}
-
-	public String getRemun_kinerja() {
-		return remun_kinerja;
-	}
-
-	public void setRemun_kinerja(String remun_kinerja) {
-		this.remun_kinerja = remun_kinerja;
-	}
-
-	public String getRemun_tambahan_manajerial() {
-		return remun_tambahan_manajerial;
-	}
-
-	public void setRemun_tambahan_manajerial(String remun_tambahan_manajerial) {
-		this.remun_tambahan_manajerial = remun_tambahan_manajerial;
-	}
-
-	public String getRemun_tambahan_diklitjar() {
-		return remun_tambahan_diklitjar;
-	}
-
-	public void setRemun_tambahan_diklitjar(String remun_tambahan_diklitjar) {
-		this.remun_tambahan_diklitjar = remun_tambahan_diklitjar;
-	}
-
-	public String getRemun_tambahan_lain() {
-		return remun_tambahan_lain;
-	}
-
-	public void setRemun_tambahan_lain(String remun_tambahan_lain) {
-		this.remun_tambahan_lain = remun_tambahan_lain;
-	}
-
-	public String getFfs() {
-		return ffs;
-	}
-
-	public void setFfs(String ffs) {
-		this.ffs = ffs;
-	}
-
-	public String getFfo() {
-		return ffo;
-	}
-
-	public void setFfo(String ffo) {
-		this.ffo = ffo;
-	}
-
-	public String getUang_makan() {
-		return uang_makan;
-	}
-
-	public void setUang_makan(String uang_makan) {
-		this.uang_makan = uang_makan;
-	}
-
-	public String getUang_lembur() {
-		return uang_lembur;
-	}
-
-	public void setUang_lembur(String uang_lembur) {
-		this.uang_lembur = uang_lembur;
-	}
-
-	public static SlipPenerimaanDtoBuilder builder() {
-		return new SlipPenerimaanDtoBuilder();
-	}
-
-	public static class SlipPenerimaanDtoBuilder {
-		private String gaji = "-";
-		private String remun_kinerja = "-";
-		private String remun_tambahan_manajerial = "-";
-		private String remun_tambahan_diklitjar = "-";
-		private String remun_tambahan_lain = "-";
-		private String ffs = "-";
-		private String ffo = "-";
-		private String uang_makan = "-";
-		private String uang_lembur = "-";
-
-		public SlipPenerimaanDtoBuilder() {
-		}
-
-		public SlipPenerimaanDtoBuilder gaji(final String gaji) {
-			this.gaji = gaji;
-			return this;
-		}
-
-		public SlipPenerimaanDtoBuilder remun_kinerja(final String remun_kinerja) {
-			this.remun_kinerja = remun_kinerja;
-			return this;
-		}
-
-		public SlipPenerimaanDtoBuilder remun_tambahan_manajerial(final String remun_tambahan_manajerial) {
-			this.remun_tambahan_manajerial = remun_tambahan_manajerial;
-			return this;
-		}
-
-		public SlipPenerimaanDtoBuilder remun_tambahan_diklitjar(final String remun_tambahan_diklitjar) {
-			this.remun_tambahan_diklitjar = remun_tambahan_diklitjar;
-			return this;
-		}
-
-		public SlipPenerimaanDtoBuilder remun_tambahan_lain(final String remun_tambahan_lain) {
-			this.remun_tambahan_lain = remun_tambahan_lain;
-			return this;
-		}
-
-		public SlipPenerimaanDtoBuilder ffs(final String ffs) {
-			this.ffs = ffs;
-			return this;
-		}
-
-		public SlipPenerimaanDtoBuilder ffo(final String ffo) {
-			this.ffo = ffo;
-			return this;
-		}
-
-		public SlipPenerimaanDtoBuilder uang_makan(final String uang_makan) {
-			this.uang_makan = uang_makan;
-			return this;
-		}
-
-		public SlipPenerimaanDtoBuilder uang_lembur(final String uang_lembur) {
-			this.uang_lembur = uang_lembur;
-			return this;
-		}
-
-		public SlipPenerimaanDto build() {
-			return new SlipPenerimaanDto(this.gaji, this.remun_kinerja, this.remun_tambahan_manajerial, this.remun_tambahan_diklitjar, this.remun_tambahan_lain, this.ffs, this.ffo,
-					this.uang_makan, this.uang_lembur);
-		}
-	}
+	@Builder.Default
+	private String uangMakan = "-";
 }
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java
index 9e3cb374..4072421f 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java
@@ -1,290 +1,95 @@
-/**
- *
- */
 package com.jasamedika.medifirst2000.dto;
 
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.*;
 
 /**
  * @author Salman
  * @since May 16th, 2023
  */
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
 public class SlipPotonganDto {
-	@Caption(value = "PPH Gaji")
-	private String pph_gaji;
+	@Caption(value = "PFK")
+	@Builder.Default
+	private String pfk = "-";
 
-	@Caption(value = "PPH Remunerasi")
-	private String pph_remun;
+	@Caption(value = "PPH")
+	@Builder.Default
+	private String pph = "-";
 
-	@Caption(value = "PPH Fee for Service")
-	private String pph_ffs;
+	@Caption(value = "Sewa Rumah")
+	@Builder.Default
+	private String sewaRumah = "-";
 
-	@Caption(value = "PPH Fee for On-Site")
-	private String pph_ffo;
+	@Caption(value = "Kelebihan Tunjangan")
+	@Builder.Default
+	private String kelebihanTunjangan = "-";
 
-	@Caption(value = "PPH Uang Makan")
-	private String pph_um;
+	@Caption(value = "Potongan Lain")
+	@Builder.Default
+	private String potonganLain = "-";
 
-	@Caption(value = "PPH Uang Lembur")
-	private String pph_ul;
-
-	@Caption(value = "Iuran Koperasi")
-	private String iuran_koperasi;
-
-	@Caption(value = "Pinjaman Koperasi")
-	private String pinjam_koperasi;
-
-	@Caption(value = "Biaya Obat")
-	private String biaya_obat;
-
-	@Caption(value = "Biaya Rawat Inap")
-	private String biaya_ri;
-
-	@Caption(value = "Biaya Rawat Jalan")
-	private String biaya_rj;
-
-	@Caption(value = "Potongan Toko Koperasi")
-	private String potongan_koperasi;
-
-	@Caption(value = "Potongan BPJS KESEHATAN")
-	private String potongan_bpjsk;
+	@Caption(value = "TabunganRumah")
+	@Builder.Default
+	private String tabunganRumah = "-";
 
 	@Caption(value = "Potongan BPJS Ketenagakerjaan")
-	private String potongan_bpjstk;
+	@Builder.Default
+	private String potonganBpjsKetenagakerjaan = "-";
 
-	public SlipPotonganDto() {
-	}
+	@Caption(value = "Potongan BPJS Kesehatan")
+	@Builder.Default
+	private String potonganBpjsKesehatan = "-";
 
-	public SlipPotonganDto(String pph_gaji, String pph_remun, String pph_ffs, String pph_ffo, String pph_um,
-			String pph_ul, String iuran_koperasi, String pinjam_koperasi, String biaya_obat, String biaya_ri,
-			String biaya_rj, String potongan_koperasi, String potongan_bpjsk, String potongan_bpjstk) {
-		super();
-		this.pph_gaji = pph_gaji;
-		this.pph_remun = pph_remun;
-		this.pph_ffs = pph_ffs;
-		this.pph_ffo = pph_ffo;
-		this.pph_um = pph_um;
-		this.pph_ul = pph_ul;
-		this.iuran_koperasi = iuran_koperasi;
-		this.pinjam_koperasi = pinjam_koperasi;
-		this.biaya_obat = biaya_obat;
-		this.biaya_ri = biaya_ri;
-		this.biaya_rj = biaya_rj;
-		this.potongan_koperasi = potongan_koperasi;
-		this.potongan_bpjsk = potongan_bpjsk;
-		this.potongan_bpjstk = potongan_bpjstk;
-	}
+	@Caption(value = "Simpanan Wajib Koperasi (Gaji)")
+	@Builder.Default
+	private String simpananWajibKoperasiGaji = "-";
 
-	public String getPph_gaji() {
-		return pph_gaji;
-	}
+	@Caption(value = "Pinjaman Koperasi (Gaji)")
+	@Builder.Default
+	private String pinjamanKoperasiGaji = "-";
 
-	public void setPph_gaji(String pph_gaji) {
-		this.pph_gaji = pph_gaji;
-	}
+	@Caption(value = "Potongan PPH 21 Remunerasi")
+	@Builder.Default
+	private String potonganPph21Remunerasi = "-";
 
-	public String getPph_remun() {
-		return pph_remun;
-	}
+	@Caption(value = "Potongan PPH 21 Remunerasi Operasional")
+	@Builder.Default
+	private String potonganPph21RemunerasiOperasional = "-";
 
-	public void setPph_remun(String pph_remun) {
-		this.pph_remun = pph_remun;
-	}
+	@Caption(value = "Potongan Obat")
+	@Builder.Default
+	private String potonganObat = "-";
 
-	public String getPph_ffs() {
-		return pph_ffs;
-	}
+	@Caption(value = "Potongan Rawat Inap")
+	@Builder.Default
+	private String potonganRawatInap = "-";
 
-	public void setPph_ffs(String pph_ffs) {
-		this.pph_ffs = pph_ffs;
-	}
+	@Caption(value = "Potongan Rawat Jalan")
+	@Builder.Default
+	private String potonganRawatJalan = "-";
 
-	public String getPph_ffo() {
-		return pph_ffo;
-	}
+	@Caption(value = "Simpanan Wajib Koperasi (Remunerasi)")
+	@Builder.Default
+	private String simpananWajibKoperasiRemunerasi = "-";
 
-	public void setPph_ffo(String pph_ffo) {
-		this.pph_ffo = pph_ffo;
-	}
+	@Caption(value = "Pinjaman Koperasi (Remunerasi)")
+	@Builder.Default
+	private String pinjamanKoperasiRemunerasi = "-";
 
-	public String getPph_um() {
-		return pph_um;
-	}
+	@Caption(value = "Toko Koperasi")
+	@Builder.Default
+	private String tokoKoperasi = "-";
 
-	public void setPph_um(String pph_um) {
-		this.pph_um = pph_um;
-	}
+	@Caption(value = "Wakap Dan Lain-lain")
+	@Builder.Default
+	private String wakafDanLainLain = "-";
 
-	public String getPph_ul() {
-		return pph_ul;
-	}
-
-	public void setPph_ul(String pph_ul) {
-		this.pph_ul = pph_ul;
-	}
-
-	public String getIuran_koperasi() {
-		return iuran_koperasi;
-	}
-
-	public void setIuran_koperasi(String iuran_koperasi) {
-		this.iuran_koperasi = iuran_koperasi;
-	}
-
-	public String getPinjam_koperasi() {
-		return pinjam_koperasi;
-	}
-
-	public void setPinjam_koperasi(String pinjam_koperasi) {
-		this.pinjam_koperasi = pinjam_koperasi;
-	}
-
-	public String getBiaya_obat() {
-		return biaya_obat;
-	}
-
-	public void setBiaya_obat(String biaya_obat) {
-		this.biaya_obat = biaya_obat;
-	}
-
-	public String getBiaya_ri() {
-		return biaya_ri;
-	}
-
-	public void setBiaya_ri(String biaya_ri) {
-		this.biaya_ri = biaya_ri;
-	}
-
-	public String getBiaya_rj() {
-		return biaya_rj;
-	}
-
-	public void setBiaya_rj(String biaya_rj) {
-		this.biaya_rj = biaya_rj;
-	}
-
-	public String getPotongan_koperasi() {
-		return potongan_koperasi;
-	}
-
-	public void setPotongan_koperasi(String potongan_koperasi) {
-		this.potongan_koperasi = potongan_koperasi;
-	}
-
-	public String getPotongan_bpjsk() {
-		return potongan_bpjsk;
-	}
-
-	public void setPotongan_bpjsk(String potongan_bpjsk) {
-		this.potongan_bpjsk = potongan_bpjsk;
-	}
-
-	public String getPotongan_bpjstk() {
-		return potongan_bpjstk;
-	}
-
-	public void setPotongan_bpjstk(String potongan_bpjstk) {
-		this.potongan_bpjstk = potongan_bpjstk;
-	}
-
-	public static SlipPotonganDtoBuilder builder() {
-		return new SlipPotonganDtoBuilder();
-	}
-
-	public static class SlipPotonganDtoBuilder {
-		private String pph_gaji = "-";
-		private String pph_remun = "-";
-		private String pph_ffs = "-";
-		private String pph_ffo = "-";
-		private String pph_um = "-";
-		private String pph_ul = "-";
-		private String iuran_koperasi = "-";
-		private String pinjam_koperasi = "-";
-		private String biaya_obat = "-";
-		private String biaya_ri = "-";
-		private String biaya_rj = "-";
-		private String potongan_koperasi = "-";
-		private String potongan_bpjsk = "-";
-
-		private String potongan_bpjstk = "-";
-
-		public SlipPotonganDtoBuilder() {
-		}
-
-		public SlipPotonganDtoBuilder pph_gaji(final String pph_gaji) {
-			this.pph_gaji = pph_gaji;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder pph_remun(final String pph_remun) {
-			this.pph_remun = pph_remun;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder pph_ffs(final String pph_ffs) {
-			this.pph_ffs = pph_ffs;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder pph_ffo(final String pph_ffo) {
-			this.pph_ffo = pph_ffo;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder pph_um(final String pph_um) {
-			this.pph_um = pph_um;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder pph_ul(final String pph_ul) {
-			this.pph_ul = pph_ul;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder iuran_koperasi(final String iuran_koperasi) {
-			this.iuran_koperasi = iuran_koperasi;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder pinjam_koperasi(final String pinjam_koperasi) {
-			this.pinjam_koperasi = pinjam_koperasi;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder biaya_obat(final String biaya_obat) {
-			this.biaya_obat = biaya_obat;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder biaya_ri(final String biaya_ri) {
-			this.biaya_ri = biaya_ri;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder biaya_rj(final String biaya_rj) {
-			this.biaya_rj = biaya_rj;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder potongan_koperasi(final String potongan_koperasi) {
-			this.potongan_koperasi = potongan_koperasi;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder potongan_bpjsk(final String potongan_bpjsk) {
-			this.potongan_bpjsk = potongan_bpjsk;
-			return this;
-		}
-
-		public SlipPotonganDtoBuilder potongan_bpjstk(final String potongan_bpjstk) {
-			this.potongan_bpjstk = potongan_bpjstk;
-			return this;
-		}
-
-		public SlipPotonganDto build() {
-			return new SlipPotonganDto(this.pph_gaji, this.pph_remun, this.pph_ffs, this.pph_ffo, this.pph_um,
-					this.pph_ul, this.iuran_koperasi, this.pinjam_koperasi, this.biaya_obat, this.biaya_ri,
-					this.biaya_rj, this.potongan_koperasi, this.potongan_bpjsk, this.potongan_bpjstk);
-		}
-	}
+	@Caption(value = "Potongan PPH 21 Uang Makan")
+	@Builder.Default
+	private String potonganPph21UangMakan = "-";
 }
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KomponenGaji.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KomponenGaji.java
index dcd5e76d..5268e2d5 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KomponenGaji.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/KomponenGaji.java
@@ -5,6 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -21,16 +22,21 @@ public class KomponenGaji implements Serializable {
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sdm_komponengaji_m_gen")
 	@Caption(value = "ID")
 	protected Integer id;
-	
+
 	@Column(name = "namakomponen", nullable = false)
+	@NotNull(message = "Nama komponen tidak boleh kosong")
 	@Caption(value = "Nama Komponen")
 	private String namaKomponen;
-	
+
 	/**
-	 * 1-Penerimaan
-	 * 2-Pemotongan
+	 * 1-Gaji, 2-Remunerasi, 3-Uang Makan, 4-Potongan Gaji, 5-Potongan
+	 * Remunerasi, 6-Potongan Uang Makan
 	 */
-	@Column(name = "jeniskomponen", nullable = false)
+	@Column(name = "jeniskomponen")
 	@Caption(value = "Jenis Komponen")
 	private Integer jenisKomponen;
+
+	@Column(name = "urutan")
+	@Caption(value = "Urutan")
+	private Integer urutan;
 }
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasien.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasien.java
index 7045e276..342cabe3 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasien.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasien.java
@@ -11,8 +11,6 @@ import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
-import static javax.persistence.FetchType.LAZY;
-
 @Getter
 @Setter
 @Entity
@@ -272,12 +270,4 @@ public class PelayananPasien extends MedicalRecordTransaction {
 	private String voucherPaketId;
 
 	private Boolean isPaket;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "strukbuktipenerimaandetailfk")
-	@Caption(value = "Struk Bukti Penerimaan Detail")
-	private StrukBuktiPenerimaanDetail strukBuktiPenerimaanDetail;
-
-	@Column(name = "strukbuktipenerimaandetailfk", insertable = false, updatable = false)
-	private String strukBuktiPenerimaanDetailId;
 }
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/StrukBuktiPenerimaanDetail.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/StrukBuktiPenerimaanDetail.java
deleted file mode 100644
index e9722e7d..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/StrukBuktiPenerimaanDetail.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-
-import static javax.persistence.FetchType.LAZY;
-
-/**
- * @author salmanoe
- * @version 1.0.0
- * @since 16/11/2023
- */
-@Getter
-@Setter
-@Entity
-@Table(name = "strukbuktipenerimaandetail_t")
-public class StrukBuktiPenerimaanDetail extends BaseTransaction {
-	private static final long serialVersionUID = -769266602610955196L;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "strukheaderfk", nullable = false)
-	@NotNull(message = "Struk Header tidak boleh kosong")
-	@Caption(value = "Struk Header")
-	private StrukBuktiPenerimaan strukBuktiPenerimaan;
-
-	@Column(name = "strukheaderfk", insertable = false, updatable = false, nullable = false)
-	private String strukBuktiPenerimaanId;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "ObjectKelompokPasienFk")
-	@Caption(value = "Object Kelompok Pasien")
-	private KelompokPasien kdkelompokpasien;
-
-	@Column(name = "ObjectKelompokPasienFk", insertable = false, updatable = false)
-	private Integer ObjectKelompokPasienId;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "ObjectKelompokTransaksiFk")
-	@Caption(value = "Object Kelompok Transaksi")
-	private KelompokTransaksi kdkelompoktransaksi;
-
-	@Column(name = "ObjectKelompokTransaksiFk", insertable = false, updatable = false)
-	private Integer ObjectKelompokTransaksiId;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "ObjectPegawaiPembayarFk")
-	@Caption(value = "Object Pegawai Pembayar")
-	private LoginUser kdpegawaipembayar;
-
-	@Column(name = "ObjectPegawaiPembayarFk", insertable = false, updatable = false)
-	private Integer ObjectPegawaiPembayarId;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "ObjectPegawaiPenerimaFk")
-	@Caption(value = "Object Pegawai Penerima")
-	private LoginUser kdpegawaipenerima;
-
-	@Column(name = "ObjectPegawaiPenerimaFk", insertable = false, updatable = false)
-	private Integer ObjectPegawaiPenerimaId;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "ObjectPegawaiPJPembebasanFk")
-	@Caption(value = "Object Pegawai P J Pembebasan")
-	private LoginUser kdpegawaipjpembebasan;
-
-	@Column(name = "ObjectPegawaiPJPembebasanFk", insertable = false, updatable = false)
-	private Integer ObjectPegawaiPJPembebasanId;
-
-	@Caption(value = "Kode Penjamin Pa Rekanan")
-	@Column(name = "KdPenjaminPaRekanan")
-	private Short kdpenjaminparekanan;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "ObjectProdukPembayaranToFk")
-	@Caption(value = "Object Produk Pembayaran To")
-	private Produk kdprodukpembayaranto;
-
-	@Column(name = "ObjectProdukPembayaranToFk", insertable = false, updatable = false)
-	private Integer ObjectProdukPembayaranToId;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "ObjectRuanganFk")
-	@Caption(value = "Object Ruangan")
-	private Ruangan kdruangan;
-
-	@Column(name = "ObjectRuanganFk", insertable = false, updatable = false)
-	private Integer ObjectRuanganId;
-
-	@Caption(value = "Keterangan Lainnya")
-	@Column(name = "KeteranganLainnya", length = 100)
-	private String keteranganlainnya;
-
-	@Caption(value = "Keterangan Pembebasan")
-	@Column(name = "KeteranganPembebasan", length = 100)
-	private String keteranganpembebasan;
-
-	@Caption(value = "Nama Pegawai Pembayar")
-	@Column(name = "NamaPegawaiPembayar", length = 40)
-	private String namapegawaipembayar;
-
-	@Caption(value = "Nama Pegawai Penerima")
-	@Column(name = "NamaPegawaiPenerima", length = 40)
-	private String namapegawaipenerima;
-
-	@Caption(value = "Nama Produk Pembayaran To")
-	@Column(name = "NamaProdukPembayaranTo", length = 80)
-	private String namaprodukpembayaranto;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "NoClosingFk")
-	@Caption(value = "No Closing")
-	private StrukClosing noclosing;
-
-	@Column(name = "NoClosingFk", insertable = false, updatable = false)
-	private String NoClosingId;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "NoSBK_ReturFk")
-	@Caption(value = "No S B K_ Retur")
-	private StrukBuktiPengeluaran nosbk_retur;
-
-	@Column(name = "NoSBK_ReturFk", insertable = false, updatable = false)
-	private String NoSBK_ReturId;
-
-	@Caption(value = "No S B M")
-	@Column(name = "NoSBM", length = 15)
-	private String nosbm;
-
-	@Caption(value = "No S B M_ Intern")
-	@Column(name = "NoSBM_Intern", length = 15)
-	private String nosbm_intern;
-
-	@Caption(value = "No S B M Before")
-	@Column(name = "NoSBMBefore", length = 10)
-	private String nosbmbefore;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "NoStrukFk")
-	@Caption(value = "No Struk")
-	private StrukPelayanan nostruk;
-
-	@Column(name = "NoStrukFk", insertable = false, updatable = false)
-	private String NoStrukId;
-
-	@Caption(value = "No Urut Login")
-	@Column(name = "NoUrutLogin", length = 10)
-	private String nourutlogin;
-
-	@Caption(value = "No Urut Ruangan")
-	@Column(name = "NoUrutRuangan", length = 10)
-	private String nourutruangan;
-
-	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "NoVerifikasiFk")
-	@Caption(value = "No Verifikasi")
-	private StrukVerifikasi noverifikasi;
-
-	@Column(name = "NoVerifikasiFk", insertable = false, updatable = false)
-	private String NoVerifikasiId;
-
-	@Caption(value = "Pegawai P J Pembebasan")
-	@Column(name = "PegawaiPJPembebasan", length = 40)
-	private String pegawaipjpembebasan;
-
-	@Caption(value = "Pembayaran Ke")
-	@Column(name = "PembayaranKe")
-	private Byte pembayaranke;
-
-	@Caption(value = "Tanggal S B M")
-	@Column(name = "TglSBM")
-	private Date tglsbm;
-
-	@Caption(value = "Total Di Bayar")
-	@Column(name = "TotalDiBayar")
-	private Double totaldibayar;
-
-	@Caption(value = "Total Di Bayar Before")
-	@Column(name = "TotalDiBayarBefore")
-	private Double totaldibayarbefore;
-
-	@Caption(value = "Total Di Bayar Cash Out")
-	@Column(name = "TotalDiBayarCashOut")
-	private Double totaldibayarcashout;
-
-	@Caption(value = "Total Di Bayar Retur")
-	@Column(name = "TotalDiBayarRetur")
-	private Double totaldibayarretur;
-
-	@Caption(value = "Total Di Bebaskan")
-	@Column(name = "TotalDiBebaskan")
-	private Double totaldibebaskan;
-
-	@Caption(value = "Total Sisa Piutang")
-	@Column(name = "TotalSisaPiutang")
-	private Double totalsisapiutang;
-
-	@Caption(value = "Total Sudah Di Bayar")
-	@Column(name = "TotalSudahDiBayar")
-	private Double totalsudahdibayar;
-
-	@Caption(value = "Total Sudah Di Bebaskan")
-	@Column(name = "TotalSudahDiBebaskan")
-	private Double totalsudahdibebaskan;
-}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienVO.java
index 64ece742..f0a94604 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienVO.java
@@ -150,9 +150,4 @@ public class PelayananPasienVO extends MedicalRecordTransactionVO {
 	private String voucherPaketId;
 
 	private Boolean isPaket;
-
-	@Caption(value = "Struk Bukti Penerimaan Detail")
-	private StrukBuktiPenerimaanDetailVO strukBuktiPenerimaanDetail;
-
-	private String strukBuktiPenerimaanDetailId;
 }
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/StrukBuktiPenerimaanDetailVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/StrukBuktiPenerimaanDetailVO.java
deleted file mode 100644
index aee05c39..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/StrukBuktiPenerimaanDetailVO.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.jasamedika.medifirst2000.vo;
-
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.helper.Caption;
-import lombok.Getter;
-import lombok.Setter;
-import org.joda.time.DateTime;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author salmanoe
- * @version 1.0.0
- * @since 16/11/2023
- */
-@Getter
-@Setter
-public class StrukBuktiPenerimaanDetailVO extends BaseTransactionVO {
-	@NotNull(message = "Struk Header tidak boleh kosong")
-	@Caption(value = "Struk Header")
-	private StrukBuktiPenerimaanVO strukBuktiPenerimaan;
-
-	private String strukBuktiPenerimaanId;
-
-	@Caption(value = "Object Kelompok Pasien")
-	private KelompokPasienVO kdkelompokpasien;
-
-	private Integer ObjectKelompokPasienId;
-
-	@Caption(value = "Object Kelompok Transaksi")
-	private KelompokTransaksiVO kdkelompoktransaksi;
-
-	private Integer ObjectKelompokTransaksiId;
-
-	@Caption(value = "Object Pegawai Pembayar")
-	private LoginUserVO kdpegawaipembayar;
-
-	private Integer ObjectPegawaiPembayarId;
-
-	@Caption(value = "Object Pegawai Penerima")
-	private LoginUserVO kdpegawaipenerima;
-
-	private Integer ObjectPegawaiPenerimaId;
-
-	@Caption(value = "Object Pegawai P J Pembebasan")
-	private LoginUserVO kdpegawaipjpembebasan;
-
-	private Integer ObjectPegawaiPJPembebasanId;
-
-	@Caption(value = "Kode Penjamin Pa Rekanan")
-	private Short kdpenjaminparekanan;
-
-	@Caption(value = "Object Produk Pembayaran To")
-	private ProdukVO kdprodukpembayaranto;
-
-	private Integer ObjectProdukPembayaranToId;
-
-	@Caption(value = "Object Ruangan")
-	private RuanganVO kdruangan;
-
-	private Integer ObjectRuanganId;
-
-	@Caption(value = "Keterangan Lainnya")
-	private String keteranganlainnya;
-
-	@Caption(value = "Keterangan Pembebasan")
-	private String keteranganpembebasan;
-
-	@Caption(value = "Nama Pegawai Pembayar")
-	private String namapegawaipembayar;
-
-	@Caption(value = "Nama Pegawai Penerima")
-	private String namapegawaipenerima;
-
-	@Caption(value = "Nama Produk Pembayaran To")
-	private String namaprodukpembayaranto;
-
-	@Caption(value = "No Closing")
-	private StrukClosingVO noclosing;
-
-	private Integer NoClosingId;
-
-	@Caption(value = "No S B K_ Retur")
-	private StrukBuktiPengeluaranVO nosbk_retur;
-
-	private Integer NoSBK_ReturId;
-
-	@Caption(value = "No S B M")
-	private String nosbm;
-
-	@Caption(value = "No S B M_ Intern")
-	private String nosbm_intern;
-
-	@Caption(value = "No S B M Before")
-	private String nosbmbefore;
-
-	@Caption(value = "No Struk")
-	private StrukPelayananVO nostruk;
-
-	private Integer NoStrukId;
-
-	@Caption(value = "No Urut Login")
-	private String nourutlogin;
-
-	@Caption(value = "No Urut Ruangan")
-	private String nourutruangan;
-
-	@Caption(value = "Pegawai P J Pembebasan")
-	private String pegawaipjpembebasan;
-
-	@Caption(value = "Pembayaran Ke")
-	private Byte pembayaranke;
-
-	@Caption(value = "Tanggal S B M")
-	private DateTime tglsbm;
-
-	@Caption(value = "Total Di Bayar")
-	private Double totaldibayar;
-
-	@Caption(value = "Total Di Bayar Before")
-	private Double totaldibayarbefore;
-
-	@Caption(value = "Total Di Bayar Cash Out")
-	private Double totaldibayarcashout;
-
-	@Caption(value = "Total Di Bayar Retur")
-	private Double totaldibayarretur;
-
-	@Caption(value = "Total Di Bebaskan")
-	private Double totaldibebaskan;
-
-	@Caption(value = "Total Sisa Piutang")
-	private Double totalsisapiutang;
-
-	@Caption(value = "Total Sudah Di Bayar")
-	private Double totalsudahdibayar;
-
-	@Caption(value = "Total Sudah Di Bebaskan")
-	private Double totalsudahdibebaskan;
-}
diff --git a/jasamedika-domain/src/main/resources/hibernate.cfg.xml b/jasamedika-domain/src/main/resources/hibernate.cfg.xml
index 276dc649..dd45c865 100644
--- a/jasamedika-domain/src/main/resources/hibernate.cfg.xml
+++ b/jasamedika-domain/src/main/resources/hibernate.cfg.xml
@@ -527,8 +527,6 @@
 		<mapping
 			class="com.jasamedika.medifirst2000.entities.StrukBuktiPengeluaranCaraBayar" />
 		<mapping class="com.jasamedika.medifirst2000.entities.StrukBuktiPenerimaan" />
-		<mapping
-			class="com.jasamedika.medifirst2000.entities.StrukBuktiPenerimaanDetail" />
 		<mapping class="com.jasamedika.medifirst2000.entities.SatuanWaktuKesling" />
 		<mapping class="com.jasamedika.medifirst2000.entities.PeriodeAccount" />
 		<mapping class="com.jasamedika.medifirst2000.entities.StrukVerifikasi" />
diff --git a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
index 74c598be..416c2a06 100644
--- a/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
+++ b/jasamedika-reporting/src/main/webapp/WEB-INF/templates/jrxml/slipGaji.jrxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Jaspersoft Studio version 6.20.5.final using JasperReports Library version 6.20.5-3efcf2e67f959db3888d79f73dde2dbd7acb4f8e  -->
+<!-- Created with Jaspersoft Studio version 6.20.1.final using JasperReports Library version 6.20.1-7584acb244139816654f64e2fd57a00d3e31921e  -->
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="slipGaji" pageWidth="595" pageHeight="842" whenNoDataType="BlankPage" columnWidth="505" leftMargin="45" rightMargin="45" topMargin="56" bottomMargin="56" whenResourceMissingType="Empty" uuid="b004215b-da52-4c09-b65d-f2feeeb72d32">
 	<property name="com.jaspersoft.studio.unit.topMargin" value="cm"/>
 	<property name="com.jaspersoft.studio.unit.bottomMargin" value="cm"/>
@@ -13,40 +13,60 @@
 	<field name="jabatan" class="java.lang.String"/>
 	<field name="unitKerja" class="java.lang.String"/>
 	<field name="subUnitKerja" class="java.lang.String"/>
-	<field name="gaji" class="java.lang.String"/>
-	<field name="remunerasiKinerja" class="java.lang.String"/>
-	<field name="remunerasiTambahanManajerial" class="java.lang.String"/>
-	<field name="feeForService" class="java.lang.String"/>
-	<field name="feeForOnSite" class="java.lang.String"/>
+	<field name="gajiPokok" class="java.lang.String"/>
+	<field name="remunerasi" class="java.lang.String"/>
 	<field name="uangMakan" class="java.lang.String"/>
-	<field name="uangLembur" class="java.lang.String"/>
-	<field name="pphGaji" class="java.lang.String"/>
-	<field name="pphRemunerasi" class="java.lang.String"/>
-	<field name="pphFeeForService" class="java.lang.String"/>
-	<field name="pphFeeForOnSite" class="java.lang.String"/>
-	<field name="pphUangMakan" class="java.lang.String"/>
-	<field name="pphUangLembur" class="java.lang.String"/>
-	<field name="iuranWajibKoperasi" class="java.lang.String"/>
-	<field name="pinjamanKoperasi" class="java.lang.String"/>
-	<field name="biayaObatAlkes" class="java.lang.String"/>
-	<field name="biayaRawatInap" class="java.lang.String"/>
-	<field name="biayaRawatJalan" class="java.lang.String"/>
-	<field name="jumlahPenerimaan" class="java.lang.String"/>
-	<field name="jumlahPemotongan" class="java.lang.String"/>
+	<field name="pph" class="java.lang.String"/>
+	<field name="potonganPph21Remunerasi" class="java.lang.String"/>
+	<field name="potonganPph21RemunerasiOperasional" class="java.lang.String"/>
+	<field name="potonganPph21UangMakan" class="java.lang.String"/>
+	<field name="wakafDanLainLain" class="java.lang.String"/>
+	<field name="simpananWajibKoperasiGaji" class="java.lang.String"/>
+	<field name="pinjamanKoperasiGaji" class="java.lang.String"/>
+	<field name="potonganObat" class="java.lang.String"/>
+	<field name="potonganRawatInap" class="java.lang.String"/>
+	<field name="potonganRawatJalan" class="java.lang.String"/>
 	<field name="jumlahPenerimaanBersih" class="java.lang.String"/>
 	<field name="periode" class="java.lang.String"/>
-	<field name="potonganTokoKoperasi" class="java.lang.String"/>
-	<field name="potonganBpjsK" class="java.lang.String"/>
-	<field name="remunerasiTambahanDiklitjar" class="java.lang.String"/>
-	<field name="remunerasiTambahanLain" class="java.lang.String"/>
-	<field name="potonganBpjsTK" class="java.lang.String"/>
+	<field name="tokoKoperasi" class="java.lang.String"/>
+	<field name="potonganBpjsKesehatan" class="java.lang.String"/>
+	<field name="remunerasiOperasional" class="java.lang.String"/>
+	<field name="potonganBpjsKetenagakerjaan" class="java.lang.String"/>
+	<field name="tunjanganIstriSuami" class="java.lang.String"/>
+	<field name="tunjanganAnak" class="java.lang.String"/>
+	<field name="tunjanganPns" class="java.lang.String"/>
+	<field name="tunjanganStruktural" class="java.lang.String"/>
+	<field name="tunjanganFungsional" class="java.lang.String"/>
+	<field name="tunjanganBeras" class="java.lang.String"/>
+	<field name="tunjanganPph" class="java.lang.String"/>
+	<field name="jumlahGaji" class="java.lang.String"/>
+	<field name="jumlahRemunerasi" class="java.lang.String"/>
+	<field name="pfk" class="java.lang.String"/>
+	<field name="sewaRumah" class="java.lang.String"/>
+	<field name="kelebihanTunjangan" class="java.lang.String"/>
+	<field name="potonganLain" class="java.lang.String"/>
+	<field name="tabunganRumah" class="java.lang.String"/>
+	<field name="jumlahPotonganGaji" class="java.lang.String"/>
+	<field name="jumlahGajiBersih" class="java.lang.String"/>
+	<field name="simpananWajibKoperasiRemunerasi" class="java.lang.String"/>
+	<field name="pinjamanKoperasiRemunerasi" class="java.lang.String"/>
+	<field name="jumlahPotonganRemunerasi" class="java.lang.String"/>
+	<field name="jumlahRemunerasiBersih" class="java.lang.String"/>
+	<field name="jumlahUangMakanBersih" class="java.lang.String"/>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
-	<title>
-		<band height="62" splitType="Stretch">
+	<summary>
+		<band height="730">
+			<image>
+				<reportElement x="0" y="0" width="505" height="42" isPrintWhenDetailOverflows="true" uuid="c4fbc1c2-32a1-42ec-a770-88149a0d9be1">
+					<property name="com.jaspersoft.studio.unit.width" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				</reportElement>
+				<imageExpression><![CDATA["../images/logoHarkit.png"]]></imageExpression>
+			</image>
 			<staticText>
-				<reportElement x="0" y="42" width="505" height="20" isPrintWhenDetailOverflows="true" uuid="94e742c7-7ea7-4b33-9350-f6cd0c9253eb">
+				<reportElement x="0" y="42" width="505" height="27" isPrintWhenDetailOverflows="true" uuid="94e742c7-7ea7-4b33-9350-f6cd0c9253eb">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
@@ -61,50 +81,39 @@
 				</textElement>
 				<text><![CDATA[Jl. Letjend. S. Parman Kav. 87, Slipi,Jakarta Barat 11420 – Indonesia, Telp 021 5668284]]></text>
 			</staticText>
-			<image>
-				<reportElement x="0" y="0" width="505" height="42" isPrintWhenDetailOverflows="true" uuid="c4fbc1c2-32a1-42ec-a770-88149a0d9be1">
-					<property name="com.jaspersoft.studio.unit.width" value="px"/>
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
-				</reportElement>
-				<imageExpression><![CDATA["../images/logoHarkit.png"]]></imageExpression>
-			</image>
-		</band>
-	</title>
-	<summary>
-		<band height="689">
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="0" width="70" height="17" isPrintWhenDetailOverflows="true" uuid="057ed757-3d6b-4918-adbc-376c8110efde">
+					<reportElement x="0" y="69" width="70" height="17" isPrintWhenDetailOverflows="true" uuid="057ed757-3d6b-4918-adbc-376c8110efde">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[Nama]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="70" y="0" width="180" height="17" isPrintWhenDetailOverflows="true" uuid="e69c43bd-2cab-467c-84b4-c71f4aeb11b1">
+					<reportElement x="70" y="69" width="180" height="17" isPrintWhenDetailOverflows="true" uuid="e69c43bd-2cab-467c-84b4-c71f4aeb11b1">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[": " + $F{namaPegawai}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="0" width="70" height="17" isPrintWhenDetailOverflows="true" uuid="533fe63e-c5d7-471c-bb42-e2027b0ab649"/>
-					<textElement verticalAlignment="Top">
+					<reportElement x="250" y="69" width="70" height="17" isPrintWhenDetailOverflows="true" uuid="533fe63e-c5d7-471c-bb42-e2027b0ab649"/>
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[Unit Kerja]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="320" y="0" width="185" height="17" isPrintWhenDetailOverflows="true" uuid="3a616526-86f6-4d77-8fa2-3bf580c12d46">
+					<reportElement x="320" y="69" width="185" height="17" isPrintWhenDetailOverflows="true" uuid="3a616526-86f6-4d77-8fa2-3bf580c12d46">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[": " + $F{unitKerja}]]></textFieldExpression>
@@ -112,37 +121,37 @@
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="17" width="70" height="17" isPrintWhenDetailOverflows="true" uuid="c3d063bc-de1b-43ac-bfea-84a4844bceed">
+					<reportElement x="0" y="86" width="70" height="17" isPrintWhenDetailOverflows="true" uuid="c3d063bc-de1b-43ac-bfea-84a4844bceed">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[NIP]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="70" y="17" width="180" height="17" isPrintWhenDetailOverflows="true" uuid="50c237de-2e38-4625-9108-1a0da686d12e">
+					<reportElement x="70" y="86" width="180" height="17" isPrintWhenDetailOverflows="true" uuid="50c237de-2e38-4625-9108-1a0da686d12e">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[": " + $F{nip}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="17" width="70" height="17" isPrintWhenDetailOverflows="true" uuid="6f486c29-1a20-42de-aadf-24b080500ebf"/>
-					<textElement verticalAlignment="Top">
+					<reportElement x="250" y="86" width="70" height="17" isPrintWhenDetailOverflows="true" uuid="6f486c29-1a20-42de-aadf-24b080500ebf"/>
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[Subunit Kerja]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="320" y="17" width="185" height="17" isPrintWhenDetailOverflows="true" uuid="5d0952ed-7a0e-4551-8a1e-37ec77941a0f">
+					<reportElement x="320" y="86" width="185" height="17" isPrintWhenDetailOverflows="true" uuid="5d0952ed-7a0e-4551-8a1e-37ec77941a0f">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[": " + $F{subUnitKerja}]]></textFieldExpression>
@@ -150,7 +159,7 @@
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="34" width="70" height="17" isPrintWhenDetailOverflows="true" uuid="2f4f51ab-1bb4-483e-b923-2031b7c252d8">
+					<reportElement x="0" y="103" width="70" height="17" isPrintWhenDetailOverflows="true" uuid="2f4f51ab-1bb4-483e-b923-2031b7c252d8">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box>
@@ -159,13 +168,13 @@
 						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[Jabatan]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="70" y="34" width="180" height="17" isPrintWhenDetailOverflows="true" uuid="6ee80807-33e0-4c1b-a4ce-0d3532725ca2">
+					<reportElement x="70" y="103" width="180" height="17" isPrintWhenDetailOverflows="true" uuid="6ee80807-33e0-4c1b-a4ce-0d3532725ca2">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
@@ -174,33 +183,33 @@
 						<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 						<rightPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[": " + $F{jabatan}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="34" width="70" height="17" isPrintWhenDetailOverflows="true" uuid="5137cbca-8972-499f-8876-cfe9489b879d">
+					<reportElement x="250" y="103" width="70" height="17" isPrintWhenDetailOverflows="true" uuid="5137cbca-8972-499f-8876-cfe9489b879d">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[Periode]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="320" y="34" width="185" height="17" isPrintWhenDetailOverflows="true" uuid="bcd9a255-8b8f-493f-9f1f-2d2263313f8a">
+					<reportElement x="320" y="103" width="185" height="17" isPrintWhenDetailOverflows="true" uuid="bcd9a255-8b8f-493f-9f1f-2d2263313f8a">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[": " + $F{periode}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<staticText>
-				<reportElement x="0" y="51" width="505" height="34" isPrintWhenDetailOverflows="true" uuid="7f60017e-ff9e-411d-86a3-c30f87191a76">
+				<reportElement x="0" y="120" width="505" height="32" isPrintWhenDetailOverflows="true" uuid="7f60017e-ff9e-411d-86a3-c30f87191a76">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.x" value="px"/>
@@ -212,7 +221,7 @@
 				<text><![CDATA[SLIP GAJI]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="85" width="505" height="17" isPrintWhenDetailOverflows="true" uuid="341fa3e5-9b09-4f73-9d89-8e98036ff3ea">
+				<reportElement x="0" y="153" width="505" height="17" isPrintWhenDetailOverflows="true" uuid="341fa3e5-9b09-4f73-9d89-8e98036ff3ea">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box leftPadding="2">
@@ -222,13 +231,13 @@
 					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
-				<textElement verticalAlignment="Top">
+				<textElement verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
 				<text><![CDATA[A. GAJI]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="102" width="250" height="17" isPrintWhenDetailOverflows="true" uuid="a4f4e960-1029-46cc-9ba6-4e326f7138bb">
+				<reportElement x="0" y="170" width="250" height="17" isPrintWhenDetailOverflows="true" uuid="a4f4e960-1029-46cc-9ba6-4e326f7138bb">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<box leftPadding="2">
@@ -238,27 +247,27 @@
 					<bottomPen lineWidth="0.0"/>
 					<rightPen lineWidth="0.0"/>
 				</box>
-				<textElement verticalAlignment="Top">
+				<textElement verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
 				<text><![CDATA[GAJI BRUTO :]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="250" y="102" width="255" height="17" isPrintWhenDetailOverflows="true" uuid="3d208c58-22c9-4d15-bccf-c9cc34ad03d3">
+				<reportElement x="250" y="170" width="255" height="17" isPrintWhenDetailOverflows="true" uuid="3d208c58-22c9-4d15-bccf-c9cc34ad03d3">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 				</reportElement>
 				<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0">
 					<topPen lineWidth="1.0"/>
 					<rightPen lineWidth="1.0"/>
 				</box>
-				<textElement verticalAlignment="Top">
+				<textElement verticalAlignment="Middle">
 					<font size="11"/>
 				</textElement>
 				<text><![CDATA[POTONGAN GAJI :]]></text>
 			</staticText>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="119" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="abb68853-5dad-43d1-a3d1-190b2e22b6bb">
+					<reportElement x="0" y="187" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="abb68853-5dad-43d1-a3d1-190b2e22b6bb">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
@@ -269,49 +278,49 @@
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[GAJI POKOK]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="119" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="854c9be0-0ce2-4692-af4e-12bd6a8b038a">
+					<reportElement x="120" y="187" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="854c9be0-0ce2-4692-af4e-12bd6a8b038a">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{gaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{gajiPokok}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="119" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="bd1cf708-98a7-4c1a-92ec-936cf638a993">
+					<reportElement x="250" y="187" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="bd1cf708-98a7-4c1a-92ec-936cf638a993">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[PFK]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="119" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="23bd833c-4b1b-4e4d-9abe-568d911ecab9">
+					<reportElement x="375" y="187" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="23bd833c-4b1b-4e4d-9abe-568d911ecab9">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pphGaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{pfk}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="136" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="d0c10d45-0b81-4baa-a965-dc941836960a">
+					<reportElement x="0" y="204" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="d0c10d45-0b81-4baa-a965-dc941836960a">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
@@ -321,47 +330,47 @@
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[TUNJ. ISTRI/SUAMI]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="136" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="7665a619-d14a-43da-9c28-be4e608e3046">
+					<reportElement x="120" y="204" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="7665a619-d14a-43da-9c28-be4e608e3046">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{gaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tunjanganIstriSuami}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="136" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="3f1df5dc-ef67-48ac-8122-f6bd75868d28"/>
+					<reportElement x="250" y="204" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="3f1df5dc-ef67-48ac-8122-f6bd75868d28"/>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[PPH]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="136" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="04037610-4b55-4407-941b-6ea3af077fd3">
+					<reportElement x="375" y="204" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="04037610-4b55-4407-941b-6ea3af077fd3">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pphGaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{pph}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="153" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="2e279ea8-04ad-4243-8842-a6bcf4382e12">
+					<reportElement x="0" y="221" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="2e279ea8-04ad-4243-8842-a6bcf4382e12">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -370,46 +379,46 @@
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[TUNJ. ANAK]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="153" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="6598e6b5-6e9a-4336-9b00-094ddb925099">
+					<reportElement x="120" y="221" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="6598e6b5-6e9a-4336-9b00-094ddb925099">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{gaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tunjanganAnak}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="153" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="67b2525f-6f74-46c2-ba83-93b879f9f4e7"/>
+					<reportElement x="250" y="221" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="67b2525f-6f74-46c2-ba83-93b879f9f4e7"/>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[SEWA RUMAH]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="153" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="90bfeefd-9b77-4bdc-9338-6868d9bbc569">
+					<reportElement x="375" y="221" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="90bfeefd-9b77-4bdc-9338-6868d9bbc569">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pphGaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{sewaRumah}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="170" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="e613754a-47f1-4599-98cc-5214d2c97d3f">
+					<reportElement x="0" y="238" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="e613754a-47f1-4599-98cc-5214d2c97d3f">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -418,46 +427,46 @@
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[TUNJ. PNS]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="170" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="214391ed-1ebc-494c-b1a0-229de4a00241">
+					<reportElement x="120" y="238" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="214391ed-1ebc-494c-b1a0-229de4a00241">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{gaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tunjanganPns}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="170" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="61f4e3bf-1bcc-4c3f-b9e0-4b693778eabe"/>
+					<reportElement x="250" y="238" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="61f4e3bf-1bcc-4c3f-b9e0-4b693778eabe"/>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[KELEBIHAN TUNJ.]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="170" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="9db0318d-991b-4a01-9046-bf89ec5ea9e8">
+					<reportElement x="375" y="238" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="9db0318d-991b-4a01-9046-bf89ec5ea9e8">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pphGaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{kelebihanTunjangan}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="187" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="293129b4-3e42-4882-ac35-4d947dd0d48e">
+					<reportElement x="0" y="255" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="293129b4-3e42-4882-ac35-4d947dd0d48e">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
@@ -466,319 +475,319 @@
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[TUNJ. STRUKTURAL]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="187" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="d4f5739b-e932-4541-8059-e6dae98b025b">
+					<reportElement x="120" y="255" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="d4f5739b-e932-4541-8059-e6dae98b025b">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{gaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tunjanganStruktural}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="187" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="cd3bc28d-7481-49bf-969e-ff3df06c5f11"/>
+					<reportElement x="250" y="255" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="cd3bc28d-7481-49bf-969e-ff3df06c5f11"/>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[POT. LAIN]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="187" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="19c075d3-465f-4623-8c58-5b7c85ff10c3">
+					<reportElement x="375" y="255" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="19c075d3-465f-4623-8c58-5b7c85ff10c3">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pphGaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{potonganLain}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="204" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="ff5e906a-e169-41d3-98d6-989af4dbb597"/>
+					<reportElement x="0" y="272" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="ff5e906a-e169-41d3-98d6-989af4dbb597"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[TUNJ. FUNGSIONAL]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="204" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="04d63821-bccc-423f-8ad7-81e8e1ad26aa">
+					<reportElement x="120" y="272" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="04d63821-bccc-423f-8ad7-81e8e1ad26aa">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{gaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tunjanganFungsional}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="204" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="12ecee37-e4df-4011-8a4e-53b98e9b6a1d"/>
+					<reportElement x="250" y="272" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="12ecee37-e4df-4011-8a4e-53b98e9b6a1d"/>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<text><![CDATA[TABRUM]]></text>
+					<text><![CDATA[TABUNGAN RUMAH]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="204" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="41cebd05-c019-471e-b7bc-e212bdcd1231">
+					<reportElement x="375" y="272" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="41cebd05-c019-471e-b7bc-e212bdcd1231">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pphGaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tabunganRumah}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="221" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="fdd76f36-33a4-4204-aa99-5a230ede1fdc"/>
+					<reportElement x="0" y="289" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="fdd76f36-33a4-4204-aa99-5a230ede1fdc"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[TUNJ. BERAS]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="221" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="c73bf533-48e4-42df-b61b-dc9ad9aba1d6">
+					<reportElement x="120" y="289" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="c73bf533-48e4-42df-b61b-dc9ad9aba1d6">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{gaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tunjanganBeras}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="221" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="0bcd1cbb-2f9a-4523-9f8a-05304a5dc20d">
+					<reportElement x="250" y="289" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="0bcd1cbb-2f9a-4523-9f8a-05304a5dc20d">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement textAlignment="Left" verticalAlignment="Top">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[POT. BPJS-TK]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="221" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="ea05cd89-4b91-442c-a22e-c924c61e8da4">
+					<reportElement x="375" y="289" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="ea05cd89-4b91-442c-a22e-c924c61e8da4">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{potonganBpjsTK}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{potonganBpjsKetenagakerjaan}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="238" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="2cfae079-649d-4af1-9503-69051e0baa2f"/>
+					<reportElement x="0" y="306" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="2cfae079-649d-4af1-9503-69051e0baa2f"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[TUNJ. PPH]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="238" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="b241b252-d157-4fc2-a233-e6e1d900851f">
+					<reportElement x="120" y="306" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="b241b252-d157-4fc2-a233-e6e1d900851f">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{gaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tunjanganPph}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="238" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="37224f91-c720-491d-8ecf-f99c6ff06eda">
+					<reportElement x="250" y="306" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="37224f91-c720-491d-8ecf-f99c6ff06eda">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement textAlignment="Left" verticalAlignment="Top">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[POT. BPJS-K]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="238" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="8e95c8eb-0a7d-4d9b-ac48-4a5e5e8ff566">
+					<reportElement x="375" y="306" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="8e95c8eb-0a7d-4d9b-ac48-4a5e5e8ff566">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{potonganBpjsK}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{potonganBpjsKesehatan}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="120" y="255" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="41d21f5d-0f28-489f-bd01-4b28443307b4">
+					<reportElement x="120" y="323" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="41d21f5d-0f28-489f-bd01-4b28443307b4">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="0" y="255" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="cc5140e2-8eb7-47b3-93c6-9dce7a0f53e4"/>
+					<reportElement x="0" y="323" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="cc5140e2-8eb7-47b3-93c6-9dce7a0f53e4"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="250" y="255" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="548ccdd6-b12e-4d6a-8405-b4dc23c0c700"/>
+					<reportElement x="250" y="323" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="548ccdd6-b12e-4d6a-8405-b4dc23c0c700"/>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[SIM. WAJIB KOPERASI]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="255" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="ce5cf3d0-9be7-45db-8b11-b26d806f7a0f">
+					<reportElement x="375" y="323" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="ce5cf3d0-9be7-45db-8b11-b26d806f7a0f">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{iuranWajibKoperasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{simpananWajibKoperasiGaji}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="272" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="c31404e7-d171-4b3c-8bd4-18c0f9975f62"/>
+					<reportElement x="0" y="340" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="c31404e7-d171-4b3c-8bd4-18c0f9975f62"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="120" y="272" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="485e3cfd-5d25-4498-86fd-2ec896f43565">
+					<reportElement x="120" y="340" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="485e3cfd-5d25-4498-86fd-2ec896f43565">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="250" y="272" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="e7e8e650-ec92-402d-a726-53c142ecabf4"/>
+					<reportElement x="250" y="340" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="e7e8e650-ec92-402d-a726-53c142ecabf4"/>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[PINJ. KOPERASI]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="272" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="fc3658b5-24ce-4b87-8d89-d739ad943151">
+					<reportElement x="375" y="340" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="fc3658b5-24ce-4b87-8d89-d739ad943151">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pinjamanKoperasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{pinjamanKoperasiGaji}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="289" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="21c38ab3-ea9b-4d43-aabf-44abdd8c540f"/>
+					<reportElement x="0" y="357" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="21c38ab3-ea9b-4d43-aabf-44abdd8c540f"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[JUMLAH GAJI]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="289" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="77ed95d4-866d-4c06-b0f5-5ea60c33ac0e">
+					<reportElement x="120" y="357" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="77ed95d4-866d-4c06-b0f5-5ea60c33ac0e">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<topPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{gaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{jumlahGaji}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="289" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="66ab74d7-fb0e-4161-a61c-b0e9564b0984"/>
+					<reportElement x="250" y="357" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="66ab74d7-fb0e-4161-a61c-b0e9564b0984"/>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0">
 						<topPen lineWidth="1.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[JUMLAH POT. GAJI]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="289" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="acc4404e-3429-4558-ab8f-0de5dfdc7775">
+					<reportElement x="375" y="357" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="acc4404e-3429-4558-ab8f-0de5dfdc7775">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -786,28 +795,28 @@
 						<topPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pinjamanKoperasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{jumlahPotonganGaji}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="306" width="375" height="17" isPrintWhenDetailOverflows="true" forecolor="#030303" backcolor="#FFFFFF" uuid="47f14eb4-4883-4357-af79-466edd411b0c"/>
+					<reportElement x="0" y="374" width="375" height="17" isPrintWhenDetailOverflows="true" forecolor="#030303" backcolor="#FFFFFF" uuid="47f14eb4-4883-4357-af79-466edd411b0c"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Top">
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[JUMLAH GAJI BERSIH YANG DITERIMA]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="306" width="130" height="17" isPrintWhenDetailOverflows="true" forecolor="#030303" backcolor="#FFFFFF" uuid="dc736c55-fba6-4429-bab2-0eb9698a73ec">
+					<reportElement x="375" y="374" width="130" height="17" isPrintWhenDetailOverflows="true" forecolor="#030303" backcolor="#FFFFFF" uuid="dc736c55-fba6-4429-bab2-0eb9698a73ec">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -815,26 +824,26 @@
 						<topPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pinjamanKoperasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{jumlahGajiBersih}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="505" y="306" width="25" height="17" isPrintWhenDetailOverflows="true" uuid="36470256-49e7-4b8c-b726-7e204568f371">
+					<reportElement x="505" y="374" width="25" height="17" isPrintWhenDetailOverflows="true" uuid="36470256-49e7-4b8c-b726-7e204568f371">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 					</reportElement>
 					<box leftPadding="2"/>
-					<textElement textAlignment="Left" verticalAlignment="Top">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[(1)]]></text>
 				</staticText>
 			</elementGroup>
 			<staticText>
-				<reportElement x="0" y="323" width="505" height="17" isPrintWhenDetailOverflows="true" uuid="5f04c78c-4140-48a9-8fd8-b05c33782a9f"/>
+				<reportElement x="0" y="391" width="505" height="17" isPrintWhenDetailOverflows="true" uuid="5f04c78c-4140-48a9-8fd8-b05c33782a9f"/>
 				<box leftPadding="2">
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -842,14 +851,14 @@
 					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
-				<textElement verticalAlignment="Top">
+				<textElement verticalAlignment="Middle">
 					<font size="10"/>
 				</textElement>
 				<text><![CDATA[B. REMUNERASI]]></text>
 			</staticText>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="340" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="75f94f9c-d493-4ec0-8ec2-385779070f63"/>
+					<reportElement x="0" y="408" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="75f94f9c-d493-4ec0-8ec2-385779070f63"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -857,52 +866,52 @@
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[REMUNERASI]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="340" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="cc63acf9-5fcb-4c98-8920-3892302e124f">
+					<reportElement x="120" y="408" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="cc63acf9-5fcb-4c98-8920-3892302e124f">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<topPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{remunerasiKinerja}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{remunerasi}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="340" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="95e372d6-b2c0-4f95-8dfe-78bcee895952">
+					<reportElement x="250" y="408" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="95e372d6-b2c0-4f95-8dfe-78bcee895952">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box leftPadding="2">
 						<topPen lineWidth="1.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[POT. PPH 21 REM.]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="340" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="3389cb66-9082-44db-a9e3-b404d498019e">
+					<reportElement x="375" y="408" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="3389cb66-9082-44db-a9e3-b404d498019e">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<topPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pphRemunerasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{potonganPph21Remunerasi}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="357" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="7e4105ea-d5a6-4791-b67a-8beb891ce566"/>
+					<reportElement x="0" y="425" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="7e4105ea-d5a6-4791-b67a-8beb891ce566"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
@@ -910,410 +919,410 @@
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[REM. OPERASIONAL]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="357" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="9c98d874-4683-40c4-b33e-dfaf00568d71">
+					<reportElement x="120" y="425" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="9c98d874-4683-40c4-b33e-dfaf00568d71">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5"/>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{remunerasiTambahanLain}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{remunerasiOperasional}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="357" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="faf19b46-b635-4d01-9929-8cf6ece3f3be">
+					<reportElement x="250" y="425" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="faf19b46-b635-4d01-9929-8cf6ece3f3be">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box leftPadding="2"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[POT. PPH 21 REM. OPS.]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="357" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="691034d4-39f1-4112-8837-f5bae3c15dd0">
+					<reportElement x="375" y="425" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="691034d4-39f1-4112-8837-f5bae3c15dd0">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pphFeeForService}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{potonganPph21RemunerasiOperasional}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="374" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="53bfd3a6-e223-4fcc-903d-add0509323ad"/>
+					<reportElement x="0" y="442" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="53bfd3a6-e223-4fcc-903d-add0509323ad"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="120" y="374" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="c1c47269-a592-4d31-bd33-ce605e90b171">
+					<reportElement x="120" y="442" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="c1c47269-a592-4d31-bd33-ce605e90b171">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="250" y="374" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="2e6c88ec-86a9-4068-9720-655ee0e72c17">
+					<reportElement x="250" y="442" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="2e6c88ec-86a9-4068-9720-655ee0e72c17">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box leftPadding="2"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[POT. OBAT]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="374" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="9db50f41-a032-4b9d-b990-e220861ae0a7">
+					<reportElement x="375" y="442" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="9db50f41-a032-4b9d-b990-e220861ae0a7">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{biayaObatAlkes}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{potonganObat}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="391" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="927c0314-12f4-42e1-8b35-fca6dd025a01"/>
+					<reportElement x="0" y="459" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="927c0314-12f4-42e1-8b35-fca6dd025a01"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="120" y="391" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="9a4cb473-bde0-4999-8a7a-780cf9464328">
+					<reportElement x="120" y="459" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="9a4cb473-bde0-4999-8a7a-780cf9464328">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="250" y="391" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="f5fcd811-bd8f-479a-afd8-1c253738734d">
+					<reportElement x="250" y="459" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="f5fcd811-bd8f-479a-afd8-1c253738734d">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box leftPadding="2"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[POT. RANAP]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="391" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="22ba09f8-d054-423b-b201-428bb2c7bcef">
+					<reportElement x="375" y="459" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="22ba09f8-d054-423b-b201-428bb2c7bcef">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{biayaRawatInap}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{potonganRawatInap}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="408" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="1f11dfbc-7335-463c-bad4-7f4dfcd06989"/>
+					<reportElement x="0" y="476" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="1f11dfbc-7335-463c-bad4-7f4dfcd06989"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="120" y="408" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="82f5bc34-995d-41ee-897c-0cc1b1718bb2">
+					<reportElement x="120" y="476" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="82f5bc34-995d-41ee-897c-0cc1b1718bb2">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="250" y="408" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="c8df630e-92b1-4fcc-9ab9-8c3b927ba9af">
+					<reportElement x="250" y="476" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="c8df630e-92b1-4fcc-9ab9-8c3b927ba9af">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box leftPadding="2"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[POT. RAJAL]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="408" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="5a846346-03f6-4281-adf1-dc7100508ef9">
+					<reportElement x="375" y="476" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="5a846346-03f6-4281-adf1-dc7100508ef9">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{biayaRawatJalan}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{potonganRawatJalan}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="425" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="50dd487a-5c57-470f-ab78-87ef2d6361a6"/>
+					<reportElement x="0" y="493" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="50dd487a-5c57-470f-ab78-87ef2d6361a6"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="120" y="425" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="26cabd9a-e831-4c6d-a531-3ec05adfc882">
+					<reportElement x="120" y="493" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="26cabd9a-e831-4c6d-a531-3ec05adfc882">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="250" y="425" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="f40bbdd5-ab0b-463d-987d-9255331d3c04"/>
+					<reportElement x="250" y="493" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="f40bbdd5-ab0b-463d-987d-9255331d3c04"/>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[SIM. WAJIB KOPERASI]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="425" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="4fb8cf0b-ce13-4838-9a26-478f9b36a4ec">
+					<reportElement x="375" y="493" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="4fb8cf0b-ce13-4838-9a26-478f9b36a4ec">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{iuranWajibKoperasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{simpananWajibKoperasiRemunerasi}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="442" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="a2580670-5302-4ba2-85db-0caa029f0ce5"/>
+					<reportElement x="0" y="510" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="a2580670-5302-4ba2-85db-0caa029f0ce5"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="120" y="442" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="aa0542b2-f481-447a-850e-7a853c4f0a48">
+					<reportElement x="120" y="510" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="aa0542b2-f481-447a-850e-7a853c4f0a48">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="250" y="442" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="2a1d1f76-7a3b-48eb-96d4-bfabd6c46800"/>
+					<reportElement x="250" y="510" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="2a1d1f76-7a3b-48eb-96d4-bfabd6c46800"/>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[PINJ. KOPERASI]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="442" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="75a50fdd-acd2-4356-aaf2-a509cef3a2a3">
+					<reportElement x="375" y="510" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="75a50fdd-acd2-4356-aaf2-a509cef3a2a3">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pinjamanKoperasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{pinjamanKoperasiRemunerasi}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="459" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="be732d3f-3ba0-41f4-bfd3-c46332cde9d3"/>
+					<reportElement x="0" y="527" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="be732d3f-3ba0-41f4-bfd3-c46332cde9d3"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="120" y="459" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="8c61f896-77a9-440b-b359-242b99cbaf44">
+					<reportElement x="120" y="527" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="8c61f896-77a9-440b-b359-242b99cbaf44">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="250" y="459" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="399aa6f2-dbcd-4bf4-a490-db90468db0ad">
+					<reportElement x="250" y="527" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="399aa6f2-dbcd-4bf4-a490-db90468db0ad">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box leftPadding="2"/>
-					<textElement textAlignment="Left" verticalAlignment="Top">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[TOKO KOPERASI]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="459" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="7888f031-3a55-45d0-984d-f5f3d52e4755">
+					<reportElement x="375" y="527" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="7888f031-3a55-45d0-984d-f5f3d52e4755">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{potonganTokoKoperasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{tokoKoperasi}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="476" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="cae85a74-eda2-4ea0-80f6-fe16d31c5950"/>
+					<reportElement x="0" y="544" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="cae85a74-eda2-4ea0-80f6-fe16d31c5950"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="0.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="120" y="476" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="dde2e5af-e351-4ed6-abc1-350b430cd120">
+					<reportElement x="120" y="544" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="dde2e5af-e351-4ed6-abc1-350b430cd120">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="11"/>
 					</textElement>
 					<text><![CDATA[]]></text>
 				</staticText>
 				<staticText>
-					<reportElement x="250" y="476" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="90fbc95c-e0a1-420e-8242-9d2098f57d87">
+					<reportElement x="250" y="544" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="90fbc95c-e0a1-420e-8242-9d2098f57d87">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box leftPadding="2"/>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[WAKAF/DLL]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="476" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="0f3ba575-c21c-4b64-8582-d0475d4fcd86">
+					<reportElement x="375" y="544" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="0f3ba575-c21c-4b64-8582-d0475d4fcd86">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pphUangLembur}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{wakafDanLainLain}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="493" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="94481325-560d-46bb-8fdb-e1abdda79c3e"/>
+					<reportElement x="0" y="561" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="94481325-560d-46bb-8fdb-e1abdda79c3e"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[JUMLAH REM.]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="493" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="e9e195d1-ed12-4578-b646-ad0b1163324d">
+					<reportElement x="120" y="561" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="e9e195d1-ed12-4578-b646-ad0b1163324d">
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<topPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{gaji}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{jumlahRemunerasi}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="493" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="70876ae2-7220-4cf9-ac91-6c9f5b075050"/>
+					<reportElement x="250" y="561" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="70876ae2-7220-4cf9-ac91-6c9f5b075050"/>
 					<box topPadding="0" leftPadding="2" bottomPadding="0" rightPadding="0">
 						<topPen lineWidth="1.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[JUMLAH POT. REM.]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="493" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="056333fc-ef34-495d-bba4-4a0f6a2a7d7d">
+					<reportElement x="375" y="561" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="056333fc-ef34-495d-bba4-4a0f6a2a7d7d">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -1321,28 +1330,28 @@
 						<topPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pinjamanKoperasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{jumlahPotonganRemunerasi}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="510" width="375" height="17" isPrintWhenDetailOverflows="true" uuid="5fdc0254-2846-4c35-8453-beb6bd804764"/>
+					<reportElement x="0" y="578" width="375" height="17" isPrintWhenDetailOverflows="true" uuid="5fdc0254-2846-4c35-8453-beb6bd804764"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Top">
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[JUMLAH REMUNERASI BERSIH YANG DITERIMA]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="510" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="11b23983-6603-471e-ba02-11eda946fa47">
+					<reportElement x="375" y="578" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="11b23983-6603-471e-ba02-11eda946fa47">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -1350,26 +1359,26 @@
 						<topPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pinjamanKoperasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{jumlahRemunerasiBersih}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="505" y="510" width="25" height="17" isPrintWhenDetailOverflows="true" uuid="50ba0c32-aa2f-4beb-8ad5-b3d9d6c8520b">
+					<reportElement x="505" y="578" width="25" height="17" isPrintWhenDetailOverflows="true" uuid="50ba0c32-aa2f-4beb-8ad5-b3d9d6c8520b">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 					</reportElement>
 					<box leftPadding="2"/>
-					<textElement textAlignment="Left" verticalAlignment="Top">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[(2)]]></text>
 				</staticText>
 			</elementGroup>
 			<staticText>
-				<reportElement x="0" y="527" width="505" height="17" isPrintWhenDetailOverflows="true" uuid="2714a3fa-f436-4bc6-bdfa-176d6f15bfc9"/>
+				<reportElement x="0" y="595" width="505" height="17" isPrintWhenDetailOverflows="true" uuid="2714a3fa-f436-4bc6-bdfa-176d6f15bfc9"/>
 				<box leftPadding="2">
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
@@ -1377,14 +1386,14 @@
 					<bottomPen lineWidth="0.0" lineStyle="Solid" lineColor="#000000"/>
 					<rightPen lineWidth="1.0" lineStyle="Solid" lineColor="#000000"/>
 				</box>
-				<textElement verticalAlignment="Top">
+				<textElement verticalAlignment="Middle">
 					<font size="11"/>
 				</textElement>
 				<text><![CDATA[C. UANG MAKAN]]></text>
 			</staticText>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="544" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="b73e63d9-c75a-4c4b-8eb2-20fd7d5d7f86"/>
+					<reportElement x="0" y="612" width="120" height="17" isPrintWhenDetailOverflows="true" uuid="b73e63d9-c75a-4c4b-8eb2-20fd7d5d7f86"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
@@ -1392,65 +1401,65 @@
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[UANG MAKAN]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="120" y="544" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="2b243495-71ec-4bb7-900a-d77345fb331f">
+					<reportElement x="120" y="612" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="2b243495-71ec-4bb7-900a-d77345fb331f">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<topPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$F{uangMakan}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="250" y="544" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="2f7dc4d5-31a3-4078-84c1-e29868c46d1e">
+					<reportElement x="250" y="612" width="125" height="17" isPrintWhenDetailOverflows="true" uuid="2f7dc4d5-31a3-4078-84c1-e29868c46d1e">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					</reportElement>
 					<box>
 						<topPen lineWidth="1.0"/>
 					</box>
-					<textElement verticalAlignment="Top">
+					<textElement verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[POT. PPH 21]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="544" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="8039ce3d-4f41-45ca-88e8-65d4853f72ac">
+					<reportElement x="375" y="612" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="8039ce3d-4f41-45ca-88e8-65d4853f72ac">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
 					<box rightPadding="5">
 						<topPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pphUangMakan}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{potonganPph21UangMakan}]]></textFieldExpression>
 				</textField>
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="561" width="375" height="17" isPrintWhenDetailOverflows="true" uuid="6e1e5438-0d8e-4e4a-a0b2-2cb9a4fde04c"/>
+					<reportElement x="0" y="629" width="375" height="17" isPrintWhenDetailOverflows="true" uuid="6e1e5438-0d8e-4e4a-a0b2-2cb9a4fde04c"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
 						<bottomPen lineWidth="0.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Top">
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[JUMLAH UANG MAKAN BERSIH YANG DITERIMA]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="561" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="d2959bf2-7cad-4da4-8bcf-6455965bd275">
+					<reportElement x="375" y="629" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="d2959bf2-7cad-4da4-8bcf-6455965bd275">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -1458,19 +1467,19 @@
 						<topPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pinjamanKoperasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{jumlahUangMakanBersih}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="505" y="561" width="25" height="17" isPrintWhenDetailOverflows="true" uuid="ac565196-1937-4f83-a200-51a353d03312">
+					<reportElement x="505" y="629" width="25" height="17" isPrintWhenDetailOverflows="true" uuid="ac565196-1937-4f83-a200-51a353d03312">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 					</reportElement>
 					<box leftPadding="2"/>
-					<textElement textAlignment="Left" verticalAlignment="Top">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[(3)]]></text>
@@ -1478,20 +1487,20 @@
 			</elementGroup>
 			<elementGroup>
 				<staticText>
-					<reportElement x="0" y="578" width="375" height="17" isPrintWhenDetailOverflows="true" uuid="1eca11e5-21d1-4fec-827e-727b229a243a"/>
+					<reportElement x="0" y="646" width="375" height="17" isPrintWhenDetailOverflows="true" uuid="1eca11e5-21d1-4fec-827e-727b229a243a"/>
 					<box leftPadding="2">
 						<pen lineWidth="1.0"/>
 						<topPen lineWidth="1.0"/>
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="0.0"/>
 					</box>
-					<textElement textAlignment="Center" verticalAlignment="Top">
+					<textElement textAlignment="Center" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[TOTAL BERSIH YANG DITERIMA (A + B + C)]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="375" y="578" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="f18d0b78-97b7-4f61-bd05-027770b1dd0e">
+					<reportElement x="375" y="646" width="130" height="17" isPrintWhenDetailOverflows="true" uuid="f18d0b78-97b7-4f61-bd05-027770b1dd0e">
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					</reportElement>
@@ -1500,113 +1509,114 @@
 						<bottomPen lineWidth="1.0"/>
 						<rightPen lineWidth="1.0"/>
 					</box>
-					<textElement textAlignment="Right" verticalAlignment="Top">
+					<textElement textAlignment="Right" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
-					<textFieldExpression><![CDATA[$F{pinjamanKoperasi}]]></textFieldExpression>
+					<textFieldExpression><![CDATA[$F{jumlahPenerimaanBersih}]]></textFieldExpression>
 				</textField>
 				<staticText>
-					<reportElement x="505" y="578" width="25" height="17" isPrintWhenDetailOverflows="true" uuid="eea87c44-436d-4e1c-8287-189c042c7cfe">
+					<reportElement x="505" y="646" width="25" height="17" isPrintWhenDetailOverflows="true" uuid="eea87c44-436d-4e1c-8287-189c042c7cfe">
 						<property name="com.jaspersoft.studio.unit.height" value="px"/>
 						<property name="com.jaspersoft.studio.unit.width" value="px"/>
 						<property name="com.jaspersoft.studio.unit.x" value="px"/>
 					</reportElement>
 					<box leftPadding="2"/>
-					<textElement textAlignment="Left" verticalAlignment="Top">
+					<textElement textAlignment="Left" verticalAlignment="Middle">
 						<font size="10"/>
 					</textElement>
 					<text><![CDATA[(4)]]></text>
 				</staticText>
 			</elementGroup>
 			<staticText>
-				<reportElement x="0" y="595" width="505" height="34" isPrintWhenDetailOverflows="true" uuid="471a5378-4af0-4aa7-ae66-c10420c23ccc">
+				<reportElement x="0" y="663" width="505" height="15" isPrintWhenDetailOverflows="true" uuid="471a5378-4af0-4aa7-ae66-c10420c23ccc">
 					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.x" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Bottom">
-					<font size="10"/>
+					<font size="8"/>
 				</textElement>
 				<text><![CDATA[Keterangan:]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="629" width="50" height="15" isPrintWhenDetailOverflows="true" uuid="d4a16575-90de-4b75-a006-e58ea59426d8">
-					<property name="com.jaspersoft.studio.unit.height" value="px"/>
+				<reportElement x="0" y="678" width="50" height="13" isPrintWhenDetailOverflows="true" uuid="d4a16575-90de-4b75-a006-e58ea59426d8">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Top">
-					<font size="10"/>
+					<font size="8"/>
 				</textElement>
 				<text><![CDATA[(1)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="50" y="629" width="455" height="15" isPrintWhenDetailOverflows="true" uuid="4ea43ee2-0609-45b2-ad25-ab9b3fbdab99">
+				<reportElement x="50" y="678" width="455" height="13" isPrintWhenDetailOverflows="true" uuid="4ea43ee2-0609-45b2-ad25-ab9b3fbdab99">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.x" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font size="10"/>
+					<font size="8"/>
 				</textElement>
 				<text><![CDATA[(JUMLAH GAJI - POTONGAN GAJI)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="644" width="50" height="15" isPrintWhenDetailOverflows="true" uuid="ed2244d8-eec5-4731-af81-6ab60f64a178">
+				<reportElement x="0" y="691" width="50" height="13" isPrintWhenDetailOverflows="true" uuid="ed2244d8-eec5-4731-af81-6ab60f64a178">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.x" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Top">
-					<font size="10"/>
+					<font size="8"/>
 				</textElement>
 				<text><![CDATA[(2)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="50" y="644" width="455" height="15" isPrintWhenDetailOverflows="true" uuid="9c9a06b5-9ac2-4c48-baf9-32d3252fe867">
+				<reportElement x="50" y="691" width="455" height="13" isPrintWhenDetailOverflows="true" uuid="9c9a06b5-9ac2-4c48-baf9-32d3252fe867">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.x" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font size="10"/>
+					<font size="8"/>
 				</textElement>
 				<text><![CDATA[(JUMLAH REMUN - POTONGAN REMUN)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="659" width="50" height="15" isPrintWhenDetailOverflows="true" uuid="6793e7d0-c8ff-4e8f-8089-a17f379abd45">
+				<reportElement x="0" y="704" width="50" height="13" isPrintWhenDetailOverflows="true" uuid="6793e7d0-c8ff-4e8f-8089-a17f379abd45">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.x" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Top">
-					<font size="10"/>
+					<font size="8"/>
 				</textElement>
 				<text><![CDATA[(3)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="50" y="659" width="455" height="15" isPrintWhenDetailOverflows="true" uuid="fb0d56d1-721e-4324-b10b-0cc3f011b898">
+				<reportElement x="50" y="704" width="455" height="13" isPrintWhenDetailOverflows="true" uuid="fb0d56d1-721e-4324-b10b-0cc3f011b898">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.x" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font size="10"/>
+					<font size="8"/>
 				</textElement>
 				<text><![CDATA[(JUMLAH UANG MAKAN - POTONGAN UANG MAKAN)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="0" y="674" width="50" height="15" isPrintWhenDetailOverflows="true" uuid="7e59d156-7b57-4f78-9360-60f80aeb0552">
+				<reportElement x="0" y="717" width="50" height="13" isPrintWhenDetailOverflows="true" uuid="7e59d156-7b57-4f78-9360-60f80aeb0552">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.x" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Center" verticalAlignment="Top">
-					<font size="10"/>
+					<font size="8"/>
 				</textElement>
 				<text><![CDATA[(4)]]></text>
 			</staticText>
 			<staticText>
-				<reportElement x="50" y="674" width="455" height="15" isPrintWhenDetailOverflows="true" uuid="a79a0b9b-c3cd-43e3-b8a7-3a3508f76170">
+				<reportElement x="50" y="717" width="455" height="13" isPrintWhenDetailOverflows="true" uuid="a79a0b9b-c3cd-43e3-b8a7-3a3508f76170">
 					<property name="com.jaspersoft.studio.unit.width" value="px"/>
 					<property name="com.jaspersoft.studio.unit.x" value="px"/>
+					<property name="com.jaspersoft.studio.unit.height" value="px"/>
 				</reportElement>
 				<textElement textAlignment="Left" verticalAlignment="Top">
-					<font size="10"/>
+					<font size="8"/>
 				</textElement>
 				<text><![CDATA[(JUMLAH BERSIH A + JUMLAH BERSIH B + JUMLAH BERSIH C)]]></text>
 			</staticText>