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

Penambahan informasi load grid flag paket sebelum diskon
---
 .../com/jasamedika/medifirst2000/dao/PelayananPasienDao.java   | 2 +-
 .../medifirst2000/service/impl/PelayananPasienServiceImpl.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
index 078ac3c3..0d0f2730 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
@@ -261,7 +261,7 @@ public interface PelayananPasienDao extends PagingAndSortingRepository<Pelayanan
 			+ "pr.id as idProduk,pr.namaProduk as namaProduk," + "kls.id as idKelas,kls.namaKelas as namaKelas,"
 			+ "pg.id as idPegawai,pg.namaLengkap as namaPegawai,"
 			+ "coalesce(pp.jumlah,0) as jumlah,coalesce(pp.hargaJual,0) as hargaJual,coalesce(pp.hargaDiscount,0) as hargaDiskon,coalesce(pp.jasa,0) as hargaJasa,"
-			+ "((coalesce(pp.hargaJual,0)-coalesce(pp.hargaDiscount,0))*coalesce(pp.jumlah,0)+coalesce(pp.jasa,0)) as totalHargaJual) "
+			+ "((coalesce(pp.hargaJual,0)-coalesce(pp.hargaDiscount,0))*coalesce(pp.jumlah,0)+coalesce(pp.jasa,0)) as totalHargaJual,pp.isPaket as isPaket) "
 			+ "from PelayananPasienPetugas ppp " + "inner join ppp.pelayananPasien pp "
 			+ "inner join pp.pasienDaftar apd " + "inner join apd.pasienDaftar pd " + "inner join apd.ruangan ru "
 			+ "inner join pp.produk pr " + "inner join pp.kelas kls " + "inner join ppp.kdpegawai pg "
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 e5a630df..00f0be8c 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
@@ -2200,7 +2200,8 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 					.namaPegawai(t.get("namaPegawai").toString()).jumlah(Double.parseDouble(t.get("jumlah").toString()))
 					.hargaJual(Double.parseDouble(t.get("hargaJual").toString()))
 					.hargaDiskon(Double.parseDouble(t.get("hargaDiskon").toString()))
-					.hargaJasa(Double.parseDouble(t.get("hargaJasa").toString()));
+					.hargaJasa(Double.parseDouble(t.get("hargaJasa").toString()))
+					.isPaket(Boolean.parseBoolean(t.get("isPaket").toString()));
 			result.add(dtoBuilder.build());
 		});
 		return result;