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 4194f6b6..0ae7b818 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
@@ -382,10 +382,12 @@ public final class Master {
 		public static final float FACTOR_RATE_NONSHIFT = 8;
 		public static final Integer[] HOLIDAY = { 8, 14, 15, 40 }; // sudah di cek tidak ada penambahan master baru
 		public static final Integer[] HOLIDAY_INCLUDED = { 7, 13, 67, 69, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83 }; // sudah di cek tidak ada penambahan master baru
-		public static final Integer NONSHIFT_J = 177; // sudah di update dengan penambahan master baru
-		public static final Integer NONSHIFT_SK = 175; // sudah di update dengan penambahan master baru
-		public static final Integer NONSHIFT_PLUS_J = 178; // sudah di update dengan penambahan master baru
-		public static final Integer NONSHIFT_PLUS_SK = 176; // sudah di update dengan penambahan master baru
+		public static final Integer NONSHIFT_J = 255; // sudah di update dengan penambahan master baru
+		public static final Integer NONSHIFT_SK = 259; // sudah di update dengan penambahan master baru
+		public static final Integer NONSHIFT_J_RAMADHAN = 181; // sudah di update dengan penambahan master baru
+		public static final Integer NONSHIFT_SK_RAMADHAN = 179; // sudah di update dengan penambahan master baru
+		public static final Integer NONSHIFT_PLUS_J = 260; // sudah di update dengan penambahan master baru
+		public static final Integer NONSHIFT_PLUS_SK = 256; // sudah di update dengan penambahan master baru
 		public static final String OPERATOR_FACTOR_RATE_NONSHIFT = "x";
 		public static final Integer[] PSM = { 31, 47, 106, 203, 204 }; // id shift kerja -> ada penambahan 203, 204
 		public static final Integer RESET = 0;
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 e9162458..25bd4155 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
@@ -822,9 +822,9 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 											LocalDate tglHijri = new LocalDate(tglIso.toDateTimeAtStartOfDay(), hijri);
 											bulanHijri = tglHijri.getMonthOfYear();
 											if (bulanHijri == 9) {
-												shiftKerjaPegawai.setId(181); // sudah id baru
+												shiftKerjaPegawai.setId(Master.ShiftKerja.NONSHIFT_J_RAMADHAN); // sudah id baru
 											} else {
-												shiftKerjaPegawai.setId(177); // sudah id baru
+												shiftKerjaPegawai.setId(Master.ShiftKerja.NONSHIFT_J); // sudah id baru
 											}
 										} else {
 											LocalDate tglIso = new LocalDate(tahun, bulan,
@@ -832,9 +832,9 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 											LocalDate tglHijri = new LocalDate(tglIso.toDateTimeAtStartOfDay(), hijri);
 											bulanHijri = tglHijri.getMonthOfYear();
 											if (bulanHijri == 9) {
-												shiftKerjaPegawai.setId(179); // sudah id baru
+												shiftKerjaPegawai.setId(Master.ShiftKerja.NONSHIFT_SK_RAMADHAN); // sudah id baru
 											} else {
-												shiftKerjaPegawai.setId(175); // sudah id baru
+												shiftKerjaPegawai.setId(Master.ShiftKerja.NONSHIFT_SK); // sudah id baru
 											}
 										}
 									} else {
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
index 7e2bc6ac..5b270d3c 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java
@@ -1240,18 +1240,18 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 									LocalDate tglHijri = new LocalDate(tglIso.toDateTimeAtStartOfDay(), hijri);
 									bulanHijri = tglHijri.getMonthOfYear();
 									if (bulanHijri == 9) {
-										shiftKerjaPegawai.setId(181); // sudah id baru
+										shiftKerjaPegawai.setId(Master.ShiftKerja.NONSHIFT_J_RAMADHAN); // sudah id baru
 									} else {
-										shiftKerjaPegawai.setId(177); // sudah id baru
+										shiftKerjaPegawai.setId(Master.ShiftKerja.NONSHIFT_J); // sudah id baru
 									}
 								} else {
 									LocalDate tglIso = new LocalDate(tahun, bulan, Integer.parseInt(hariLibur.get("tgl").toString()), iso);
 									LocalDate tglHijri = new LocalDate(tglIso.toDateTimeAtStartOfDay(), hijri);
 									bulanHijri = tglHijri.getMonthOfYear();
 									if (bulanHijri == 9) {
-										shiftKerjaPegawai.setId(179); // sudah id baru
+										shiftKerjaPegawai.setId(Master.ShiftKerja.NONSHIFT_SK_RAMADHAN); // sudah id baru
 									} else {
-										shiftKerjaPegawai.setId(175); // sudah id baru
+										shiftKerjaPegawai.setId(Master.ShiftKerja.NONSHIFT_SK); // sudah id baru
 									}
 								}
 							} else {
@@ -1371,18 +1371,18 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 									LocalDate tglHijri = new LocalDate(tglIso.toDateTimeAtStartOfDay(), hijri);
 									bulanHijri = tglHijri.getMonthOfYear();
 									if (bulanHijri == 9) {
-										shiftKerjaPegawai.setId(181);
+										shiftKerjaPegawai.setId(Master.ShiftKerja.NONSHIFT_J_RAMADHAN);
 									} else {
-										shiftKerjaPegawai.setId(177);
+										shiftKerjaPegawai.setId(Master.ShiftKerja.NONSHIFT_J);
 									}
 								} else {
 									LocalDate tglIso = new LocalDate(tahun, bulan, Integer.parseInt(hariLibur.get("tgl").toString()), iso);
 									LocalDate tglHijri = new LocalDate(tglIso.toDateTimeAtStartOfDay(), hijri);
 									bulanHijri = tglHijri.getMonthOfYear();
 									if (bulanHijri == 9) {
-										shiftKerjaPegawai.setId(179);
+										shiftKerjaPegawai.setId(Master.ShiftKerja.NONSHIFT_SK_RAMADHAN);
 									} else {
-										shiftKerjaPegawai.setId(175);
+										shiftKerjaPegawai.setId(Master.ShiftKerja.NONSHIFT_SK);
 									}
 								}
 							} else {