diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienNakesServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienNakesServiceImpl.java
index c383be8e..06370a9c 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienNakesServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienNakesServiceImpl.java
@@ -3,6 +3,7 @@ package com.jasamedika.medifirst2000.service.impl;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -50,33 +51,39 @@ public class PelayananPasienNakesServiceImpl extends BaseVoServiceImpl implement
 	@Override
 	public PelayananPasienNakesVO add(PelayananPasienNakesVO vo) throws JpaSystemException, ServiceVOException {
 		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+		DateFormat mf = new SimpleDateFormat("yyyy-MM");
 
-		PelayananPasienNakes pelayananNakes = pelayananNakesConverter.transferVOToModel(vo, new PelayananPasienNakes());
+		if (mf.format(vo.getTglPelayanan()).equals(mf.format(new Date()))) {
+			PelayananPasienNakes pelayananNakes = pelayananNakesConverter.transferVOToModel(vo,
+					new PelayananPasienNakes());
 
-		AntrianPasienDiPeriksa antrianPasien = antrianPasienConverter.transferVOToModel(vo.getAntrianPasienDiperiksa(),
-				new AntrianPasienDiPeriksa());
-		pelayananNakes.setAntrianPasienDiperiksa(antrianPasien);
+			AntrianPasienDiPeriksa antrianPasien = antrianPasienConverter
+					.transferVOToModel(vo.getAntrianPasienDiperiksa(), new AntrianPasienDiPeriksa());
+			pelayananNakes.setAntrianPasienDiperiksa(antrianPasien);
 
-		ProdukNakes produk = produkNakesConverter.transferVOToModel(vo.getProduk(), new ProdukNakes());
-		pelayananNakes.setProduk(produk);
+			ProdukNakes produk = produkNakesConverter.transferVOToModel(vo.getProduk(), new ProdukNakes());
+			pelayananNakes.setProduk(produk);
 
-		Pegawai pegawai = pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai());
-		pelayananNakes.setPegawai(pegawai);
+			Pegawai pegawai = pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai());
+			pelayananNakes.setPegawai(pegawai);
 
-		SkoringTindakanNakes skoringNakes = skoringTindakanNakesDao.findLast(vo.getProduk().getId(),
-				df.format(vo.getTglPelayanan()));
-		if (CommonUtil.isNotNullOrEmpty(skoringNakes)) {
-			pelayananNakes.setSkor(skoringNakes.getSkor());
+			SkoringTindakanNakes skoringNakes = skoringTindakanNakesDao.findLast(vo.getProduk().getId(),
+					df.format(vo.getTglPelayanan()));
+			if (CommonUtil.isNotNullOrEmpty(skoringNakes)) {
+				pelayananNakes.setSkor(skoringNakes.getSkor());
+			} else {
+				pelayananNakes.setSkor(1.00);
+			}
+
+			PelayananPasienNakes resultModel = pelayananNakesDao.save(pelayananNakes);
+
+			PelayananPasienNakesVO resultVO = new PelayananPasienNakesVO();
+			resultVO = pelayananNakesConverter.transferModelToVO(resultModel, resultVO);
+
+			return resultVO;
 		} else {
-			pelayananNakes.setSkor(1.00);
+			return null;
 		}
-
-		PelayananPasienNakes resultModel = pelayananNakesDao.save(pelayananNakes);
-
-		PelayananPasienNakesVO resultVO = new PelayananPasienNakesVO();
-		resultVO = pelayananNakesConverter.transferModelToVO(resultModel, resultVO);
-
-		return resultVO;
 	}
 
 	@Override
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienPerawatServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienPerawatServiceImpl.java
index ad1582a9..6d38e881 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienPerawatServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienPerawatServiceImpl.java
@@ -3,6 +3,7 @@ package com.jasamedika.medifirst2000.service.impl;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -50,34 +51,39 @@ public class PelayananPasienPerawatServiceImpl extends BaseVoServiceImpl impleme
 	@Override
 	public PelayananPasienPerawatVO add(PelayananPasienPerawatVO vo) throws JpaSystemException, ServiceVOException {
 		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+		DateFormat mf = new SimpleDateFormat("yyyy-MM");
 
-		PelayananPasienPerawat pelayananPerawat = pelayananPerawatConverter.transferVOToModel(vo,
-				new PelayananPasienPerawat());
+		if (mf.format(vo.getTglPelayanan()).equals(mf.format(new Date()))) {
+			PelayananPasienPerawat pelayananPerawat = pelayananPerawatConverter.transferVOToModel(vo,
+					new PelayananPasienPerawat());
 
-		AntrianPasienDiPeriksa antrianPasien = antrianPasienConverter.transferVOToModel(vo.getAntrianPasienDiperiksa(),
-				new AntrianPasienDiPeriksa());
-		pelayananPerawat.setAntrianPasienDiperiksa(antrianPasien);
+			AntrianPasienDiPeriksa antrianPasien = antrianPasienConverter
+					.transferVOToModel(vo.getAntrianPasienDiperiksa(), new AntrianPasienDiPeriksa());
+			pelayananPerawat.setAntrianPasienDiperiksa(antrianPasien);
 
-		ProdukPerawat produk = produkPerawatConverter.transferVOToModel(vo.getProduk(), new ProdukPerawat());
-		pelayananPerawat.setProduk(produk);
+			ProdukPerawat produk = produkPerawatConverter.transferVOToModel(vo.getProduk(), new ProdukPerawat());
+			pelayananPerawat.setProduk(produk);
 
-		Pegawai pegawai = pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai());
-		pelayananPerawat.setPegawai(pegawai);
+			Pegawai pegawai = pegawaiConverter.transferVOToModel(vo.getPegawai(), new Pegawai());
+			pelayananPerawat.setPegawai(pegawai);
 
-		SkoringTindakanPerawat skoringPerawat = skoringTindakanPerawatDao.findLast(vo.getProduk().getId(),
-				df.format(vo.getTglPelayanan()));
-		if (CommonUtil.isNotNullOrEmpty(skoringPerawat)) {
-			pelayananPerawat.setSkor(skoringPerawat.getSkor());
+			SkoringTindakanPerawat skoringPerawat = skoringTindakanPerawatDao.findLast(vo.getProduk().getId(),
+					df.format(vo.getTglPelayanan()));
+			if (CommonUtil.isNotNullOrEmpty(skoringPerawat)) {
+				pelayananPerawat.setSkor(skoringPerawat.getSkor());
+			} else {
+				pelayananPerawat.setSkor(1.00);
+			}
+
+			PelayananPasienPerawat resultModel = pelayananPerawatDao.save(pelayananPerawat);
+
+			PelayananPasienPerawatVO resultVO = new PelayananPasienPerawatVO();
+			resultVO = pelayananPerawatConverter.transferModelToVO(resultModel, resultVO);
+
+			return resultVO;
 		} else {
-			pelayananPerawat.setSkor(1.00);
+			return null;
 		}
-
-		PelayananPasienPerawat resultModel = pelayananPerawatDao.save(pelayananPerawat);
-
-		PelayananPasienPerawatVO resultVO = new PelayananPasienPerawatVO();
-		resultVO = pelayananPerawatConverter.transferModelToVO(resultModel, resultVO);
-
-		return resultVO;
 	}
 
 	@Override
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 a93f203d..7571c370 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
@@ -1607,7 +1607,9 @@ public class IkiDanRemunerasiController extends LocaleController<IkiDanRemuneras
 						getMessage(MessageResource.LABEL_SUCCESS, request));
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
-				return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,
+						getMessage(MessageResource.LABEL_ERROR, request));
+				return RestUtil.getJsonHttptatus(HttpStatus.BAD_REQUEST, mapHeaderMessage);
 			}
 		} catch (ServiceVOException sve) {
 			LOGGER.error("Got exception {} when add/update pelayanan pasien oleh perawat", sve.getMessage());
@@ -1953,7 +1955,9 @@ public class IkiDanRemunerasiController extends LocaleController<IkiDanRemuneras
 						getMessage(MessageResource.LABEL_SUCCESS, request));
 				return RestUtil.getJsonResponse(result, HttpStatus.CREATED, mapHeaderMessage);
 			} else {
-				return RestUtil.getJsonHttptatus(HttpStatus.NOT_ACCEPTABLE);
+				mapHeaderMessage.put(WebConstants.HttpHeaderInfo.LABEL_ERROR,
+						getMessage(MessageResource.LABEL_ERROR, request));
+				return RestUtil.getJsonHttptatus(HttpStatus.BAD_REQUEST, mapHeaderMessage);
 			}
 		} catch (ServiceVOException sve) {
 			LOGGER.error("Got exception {} when add/update pelayanan pasien oleh nakes lain", sve.getMessage());