diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java
index c150b92d..d4fc1232 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/EvaluasiJabatanDao.java
@@ -49,7 +49,7 @@ public interface EvaluasiJabatanDao extends PagingAndSortingRepository<EvaluasiJ
 	@Query("select new Map(ej.tahun as tahun,ej.bulan as bulan,ej.tahun || '-' || ej.bulan as periodePerhitungan,"
 			+ "ej.tglHitung as tglHitung,to_char(ej.tglHitung, 'dd-MM-yyyy HH:mm:ss') as tglHitungFormatted,"
 			+ "j.namaExternal as unitKerja,j.id as idJabatan,j.namaJabatan as namaJabatan,"
-			+ "nj.grade as grade,nj.detailKelompokJabatan as kelompokJabatan,"
+			+ "nj.gradeDesc as grade,nj.detailKelompokJabatan as kelompokJabatan,"
 			+ "f1.profile as f1,f2.profile as f2,f3.profile as f3,"
 			+ "f4.profile as f4,f5.profile as f5,f7.profile as f7,"
 			+ "f8.profile as f8,f9.profile as f9,f10.profile as f10,"
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
index e7dac751..3b6081de 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java
@@ -19,7 +19,7 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 	// grade_nilai_jabatan
 	@Query("select NEW Map (  " + "jabatanInternal.namaJabatan as namaJabatan,  "
 			+ "kelompokJabatan.id as kelompokJabatanId,  " + "nilaiKelompokJabatan.id as nilaiKelompokJabatan,  "
-			+ "nilaiKelompokJabatan.grade as grade,  " + "pegawai.nipPns as nipPns,  " + "pegawai.nipPns as nipPns,  "
+			+ "nilaiKelompokJabatan.gradeDesc as grade,  " + "pegawai.nipPns as nipPns,  " + "pegawai.nipPns as nipPns,  "
 			+ "pegawai.namaLengkap as namaLengkap,  " + "pegawai.nilaiJabatan as nilaiJabatan,  "
 			+ "golongan.id as idGolongan,  " + "golongan.golonganPegawai as golongan,  "
 			+ "unitKerja.name as unitKerja,  " + "unitKerja.id as idUnitKerja, " + "subUnitKerja.id as idSubUnitKerja, "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java
index a851b000..b1c94053 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java
@@ -378,7 +378,7 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends CrudRepository<MapPegaw
 			@Param("idSubunitKerja") Integer idSubunitKerja);
 
 	@Query("select new Map(ej.tglHitung as tglHitung,ej.bulan as bulan,ej.tahun as tahun,"
-			+ "nj.id as idDetailKelompokJabatan,nj.grade as grade,nj.detailKelompokJabatan as detailKelompokJabatan,"
+			+ "nj.id as idDetailKelompokJabatan,nj.gradeDesc as grade,nj.detailKelompokJabatan as detailKelompokJabatan,"
 			+ "j.id as idJabatan,j.namaJabatan as namaJabatan," + "ej.totalNilai as nilaiJabatan) "
 			+ "from MapPegawaiJabatanToUnitKerja mj, EvaluasiJabatan ej " + "inner join mj.jabatan j "
 			+ "inner join ej.grade nj " + "where mj.jabatanId = ej.jabatanId " + "and ej.jabatanId = j.id "
@@ -387,7 +387,7 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends CrudRepository<MapPegaw
 	List<Map<String, Object>> findEvaluasiJabatanByPegawai(@Param("pegawaiId") Integer idPegawai);
 
 	@Query("select new Map(ej.tglHitung as tglHitung,ej.bulan as bulan,ej.tahun as tahun,"
-			+ "nj.id as idDetailKelompokJabatan,nj.grade as grade,nj.detailKelompokJabatan as detailKelompokJabatan,"
+			+ "nj.id as idDetailKelompokJabatan,nj.gradeDesc as grade,nj.detailKelompokJabatan as detailKelompokJabatan,"
 			+ "j.id as idJabatan,j.namaJabatan as namaJabatan,ej.totalNilai as nilaiJabatan) "
 			+ "from EvaluasiJabatan ej " + "inner join ej.jabatan j " + "inner join ej.grade nj "
 			+ "where ej.statusEnabled is true " + "and j.id in (:listJabatanId) " + "and j.kdJabatan = 'ANJAB' "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java
index 733c6018..1d3de6ae 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/NilaiKelompokJabatanDao.java
@@ -22,7 +22,7 @@ public interface NilaiKelompokJabatanDao extends PagingAndSortingRepository<Nila
 	public NilaiKelompokJabatan getNilaiKelompokJabatan(@Param("kelompokJabatanId") Integer kelompokJabatanId);
 
 	@Query("select new map (model.id as id, model.detailKelompokJabatan as detailKelompokJabatan, "
-			+ "model.grade as grade, model.kelompokJabatanId as kelompokJabatanId, "
+			+ "model.gradeDesc as grade, model.kelompokJabatanId as kelompokJabatanId, "
 			+ "model.nilaiTerendah as nilaiTerendah, model.nilaiTertinggi as nilaiTertinggi) "
 			+ " from NilaiKelompokJabatan model where model.statusEnabled is true")
 	public List<Map<String, Object>> getAllByStatusEnabled();
@@ -33,14 +33,17 @@ public interface NilaiKelompokJabatanDao extends PagingAndSortingRepository<Nila
 	public Map<String, Object> getNilaiKelompokJabatanById(
 			@Param("detailKelompokJabatanId") Integer detailKelompokJabatanId);
 
-	@Query("select distinct new Map(cast(nj.grade as integer) as grade," + "nj.gajiHonorarium as gajiHonorarium,"
-			+ "nj.minInsentif as minInsentif,nj.maxInsentif as maxInsentif,"
-			+ "nj.maxTotalRemunerasi as maxTotalRemunerasi) " + "from NilaiKelompokJabatan nj "
-			+ "where nj.statusEnabled is true " + "and cast(nj.grade as integer) > 0 "
-			+ "order by cast(nj.grade as integer) desc")
+	@Query("select distinct new Map(ar.noRec as noRec," + "cast(nj.gradeDesc as integer) as grade,"
+			+ "nj.gajiHonorarium as gajiHonorarium," + "nj.minInsentif as minInsentif,"
+			+ "nj.maxInsentif as maxInsentif," + "nj.maxTotalRemunerasi as maxTotalRemunerasi,"
+			+ "ar.tanggalPembaharuanData) " + "from NilaiKelompokJabatan nj, " + "AnggaranRemunerasi ar "
+			+ "inner join nj.grade gr " + "where ar.gradeId = nj.grade " + "and ar.gradeId = gr.id "
+			+ "and nj.statusEnabled is true " + "and ar.statusEnabled is true " + "and gr.statusEnabled is true "
+			+ "and cast(nj.gradeDesc as integer) > 0 " + "order by cast(nj.gradeDesc as integer) desc, "
+			+ "ar.tanggalPembaharuanData desc")
 	public List<Map<String, Object>> findPlafonRemunerasi();
 
-	@Query("select nj.id from NilaiKelompokJabatan nj where nj.grade = :grade")
+	@Query("select nj.id from NilaiKelompokJabatan nj where nj.gradeDesc = :grade")
 	public List<Integer> findIdsByGrade(@Param("grade") String grade);
 
 	@Query("select new Map(pg.id as idPegawai,pg.namaLengkap as namaPegawai,"
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/NilaiKelompokJabatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/NilaiKelompokJabatanServiceImpl.java
index 16e7c157..788a9e7c 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/NilaiKelompokJabatanServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/NilaiKelompokJabatanServiceImpl.java
@@ -100,7 +100,18 @@ public class NilaiKelompokJabatanServiceImpl extends BaseVoServiceImpl implement
 
 	@Override
 	public List<Map<String, Object>> getPlafonRemunerasi() {
-		List<Map<String, Object>> result = nilaiKelompokJabatanDao.findPlafonRemunerasi();
+		List<Map<String, Object>> result = new ArrayList<>();
+		List<Integer> listGrade = new ArrayList<>();
+
+		List<Map<String, Object>> data = nilaiKelompokJabatanDao.findPlafonRemunerasi();
+		if (CommonUtil.isNotNullOrEmpty(data)) {
+			for (Map<String, Object> map : data) {
+				if (!listGrade.contains(map.get("grade"))) {
+					listGrade.add(Integer.valueOf(map.get("grade").toString()));
+					result.add(map);
+				}
+			}
+		}
 
 		return result;
 	}
@@ -109,16 +120,16 @@ public class NilaiKelompokJabatanServiceImpl extends BaseVoServiceImpl implement
 	public List<Map<String, Object>> getPenempatanEvaluasiJabatan() {
 		List<Map<String, Object>> result = new ArrayList<>();
 		List<Integer> listIdPegawai = new ArrayList<>();
-		
+
 		List<Map<String, Object>> data = nilaiKelompokJabatanDao.findPenempatanEvaluasiJabatan();
-		
+
 		if (CommonUtil.isNotNullOrEmpty(data)) {
 			for (Map<String, Object> map : data) {
 				if (!listIdPegawai.contains(map.get("idPegawai"))) {
 					listIdPegawai.add(Integer.valueOf(map.get("idPegawai").toString()));
 				}
 			}
-			
+
 			for (Integer idPegawai : listIdPegawai) {
 				for (Map<String, Object> map : data) {
 					if (map.get("idPegawai").equals(idPegawai)) {
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/NilaiKelompokJabatan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/NilaiKelompokJabatan.java
index eeb329c2..7e9c3883 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/NilaiKelompokJabatan.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/NilaiKelompokJabatan.java
@@ -35,9 +35,17 @@ public class NilaiKelompokJabatan extends BaseMaster {
 	@Caption(value = "DetailKelompokJabatan")
 	private String detailKelompokJabatan;
 
+	@ManyToOne
+	@JoinColumn(name = "objectgradefk")
+	@Caption(value = "Grade")
+	private GradeRemunerasi grade;
+
+	@Column(name = "objectgradefk", insertable = false, updatable = false)
+	private Integer gradeId;
+
 	@Column(name = "Grade", nullable = false, length = 100)
 	@Caption(value = "Grade")
-	private String grade;
+	private String gradeDesc;
 
 	@Column(name = "NilaiTerendah", nullable = false, length = 100)
 	@Caption(value = "NilaiTerendah")
@@ -73,54 +81,70 @@ public class NilaiKelompokJabatan extends BaseMaster {
 		return kelompokJabatan;
 	}
 
-	public Integer getKelompokJabatanId() {
-		return kelompokJabatanId;
-	}
-
-	public String getDetailKelompokJabatan() {
-		return detailKelompokJabatan;
-	}
-
-	public String getGrade() {
-		return grade;
-	}
-
-	public Integer getNilaiTerendah() {
-		return nilaiTerendah;
-	}
-
-	public Integer getNilaiTertinggi() {
-		return nilaiTertinggi;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
 	public void setKelompokJabatan(KelompokJabatan kelompokJabatan) {
 		this.kelompokJabatan = kelompokJabatan;
 	}
 
+	public Integer getKelompokJabatanId() {
+		return kelompokJabatanId;
+	}
+
 	public void setKelompokJabatanId(Integer kelompokJabatanId) {
 		this.kelompokJabatanId = kelompokJabatanId;
 	}
 
+	public String getDetailKelompokJabatan() {
+		return detailKelompokJabatan;
+	}
+
 	public void setDetailKelompokJabatan(String detailKelompokJabatan) {
 		this.detailKelompokJabatan = detailKelompokJabatan;
 	}
 
-	public void setGrade(String grade) {
+	public GradeRemunerasi getGrade() {
+		return grade;
+	}
+
+	public void setGrade(GradeRemunerasi grade) {
 		this.grade = grade;
 	}
 
+	public Integer getGradeId() {
+		return gradeId;
+	}
+
+	public void setGradeId(Integer gradeId) {
+		this.gradeId = gradeId;
+	}
+
+	public String getGradeDesc() {
+		return gradeDesc;
+	}
+
+	public void setGradeDesc(String gradeDesc) {
+		this.gradeDesc = gradeDesc;
+	}
+
+	public Integer getNilaiTerendah() {
+		return nilaiTerendah;
+	}
+
 	public void setNilaiTerendah(Integer nilaiTerendah) {
 		this.nilaiTerendah = nilaiTerendah;
 	}
 
+	public Integer getNilaiTertinggi() {
+		return nilaiTertinggi;
+	}
+
 	public void setNilaiTertinggi(Integer nilaiTertinggi) {
 		this.nilaiTertinggi = nilaiTertinggi;
 	}
 
+	public Integer getId() {
+		return id;
+	}
+
 	public void setId(Integer id) {
 		this.id = id;
 	}
@@ -129,30 +153,30 @@ public class NilaiKelompokJabatan extends BaseMaster {
 		return gajiHonorarium;
 	}
 
-	public Double getMinInsentif() {
-		return minInsentif;
-	}
-
-	public Double getMaxInsentif() {
-		return maxInsentif;
-	}
-
-	public Double getMaxTotalRemunerasi() {
-		return maxTotalRemunerasi;
-	}
-
 	public void setGajiHonorarium(Double gajiHonorarium) {
 		this.gajiHonorarium = gajiHonorarium;
 	}
 
+	public Double getMinInsentif() {
+		return minInsentif;
+	}
+
 	public void setMinInsentif(Double minInsentif) {
 		this.minInsentif = minInsentif;
 	}
 
+	public Double getMaxInsentif() {
+		return maxInsentif;
+	}
+
 	public void setMaxInsentif(Double maxInsentif) {
 		this.maxInsentif = maxInsentif;
 	}
 
+	public Double getMaxTotalRemunerasi() {
+		return maxTotalRemunerasi;
+	}
+
 	public void setMaxTotalRemunerasi(Double maxTotalRemunerasi) {
 		this.maxTotalRemunerasi = maxTotalRemunerasi;
 	}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NilaiKelompokJabatanVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NilaiKelompokJabatanVO.java
index b5a5248e..3991683c 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NilaiKelompokJabatanVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NilaiKelompokJabatanVO.java
@@ -15,14 +15,19 @@ public class NilaiKelompokJabatanVO extends BaseMasterVO {
 
 	private String detailKelompokJabatan;
 
-	private String grade;
+	@Caption(value = "Grade")
+	private GradeRemunerasiVO grade;
+
+	private Integer gradeId;
+
+	private String gradeDesc;
 
 	@Caption(value = "NilaiTerendah")
 	private Integer nilaiTerendah;
 
 	@Caption(value = "NilaiTertinggi")
 	private Integer nilaiTertinggi;
-	
+
 	@Caption(value = "Gaji Honorarium")
 	private Double gajiHonorarium;
 
@@ -39,38 +44,54 @@ public class NilaiKelompokJabatanVO extends BaseMasterVO {
 		return kelompokJabatan;
 	}
 
-	public String getDetailKelompokJabatan() {
-		return detailKelompokJabatan;
-	}
-
-	public String getGrade() {
-		return grade;
-	}
-
-	public Integer getNilaiTerendah() {
-		return nilaiTerendah;
-	}
-
-	public Integer getNilaiTertinggi() {
-		return nilaiTertinggi;
-	}
-
 	public void setKelompokJabatan(KelompokJabatanVO kelompokJabatan) {
 		this.kelompokJabatan = kelompokJabatan;
 	}
 
+	public String getDetailKelompokJabatan() {
+		return detailKelompokJabatan;
+	}
+
 	public void setDetailKelompokJabatan(String detailKelompokJabatan) {
 		this.detailKelompokJabatan = detailKelompokJabatan;
 	}
 
-	public void setGrade(String grade) {
+	public GradeRemunerasiVO getGrade() {
+		return grade;
+	}
+
+	public void setGrade(GradeRemunerasiVO grade) {
 		this.grade = grade;
 	}
 
+	public Integer getGradeId() {
+		return gradeId;
+	}
+
+	public void setGradeId(Integer gradeId) {
+		this.gradeId = gradeId;
+	}
+
+	public String getGradeDesc() {
+		return gradeDesc;
+	}
+
+	public void setGradeDesc(String gradeDesc) {
+		this.gradeDesc = gradeDesc;
+	}
+
+	public Integer getNilaiTerendah() {
+		return nilaiTerendah;
+	}
+
 	public void setNilaiTerendah(Integer nilaiTerendah) {
 		this.nilaiTerendah = nilaiTerendah;
 	}
 
+	public Integer getNilaiTertinggi() {
+		return nilaiTertinggi;
+	}
+
 	public void setNilaiTertinggi(Integer nilaiTertinggi) {
 		this.nilaiTertinggi = nilaiTertinggi;
 	}
@@ -79,30 +100,30 @@ public class NilaiKelompokJabatanVO extends BaseMasterVO {
 		return gajiHonorarium;
 	}
 
-	public Double getMinInsentif() {
-		return minInsentif;
-	}
-
-	public Double getMaxInsentif() {
-		return maxInsentif;
-	}
-
-	public Double getMaxTotalRemunerasi() {
-		return maxTotalRemunerasi;
-	}
-
 	public void setGajiHonorarium(Double gajiHonorarium) {
 		this.gajiHonorarium = gajiHonorarium;
 	}
 
+	public Double getMinInsentif() {
+		return minInsentif;
+	}
+
 	public void setMinInsentif(Double minInsentif) {
 		this.minInsentif = minInsentif;
 	}
 
+	public Double getMaxInsentif() {
+		return maxInsentif;
+	}
+
 	public void setMaxInsentif(Double maxInsentif) {
 		this.maxInsentif = maxInsentif;
 	}
 
+	public Double getMaxTotalRemunerasi() {
+		return maxTotalRemunerasi;
+	}
+
 	public void setMaxTotalRemunerasi(Double maxTotalRemunerasi) {
 		this.maxTotalRemunerasi = maxTotalRemunerasi;
 	}
diff --git a/jasamedika-domain/src/main/resources/hibernate.cfg.xml b/jasamedika-domain/src/main/resources/hibernate.cfg.xml
index 14bb5de1..d5938abb 100644
--- a/jasamedika-domain/src/main/resources/hibernate.cfg.xml
+++ b/jasamedika-domain/src/main/resources/hibernate.cfg.xml
@@ -683,5 +683,7 @@
   <mapping class="com.jasamedika.medifirst2000.entities.ActivityPegawai"/>
   <mapping class="com.jasamedika.medifirst2000.entities.SkoringTindakanMedis"/>
   <mapping class="com.jasamedika.medifirst2000.entities.IndikatorKinerjaJabatan"/>
+  <mapping class="com.jasamedika.medifirst2000.entities.AnggaranRemunerasi"/>
+  <mapping class="com.jasamedika.medifirst2000.entities.GradeRemunerasi"/>
  </session-factory>
 </hibernate-configuration>
diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java
index f457788d..c552fe3c 100644
--- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java
+++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/IkiDanRemunerasiController.java
@@ -26,6 +26,8 @@ import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.core.web.WebConstants;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
+import com.jasamedika.medifirst2000.service.AnggaranRemunerasiService;
+import com.jasamedika.medifirst2000.service.GradeRemunService;
 import com.jasamedika.medifirst2000.service.IkiDanRemunerasiService;
 import com.jasamedika.medifirst2000.service.IndikatorKinerjaJabatanService;
 import com.jasamedika.medifirst2000.service.IndikatorKinerjaService;
@@ -34,6 +36,8 @@ import com.jasamedika.medifirst2000.service.LogbookKinerjaService;
 import com.jasamedika.medifirst2000.service.SkoringTindakanMedisService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
+import com.jasamedika.medifirst2000.vo.AnggaranRemunerasiVO;
+import com.jasamedika.medifirst2000.vo.GradeRemunerasiVO;
 import com.jasamedika.medifirst2000.vo.IkiDanRemunerasiVO;
 import com.jasamedika.medifirst2000.vo.IndikatorKinerjaJabatanVO;
 import com.jasamedika.medifirst2000.vo.IndikatorKinerjaVO;
@@ -52,6 +56,12 @@ public class IkiDanRemunerasiController extends LocaleController<IkiDanRemuneras
 	@Autowired
 	private IkiDanRemunerasiService service;
 
+	@Autowired
+	private GradeRemunService gradeService;
+
+	@Autowired
+	private AnggaranRemunerasiService anggaranRemunerasiService;
+
 	@Autowired
 	private IndikatorKinerjaService indikatorKinerjaService;
 
@@ -264,6 +274,86 @@ public class IkiDanRemunerasiController extends LocaleController<IkiDanRemuneras
 		}
 	}
 
+	@RequestMapping(value = "/save-master-grade-remunerasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<GradeRemunerasiVO> saveMasterGradeRemunerasi(HttpServletRequest request,
+			@Valid @RequestBody GradeRemunerasiVO vo) {
+		try {
+			GradeRemunerasiVO result = new GradeRemunerasiVO();
+			if (CommonUtil.isNotNullOrEmpty(vo.getId())) {
+				result = gradeService.update(vo);
+			} else {
+				result = gradeService.add(vo);
+			}
+			if (CommonUtil.isNotNullOrEmpty(result)) {
+				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
+						getMessage(MessageResource.LABEL_SUCCESS, request));
+				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
+			} else {
+				return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+			}
+		} catch (ServiceVOException sve) {
+			LOGGER.error("Got exception {} when add/update master grade remunerasi", sve.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		} catch (JpaSystemException jse) {
+			LOGGER.error("Got exception {} when add/update master grade remunerasi", jse.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+		}
+	}
+
+	@RequestMapping(value = "/save-anggaran-remunerasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<AnggaranRemunerasiVO> saveAnggaranRemunerasi(HttpServletRequest request,
+			@Valid @RequestBody AnggaranRemunerasiVO vo) {
+		try {
+			AnggaranRemunerasiVO result = new AnggaranRemunerasiVO();
+			if (CommonUtil.isNotNullOrEmpty(vo.getNoRec())) {
+				result = anggaranRemunerasiService.update(vo);
+			} else {
+				result = anggaranRemunerasiService.add(vo);
+			}
+			if (CommonUtil.isNotNullOrEmpty(result)) {
+				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
+						getMessage(MessageResource.LABEL_SUCCESS, request));
+				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
+			} else {
+				return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+			}
+		} catch (ServiceVOException sve) {
+			LOGGER.error("Got exception {} when add/update master anggaran remunerasi", sve.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		} catch (JpaSystemException jse) {
+			LOGGER.error("Got exception {} when add/update master anggaran remunerasi", jse.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+		}
+	}
+
+	@RequestMapping(value = "/save-all-anggaran-remunerasi", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<List<String>> saveAllAnggaranRemunerasi(HttpServletRequest request,
+			@Valid @RequestBody List<AnggaranRemunerasiVO> listVO,
+			@RequestParam(value = "loginUserId", required = true) Integer idLoginUser) {
+		try {
+			List<String> result = anggaranRemunerasiService.addAll(listVO, idLoginUser);
+			if (CommonUtil.isNotNullOrEmpty(result)) {
+				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
+						getMessage(MessageResource.LABEL_SUCCESS, request));
+				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
+			} else {
+				return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+			}
+		} catch (ServiceVOException sve) {
+			LOGGER.error("Got exception {} when add master all anggaran remunerasi", sve.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, sve.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		} catch (JpaSystemException jse) {
+			LOGGER.error("Got exception {} when add master all anggaran remunerasi", jse.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+		}
+	}
+
 	@RequestMapping(value = "/save-master-indikator-kinerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<IndikatorKinerjaVO> saveMasterIndikatorKinerja(HttpServletRequest request,
 			@Valid @RequestBody IndikatorKinerjaVO vo) {
@@ -523,7 +613,7 @@ public class IkiDanRemunerasiController extends LocaleController<IkiDanRemuneras
 	}
 
 	@RequestMapping(value = "/get-akses-skoring-tindakan-medis", method = RequestMethod.GET)
-	public ResponseEntity<Map<String, Object>> getDuplicateSkoringTindakanMedis(HttpServletRequest request,
+	public ResponseEntity<Map<String, Object>> getAksesSkoringTindakanMedis(HttpServletRequest request,
 			@RequestParam(value = "pegawaiId", required = true) Integer idPegawai) throws ParseException {
 		try {
 			Map<String, Object> result = skoringTindakanMedisService.findAkses(idPegawai);
diff --git a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
index 175e4ada..b8c45600 100644
--- a/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
+++ b/jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/SdmController.java
@@ -41,6 +41,7 @@ import com.jasamedika.medifirst2000.entities.UnitKerjaPegawai;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.AbsensiPegawaiService;
 import com.jasamedika.medifirst2000.service.ActivityPegawaiService;
+import com.jasamedika.medifirst2000.service.AnggaranRemunerasiService;
 import com.jasamedika.medifirst2000.service.AsuransiNakerService;
 import com.jasamedika.medifirst2000.service.AturanPeminjamanService;
 import com.jasamedika.medifirst2000.service.BerkasLamaranService;
@@ -411,6 +412,9 @@ public class SdmController extends LocaleController<AkunVO> {
 	@Autowired
 	private NilaiKelompokJabatanService nilaiKelompokJabatanService;
 
+	@Autowired
+	private AnggaranRemunerasiService anggaranRemunerasiService;
+
 	@RequestMapping(value = "/save-custom-uraian-kerja", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> saveBerkasLamaran(@Valid @RequestBody CustomIndexKerjaVO vo,
 			HttpServletRequest request) throws ParseException {
@@ -5788,6 +5792,25 @@ public class SdmController extends LocaleController<AkunVO> {
 		}
 	}
 
+	@RequestMapping(value = "/get-anggaran-remunerasi-tahun-ini", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<Map<String, Object>> getAnggaranRemunerasiTahunIni(HttpServletRequest request) {
+		try {
+			Map<String, Object> result = anggaranRemunerasiService.findAnggaranTahunIni();
+			if (null != result)
+				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_SUCCESS,
+						getMessage(MessageResource.LABEL_SUCCESS, request));
+			return RestUtil.getJsonResponse(result, HttpStatus.OK, mapHeaderMessage);
+		} catch (ServiceVOException e) {
+			LOGGER.error("Got exception {} when get anggaran remunerasi tahun ini", e.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, e.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.INTERNAL_SERVER_ERROR, mapHeaderMessage);
+		} catch (JpaSystemException jse) {
+			LOGGER.error("Got exception {} when get anggaran remunerasi tahun ini", jse.getMessage());
+			addHeaderMessage(Constants.MessageInfo.ERROR_MESSAGE, jse.getMessage());
+			return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
+		}
+	}
+
 	@RequestMapping(value = "/get-plafon-remunerasi", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<Map<String, Object>>> getPlafonRemunerasi(HttpServletRequest request) {
 		try {