Merge branch 'dev/remun/detail-logbook' into dev/no-cron
This commit is contained in:
commit
b93e4ff37b
@ -3010,13 +3010,15 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
|
|||||||
List<String> listIdPelayananPaketBukanFixedPay = result.stream()
|
List<String> listIdPelayananPaketBukanFixedPay = result.stream()
|
||||||
.filter(r -> paketBukanFixedPay.contains(Integer.parseInt(r.get("idProduk").toString())))
|
.filter(r -> paketBukanFixedPay.contains(Integer.parseInt(r.get("idProduk").toString())))
|
||||||
.map(r -> r.get("idPelayanan").toString()).collect(Collectors.toList());
|
.map(r -> r.get("idPelayanan").toString()).collect(Collectors.toList());
|
||||||
List<PelayananPasienDetail> detailPelayananPaketBukanFixedPay = pelayananPasienDetailDao
|
if (!listIdPelayananPaketBukanFixedPay.isEmpty()) {
|
||||||
.findByPelayananAndKomponenHarga(listIdPelayananPaketBukanFixedPay, TOTAL_TARIF);
|
List<PelayananPasienDetail> detailPelayananPaketBukanFixedPay = pelayananPasienDetailDao
|
||||||
for (Map<String, Object> res : result) {
|
.findByPelayananAndKomponenHarga(listIdPelayananPaketBukanFixedPay, TOTAL_TARIF);
|
||||||
Optional<PelayananPasienDetail> detail = detailPelayananPaketBukanFixedPay.stream()
|
for (Map<String, Object> res : result) {
|
||||||
.filter(d -> d.getPelayananPasienId().equals(res.get("idPelayanan"))).findFirst();
|
Optional<PelayananPasienDetail> detail = detailPelayananPaketBukanFixedPay.stream()
|
||||||
detail.ifPresent(
|
.filter(d -> d.getPelayananPasienId().equals(res.get("idPelayanan"))).findFirst();
|
||||||
d -> res.put("hargaJual", CommonUtil.isNotNullOrEmpty(d.getHargaJual()) ? d.getHargaJual() : 0.00));
|
detail.ifPresent(
|
||||||
|
d -> res.put("hargaJual", CommonUtil.isNotNullOrEmpty(d.getHargaJual()) ? d.getHargaJual() : 0.00));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user