From 9ff89ae24d7bba69b166556d0a4c3072ef01d687 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Mon, 10 Jan 2022 17:23:22 +0700
Subject: [PATCH] Update SkoringTindakanMedisService Perbaikan filter tmt
 paling baru yang ditampilkan di daftar skoring tindakan medis

---
 .../medifirst2000/dao/SkoringTindakanMedisDao.java         | 6 ++++--
 .../service/impl/SkoringTindakanMedisServiceImpl.java      | 7 ++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanMedisDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanMedisDao.java
index 688e1f37..48050487 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanMedisDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanMedisDao.java
@@ -21,7 +21,8 @@ public interface SkoringTindakanMedisDao extends PagingAndSortingRepository<Skor
 			+ "when stm.statusVerifikasi is true then 'Terverifikasi' end) as statusVerifikasi,"
 			+ "stm.tanggalMulaiBerlaku as tglMulaiBerlaku," + "stm.tanggalPembaharuanData as tglPembaharuanData) "
 			+ "from SkoringTindakanMedis stm " + "inner join stm.produk pr " + "inner join stm.kelompokKerja sk "
-			+ "inner join sk.unitKerja uk " + "where stm.statusEnabled is true";
+			+ "inner join sk.unitKerja uk " + "where stm.statusEnabled is true "
+			+ "and to_char(stm.tanggalMulaiBerlaku,'yyyy-MM-dd') <= to_char(now(),'yyyy-MM-dd')";
 
 	String kelompokKerja = " and sk.id in (:listSubunitKerjaId)";
 
@@ -31,7 +32,8 @@ public interface SkoringTindakanMedisDao extends PagingAndSortingRepository<Skor
 
 	String statusVerifikasi = " and stm.statusVerifikasi = :isStatusVerifikasi";
 
-	String sortSearch = " order by sk.name asc,pr.namaProduk asc,stm.detailProduk asc,stm.tanggalPembaharuanData desc";
+	String sortSearch = " order by sk.name asc," + "pr.namaProduk asc," + "stm.detailProduk asc, "
+			+ "stm.tanggalMulaiBerlaku desc, stm.tanggalPembaharuanData desc";
 
 	@Query(strAllEnabled + sortSearch)
 	List<Map<String, Object>> findAllEnabled();
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java
index 79f70e59..31e2345c 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanMedisServiceImpl.java
@@ -235,8 +235,7 @@ public class SkoringTindakanMedisServiceImpl extends BaseVoServiceImpl implement
 			boolean isContained = false;
 			for (Map<String, Object> mapFilter : filter) {
 				if (mapData.get("produkId").equals(mapFilter.get("produkId"))
-						&& mapData.get("kelompokKerjaId").equals(mapFilter.get("kelompokKerjaId"))
-						&& mapData.get("tglMulaiBerlaku").equals(mapFilter.get("tglMulaiBerlaku"))) {
+						&& mapData.get("kelompokKerjaId").equals(mapFilter.get("kelompokKerjaId"))) {
 					isContained = true;
 					break;
 				}
@@ -245,7 +244,6 @@ public class SkoringTindakanMedisServiceImpl extends BaseVoServiceImpl implement
 				Map<String, Object> mapFilter = new HashMap<>();
 				mapFilter.put("produkId", mapData.get("produkId"));
 				mapFilter.put("kelompokKerjaId", mapData.get("kelompokKerjaId"));
-				mapFilter.put("tglMulaiBerlaku", mapData.get("tglMulaiBerlaku"));
 				filter.add(mapFilter);
 			}
 		}
@@ -253,8 +251,7 @@ public class SkoringTindakanMedisServiceImpl extends BaseVoServiceImpl implement
 		for (Map<String, Object> mapFilter : filter) {
 			for (Map<String, Object> mapData : data) {
 				if (mapFilter.get("produkId").equals(mapData.get("produkId"))
-						&& mapFilter.get("kelompokKerjaId").equals(mapData.get("kelompokKerjaId"))
-						&& mapFilter.get("tglMulaiBerlaku").equals(mapData.get("tglMulaiBerlaku"))) {
+						&& mapFilter.get("kelompokKerjaId").equals(mapData.get("kelompokKerjaId"))) {
 					result.add(mapData);
 					break;
 				}