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,36 +509,38 @@ 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();
|
||||||
Map<String, Object> capaianTanggal = new HashMap<>();
|
if (jumlahHargaJasa > 0.0) {
|
||||||
capaianTanggal.put("tanggal", tanggalFormatter.format(date));
|
Map<String, Object> capaianTanggal = new HashMap<>();
|
||||||
capaianTanggal.put("capaian", nf.format(jumlahHargaJasa));
|
capaianTanggal.put("tanggal", tanggalFormatter.format(date));
|
||||||
{
|
capaianTanggal.put("capaian", nf.format(jumlahHargaJasa));
|
||||||
List<Map<String, Object>> deskripsi = new ArrayList<>();
|
{
|
||||||
data.forEach(d -> {
|
List<Map<String, Object>> deskripsi = new ArrayList<>();
|
||||||
Map<String, Object> detailDeskripsi = new HashMap<>();
|
data.forEach(d -> {
|
||||||
List<Map<String, Object>> detailData = (List<Map<String, Object>>) d.get("detail");
|
Map<String, Object> detailDeskripsi = new HashMap<>();
|
||||||
detailData.stream().filter(tail -> tail.get("tanggal").toString().equals(tanggal)).findFirst()
|
List<Map<String, Object>> detailData = (List<Map<String, Object>>) d.get("detail");
|
||||||
.ifPresent(tail -> {
|
detailData.stream().filter(tail -> tail.get("tanggal").toString().equals(tanggal)).findFirst()
|
||||||
detailDeskripsi.put("layanan", d.get("namaProduk").toString());
|
.ifPresent(tail -> {
|
||||||
if (CommonUtil.isNotNullOrEmpty(d.get("persenJasa"))) {
|
detailDeskripsi.put("layanan", d.get("namaProduk").toString());
|
||||||
detailDeskripsi.put("tarifJasa",
|
if (CommonUtil.isNotNullOrEmpty(d.get("persenJasa"))) {
|
||||||
nf.format(Double.parseDouble(d.get("hargaJual").toString())) + "/"
|
detailDeskripsi.put("tarifJasa",
|
||||||
+ d.get("persenJasa").toString());
|
nf.format(Double.parseDouble(d.get("hargaJual").toString())) + "/"
|
||||||
} else {
|
+ d.get("persenJasa").toString());
|
||||||
detailDeskripsi.put("tarifJasa",
|
} else {
|
||||||
nf.format(Double.parseDouble(d.get("hargaJual").toString())));
|
detailDeskripsi.put("tarifJasa",
|
||||||
}
|
nf.format(Double.parseDouble(d.get("hargaJual").toString())));
|
||||||
detailDeskripsi.put("remun",
|
}
|
||||||
nf.format(Double.parseDouble(d.get("hargaJasa").toString())));
|
detailDeskripsi.put("remun",
|
||||||
detailDeskripsi.put("jumlah", tail.get("jumlah").toString());
|
nf.format(Double.parseDouble(d.get("hargaJasa").toString())));
|
||||||
detailDeskripsi.put("keterangan", d.get("keterangan").toString());
|
detailDeskripsi.put("jumlah", tail.get("jumlah").toString());
|
||||||
});
|
detailDeskripsi.put("keterangan", d.get("keterangan").toString());
|
||||||
if (CommonUtil.isNotNullOrEmpty(detailDeskripsi))
|
});
|
||||||
deskripsi.add(detailDeskripsi);
|
if (CommonUtil.isNotNullOrEmpty(detailDeskripsi))
|
||||||
});
|
deskripsi.add(detailDeskripsi);
|
||||||
capaianTanggal.put("deskripsi", deskripsi);
|
});
|
||||||
|
capaianTanggal.put("deskripsi", deskripsi);
|
||||||
|
}
|
||||||
|
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