diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananNakesDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananNakesDao.java index b5dbaba3..6b5c21e1 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananNakesDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananNakesDao.java @@ -22,7 +22,7 @@ public interface PelayananNakesDao extends PagingAndSortingRepository findAllByKontrak(@Param("bulan") String bulan, @Param("pegawaiId") Integer idPegawai); @Query("select new Map(pnt.noRec as noRec," + "pnt.tglPelayanan as tglPelayanan," - + "pnt.skor as skor,pnt.jumlah as jumlah," + "pnt.skor*pnt.jumlah as totalSkor," + "pnt.catatan as detail," + + "pnt.skor as skor,pnt.jumlah as jumlah," + "pnt.skor*pnt.jumlah as tSkor," + "pnt.catatan as detail," + "pn.id as produkId,pn.namaProduk as namaProduk," + "pn.kdProduk as kdProduk," + "(case when pn.kdProduk = 1 then 'Pelayanan Pasien' " + "when pn.kdProduk = 2 then 'Pelayanan Non-Pasien' end) as kodeProduk," diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienNakesDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienNakesDao.java index f9ba4c3f..92efd256 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienNakesDao.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienNakesDao.java @@ -31,7 +31,7 @@ public interface PelayananPasienNakesDao extends PagingAndSortingRepository mapLayanan : dataTglPelayanan) { if (idProduk.equals(mapLayanan.get("produkId")) && skor.equals(mapLayanan.get("skor"))) { jumlahTindakan += Double.valueOf(mapLayanan.get("jumlah").toString()); - jumlahSkor += Double.valueOf(mapLayanan.get("totalSkor").toString()); + jumlahSkor += Double.valueOf(mapLayanan.get("tSkor").toString()); Map mapDetail = new HashMap<>(); mapDetail.put("jumlah", mapLayanan.get("jumlah")); @@ -2870,7 +2870,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb if (CommonUtil.isNotNullOrEmpty(data)) { data.put("detail", detail); data.put("jumlah", jumlahTindakan); - data.put("totalSkor", Double.parseDouble(decf.format(jumlahSkor))); + data.put("tSkor", Double.parseDouble(decf.format(jumlahSkor))); result.add(data); }