From 7ea34b1ec6f917b3debb785d5b1a539f37a47468 Mon Sep 17 00:00:00 2001
From: adesyawal <52590145+adesyawal@users.noreply.github.com>
Date: Wed, 13 Aug 2025 07:47:18 +0700
Subject: [PATCH] Bug Fixing Hak Akses Diskon Total

---
 .../service/impl/PelayananPasienServiceImpl.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

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 7906a824..109c3575 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
@@ -3647,16 +3647,20 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 	public void diskonTagihan(String kodeVoucher, List<TagihanPendaftaranDto> dtoList) {
 		List<Integer> unitKerjaDiskonTarek = splitDataSettingDatafixed("unitKerjaDiskonTarek");
 		List<Integer> jabatanDiskonTarek = splitDataSettingDatafixed("jabatanDiskonTarek");
-		List<Integer> listIdPegawai = mapPegawaiJabatanToUnitKerjaDao
-				.findPegawaiIdByUnitKerjaIdAndJabatanId(unitKerjaDiskonTarek, jabatanDiskonTarek);
+		List<Integer> listIdPegawai = mapPegawaiJabatanToUnitKerjaDao.findPegawaiIdByUnitKerjaIdAndJabatanId(unitKerjaDiskonTarek, jabatanDiskonTarek);
 		LoginUser loginUser = loginUserService.getLoginUser();
 		boolean accessGranted = loginUserService.accessGranted(loginUser, listIdPegawai);
-		if (!accessGranted && kodeVoucher.isEmpty()
-				|| !accessGranted && !loginUser.getKelompokUser().getId().equals(TATA_REKENING))
-			throw new ServiceVOException("Tidak memiliki akses melakukan diskon");
 		if (CommonUtil.isNotNullOrEmpty(kodeVoucher)) {
+			if (!accessGranted || kodeVoucher.isEmpty()) {
+				throw new ServiceVOException("Tidak memiliki akses melakukan diskon paket, periksa sotk pegawai atau kode voucher.");
+			}
+
 			diskonPaket(kodeVoucher, dtoList);
 		} else {
+			if (!accessGranted) {
+				throw new ServiceVOException("Tidak memiliki akses melakukan diskon, periksa sotk");
+			}
+			
 			List<String> listNoRec = dtoList.stream().map(TagihanPendaftaranDto::getNoRec).collect(Collectors.toList());
 			List<PelayananPasien> listPelayanan = pelayananPasienDao.findAll(listNoRec);
 			listPelayanan.forEach(p -> {