Merge branch 'dev/base' into dev/integrasi/minio

This commit is contained in:
adesyawal 2026-01-08 10:00:45 +07:00
commit 637ad7b114
2 changed files with 29 additions and 4 deletions

View File

@ -461,6 +461,10 @@ public final class Master {
public static final Integer KSM_OBGYN = 59;
}
public static final class AppDefaultVariabel {
public static final Integer RECURSIVE_BATCH = 8000;
}
public static final class User {
public static final Integer MOBILE_JKN = 3;
}

View File

@ -1877,8 +1877,17 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
.map(d -> d.get("paketId").toString() + d.get("idKelas").toString()).collect(Collectors.toList()));
allConcatProdukKelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
.map(d -> d.get("idProduk").toString() + d.get("idKelas").toString()).collect(Collectors.toList()));
List<HargaNettoProdukByKelasD> tarifDetailReguler = hargaNettoProdukByKelasDDao
.findByConcateProdukKelas(allConcatProdukKelas);
//List<HargaNettoProdukByKelasD> tarifDetailReguler = hargaNettoProdukByKelasDDao.findByConcateProdukKelas(allConcatProdukKelas); // Ganti Versi batching
final int BATCH_SIZE = Master.AppDefaultVariabel.RECURSIVE_BATCH; // Limitasi Jumlah Data Per Batch
int total = allConcatProdukKelas.size();
List<HargaNettoProdukByKelasD> tarifDetailReguler = new ArrayList<>();
for (int i = 0; i < total; i += BATCH_SIZE) {
int end = Math.min(i + BATCH_SIZE, total);
List<String> batchKeys = allConcatProdukKelas.subList(i, end);
List<HargaNettoProdukByKelasD> batchResult = hargaNettoProdukByKelasDDao.findByConcateProdukKelas(batchKeys);
tarifDetailReguler.addAll(batchResult);
}
List<String> allConcatProdukNonkelas = listData.stream()
.filter(d -> CommonUtil.isNotNullOrEmpty(d.get("regRefId")))
.map(d -> d.get("regRefId").toString() + NON_KELAS).collect(Collectors.toList());
@ -1886,8 +1895,17 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
.map(d -> d.get("paketId").toString() + NON_KELAS).collect(Collectors.toList()));
allConcatProdukNonkelas.addAll(listData.stream().filter(d -> CommonUtil.isNotNullOrEmpty(d.get("idProduk")))
.map(d -> d.get("idProduk").toString() + NON_KELAS).collect(Collectors.toList()));
List<HargaNettoProdukByKelasD> tarifDetailNonKelas = hargaNettoProdukByKelasDDao
.findByConcateProdukKelas(allConcatProdukNonkelas);
//List<HargaNettoProdukByKelasD> tarifDetailNonKelas = hargaNettoProdukByKelasDDao.findByConcateProdukKelas(allConcatProdukNonkelas); // Ganti Versi batching
final int BATCH_SIZE_NB = Master.AppDefaultVariabel.RECURSIVE_BATCH;
int totalNB = allConcatProdukNonkelas.size();
List<HargaNettoProdukByKelasD> tarifDetailNonKelas = new ArrayList<>();
for (int i = 0; i < totalNB; i += BATCH_SIZE_NB) {
int end = Math.min(i + BATCH_SIZE_NB, totalNB);
List<String> batchKeys = allConcatProdukNonkelas.subList(i, end);
List<HargaNettoProdukByKelasD> batchResult = hargaNettoProdukByKelasDDao.findByConcateProdukKelas(batchKeys);
tarifDetailNonKelas.addAll(batchResult);
}
Set<Map<String, Object>> ibuPaketDiRanapByDokter = pelayananPasienDao.findPasienPaketDiRanapByDokter(drKsmObgyn,
allProdukEntriId, Arrays.asList(GRUP_RAWAT_INAP));
Set<Integer> setIdIbu = ibuPaketDiRanapByDokter.stream()
@ -2248,6 +2266,9 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
} else {
remunFfs = this.splitRemunFfs(idPegawai, bulan);
}
// cek disini
@SuppressWarnings("unchecked")
List<Map<String, Object>> listData = (List<Map<String, Object>>) remunFfs.get("remun");
Double target = Double.parseDouble(remunFfs.get("targetRemun").toString());