From 6c015317fa3c82c81d6946d77801f5c62ba9e1e0 Mon Sep 17 00:00:00 2001
From: Salman Manoe <salmanoe@live.com>
Date: Tue, 31 Dec 2024 09:52:11 +0700
Subject: [PATCH] Update service remunerasi

Penyesuaian tampilan KPTL pada penamaan nama produk di logbook dokter
---
 .../medifirst2000/dao/PelayananPasienDao.java          | 10 +++++-----
 .../com/jasamedika/medifirst2000/entities/Produk.java  |  3 +++
 .../java/com/jasamedika/medifirst2000/vo/ProdukVO.java |  3 +++
 3 files changed, 11 insertions(+), 5 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 751e80ca..1e99a21c 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
@@ -184,7 +184,8 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 	@Query("select pp from PelayananPasien pp where pp.noRec in (:listNoRec)")
 	List<PelayananPasien> findAll(@Param("listNoRec") List<String> listNoRec);
 
-	String LOGBOOK_DOKTER = "select new Map(pr.id as idProduk,pr.namaProduk as namaProduk,"
+	String LOGBOOK_DOKTER = "select new Map(pr.id as idProduk,"
+			+ "concat(case when pr.kptl is not null then concat(pr.kptl,' - ') else '' end) || pr.namaProduk as namaProduk,"
 			+ "pr.detailJenisProdukId as idDetailJenisProduk,pr.golonganProdukId as idGolonganProduk,"
 			+ "djp.jenisProdukId as idJenisProduk," + "pd.voucherPaketId as idVoucherDaftar,"
 			+ "pd.kelompokPasienId as idKelompokPasien," + "case when pd.kelompokPasienId = 2 then 1 "
@@ -256,10 +257,9 @@ public interface PelayananPasienDao extends JpaRepository<PelayananPasien, Strin
 			+ "when pp.kelasId = 21 then 7 " + "else 8 end," + "kls.namaKelas," + "ppp.noRec,"
 			+ "ppp.ObjectJenisPetugasPeId,ppp.ObjectPegawaiId,"
 			+ "pp.noRec,coalesce(pp.hargaJual,0),coalesce(pp.jumlah,0)," + "coalesce(pp.isPaket,false),"
-			+ "coalesce(pp.persenDiskonPegawai,0.0),"
-			+ "pp.tglPelayanan,to_char(pp.tglPelayanan,'yyyy-MM-dd')," + "pp.sayatanId,sy.urutan,"
-			+ "coalesce(sy.persen,0),coalesce(sy.nama,'')," + "apd.noRec,apd.pegawaiId," + "apd.ruanganId,"
-			+ "case when ru.kelompokRuangan = 'EKSEKUTIF' then 'Eksekutif' else 'Reguler' end,"
+			+ "coalesce(pp.persenDiskonPegawai,0.0)," + "pp.tglPelayanan,to_char(pp.tglPelayanan,'yyyy-MM-dd'),"
+			+ "pp.sayatanId,sy.urutan," + "coalesce(sy.persen,0),coalesce(sy.nama,'')," + "apd.noRec,apd.pegawaiId,"
+			+ "apd.ruanganId," + "case when ru.kelompokRuangan = 'EKSEKUTIF' then 'Eksekutif' else 'Reguler' end,"
 			+ "ru.departemenId," + "pd.noRec ";
 
 	String ORDER_LOGBOOK_DOKTER = "order by case when pd.kelompokPasienId = 2 then 1 "
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java
index ca371c4f..b1b730c0 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Produk.java
@@ -415,4 +415,7 @@ public class Produk extends BaseMasterProduk {
 
 	@Column(name = "ispsikotropika")
 	private Boolean isPsikotropika;
+
+	@Column(name = "kode_kptl")
+	private String kptl;
 }
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ProdukVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ProdukVO.java
index 5b5bafbe..6a40159a 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ProdukVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ProdukVO.java
@@ -246,4 +246,7 @@ public class ProdukVO extends BaseMasterVO {
 	@Caption(value = "Status")
 	@Column(name = "Status", nullable = true)
 	private String status;
+
+	@Caption(value = "KPTL")
+	private String kptl;
 }