Update LogbookKinerjaService
Perubahan penamaan variable totalSkor menjadi tSkor di logbook skor nakes lain
This commit is contained in:
parent
d77f960932
commit
19567b2c4a
@ -22,7 +22,7 @@ public interface PelayananNakesDao extends PagingAndSortingRepository<PelayananN
|
||||
List<PelayananNakes> 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,"
|
||||
|
||||
@ -31,7 +31,7 @@ public interface PelayananPasienNakesDao extends PagingAndSortingRepository<Pela
|
||||
@Param("pegawaiId") Integer idPegawai);
|
||||
|
||||
@Query("select new Map(ppn.noRec as noRec," + "ppn.tglPelayanan as tglPelayanan,"
|
||||
+ "ppn.skor as skor,ppn.jumlah as jumlah," + "ppn.skor*ppn.jumlah as totalSkor,"
|
||||
+ "ppn.skor as skor,ppn.jumlah as jumlah," + "ppn.skor*ppn.jumlah as tSkor,"
|
||||
+ "ppn.antrianPasienDiperiksaId 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,"
|
||||
|
||||
@ -2830,14 +2830,14 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
|
||||
if (idProduk.equals(mapLayanan.get("produkId")) && skor.equals(mapLayanan.get("skor"))
|
||||
&& tglPelayanan.equals(df.format((Date) mapLayanan.get("tglPelayanan")))) {
|
||||
jumlahTindakan += Double.valueOf(mapLayanan.get("jumlah").toString());
|
||||
jumlahSkor += Double.valueOf(mapLayanan.get("totalSkor").toString());
|
||||
jumlahSkor += Double.valueOf(mapLayanan.get("tSkor").toString());
|
||||
data.putAll(mapLayanan);
|
||||
data.put("tglPelayanan", df.format(((Date) mapLayanan.get("tglPelayanan"))));
|
||||
}
|
||||
}
|
||||
if (CommonUtil.isNotNullOrEmpty(data)) {
|
||||
data.put("jumlah", jumlahTindakan);
|
||||
data.put("totalSkor", jumlahSkor);
|
||||
data.put("tSkor", jumlahSkor);
|
||||
|
||||
dataTglPelayanan.add(data);
|
||||
}
|
||||
@ -2855,7 +2855,7 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb
|
||||
for (Map<String, Object> 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<String, Object> 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);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user