Merge branch 'dev/remun/logbook-dg-jam-kerja' into dev/no-cron

This commit is contained in:
Salman Manoe 2024-05-31 16:11:13 +07:00
commit 4b3e255750

View File

@ -1070,6 +1070,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
*/
List<Map<String, Object>> listDataJamKerja = new ArrayList<>();
for (Map<String, Object> d : listRatedPay) {
d.put("isJamKerja", false);
if (CommonUtil.isNotNullOrEmpty(d.get("tglPelayanan"))) {
LocalDate tglPelayanan = ((Date) d.get("tglPelayanan")).toInstant().atZone(ZoneId.systemDefault())
.toLocalDate();
@ -1103,7 +1104,6 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
*/
List<Map<String, Object>> listDataLuarJamKerja = new ArrayList<>();
for (Map<String, Object> d : listRatedPay) {
d.put("isJamKerja", false);
if (CommonUtil.isNotNullOrEmpty(d.get("tglPelayanan"))) {
LocalDate tglPelayanan = ((Date) d.get("tglPelayanan")).toInstant().atZone(ZoneId.systemDefault())
.toLocalDate();