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 99992e65..892476b4 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
@@ -21,7 +21,8 @@ public interface SkoringTindakanPerawatDao extends PagingAndSortingRepository<Sk
 			+ "prp.id as produkId,prp.namaProduk as namaProduk," + "prp.klasifikasi as kdKlasif,"
 			+ "(case when prp.klasifikasi = 0 then 'Tidak Ada' " + "when prp.klasifikasi = 1 then 'Asuhan' "
 			+ "when prp.klasifikasi = 2 then 'Tindakan' " + "when prp.klasifikasi = 3 then 'Laporan' end) as stKlasif) "
-			+ "from SkoringTindakanPerawat stp " + "inner join stp.produk prp " + "where stp.statusEnabled is true";
+			+ "from SkoringTindakanPerawat stp " + "inner join stp.produk prp " + "where stp.statusEnabled is true "
+			+ "and to_char(stp.tanggalMulaiBerlaku,'yyyy-MM-dd') <= to_char(now(),'yyyy-MM-dd')";
 
 	String produk = " and lower(prp.namaProduk) like %:namaProduk%";
 
@@ -29,7 +30,8 @@ public interface SkoringTindakanPerawatDao extends PagingAndSortingRepository<Sk
 
 	String statusKlasifikasi = " and prp.klasifikasi = :kdKlasif";
 
-	String sortSearch = " order by prp.namaProduk asc,stp.tanggalPembaharuanData desc";
+	String sortSearch = " order by prp.namaProduk asc, "
+			+ "stp.tanggalMulaiBerlaku desc, stp.tanggalPembaharuanData desc";
 
 	@Query(strAllEnabled + sortSearch)
 	List<Map<String, Object>> findAllEnabled();
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 2390504a..60a9a8cc 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
@@ -191,8 +191,7 @@ public class SkoringTindakanPerawatServiceImpl extends BaseVoServiceImpl impleme
 		for (Map<String, Object> mapData : data) {
 			boolean isContained = false;
 			for (Map<String, Object> mapFilter : filter) {
-				if (mapData.get("produkId").equals(mapFilter.get("produkId"))
-						&& mapData.get("tglMulaiBerlaku").equals(mapFilter.get("tglMulaiBerlaku"))) {
+				if (mapData.get("produkId").equals(mapFilter.get("produkId"))) {
 					isContained = true;
 					break;
 				}
@@ -200,15 +199,13 @@ public class SkoringTindakanPerawatServiceImpl extends BaseVoServiceImpl impleme
 			if (!isContained) {
 				Map<String, Object> mapFilter = new HashMap<>();
 				mapFilter.put("produkId", mapData.get("produkId"));
-				mapFilter.put("tglMulaiBerlaku", mapData.get("tglMulaiBerlaku"));
 				filter.add(mapFilter);
 			}
 		}
 
 		for (Map<String, Object> mapFilter : filter) {
 			for (Map<String, Object> mapData : data) {
-				if (mapFilter.get("produkId").equals(mapData.get("produkId"))
-						&& mapFilter.get("tglMulaiBerlaku").equals(mapData.get("tglMulaiBerlaku"))) {
+				if (mapFilter.get("produkId").equals(mapData.get("produkId"))) {
 					// data hanya untuk diakses oleh bidang keperawatan
 					mapData.put("unitKerjaId", Master.UnitKerja.BID_WAT);