diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanPerawatDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanPerawatDao.java
index 892476b4..93abbb0e 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanPerawatDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanPerawatDao.java
@@ -63,7 +63,9 @@ public interface SkoringTindakanPerawatDao extends PagingAndSortingRepository<Sk
 
 	String strCekDupSkoring = "select stp.noRec " + "from SkoringTindakanPerawat stp " + "inner join stp.produk prp "
 			+ "where stp.statusEnabled is true "
-			+ "and lower(regexp_replace(prp.namaProduk,:patternText,'','g')) = :namaProduk " + "and stp.skor = :skor";
+			+ "and lower(regexp_replace(prp.namaProduk,:patternText,'','g')) = :namaProduk";
+
+	String skor = " and stp.skor = :skor";
 
 	String tglBerlaku = " and to_char(stp.tanggalMulaiBerlaku,'yyyy-MM-dd') = :tglMulaiBerlaku";
 
@@ -71,20 +73,20 @@ public interface SkoringTindakanPerawatDao extends PagingAndSortingRepository<Sk
 
 	String sortTglBerlaku = " order by stp.tanggalMulaiBerlaku desc";
 
-	@Query(strCekDupSkoring + sortTglBerlaku)
+	@Query(strCekDupSkoring + skor + sortTglBerlaku)
 	List<String> findLastDupSkoring(@Param("namaProduk") String namaProduk, @Param("skor") Double skor,
 			@Param("patternText") String patternText);
 
 	@Query(strCekDupSkoring + tglBerlaku)
-	List<String> findDupSkoring(@Param("namaProduk") String namaProduk, @Param("skor") Double skor,
+	List<String> findDupSkoring(@Param("namaProduk") String namaProduk,
 			@Param("tglMulaiBerlaku") String tglMulaiBerlaku, @Param("patternText") String patternText);
 
-	@Query(strCekDupSkoring + idSkoring + sortTglBerlaku)
+	@Query(strCekDupSkoring + skor + idSkoring + sortTglBerlaku)
 	List<String> findLastDupSkoring(@Param("namaProduk") String namaProduk, @Param("skor") Double skor,
 			@Param("patternText") String patternText, @Param("noRec") String noRec);
 
 	@Query(strCekDupSkoring + tglBerlaku + idSkoring)
-	List<String> findDupSkoring(@Param("namaProduk") String namaProduk, @Param("skor") Double skor,
+	List<String> findDupSkoring(@Param("namaProduk") String namaProduk,
 			@Param("tglMulaiBerlaku") String tglMulaiBerlaku, @Param("patternText") String patternText,
 			@Param("noRec") String noRec);
 
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanPerawatServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanPerawatServiceImpl.java
index 60a9a8cc..4a3eff0d 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanPerawatServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanPerawatServiceImpl.java
@@ -231,14 +231,14 @@ public class SkoringTindakanPerawatServiceImpl extends BaseVoServiceImpl impleme
 		if (CommonUtil.isNotNullOrEmpty(noRec)) {
 			listNorec = skoringTindakanDao.findLastDupSkoring(replacedNamaProduk, skor, patternText, noRec);
 			if (CommonUtil.isNullOrEmpty(listNorec)) {
-				listNorec = skoringTindakanDao.findDupSkoring(replacedNamaProduk, skor,
-						df.format(new Date(tglMulaiBerlaku)), patternText, noRec);
+				listNorec = skoringTindakanDao.findDupSkoring(replacedNamaProduk, df.format(new Date(tglMulaiBerlaku)),
+						patternText, noRec);
 			}
 		} else {
 			listNorec = skoringTindakanDao.findLastDupSkoring(replacedNamaProduk, skor, patternText);
 			if (CommonUtil.isNullOrEmpty(listNorec)) {
-				listNorec = skoringTindakanDao.findDupSkoring(replacedNamaProduk, skor,
-						df.format(new Date(tglMulaiBerlaku)), patternText);
+				listNorec = skoringTindakanDao.findDupSkoring(replacedNamaProduk, df.format(new Date(tglMulaiBerlaku)),
+						patternText);
 			}
 		}