From 70ae4b1f5dc614ee7a57fd91631098a5fb7359d1 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Thu, 31 Aug 2023 16:53:58 +0700
Subject: [PATCH] Update service pelayanan pasien

Perbaikan hak akses diskon paket disamakan diskon total
---
 .../dao/MapPegawaiJabatanToUnitKerjaDao.java       |  6 +++---
 .../service/impl/PelayananPasienServiceImpl.java   | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java
index 346be89b..cbec73c4 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java
@@ -499,7 +499,7 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends CrudRepository<MapPegaw
 
 	@Query("select pg.id from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg "
 			+ "where mj.statusEnabled is true " + "and pg.statusEnabled is true "
-			+ "and mj.unitKerjaPegawaiId = :unitKerjaId " + "and mj.jabatanId = :jabatanId")
-	List<Integer> findPegawaiIdByUnitKerjaIdAndJabatanId(@Param("unitKerjaId") Integer unitKerjaId,
-			@Param("jabatanId") Integer jabatanId);
+			+ "and mj.unitKerjaPegawaiId in (:unitKerjaId) " + "and mj.jabatanId in (:jabatanId)")
+	List<Integer> findPegawaiIdByUnitKerjaIdAndJabatanId(@Param("unitKerjaId") List<Integer> unitKerjaId,
+			@Param("jabatanId") List<Integer> jabatanId);
 }
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
index f36e2db6..f9034c63 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
@@ -2244,13 +2244,13 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 
 	@Override
 	public void diskonTagihan(String kodeVoucher, List<TagihanPendaftaranDto> dtoList) {
-		if (CommonUtil.isNullOrEmpty(kodeVoucher)) {
-			List<Integer> listIdPegawai = mapPegawaiJabatanToUnitKerjaDao.findPegawaiIdByUnitKerjaIdAndJabatanId(48,
-					1075);
-			boolean accessGranted = loginUserService.accessGranted(loginUserService.getLoginUser(), listIdPegawai);
-			if (!accessGranted)
-				throw new ServiceVOException("Tidak memiliki akses diskon total");
-		}
+		List<Integer> unitKerjaDiskonTarek = splitDataSettingDatafixed("unitKerjaDiskonTarek");
+		List<Integer> jabatanDiskonTarek = splitDataSettingDatafixed("jabatanDiskonTarek");
+		List<Integer> listIdPegawai = mapPegawaiJabatanToUnitKerjaDao
+				.findPegawaiIdByUnitKerjaIdAndJabatanId(unitKerjaDiskonTarek, jabatanDiskonTarek);
+		boolean accessGranted = loginUserService.accessGranted(loginUserService.getLoginUser(), listIdPegawai);
+		if (!accessGranted)
+			throw new ServiceVOException("Tidak memiliki akses melakukan diskon");
 		if (CommonUtil.isNotNullOrEmpty(kodeVoucher)) {
 			diskonPaket(kodeVoucher, dtoList);
 		} else {