Update PelayananPasienServiceImpl.java
Penyesuaian logbook dokter di superapp hanya menampilkan tanggal-tanggal capaian remun > Rp0
This commit is contained in:
parent
680aa18d2f
commit
24e11b5391
@ -509,6 +509,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
.mapToDouble(tail -> Double.parseDouble(tail.get("hargaJasa").toString())
|
.mapToDouble(tail -> Double.parseDouble(tail.get("hargaJasa").toString())
|
||||||
* Double.parseDouble(tail.get("jumlah").toString()))
|
* Double.parseDouble(tail.get("jumlah").toString()))
|
||||||
.sum();
|
.sum();
|
||||||
|
if (jumlahHargaJasa > 0.0) {
|
||||||
Map<String, Object> capaianTanggal = new HashMap<>();
|
Map<String, Object> capaianTanggal = new HashMap<>();
|
||||||
capaianTanggal.put("tanggal", tanggalFormatter.format(date));
|
capaianTanggal.put("tanggal", tanggalFormatter.format(date));
|
||||||
capaianTanggal.put("capaian", nf.format(jumlahHargaJasa));
|
capaianTanggal.put("capaian", nf.format(jumlahHargaJasa));
|
||||||
@ -540,6 +541,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
}
|
}
|
||||||
result.add(capaianTanggal);
|
result.add(capaianTanggal);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2119,7 +2121,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
: byDetailTarifNonKelas.get().getHargaSatuan()));
|
: byDetailTarifNonKelas.get().getHargaSatuan()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(d.get("idDepartemen"))
|
} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(Integer.parseInt(d.get("idDepartemen").toString()))
|
||||||
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
|
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
|
||||||
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
|
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
|
||||||
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
|
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
|
||||||
@ -2129,7 +2131,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
|
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
|
||||||
? byDetailTarifNonKelas.get().getHargaNetto1()
|
? byDetailTarifNonKelas.get().getHargaNetto1()
|
||||||
: byDetailTarifNonKelas.get().getHargaSatuan()));
|
: byDetailTarifNonKelas.get().getHargaSatuan()));
|
||||||
} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(d.get("idDepartemen"))
|
} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(Integer.parseInt(d.get("idDepartemen").toString()))
|
||||||
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
|
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
|
||||||
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
|
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
|
||||||
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
|
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user