From 3484b994c0b262687810d75d340fd11453b053f6 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Wed, 13 Apr 2022 10:15:10 +0700
Subject: [PATCH] Update SkoringTindakanMedisService Perbaikan service
 pengecekan data duplikat saat simpan edit skoring tindakan medis

---
 .../dao/SkoringTindakanMedisDao.java          | 19 ++++++++++---------
 .../impl/SkoringTindakanMedisServiceImpl.java |  6 +++---
 2 files changed, 13 insertions(+), 12 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 2e0611dd..62c07cb8 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
@@ -101,27 +101,28 @@ public interface SkoringTindakanMedisDao extends PagingAndSortingRepository<Skor
 	String strCekDupSkoring = "select stm.noRec " + "from SkoringTindakanMedis stm " + "inner join stm.produk pd "
 			+ "where stm.statusEnabled is true "
 			+ "and lower(regexp_replace(pd.namaProduk,:patternText,'','g')) = :namaProduk "
-			+ "and stm.kelompokKerjaId = :kelompokKerjaId " + "and stm.skor = :skor "
+			+ "and stm.kelompokKerjaId = :kelompokKerjaId "
 			+ "and lower(regexp_replace(stm.detailProduk,:patternText,'','g')) = :detailProduk";
 
+	String skor = " and stm.skor = :skor";
+
 	String tglBerlaku = " and to_char(stm.tanggalMulaiBerlaku,'yyyy-MM-dd') = :tglMulaiBerlaku";
 
 	String idSkoring = " and stm.noRec <> :noRec";
 
 	String sortTglBerlaku = " order by stm.tanggalMulaiBerlaku desc";
 
-	@Query(strCekDupSkoring + sortTglBerlaku)
+	@Query(strCekDupSkoring + skor + sortTglBerlaku)
 	List<String> findLastDupSkoring(@Param("namaProduk") String namaProduk,
 			@Param("kelompokKerjaId") Integer idKelompokKerja, @Param("skor") Double skor,
 			@Param("patternText") String patternText, @Param("detailProduk") String detailProduk);
 
 	@Query(strCekDupSkoring + tglBerlaku)
 	List<String> findDupSkoring(@Param("namaProduk") String namaProduk,
-			@Param("kelompokKerjaId") Integer idKelompokKerja, @Param("skor") Double skor,
-			@Param("tglMulaiBerlaku") String tglMulaiBerlaku, @Param("patternText") String patternText,
-			@Param("detailProduk") String detailProduk);
+			@Param("kelompokKerjaId") Integer idKelompokKerja, @Param("tglMulaiBerlaku") String tglMulaiBerlaku,
+			@Param("patternText") String patternText, @Param("detailProduk") String detailProduk);
 
-	@Query(strCekDupSkoring + idSkoring + sortTglBerlaku)
+	@Query(strCekDupSkoring + skor + idSkoring + sortTglBerlaku)
 	List<String> findLastDupSkoring(@Param("namaProduk") String namaProduk,
 			@Param("kelompokKerjaId") Integer idKelompokKerja, @Param("skor") Double skor,
 			@Param("patternText") String patternText, @Param("detailProduk") String detailProduk,
@@ -129,9 +130,9 @@ public interface SkoringTindakanMedisDao extends PagingAndSortingRepository<Skor
 
 	@Query(strCekDupSkoring + tglBerlaku + idSkoring)
 	List<String> findDupSkoring(@Param("namaProduk") String namaProduk,
-			@Param("kelompokKerjaId") Integer idKelompokKerja, @Param("skor") Double skor,
-			@Param("tglMulaiBerlaku") String tglMulaiBerlaku, @Param("patternText") String patternText,
-			@Param("detailProduk") String detailProduk, @Param("noRec") String noRec);
+			@Param("kelompokKerjaId") Integer idKelompokKerja, @Param("tglMulaiBerlaku") String tglMulaiBerlaku,
+			@Param("patternText") String patternText, @Param("detailProduk") String detailProduk,
+			@Param("noRec") String noRec);
 
 	@Query("select new Map(stm.noRec as noRec,stm.detailProduk as detailProduk) " + "from SkoringTindakanMedis stm "
 			+ "where stm.statusEnabled is true " + "and stm.noRec in (:listNorec)")
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 28b2cd51..35352f8e 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
@@ -319,14 +319,14 @@ public class SkoringTindakanMedisServiceImpl extends BaseVoServiceImpl implement
 			listNorec = skoringTindakanMedisDao.findLastDupSkoring(replacedNamaProduk, idKelompokKerja, skor,
 					patternText, replacedDetailProduk, noRec);
 			if (CommonUtil.isNullOrEmpty(listNorec)) {
-				listNorec = skoringTindakanMedisDao.findDupSkoring(replacedNamaProduk, idKelompokKerja, skor,
+				listNorec = skoringTindakanMedisDao.findDupSkoring(replacedNamaProduk, idKelompokKerja,
 						df.format(new Date(tglMulaiBerlaku)), patternText, replacedDetailProduk, noRec);
 			}
 		} else {
 			listNorec = skoringTindakanMedisDao.findLastDupSkoring(replacedNamaProduk, idKelompokKerja, skor,
 					patternText, replacedDetailProduk);
 			if (CommonUtil.isNullOrEmpty(listNorec)) {
-				listNorec = skoringTindakanMedisDao.findDupSkoring(replacedNamaProduk, idKelompokKerja, skor,
+				listNorec = skoringTindakanMedisDao.findDupSkoring(replacedNamaProduk, idKelompokKerja,
 						df.format(new Date(tglMulaiBerlaku)), patternText, replacedDetailProduk);
 			}
 		}
@@ -569,7 +569,7 @@ public class SkoringTindakanMedisServiceImpl extends BaseVoServiceImpl implement
 				}
 			});
 		}
-		
+
 		try {
 			countDown.await();