From a91e861d10ca3ea5fd60fb3382d98da430df0729 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Wed, 13 Apr 2022 10:17:10 +0700
Subject: [PATCH] Update SkoringTindakanNakesService Perbaikan service
 pengecekan mapping skoring duplikat saat simpan edit skoring tindakan nakes
 lain

---
 .../dao/SkoringTindakanNakesDao.java              | 15 ++++++++-------
 .../impl/SkoringTindakanNakesServiceImpl.java     |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanNakesDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanNakesDao.java
index 8780320f..b9c9bea8 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanNakesDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/SkoringTindakanNakesDao.java
@@ -67,7 +67,9 @@ public interface SkoringTindakanNakesDao extends PagingAndSortingRepository<Skor
 	String strCekDupSkoring = "select stn.noRec " + "from SkoringTindakanNakes stn " + "inner join stn.produk prn "
 			+ "inner join prn.profesi pfs " + "where stn.statusEnabled is true "
 			+ "and lower(regexp_replace(prn.namaProduk,:patternText,'','g')) = :namaProduk "
-			+ "and pfs.id = :profesiId " + "and stn.skor = :skor";
+			+ "and pfs.id = :profesiId ";
+
+	String skor = " and stn.skor = :skor";
 
 	String tglBerlaku = " and to_char(stn.tanggalMulaiBerlaku,'yyyy-MM-dd') = :tglMulaiBerlaku";
 
@@ -75,23 +77,22 @@ public interface SkoringTindakanNakesDao extends PagingAndSortingRepository<Skor
 
 	String sortTglBerlaku = " order by stn.tanggalMulaiBerlaku desc";
 
-	@Query(strCekDupSkoring + sortTglBerlaku)
+	@Query(strCekDupSkoring + skor + sortTglBerlaku)
 	List<String> findLastDupSkoring(@Param("namaProduk") String namaProduk, @Param("profesiId") Integer idProfesi,
 			@Param("skor") Double skor, @Param("patternText") String patternText);
 
 	@Query(strCekDupSkoring + tglBerlaku)
 	List<String> findDupSkoring(@Param("namaProduk") String namaProduk, @Param("profesiId") Integer idProfesi,
-			@Param("skor") Double skor, @Param("tglMulaiBerlaku") String tglMulaiBerlaku,
-			@Param("patternText") String patternText);
+			@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("profesiId") Integer idProfesi,
 			@Param("skor") Double skor, @Param("patternText") String patternText, @Param("noRec") String noRec);
 
 	@Query(strCekDupSkoring + tglBerlaku + idSkoring)
 	List<String> findDupSkoring(@Param("namaProduk") String namaProduk, @Param("profesiId") Integer idProfesi,
-			@Param("skor") Double skor, @Param("tglMulaiBerlaku") String tglMulaiBerlaku,
-			@Param("patternText") String patternText, @Param("noRec") String noRec);
+			@Param("tglMulaiBerlaku") String tglMulaiBerlaku, @Param("patternText") String patternText,
+			@Param("noRec") String noRec);
 
 	@Query("select new Map(stn.noRec as noRec,stn.skor as skor," + "prn.namaProduk as namaProduk,"
 			+ "pfs.namaProfesi as namaProfesi) " + "from SkoringTindakanNakes stn " + "inner join stn.produk prn "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanNakesServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanNakesServiceImpl.java
index 17eb2ac3..d01177ff 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanNakesServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SkoringTindakanNakesServiceImpl.java
@@ -254,13 +254,13 @@ public class SkoringTindakanNakesServiceImpl extends BaseVoServiceImpl implement
 		if (CommonUtil.isNotNullOrEmpty(noRec)) {
 			listNorec = skoringTindakanDao.findLastDupSkoring(replacedNamaProduk, idProfesi, skor, patternText, noRec);
 			if (CommonUtil.isNullOrEmpty(listNorec)) {
-				listNorec = skoringTindakanDao.findDupSkoring(replacedNamaProduk, idProfesi, skor,
+				listNorec = skoringTindakanDao.findDupSkoring(replacedNamaProduk, idProfesi,
 						df.format(new Date(tglMulaiBerlaku)), patternText, noRec);
 			}
 		} else {
 			listNorec = skoringTindakanDao.findLastDupSkoring(replacedNamaProduk, idProfesi, skor, patternText);
 			if (CommonUtil.isNullOrEmpty(listNorec)) {
-				listNorec = skoringTindakanDao.findDupSkoring(replacedNamaProduk, idProfesi, skor,
+				listNorec = skoringTindakanDao.findDupSkoring(replacedNamaProduk, idProfesi,
 						df.format(new Date(tglMulaiBerlaku)), patternText);
 			}
 		}