salmanoe/SC-be-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/integrasi/superapp' into prod/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2024-09-02 10:27:05 +07:00
commit 9ac1983f2b
1 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
View File

@ -509,6 +509,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
.mapToDouble(tail -> Double.parseDouble(tail.get("hargaJasa").toString())
* Double.parseDouble(tail.get("jumlah").toString()))
.sum();
if (jumlahHargaJasa > 0.0) {
Map<String, Object> capaianTanggal = new HashMap<>();
capaianTanggal.put("tanggal", tanggalFormatter.format(date));
capaianTanggal.put("capaian", nf.format(jumlahHargaJasa));
@ -540,6 +541,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
}
result.add(capaianTanggal);
}
}
return result;
}
@ -2119,7 +2121,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
: 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"))) {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
@ -2129,7 +2131,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
? byDetailTarifNonKelas.get().getHargaNetto1()
: 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"))) {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))