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

Merge branch 'dev/remun/logbook-tarif' into dev/no-cron

Browse Source
This commit is contained in:
Salman Manoe 2025-02-25 09:48:58 +07:00
commit 9245a29163
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/BaseVoServiceImpl.java
View File

@ -134,12 +134,14 @@ public abstract class BaseVoServiceImpl {
Type effectiveDateDataFixType = new TypeToken<List<EffectiveDateDataFixDTO>>() { Type effectiveDateDataFixType = new TypeToken<List<EffectiveDateDataFixDTO>>() {
}.getType(); }.getType();
String jsonProdukDokterUmum = getSettingDataFixed(namaField); String jsonProdukDokterUmum = getSettingDataFixed(namaField);
if (jsonProdukDokterUmum.isEmpty())
return result;
List<EffectiveDateDataFixDTO> dataFixDTOList = gson.fromJson(jsonProdukDokterUmum, effectiveDateDataFixType); List<EffectiveDateDataFixDTO> dataFixDTOList = gson.fromJson(jsonProdukDokterUmum, effectiveDateDataFixType);
Optional<EffectiveDateDataFixDTO> first = dataFixDTOList.stream() Optional<EffectiveDateDataFixDTO> first = dataFixDTOList.stream()
.sorted(Comparator.comparing(EffectiveDateDataFixDTO::getTmt, Comparator.reverseOrder())) .sorted(Comparator.comparing(EffectiveDateDataFixDTO::getTmt, Comparator.reverseOrder()))
.filter(dto -> dto.getTmt() <= date.getTime()).findFirst(); .filter(dto -> dto.getTmt() <= date.getTime()).findFirst();
if (first.isPresent()) { if (first.isPresent()) {
String[] split = first.get().getNilaiField().split(","); String[] split = first.get().getNilaiField().replace(" ","").split(",");
for (String s : split) for (String s : split)
result.add(Integer.valueOf(s)); result.add(Integer.valueOf(s));
} }