diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java index f034985d..30abcb3e 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaServiceImpl.java @@ -641,6 +641,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb } } + resByJenisIndikator = resByJenisIndikator.stream() + .sorted(Comparator.comparing(o1 -> (Date) o1.get("namaIndikator"))).collect(Collectors.toList()); + if (idJenisIndikator.equals(1)) { result.put("kuantitas", resByJenisIndikator); } else if (idJenisIndikator.equals(2)) { @@ -2513,6 +2516,9 @@ public class LogbookKinerjaServiceImpl extends BaseVoServiceImpl implements Logb tHasil += Double.valueOf(map.get("hasil").toString()); } } + jiDetail = jiDetail.stream().sorted(Comparator.comparing(o2 -> o2.get("namaIndikator").toString())) + .collect(Collectors.toList()); + jiData.put("detail", jiDetail); jiData.put("stBobot", jiBobot); jiData.put("stHasil", jiHasil);