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