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

Merge branch 'dev/remun/logbook-dg-jam-kerja' into prod/base

Browse Source
This commit is contained in:
Salman Manoe 2024-05-31 16:11:46 +07:00
commit 172c1a0539
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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