From 04459e2e20e5084d27d283c5f6a7aeb57373ff17 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Fri, 1 Sep 2023 19:55:27 +0700
Subject: [PATCH] Update PelayananPasienServiceImpl.java

Perbaikan set foreign key voucher dihilangkan untuk layanan tidak diskon paket saat verifikasi pasien pulang
---
 .../service/impl/PelayananPasienServiceImpl.java          | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 f702c838..3cc4a345 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
@@ -2333,7 +2333,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 							detailPelayanan.addAll(detailDiskon);
 						}
 					}
-					p.setVoucherPaket(voucher);
 					p.setHargaDiscount(0.0);
 				});
 			}
@@ -2350,7 +2349,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					p.setHargaDiscount(dto.getHargaDiskon());
 					p.setJasa(dto.getHargaJasa());
 					p.setIsPaket(dto.getIsPaket());
-					p.setVoucherPaket(voucher);
+					if (dto.getIsPaket())
+						p.setVoucherPaket(voucher);
 					pelayanan.add(p);
 				});
 			});
@@ -2385,7 +2385,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						origin.get().setHargaDiscount(dto.getHargaDiskon());
 						origin.get().setJasa(dto.getHargaJasa());
 						origin.get().setIsPaket(dto.getIsPaket());
-						origin.get().setVoucherPaket(voucher);
+						if (dto.getIsPaket())
+							origin.get().setVoucherPaket(voucher);
 						{
 							List<PelayananPasienDetail> detailOrigin = pelayananPasienDetailDao
 									.findByPelayananPasien(origin.get().getNoRec());
@@ -2437,7 +2438,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 						duplicate.get().setJumlah(duplicate.get().getJumlah() - origin.get().getJumlah());
 						duplicate.get().setHargaDiscount(0.0);
 						duplicate.get().setIsPaket(false);
-						duplicate.get().setVoucherPaket(voucher);
 						{
 							List<PelayananPasienDetail> duplicateDetail = splitDetailPelayanan.stream()
 									.filter(d -> d.getNoRec() == null).collect(Collectors.toList());