From 20b38c760fce9c9699fffdfa88c3cff3d3fd0e51 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Fri, 25 Aug 2023 16:12:04 +0700
Subject: [PATCH] Update PelayananPasienServiceImpl.java

Perbaikan reset diskon paket kepala diluar batal paket
---
 .../impl/PelayananPasienServiceImpl.java        | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 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 862d6d9b..e3d4f7bd 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
@@ -2258,24 +2258,29 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				});
 			}
 			{
+				List<PelayananPasienDetail> detailPelayanan = new ArrayList<>();
 				List<String> norecPelayananPaket = dtoList.stream()
 						.filter(d -> voucher.getPaketId().equals(d.getIdProduk())).map(TagihanPendaftaranDto::getNoRec)
 						.collect(Collectors.toList());
 				List<PelayananPasien> pelayananPaket = pelayananPasienDao.findAll(norecPelayananPaket);
 				pelayananPaket.forEach(p -> {
-					if (p.getHargaDiscount() > 0.0) {
-						List<PelayananPasienDetail> detailPelayanan = pelayananPasienDetailDao
+					Double hargaDiscount = p.getHargaDiscount();
+					if (CommonUtil.isNotNullOrEmpty(hargaDiscount) && hargaDiscount > 0.0) {
+						// Cek Detail Diskon
+						List<PelayananPasienDetail> detailPelayananPaket = pelayananPasienDetailDao
 								.findByPelayananPasien(p.getNoRec());
-						List<PelayananPasienDetail> detailDiscount = detailPelayanan.stream()
+						List<PelayananPasienDetail> detailDiskon = detailPelayananPaket.stream()
 								.filter(d -> d.getHargaDiscount() > 0.0).collect(Collectors.toList());
-						if (CommonUtil.isNotNullOrEmpty(detailDiscount) && !detailDiscount.isEmpty()) {
-							detailDiscount.forEach(d -> d.setHargaDiscount(0.0));
-							pelayananPasienDetailDao.save(detailDiscount);
+						if (CommonUtil.isNotNullOrEmpty(detailDiskon) && !detailDiskon.isEmpty()) {
+							// Reset Diskon
+							detailDiskon.forEach(d -> d.setHargaDiscount(0.0));
+							detailPelayanan.addAll(detailDiskon);
 						}
 					}
 					p.setVoucherPaket(voucher);
 					p.setHargaDiscount(0.0);
 				});
+				pelayananPasienDetailDao.save(detailPelayanan);
 			}
 			{
 				List<PelayananPasien> pelayanan = new ArrayList<>();