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

Compare commits

base: salmanoe:f9d2af743f3421e0a5981dcd95cf2e8161a2161e
Branches Tags
salmanoe:master
salmanoe:dev/integrasi/minio
salmanoe:dev/technical-debt/clean-code
salmanoe:prod/base
salmanoe:prod/no-cron
salmanoe:dev/no-cron
salmanoe:ade/bug-fixing/hapus-logbook
salmanoe:dev/base
salmanoe:ade/monitoring-absensi/bug-fixing-absen-tunggal
salmanoe:ade/bug-remun/perbaikan-recursive-fixed-pay
salmanoe:ade/monitoring-absen/shift-pm3
salmanoe:ade/monitor-absen/shift-pm2
salmanoe:ade/monitor-absen/shift-pm
salmanoe:ade/monitoring/check-health4
salmanoe:ade/monitoring/check-health3
salmanoe:ade/monitoring/check-health2
salmanoe:ade/sdm-absensi/realisasi-absensi
salmanoe:ade/logbook-tarif/penyesuainruangan70persen
salmanoe:ade/logbook-tarif/ekslusi-dentalicious
salmanoe:ade/bug-fixing/master-shift-on-cuti
salmanoe:ade/bug-fixing/level-unitkerja-direktur
salmanoe:ade/mastershift-holidayservice-monitoringabsensi
salmanoe:ade/logbook/rekap-logbook-tarif
salmanoe:ade/bug-fixing/intervensi-cuti
salmanoe:dev-ade/sdm/intervensi-cuti
salmanoe:ade/bug-fixing/hak-akses-diskon-total
salmanoe:dev/billing/diskonpegawai
salmanoe:sdm/remunerasi/bug-fixing-pelayan-findPelayananBedah
salmanoe:dev/sdm/remunerasi
salmanoe:dev/remunerasi/bugfixingakumulasipersen
salmanoe:dev/pegawai/ws-example-ade-v2
..
compare: salmanoe:cf0e09ae014310b81ed0e5fc07fdfabbcdfc41cc
Branches Tags
salmanoe:dev/integrasi/minio
salmanoe:dev/technical-debt/clean-code
salmanoe:master
salmanoe:prod/base
salmanoe:prod/no-cron
salmanoe:dev/no-cron
salmanoe:ade/bug-fixing/hapus-logbook
salmanoe:dev/base
salmanoe:ade/monitoring-absensi/bug-fixing-absen-tunggal
salmanoe:ade/bug-remun/perbaikan-recursive-fixed-pay
salmanoe:ade/monitoring-absen/shift-pm3
salmanoe:ade/monitor-absen/shift-pm2
salmanoe:ade/monitor-absen/shift-pm
salmanoe:ade/monitoring/check-health4
salmanoe:ade/monitoring/check-health3
salmanoe:ade/monitoring/check-health2
salmanoe:ade/sdm-absensi/realisasi-absensi
salmanoe:ade/logbook-tarif/penyesuainruangan70persen
salmanoe:ade/logbook-tarif/ekslusi-dentalicious
salmanoe:ade/bug-fixing/master-shift-on-cuti
salmanoe:ade/bug-fixing/level-unitkerja-direktur
salmanoe:ade/mastershift-holidayservice-monitoringabsensi
salmanoe:ade/logbook/rekap-logbook-tarif
salmanoe:ade/bug-fixing/intervensi-cuti
salmanoe:dev-ade/sdm/intervensi-cuti
salmanoe:ade/bug-fixing/hak-akses-diskon-total
salmanoe:dev/billing/diskonpegawai
salmanoe:sdm/remunerasi/bug-fixing-pelayan-findPelayananBedah
salmanoe:dev/sdm/remunerasi
salmanoe:dev/remunerasi/bugfixingakumulasipersen
salmanoe:dev/pegawai/ws-example-ade-v2

No commits in common. "f9d2af743f3421e0a5981dcd95cf2e8161a2161e" and "cf0e09ae014310b81ed0e5fc07fdfabbcdfc41cc" have entirely different histories.
f9d2af743f ... cf0e09ae01

5 changed files with 277 additions and 330 deletions
Show Stats Expand all files Collapse all files

5
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java
View File

@ -501,9 +501,4 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends JpaRepository<MapPegawa
+ "where mj.statusEnabled is true " + "and skj.statusEnabled is true " + "and lower(skj.name) like 'kk%' " + "where mj.statusEnabled is true " + "and skj.statusEnabled is true " + "and lower(skj.name) like 'kk%' "
+ "and mj.pegawaiId = :pegawaiId") + "and mj.pegawaiId = :pegawaiId")
List<Integer> findKelompokKerjaByDokter(@Param("pegawaiId") Integer idPegawai); List<Integer> findKelompokKerjaByDokter(@Param("pegawaiId") Integer idPegawai);
@Query("select mj.pegawaiId from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg "
+ "where mj.statusEnabled is true " + "and pg.statusEnabled is true "
+ "and mj.pegawaiId = :idPegawai " + "and pg.jenisPegawaiId = 1")
Set<Integer> findDokterByPegawaiId(@Param("idPegawai") Integer idPegawai);
} }

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

@ -6,6 +6,6 @@ package com.jasamedika.medifirst2000.service;
* @since 25/04/2024 * @since 25/04/2024
*/ */
public interface LogbookRemunService { public interface LogbookRemunService {
/* Service ini digunakan untuk mendapatkan data rekap loggbook seluruh pegawai dengan data bulan now - 1 */
void generateRecap(Integer idPegawai); void generateRecap();
} }

570
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookRemunServiceImpl.java
View File

@ -9,8 +9,6 @@ import com.jasamedika.medifirst2000.service.LogbookRemunService;
import com.jasamedika.medifirst2000.service.PelayananPasienService; import com.jasamedika.medifirst2000.service.PelayananPasienService;
import com.jasamedika.medifirst2000.service.RemunerasiService; import com.jasamedika.medifirst2000.service.RemunerasiService;
import com.jasamedika.medifirst2000.util.DateUtil; import com.jasamedika.medifirst2000.util.DateUtil;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.util.StringUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -64,26 +62,19 @@ public class LogbookRemunServiceImpl extends BaseVoServiceImpl implements Logboo
private MapJabatanProfesiDao mapJabatanProfesiDao; private MapJabatanProfesiDao mapJabatanProfesiDao;
@Override @Override
public void generateRecap(Integer idPegawai) { public void generateRecap() {
LOGGER.info("Start simpan rekapitulasi detail logbook dokter"); LOGGER.info("Start simpan rekapitulasi detail logbook dokter");
Set<Integer> listIdDokter = new HashSet<>(); LocalDate localDate = LocalDate.now().minusMonths(1);
LocalDate localDate = LocalDate.now().minusMonths(1); Date date = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
Date date = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); Date tglAwal = DateUtil.startMonth(date);
Date tglAwal = DateUtil.startMonth(date); Date tglAkhir = DateUtil.endMonth(date);
Date tglAkhir = DateUtil.endMonth(date); Set<Integer> listIdDokter = mapPegawaiJabatanToUnitKerjaDao
.findDokterByUnitKerja(splitDataSettingDatafixed("listIdUnitKerjaKsm"));
if (CommonUtil.isNotNullOrEmpty(idPegawai)) { List<Integer> listTerapis = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
Set<Integer> getListIdDokter = mapPegawaiJabatanToUnitKerjaDao.findDokterByPegawaiId(idPegawai); listIdDokter.addAll(listTerapis);
listIdDokter.addAll(getListIdDokter); if (!listIdDokter.isEmpty()) {
}else{ // Delete untuk pembaharuan data
Set<Integer> getListIdDokter = mapPegawaiJabatanToUnitKerjaDao.findDokterByUnitKerja(splitDataSettingDatafixed("listIdUnitKerjaKsm"));
listIdDokter.addAll(getListIdDokter);
List<Integer> listTerapis = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
listIdDokter.addAll(listTerapis);
}
if (CommonUtil.isNotNullOrEmpty(listIdDokter)) {
deleteByPeriod(listIdDokter, tglAwal, tglAkhir); deleteByPeriod(listIdDokter, tglAwal, tglAkhir);
} }
saveRekapDetailLogbookDokter(listIdDokter, date); saveRekapDetailLogbookDokter(listIdDokter, date);
@ -129,65 +120,60 @@ public class LogbookRemunServiceImpl extends BaseVoServiceImpl implements Logboo
} else { } else {
kinerjaDokter = remunerasiService.logbookRemunTarifDokter(idPegawai, bulan, null); kinerjaDokter = remunerasiService.logbookRemunTarifDokter(idPegawai, bulan, null);
} }
List<Map<String, Object>> remun = (List<Map<String, Object>>) kinerjaDokter.get("data");
if(!kinerjaDokter.isEmpty()){ for (Map<String, Object> map : remun) {
List<Map<String, Object>> remun = (List<Map<String, Object>>) kinerjaDokter.get("data"); List<String> listNorecPelayananPasienPetugas = new ArrayList<>();
if(!remun.isEmpty()){ {
for (Map<String, Object> map : remun) { List<Map<String, Object>> detail = (List<Map<String, Object>>) map.get("detail");
List<String> listNorecPelayananPasienPetugas = new ArrayList<>(); for (Map<String, Object> d : detail)
{ listNorecPelayananPasienPetugas.addAll((List<String>) d.get("norecs"));
List<Map<String, Object>> detail = (List<Map<String, Object>>) map.get("detail"); }
for (Map<String, Object> d : detail) LogbookDokter logbookDokter = new LogbookDokter();
listNorecPelayananPasienPetugas.addAll((List<String>) d.get("norecs")); logbookDokter.setKdProfile((short) 0);
} logbookDokter.setStatusEnabled(true);
LogbookDokter logbookDokter = new LogbookDokter(); logbookDokter.setJenisLogbook("JKN");
logbookDokter.setKdProfile((short) 0); logbookDokter.setKelompokPasien(
logbookDokter.setStatusEnabled(true); getKelompokPasien(Integer.parseInt(map.get("idKelompokPasien").toString())));
logbookDokter.setJenisLogbook("JKN"); logbookDokter.setKeterangan(map.get("keterangan").toString());
logbookDokter.setKelompokPasien( logbookDokter.setPersenJasa(
getKelompokPasien(Integer.parseInt(map.get("idKelompokPasien").toString()))); Double.parseDouble(map.get("persenJasa").toString().replace("%", "")));
logbookDokter.setKeterangan(map.get("keterangan").toString()); logbookDokter.setProduk(map.get("namaProduk").toString());
logbookDokter.setPersenJasa( logbookDokter.setProdukId(Integer.parseInt(map.get("idProduk").toString()));
Double.parseDouble(map.get("persenJasa").toString().replace("%", ""))); double hargaJasa = Double.parseDouble(map.get("hargaJasa").toString());
logbookDokter.setProduk(map.get("namaProduk").toString()); logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
logbookDokter.setProdukId(Integer.parseInt(map.get("idProduk").toString())); logbookDokter
double hargaJasa = Double.parseDouble(map.get("hargaJasa").toString()); .setTarif(BigDecimal.valueOf(Double.parseDouble(map.get("hargaJual").toString())));
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa)); int jumlah = Double.valueOf(map.get("jumlah").toString()).intValue();
logbookDokter logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah));
.setTarif(BigDecimal.valueOf(Double.parseDouble(map.get("hargaJual").toString()))); logbookDokter.setTotalTindakan(jumlah);
int jumlah = Double.valueOf(map.get("jumlah").toString()).intValue(); logbookDokter.setLogbookRemun(savedRemun);
logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah)); LogbookDokter savedLogbookDokter = logbookDokterDao.save(logbookDokter);
logbookDokter.setTotalTindakan(jumlah); {
logbookDokter.setLogbookRemun(savedRemun); List<Map<String, Object>> detailLogbook = pelayananPasienService
LogbookDokter savedLogbookDokter = logbookDokterDao.save(logbookDokter); .detailLogbookTarifDokter(idPegawai, listNorecPelayananPasienPetugas);
{ List<DetailLogbookDokter> listDetailLogbookDokter = new ArrayList<>();
List<Map<String, Object>> detailLogbook = pelayananPasienService for (Map<String, Object> detail : detailLogbook) {
.detailLogbookTarifDokter(idPegawai, listNorecPelayananPasienPetugas); DetailLogbookDokter detailLogbookDokter = new DetailLogbookDokter();
List<DetailLogbookDokter> listDetailLogbookDokter = new ArrayList<>(); detailLogbookDokter.setKdProfile((short) 0);
for (Map<String, Object> detail : detailLogbook) { detailLogbookDokter.setStatusEnabled(true);
DetailLogbookDokter detailLogbookDokter = new DetailLogbookDokter(); detailLogbookDokter.setDiskon(
detailLogbookDokter.setKdProfile((short) 0); BigDecimal.valueOf(Double.parseDouble(detail.get("diskon").toString())));
detailLogbookDokter.setStatusEnabled(true); detailLogbookDokter.setJumlahTindakan(
detailLogbookDokter.setDiskon( Double.valueOf(detail.get("jumlah").toString()).intValue());
BigDecimal.valueOf(Double.parseDouble(detail.get("diskon").toString()))); detailLogbookDokter.setJenisPelaksana(detail.get("jenisPelaksana").toString());
detailLogbookDokter.setJumlahTindakan( detailLogbookDokter.setKelas(detail.get("namaKelas").toString());
Double.valueOf(detail.get("jumlah").toString()).intValue()); detailLogbookDokter.setNamaPasien(detail.get("namaPasien").toString());
detailLogbookDokter.setJenisPelaksana(detail.get("jenisPelaksana").toString()); detailLogbookDokter.setNoRegistrasi(detail.get("noRegistrasi").toString());
detailLogbookDokter.setKelas(detail.get("namaKelas").toString()); detailLogbookDokter.setNoRekamMedis(detail.get("noCm").toString());
detailLogbookDokter.setNamaPasien(detail.get("namaPasien").toString()); detailLogbookDokter.setRuangan(detail.get("namaRuangan").toString());
detailLogbookDokter.setNoRegistrasi(detail.get("noRegistrasi").toString()); detailLogbookDokter
detailLogbookDokter.setNoRekamMedis(detail.get("noCm").toString()); .setTanggalPelayanan(DateUtil.toDate(detail.get("tanggal").toString()));
detailLogbookDokter.setRuangan(detail.get("namaRuangan").toString()); detailLogbookDokter.setTarif(
detailLogbookDokter BigDecimal.valueOf(Double.parseDouble(detail.get("hargaJual").toString())));
.setTanggalPelayanan(DateUtil.toDate(detail.get("tanggal").toString())); detailLogbookDokter.setLogbookDokter(savedLogbookDokter);
detailLogbookDokter.setTarif( listDetailLogbookDokter.add(detailLogbookDokter);
BigDecimal.valueOf(Double.parseDouble(detail.get("hargaJual").toString())));
detailLogbookDokter.setLogbookDokter(savedLogbookDokter);
listDetailLogbookDokter.add(detailLogbookDokter);
}
detailLogbookDokterDao.save(listDetailLogbookDokter);
}
} }
detailLogbookDokterDao.save(listDetailLogbookDokter);
} }
} }
} }
@ -198,63 +184,60 @@ public class LogbookRemunServiceImpl extends BaseVoServiceImpl implements Logboo
} else { } else {
ffs = remunerasiService.logbookFfsTarifDokter(idPegawai, bulan, null); ffs = remunerasiService.logbookFfsTarifDokter(idPegawai, bulan, null);
} }
for (Map<String, Object> fee : ffs) {
if(!ffs.isEmpty()){ List<String> listNorecPelayananPasienPetugas = new ArrayList<>();
for (Map<String, Object> fee : ffs) { {
List<String> listNorecPelayananPasienPetugas = new ArrayList<>(); List<Map<String, Object>> detail = (List<Map<String, Object>>) fee.get("detail");
{ for (Map<String, Object> d : detail)
List<Map<String, Object>> detail = (List<Map<String, Object>>) fee.get("detail"); listNorecPelayananPasienPetugas.addAll((List<String>) d.get("norecs"));
for (Map<String, Object> d : detail) }
listNorecPelayananPasienPetugas.addAll((List<String>) d.get("norecs")); LogbookDokter logbookDokter = new LogbookDokter();
} logbookDokter.setKdProfile((short) 0);
LogbookDokter logbookDokter = new LogbookDokter(); logbookDokter.setStatusEnabled(true);
logbookDokter.setKdProfile((short) 0); logbookDokter.setJenisLogbook("DALAM_JAM_KERJA");
logbookDokter.setStatusEnabled(true); logbookDokter.setJenisRuangan(fee.get("jenisRuangan").toString().toUpperCase());
logbookDokter.setJenisLogbook("DALAM_JAM_KERJA"); logbookDokter.setKelompokPasien(
logbookDokter.setJenisRuangan(fee.get("jenisRuangan").toString().toUpperCase()); getKelompokPasien(Integer.parseInt(fee.get("idKelompokPasien").toString())));
logbookDokter.setKelompokPasien( logbookDokter.setKeterangan(fee.get("keterangan").toString());
getKelompokPasien(Integer.parseInt(fee.get("idKelompokPasien").toString()))); logbookDokter.setPersenJasa(
logbookDokter.setKeterangan(fee.get("keterangan").toString()); Double.parseDouble(fee.get("persenJasa").toString().replace("%", "")));
logbookDokter.setPersenJasa( logbookDokter.setProduk(fee.get("namaProduk").toString());
Double.parseDouble(fee.get("persenJasa").toString().replace("%", ""))); logbookDokter.setProdukId(Integer.parseInt(fee.get("idProduk").toString()));
logbookDokter.setProduk(fee.get("namaProduk").toString()); double hargaJasa = Double.parseDouble(fee.get("hargaJasa").toString());
logbookDokter.setProdukId(Integer.parseInt(fee.get("idProduk").toString())); logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
double hargaJasa = Double.parseDouble(fee.get("hargaJasa").toString()); logbookDokter
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa)); .setTarif(BigDecimal.valueOf(Double.parseDouble(fee.get("hargaJual").toString())));
logbookDokter int jumlah = Double.valueOf(fee.get("jumlah").toString()).intValue();
.setTarif(BigDecimal.valueOf(Double.parseDouble(fee.get("hargaJual").toString()))); logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah));
int jumlah = Double.valueOf(fee.get("jumlah").toString()).intValue(); logbookDokter.setTotalTindakan(jumlah);
logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah)); logbookDokter.setLogbookRemun(savedRemun);
logbookDokter.setTotalTindakan(jumlah); LogbookDokter savedLogbookDokter = logbookDokterDao.save(logbookDokter);
logbookDokter.setLogbookRemun(savedRemun); {
LogbookDokter savedLogbookDokter = logbookDokterDao.save(logbookDokter); List<Map<String, Object>> detailLogbook = pelayananPasienService
{ .detailLogbookTarifDokter(idPegawai, listNorecPelayananPasienPetugas);
List<Map<String, Object>> detailLogbook = pelayananPasienService List<DetailLogbookDokter> listDetailLogbookDokter = new ArrayList<>();
.detailLogbookTarifDokter(idPegawai, listNorecPelayananPasienPetugas); for (Map<String, Object> detail : detailLogbook) {
List<DetailLogbookDokter> listDetailLogbookDokter = new ArrayList<>(); DetailLogbookDokter detailLogbookDokter = new DetailLogbookDokter();
for (Map<String, Object> detail : detailLogbook) { detailLogbookDokter.setKdProfile((short) 0);
DetailLogbookDokter detailLogbookDokter = new DetailLogbookDokter(); detailLogbookDokter.setStatusEnabled(true);
detailLogbookDokter.setKdProfile((short) 0); detailLogbookDokter.setDiskon(
detailLogbookDokter.setStatusEnabled(true); BigDecimal.valueOf(Double.parseDouble(detail.get("diskon").toString())));
detailLogbookDokter.setDiskon( detailLogbookDokter.setJumlahTindakan(
BigDecimal.valueOf(Double.parseDouble(detail.get("diskon").toString()))); Double.valueOf(detail.get("jumlah").toString()).intValue());
detailLogbookDokter.setJumlahTindakan( detailLogbookDokter.setJenisPelaksana(detail.get("jenisPelaksana").toString());
Double.valueOf(detail.get("jumlah").toString()).intValue()); detailLogbookDokter.setKelas(detail.get("namaKelas").toString());
detailLogbookDokter.setJenisPelaksana(detail.get("jenisPelaksana").toString()); detailLogbookDokter.setNamaPasien(detail.get("namaPasien").toString());
detailLogbookDokter.setKelas(detail.get("namaKelas").toString()); detailLogbookDokter.setNoRegistrasi(detail.get("noRegistrasi").toString());
detailLogbookDokter.setNamaPasien(detail.get("namaPasien").toString()); detailLogbookDokter.setNoRekamMedis(detail.get("noCm").toString());
detailLogbookDokter.setNoRegistrasi(detail.get("noRegistrasi").toString()); detailLogbookDokter.setRuangan(detail.get("namaRuangan").toString());
detailLogbookDokter.setNoRekamMedis(detail.get("noCm").toString()); detailLogbookDokter
detailLogbookDokter.setRuangan(detail.get("namaRuangan").toString()); .setTanggalPelayanan(DateUtil.toDate(detail.get("tanggal").toString()));
detailLogbookDokter detailLogbookDokter.setTarif(
.setTanggalPelayanan(DateUtil.toDate(detail.get("tanggal").toString())); BigDecimal.valueOf(Double.parseDouble(detail.get("hargaJual").toString())));
detailLogbookDokter.setTarif( detailLogbookDokter.setLogbookDokter(savedLogbookDokter);
BigDecimal.valueOf(Double.parseDouble(detail.get("hargaJual").toString()))); listDetailLogbookDokter.add(detailLogbookDokter);
detailLogbookDokter.setLogbookDokter(savedLogbookDokter);
listDetailLogbookDokter.add(detailLogbookDokter);
}
detailLogbookDokterDao.save(listDetailLogbookDokter);
} }
detailLogbookDokterDao.save(listDetailLogbookDokter);
} }
} }
} }
@ -265,63 +248,60 @@ public class LogbookRemunServiceImpl extends BaseVoServiceImpl implements Logboo
} else { } else {
ffs = remunerasiService.logbookFfsLuarTarifDokter(idPegawai, bulan, null); ffs = remunerasiService.logbookFfsLuarTarifDokter(idPegawai, bulan, null);
} }
for (Map<String, Object> fee : ffs) {
if(!ffs.isEmpty()){ List<String> listNorecPelayananPasienPetugas = new ArrayList<>();
for (Map<String, Object> fee : ffs) { {
List<String> listNorecPelayananPasienPetugas = new ArrayList<>(); List<Map<String, Object>> detail = (List<Map<String, Object>>) fee.get("detail");
{ for (Map<String, Object> d : detail)
List<Map<String, Object>> detail = (List<Map<String, Object>>) fee.get("detail"); listNorecPelayananPasienPetugas.addAll((List<String>) d.get("norecs"));
for (Map<String, Object> d : detail) }
listNorecPelayananPasienPetugas.addAll((List<String>) d.get("norecs")); LogbookDokter logbookDokter = new LogbookDokter();
} logbookDokter.setKdProfile((short) 0);
LogbookDokter logbookDokter = new LogbookDokter(); logbookDokter.setStatusEnabled(true);
logbookDokter.setKdProfile((short) 0); logbookDokter.setJenisLogbook("LUAR_JAM_KERJA");
logbookDokter.setStatusEnabled(true); logbookDokter.setJenisRuangan(fee.get("jenisRuangan").toString().toUpperCase());
logbookDokter.setJenisLogbook("LUAR_JAM_KERJA"); logbookDokter.setKelompokPasien(
logbookDokter.setJenisRuangan(fee.get("jenisRuangan").toString().toUpperCase()); getKelompokPasien(Integer.parseInt(fee.get("idKelompokPasien").toString())));
logbookDokter.setKelompokPasien( logbookDokter.setKeterangan(fee.get("keterangan").toString());
getKelompokPasien(Integer.parseInt(fee.get("idKelompokPasien").toString()))); logbookDokter.setPersenJasa(
logbookDokter.setKeterangan(fee.get("keterangan").toString()); Double.parseDouble(fee.get("persenJasa").toString().replace("%", "")));
logbookDokter.setPersenJasa( logbookDokter.setProduk(fee.get("namaProduk").toString());
Double.parseDouble(fee.get("persenJasa").toString().replace("%", ""))); logbookDokter.setProdukId(Integer.parseInt(fee.get("idProduk").toString()));
logbookDokter.setProduk(fee.get("namaProduk").toString()); double hargaJasa = Double.parseDouble(fee.get("hargaJasa").toString());
logbookDokter.setProdukId(Integer.parseInt(fee.get("idProduk").toString())); logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
double hargaJasa = Double.parseDouble(fee.get("hargaJasa").toString()); logbookDokter
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa)); .setTarif(BigDecimal.valueOf(Double.parseDouble(fee.get("hargaJual").toString())));
logbookDokter int jumlah = Double.valueOf(fee.get("jumlah").toString()).intValue();
.setTarif(BigDecimal.valueOf(Double.parseDouble(fee.get("hargaJual").toString()))); logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah));
int jumlah = Double.valueOf(fee.get("jumlah").toString()).intValue(); logbookDokter.setTotalTindakan(jumlah);
logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah)); logbookDokter.setLogbookRemun(savedRemun);
logbookDokter.setTotalTindakan(jumlah); LogbookDokter savedLogbookDokter = logbookDokterDao.save(logbookDokter);
logbookDokter.setLogbookRemun(savedRemun); {
LogbookDokter savedLogbookDokter = logbookDokterDao.save(logbookDokter); List<Map<String, Object>> detailLogbook = pelayananPasienService
{ .detailLogbookTarifDokter(idPegawai, listNorecPelayananPasienPetugas);
List<Map<String, Object>> detailLogbook = pelayananPasienService List<DetailLogbookDokter> listDetailLogbookDokter = new ArrayList<>();
.detailLogbookTarifDokter(idPegawai, listNorecPelayananPasienPetugas); for (Map<String, Object> detail : detailLogbook) {
List<DetailLogbookDokter> listDetailLogbookDokter = new ArrayList<>(); DetailLogbookDokter detailLogbookDokter = new DetailLogbookDokter();
for (Map<String, Object> detail : detailLogbook) { detailLogbookDokter.setKdProfile((short) 0);
DetailLogbookDokter detailLogbookDokter = new DetailLogbookDokter(); detailLogbookDokter.setStatusEnabled(true);
detailLogbookDokter.setKdProfile((short) 0); detailLogbookDokter.setDiskon(
detailLogbookDokter.setStatusEnabled(true); BigDecimal.valueOf(Double.parseDouble(detail.get("diskon").toString())));
detailLogbookDokter.setDiskon( detailLogbookDokter.setJumlahTindakan(
BigDecimal.valueOf(Double.parseDouble(detail.get("diskon").toString()))); Double.valueOf(detail.get("jumlah").toString()).intValue());
detailLogbookDokter.setJumlahTindakan( detailLogbookDokter.setJenisPelaksana(detail.get("jenisPelaksana").toString());
Double.valueOf(detail.get("jumlah").toString()).intValue()); detailLogbookDokter.setKelas(detail.get("namaKelas").toString());
detailLogbookDokter.setJenisPelaksana(detail.get("jenisPelaksana").toString()); detailLogbookDokter.setNamaPasien(detail.get("namaPasien").toString());
detailLogbookDokter.setKelas(detail.get("namaKelas").toString()); detailLogbookDokter.setNoRegistrasi(detail.get("noRegistrasi").toString());
detailLogbookDokter.setNamaPasien(detail.get("namaPasien").toString()); detailLogbookDokter.setNoRekamMedis(detail.get("noCm").toString());
detailLogbookDokter.setNoRegistrasi(detail.get("noRegistrasi").toString()); detailLogbookDokter.setRuangan(detail.get("namaRuangan").toString());
detailLogbookDokter.setNoRekamMedis(detail.get("noCm").toString()); detailLogbookDokter
detailLogbookDokter.setRuangan(detail.get("namaRuangan").toString()); .setTanggalPelayanan(DateUtil.toDate(detail.get("tanggal").toString()));
detailLogbookDokter detailLogbookDokter.setTarif(
.setTanggalPelayanan(DateUtil.toDate(detail.get("tanggal").toString())); BigDecimal.valueOf(Double.parseDouble(detail.get("hargaJual").toString())));
detailLogbookDokter.setTarif( detailLogbookDokter.setLogbookDokter(savedLogbookDokter);
BigDecimal.valueOf(Double.parseDouble(detail.get("hargaJual").toString()))); listDetailLogbookDokter.add(detailLogbookDokter);
detailLogbookDokter.setLogbookDokter(savedLogbookDokter);
listDetailLogbookDokter.add(detailLogbookDokter);
}
detailLogbookDokterDao.save(listDetailLogbookDokter);
} }
detailLogbookDokterDao.save(listDetailLogbookDokter);
} }
} }
} }
@ -332,61 +312,58 @@ public class LogbookRemunServiceImpl extends BaseVoServiceImpl implements Logboo
} else { } else {
fixedPay = remunerasiService.logbookFixedPayDokter(idPegawai, bulan, null); fixedPay = remunerasiService.logbookFixedPayDokter(idPegawai, bulan, null);
} }
for (Map<String, Object> pay : fixedPay) {
if(!fixedPay.isEmpty()){ List<String> listNorecPelayananPasienPetugas = new ArrayList<>();
for (Map<String, Object> pay : fixedPay) { {
List<String> listNorecPelayananPasienPetugas = new ArrayList<>(); List<Map<String, Object>> detail = (List<Map<String, Object>>) pay.get("detail");
{ for (Map<String, Object> d : detail)
List<Map<String, Object>> detail = (List<Map<String, Object>>) pay.get("detail"); listNorecPelayananPasienPetugas.addAll((List<String>) d.get("norecs"));
for (Map<String, Object> d : detail) }
listNorecPelayananPasienPetugas.addAll((List<String>) d.get("norecs")); LogbookDokter logbookDokter = new LogbookDokter();
} logbookDokter.setKdProfile((short) 0);
LogbookDokter logbookDokter = new LogbookDokter(); logbookDokter.setStatusEnabled(true);
logbookDokter.setKdProfile((short) 0); logbookDokter.setJenisLogbook("FIXED_PAY");
logbookDokter.setStatusEnabled(true); logbookDokter.setJenisRuangan(pay.get("jenisRuangan").toString().toUpperCase());
logbookDokter.setJenisLogbook("FIXED_PAY"); logbookDokter.setKelompokPasien(
logbookDokter.setJenisRuangan(pay.get("jenisRuangan").toString().toUpperCase()); getKelompokPasien(Integer.parseInt(pay.get("idKelompokPasien").toString())));
logbookDokter.setKelompokPasien( logbookDokter.setKeterangan(pay.get("keterangan").toString());
getKelompokPasien(Integer.parseInt(pay.get("idKelompokPasien").toString()))); logbookDokter.setProduk(pay.get("namaProduk").toString());
logbookDokter.setKeterangan(pay.get("keterangan").toString()); logbookDokter.setProdukId(Integer.parseInt(pay.get("idProduk").toString()));
logbookDokter.setProduk(pay.get("namaProduk").toString()); double hargaJasa = Double.parseDouble(pay.get("hargaJasa").toString());
logbookDokter.setProdukId(Integer.parseInt(pay.get("idProduk").toString())); logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
double hargaJasa = Double.parseDouble(pay.get("hargaJasa").toString()); logbookDokter
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa)); .setTarif(BigDecimal.valueOf(Double.parseDouble(pay.get("hargaJual").toString())));
logbookDokter int jumlah = Double.valueOf(pay.get("jumlah").toString()).intValue();
.setTarif(BigDecimal.valueOf(Double.parseDouble(pay.get("hargaJual").toString()))); logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah));
int jumlah = Double.valueOf(pay.get("jumlah").toString()).intValue(); logbookDokter.setTotalTindakan(jumlah);
logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah)); logbookDokter.setLogbookRemun(savedRemun);
logbookDokter.setTotalTindakan(jumlah); LogbookDokter savedLogbookDokter = logbookDokterDao.save(logbookDokter);
logbookDokter.setLogbookRemun(savedRemun); {
LogbookDokter savedLogbookDokter = logbookDokterDao.save(logbookDokter); List<Map<String, Object>> detailLogbook = pelayananPasienService
{ .detailLogbookTarifDokter(idPegawai, listNorecPelayananPasienPetugas);
List<Map<String, Object>> detailLogbook = pelayananPasienService List<DetailLogbookDokter> listDetailLogbookDokter = new ArrayList<>();
.detailLogbookTarifDokter(idPegawai, listNorecPelayananPasienPetugas); for (Map<String, Object> detail : detailLogbook) {
List<DetailLogbookDokter> listDetailLogbookDokter = new ArrayList<>(); DetailLogbookDokter detailLogbookDokter = new DetailLogbookDokter();
for (Map<String, Object> detail : detailLogbook) { detailLogbookDokter.setKdProfile((short) 0);
DetailLogbookDokter detailLogbookDokter = new DetailLogbookDokter(); detailLogbookDokter.setStatusEnabled(true);
detailLogbookDokter.setKdProfile((short) 0); detailLogbookDokter.setDiskon(
detailLogbookDokter.setStatusEnabled(true); BigDecimal.valueOf(Double.parseDouble(detail.get("diskon").toString())));
detailLogbookDokter.setDiskon( detailLogbookDokter.setJumlahTindakan(
BigDecimal.valueOf(Double.parseDouble(detail.get("diskon").toString()))); Double.valueOf(detail.get("jumlah").toString()).intValue());
detailLogbookDokter.setJumlahTindakan( detailLogbookDokter.setJenisPelaksana(detail.get("jenisPelaksana").toString());
Double.valueOf(detail.get("jumlah").toString()).intValue()); detailLogbookDokter.setKelas(detail.get("namaKelas").toString());
detailLogbookDokter.setJenisPelaksana(detail.get("jenisPelaksana").toString()); detailLogbookDokter.setNamaPasien(detail.get("namaPasien").toString());
detailLogbookDokter.setKelas(detail.get("namaKelas").toString()); detailLogbookDokter.setNoRegistrasi(detail.get("noRegistrasi").toString());
detailLogbookDokter.setNamaPasien(detail.get("namaPasien").toString()); detailLogbookDokter.setNoRekamMedis(detail.get("noCm").toString());
detailLogbookDokter.setNoRegistrasi(detail.get("noRegistrasi").toString()); detailLogbookDokter.setRuangan(detail.get("namaRuangan").toString());
detailLogbookDokter.setNoRekamMedis(detail.get("noCm").toString()); detailLogbookDokter
detailLogbookDokter.setRuangan(detail.get("namaRuangan").toString()); .setTanggalPelayanan(DateUtil.toDate(detail.get("tanggal").toString()));
detailLogbookDokter detailLogbookDokter.setTarif(
.setTanggalPelayanan(DateUtil.toDate(detail.get("tanggal").toString())); BigDecimal.valueOf(Double.parseDouble(detail.get("hargaJual").toString())));
detailLogbookDokter.setTarif( detailLogbookDokter.setLogbookDokter(savedLogbookDokter);
BigDecimal.valueOf(Double.parseDouble(detail.get("hargaJual").toString()))); listDetailLogbookDokter.add(detailLogbookDokter);
detailLogbookDokter.setLogbookDokter(savedLogbookDokter);
listDetailLogbookDokter.add(detailLogbookDokter);
}
detailLogbookDokterDao.save(listDetailLogbookDokter);
} }
detailLogbookDokterDao.save(listDetailLogbookDokter);
} }
} }
} }
@ -397,61 +374,58 @@ public class LogbookRemunServiceImpl extends BaseVoServiceImpl implements Logboo
} else { } else {
klaimMpp = remunerasiService.logbookKlaimMppDokter(idPegawai, bulan); klaimMpp = remunerasiService.logbookKlaimMppDokter(idPegawai, bulan);
} }
for (Map<String, Object> mpp : klaimMpp) {
if(!klaimMpp.isEmpty()){ List<String> listNorecPelayananPasienPetugas = new ArrayList<>();
for (Map<String, Object> mpp : klaimMpp) { {
List<String> listNorecPelayananPasienPetugas = new ArrayList<>(); List<Map<String, Object>> detail = (List<Map<String, Object>>) mpp.get("detail");
{ for (Map<String, Object> d : detail)
List<Map<String, Object>> detail = (List<Map<String, Object>>) mpp.get("detail"); listNorecPelayananPasienPetugas.addAll((List<String>) d.get("norecs"));
for (Map<String, Object> d : detail) }
listNorecPelayananPasienPetugas.addAll((List<String>) d.get("norecs")); LogbookDokter logbookDokter = new LogbookDokter();
} logbookDokter.setKdProfile((short) 0);
LogbookDokter logbookDokter = new LogbookDokter(); logbookDokter.setStatusEnabled(true);
logbookDokter.setKdProfile((short) 0); logbookDokter.setJenisLogbook("KLAIM_MPP");
logbookDokter.setStatusEnabled(true); logbookDokter.setJenisRuangan(mpp.get("jenisRuangan").toString().toUpperCase());
logbookDokter.setJenisLogbook("KLAIM_MPP"); logbookDokter.setKelompokPasien(
logbookDokter.setJenisRuangan(mpp.get("jenisRuangan").toString().toUpperCase()); getKelompokPasien(Integer.parseInt(mpp.get("idKelompokPasien").toString())));
logbookDokter.setKelompokPasien( logbookDokter.setKeterangan(mpp.get("keterangan").toString());
getKelompokPasien(Integer.parseInt(mpp.get("idKelompokPasien").toString()))); logbookDokter.setProduk(mpp.get("namaProduk").toString());
logbookDokter.setKeterangan(mpp.get("keterangan").toString()); logbookDokter.setProdukId(Integer.parseInt(mpp.get("idProduk").toString()));
logbookDokter.setProduk(mpp.get("namaProduk").toString()); double hargaJasa = Double.parseDouble(mpp.get("hargaJasa").toString());
logbookDokter.setProdukId(Integer.parseInt(mpp.get("idProduk").toString())); logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
double hargaJasa = Double.parseDouble(mpp.get("hargaJasa").toString()); logbookDokter
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa)); .setTarif(BigDecimal.valueOf(Double.parseDouble(mpp.get("hargaJual").toString())));
logbookDokter int jumlah = Double.valueOf(mpp.get("jumlah").toString()).intValue();
.setTarif(BigDecimal.valueOf(Double.parseDouble(mpp.get("hargaJual").toString()))); logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah));
int jumlah = Double.valueOf(mpp.get("jumlah").toString()).intValue(); logbookDokter.setTotalTindakan(jumlah);
logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah)); logbookDokter.setLogbookRemun(savedRemun);
logbookDokter.setTotalTindakan(jumlah); LogbookDokter savedLogbookDokter = logbookDokterDao.save(logbookDokter);
logbookDokter.setLogbookRemun(savedRemun); {
LogbookDokter savedLogbookDokter = logbookDokterDao.save(logbookDokter); List<Map<String, Object>> detailLogbook = pelayananPasienService
{ .detailLogbookTarifDokter(idPegawai, listNorecPelayananPasienPetugas);
List<Map<String, Object>> detailLogbook = pelayananPasienService List<DetailLogbookDokter> listDetailLogbookDokter = new ArrayList<>();
.detailLogbookTarifDokter(idPegawai, listNorecPelayananPasienPetugas); for (Map<String, Object> detail : detailLogbook) {
List<DetailLogbookDokter> listDetailLogbookDokter = new ArrayList<>(); DetailLogbookDokter detailLogbookDokter = new DetailLogbookDokter();
for (Map<String, Object> detail : detailLogbook) { detailLogbookDokter.setKdProfile((short) 0);
DetailLogbookDokter detailLogbookDokter = new DetailLogbookDokter(); detailLogbookDokter.setStatusEnabled(true);
detailLogbookDokter.setKdProfile((short) 0); detailLogbookDokter.setDiskon(
detailLogbookDokter.setStatusEnabled(true); BigDecimal.valueOf(Double.parseDouble(detail.get("diskon").toString())));
detailLogbookDokter.setDiskon( detailLogbookDokter.setJumlahTindakan(
BigDecimal.valueOf(Double.parseDouble(detail.get("diskon").toString()))); Double.valueOf(detail.get("jumlah").toString()).intValue());
detailLogbookDokter.setJumlahTindakan( detailLogbookDokter.setJenisPelaksana(detail.get("jenisPelaksana").toString());
Double.valueOf(detail.get("jumlah").toString()).intValue()); detailLogbookDokter.setKelas(detail.get("namaKelas").toString());
detailLogbookDokter.setJenisPelaksana(detail.get("jenisPelaksana").toString()); detailLogbookDokter.setNamaPasien(detail.get("namaPasien").toString());
detailLogbookDokter.setKelas(detail.get("namaKelas").toString()); detailLogbookDokter.setNoRegistrasi(detail.get("noRegistrasi").toString());
detailLogbookDokter.setNamaPasien(detail.get("namaPasien").toString()); detailLogbookDokter.setNoRekamMedis(detail.get("noCm").toString());
detailLogbookDokter.setNoRegistrasi(detail.get("noRegistrasi").toString()); detailLogbookDokter.setRuangan(detail.get("namaRuangan").toString());
detailLogbookDokter.setNoRekamMedis(detail.get("noCm").toString()); detailLogbookDokter
detailLogbookDokter.setRuangan(detail.get("namaRuangan").toString()); .setTanggalPelayanan(DateUtil.toDate(detail.get("tanggal").toString()));
detailLogbookDokter detailLogbookDokter.setTarif(
.setTanggalPelayanan(DateUtil.toDate(detail.get("tanggal").toString())); BigDecimal.valueOf(Double.parseDouble(detail.get("hargaJual").toString())));
detailLogbookDokter.setTarif( detailLogbookDokter.setLogbookDokter(savedLogbookDokter);
BigDecimal.valueOf(Double.parseDouble(detail.get("hargaJual").toString()))); listDetailLogbookDokter.add(detailLogbookDokter);
detailLogbookDokter.setLogbookDokter(savedLogbookDokter);
listDetailLogbookDokter.add(detailLogbookDokter);
}
detailLogbookDokterDao.save(listDetailLogbookDokter);
} }
detailLogbookDokterDao.save(listDetailLogbookDokter);
} }
} }
} }

7
jasamedika-pelayanan/src/main/java/com/jasamedika/medifirst2000/task/schedule/LogbookTask.java
View File

@ -199,16 +199,9 @@ public class LogbookTask {
LOGGER.info("Simpan rekapitulasi logbook dokter berhasil...!"); LOGGER.info("Simpan rekapitulasi logbook dokter berhasil...!");
} }
/*
@Scheduled(cron = "0 0 0 1-6 * ?") @Scheduled(cron = "0 0 0 1-6 * ?")
public void saveRekapDetailLogbookDokter() { public void saveRekapDetailLogbookDokter() {
logbookRemunService.generateRecap(); logbookRemunService.generateRecap();
} }
*/
@Scheduled(cron = "0 15 0 4-5 * ?")
public void saveRekapDetailLogbookDokter() {
logbookRemunService.generateRecap(null);
}
} }

17
jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/LogbookRemunController.java
View File

@ -11,7 +11,6 @@ import org.springframework.http.ResponseEntity;
import org.springframework.orm.jpa.JpaSystemException; import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.PathVariable;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -24,7 +23,6 @@ import static org.springframework.http.HttpStatus.ACCEPTED;
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
import static org.springframework.web.bind.annotation.RequestMethod.POST; import static org.springframework.web.bind.annotation.RequestMethod.POST;
import static org.springframework.web.bind.annotation.RequestMethod.GET;
/** /**
* @author Salman * @author Salman
@ -43,7 +41,7 @@ public class LogbookRemunController extends LocaleController<LogbookKinerjaVO> {
@RequestMapping(value = "/rekap", method = POST, produces = APPLICATION_JSON_VALUE) @RequestMapping(value = "/rekap", method = POST, produces = APPLICATION_JSON_VALUE)
public ResponseEntity<String> patchingRecapLogbook(HttpServletRequest request) { public ResponseEntity<String> patchingRecapLogbook(HttpServletRequest request) {
try { try {
logbookRemunService.generateRecap(null); logbookRemunService.generateRecap();
mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request)); mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
return getJsonResponse("The recap has been successfully generated", ACCEPTED, mapHeaderMessage); return getJsonResponse("The recap has been successfully generated", ACCEPTED, mapHeaderMessage);
} catch (ServiceVOException | JpaSystemException e) { } catch (ServiceVOException | JpaSystemException e) {
@ -53,17 +51,4 @@ public class LogbookRemunController extends LocaleController<LogbookKinerjaVO> {
} }
} }
@RequestMapping(value = "/rekap/by-pegawai/{idPegawai}", method = GET, produces = APPLICATION_JSON_VALUE)
public ResponseEntity<String> patchingRecapLogbook1(HttpServletRequest request, @PathVariable("idPegawai") Integer idPegawai) {
try {
//System.out.println(idPegawai);
logbookRemunService.generateRecap(idPegawai);
mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
return getJsonResponse("The recap has been successfully generated", ACCEPTED, mapHeaderMessage);
} catch (ServiceVOException | JpaSystemException e) {
LOGGER.error("Got Exception {} when generateRecap", e.getMessage());
mapHeaderMessage.put(ERROR_MESSAGE, e.getMessage());
return getJsonHttptatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
}
}
} }