diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
index 81814ea6..394c16ca 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
@@ -955,7 +955,8 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl implements MapPegawaiJabata
 			mapFilter.put("jenisJabatan", jenisJabatan);
 			mapFilter.put("atasanLangsung", atasanLangsung);
 			mapFilter.put("pejabatPenilai", pejabatPenilai);
-			if (jabatan.get("kdJabatan").equals("ANJAB")) {
+
+			if (CommonUtil.isNotNullOrEmpty(jabatan.get("kdJabatan")) && jabatan.get("kdJabatan").equals("ANJAB")) {
 				mapFilter.put("kdJabatan", "ANJAB");
 			} else {
 				mapFilter.put("kdJabatan", "NONANJAB");
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 dacc1833..7d6ceeff 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
@@ -212,7 +212,8 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 
 	@Override
 	@Transactional(readOnly = false)
-	public Map<String, Object> saveListJadwalPegawai(List<PegawaiJadwalKerjaVO> vos, boolean isUnggah, boolean isPenangguhan) {
+	public Map<String, Object> saveListJadwalPegawai(List<PegawaiJadwalKerjaVO> vos, boolean isUnggah,
+			boolean isPenangguhan) {
 		Map<String, Object> result = new HashMap<String, Object>();
 
 		for (PegawaiJadwalKerjaVO vo : vos) {
@@ -230,8 +231,7 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 					model.setRuangan(ruanganConverter.transferVOToModel(vo.getRuangan(), new Ruangan()));
 				}
 				if (isPenangguhan && CommonUtil.isNotNullOrEmpty(vo.getShift())
-						&& CommonUtil.isNotNullOrEmpty(vo.getShift().getId())
-						&& vo.getShift().getId().equals(0)) {
+						&& CommonUtil.isNotNullOrEmpty(vo.getShift().getId()) && vo.getShift().getId().equals(0)) {
 					if (CommonUtil.isNotNullOrEmpty(vo.getTanggal())) {
 						Date tanggal = pegawaiJadwalKerjaDao.getTanggal(vo.getTanggal().getId());
 						Map<String, Object> map = pegawaiJadwalKerjaDao.getJadwal(vo.getPegawai().getId(),
@@ -250,7 +250,7 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 							model.setTanggal(kalenderConverter.transferVOToModel(vo.getTanggal(), new Kalender()));
 							if (CommonUtil.isNotNullOrEmpty(map) && CommonUtil.isNotNullOrEmpty(map.get("id"))) {
 								model.setId(Integer.parseInt(map.get("id").toString()));
-								if (CommonUtil.isNotNullOrEmpty(map.get("flagKetidakhadiran")) 
+								if (CommonUtil.isNotNullOrEmpty(map.get("flagKetidakhadiran"))
 										&& Boolean.parseBoolean(map.get("flagKetidakhadiran").toString())) {
 									editKetidakhadiran = true;
 								} else if (isUnggah && vo.getShift().getFlagKetidakhadiran()) {
@@ -354,9 +354,7 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 		List<String> listNorec = new ArrayList<>();
 		List<PegawaiJadwalKerjaVO> result = new ArrayList<>();
 		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-//		Integer[] intStatusLibur = { 8, 14, 15, 40 };
-//		Integer[] intStatusSakitAlasanPenting = { 6, 42, 43, 44, 76, 77, 78, 79 };
-		Integer[] intStatusCutiBesarMelahirkan = { 2, 14, 24, 25, 6, 29 }; // adding_sakit_jika_2_tanggal_permohonan
+		Integer[] intStatusCutiBesarMelahirkan = { 2, 14, 24, 25, 6, 29, 26 };
 		Integer idTglCuti1 = null;
 		Integer idTglCuti2 = null;
 
@@ -420,8 +418,7 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 						break;
 					}
 				}
-				// Jika Cuti Besar atau Cuti Melahirkan atau sakit lebih dari 1
-				// hari
+				// Jika_Cuti_Besar_atau_Cuti_Melahirkan_atau_sakit_lebih_dari_1_hari
 				if (listNorec.size() == 2 && Arrays.asList(intStatusCutiBesarMelahirkan).contains(idStatusPegawai)) {
 					PegawaiVO pegawai = new PegawaiVO();
 					ShiftKerjaVO shiftKerja = new ShiftKerjaVO();
@@ -484,7 +481,8 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 						String strTglCuti = df.format(tglCuti);
 						Integer idTglCuti = listTanggalCutiDao.getIdKalenderByTglCuti(strTglCuti);
 
-						if (idTglCuti.equals(idTanggal) && !Arrays.asList(Master.ShiftKerja.HOLIDAY).contains(idShift)) {
+						if (idTglCuti.equals(idTanggal)
+								&& !Arrays.asList(Master.ShiftKerja.HOLIDAY).contains(idShift)) {
 							shiftKerja.setId(idShiftExec);
 							break;
 						} else if (idTglCuti.equals(idTanggal)
@@ -903,8 +901,8 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 						if (idShift == 2) {
 							listShiftKerja.addAll(shiftKerjaDao.findByKelompokShiftId(1));
 						}
-						List<PegawaiJadwalKerja> resultPegawaiJadwalKerja = pegawaiDaoCustom
-								.findJadwalByTanggal(tahun, bulan, idPegawai);
+						List<PegawaiJadwalKerja> resultPegawaiJadwalKerja = pegawaiDaoCustom.findJadwalByTanggal(tahun,
+								bulan, idPegawai);
 
 						if (resultPegawaiJadwalKerja.size() == 0) { // Apabila_jadwal_kosong
 							if (idShift == 1 || idShift == 2) { // apabila_pegawai_nonshift
@@ -1032,7 +1030,7 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 	public String writeExcelPegawaiJadwalKerja(String bulan, Integer idUnitKerja, Integer idSubunitKerja)
 			throws ParseException {
 		String absoluteFilePath = "";
-		
+
 		HSSFWorkbook workbook = new HSSFWorkbook();
 		HSSFSheet sheet = workbook.createSheet(new SimpleDateFormat("MMMM yyyy", new Locale("in", "ID"))
 				.format(new SimpleDateFormat("yyyy-MM").parse(bulan)));
@@ -1097,14 +1095,14 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 
 			String workingDir = System.getProperty("user.dir");
 			String your_os = System.getProperty("os.name").toLowerCase();
-			
+
 			if (your_os.indexOf("win") >= 0) {
 				// if_windows
 				absoluteFilePath = workingDir + "\\" + filename;
 			} else if (your_os.indexOf("nix") >= 0 || your_os.indexOf("nux") >= 0 || your_os.indexOf("mac") >= 0) {
 				// if_unix_or_mac
 				absoluteFilePath = workingDir + "//tmp//" + filename;
-//				absoluteFilePath = workingDir + "/" + filename;
+				// absoluteFilePath = workingDir + "/" + filename;
 			} else {
 				// unknown_os?
 				absoluteFilePath = workingDir + "/" + filename;
@@ -1114,7 +1112,7 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 			workbook.write(out);
 
 			out.close();
-			
+
 			return absoluteFilePath;
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -1122,7 +1120,7 @@ public class PegawaiJadwalKerjaServiceImpl extends BaseVoServiceImpl implements
 			return absoluteFilePath;
 		}
 	}
-	
+
 	@Override
 	public Resource loadFileAsResource(String fileName) throws Exception {
 		try {