Merge branch 'dev/base' into dev/technical-debt/clean-code
This commit is contained in:
commit
171e5a984a
@ -501,4 +501,9 @@ 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);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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();
|
void generateRecap(Integer idPegawai);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,6 +9,8 @@ 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;
|
||||||
@ -62,21 +64,28 @@ public class LogbookRemunServiceImpl extends BaseVoServiceImpl implements Logboo
|
|||||||
private MapJabatanProfesiDao mapJabatanProfesiDao;
|
private MapJabatanProfesiDao mapJabatanProfesiDao;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void generateRecap() {
|
public void generateRecap(Integer idPegawai) {
|
||||||
LOGGER.info("Start simpan rekapitulasi detail logbook dokter");
|
LOGGER.info("Start simpan rekapitulasi detail logbook dokter");
|
||||||
|
|
||||||
LocalDate localDate = LocalDate.now().minusMonths(1);
|
Set<Integer> listIdDokter = new HashSet<>();
|
||||||
Date date = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
|
LocalDate localDate = LocalDate.now().minusMonths(1);
|
||||||
Date tglAwal = DateUtil.startMonth(date);
|
Date date = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
|
||||||
Date tglAkhir = DateUtil.endMonth(date);
|
Date tglAwal = DateUtil.startMonth(date);
|
||||||
Set<Integer> listIdDokter = mapPegawaiJabatanToUnitKerjaDao
|
Date tglAkhir = DateUtil.endMonth(date);
|
||||||
.findDokterByUnitKerja(splitDataSettingDatafixed("listIdUnitKerjaKsm"));
|
|
||||||
List<Integer> listTerapis = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
|
if (CommonUtil.isNotNullOrEmpty(idPegawai)) {
|
||||||
listIdDokter.addAll(listTerapis);
|
Set<Integer> getListIdDokter = mapPegawaiJabatanToUnitKerjaDao.findDokterByPegawaiId(idPegawai);
|
||||||
if (!listIdDokter.isEmpty()) {
|
listIdDokter.addAll(getListIdDokter);
|
||||||
// Delete untuk pembaharuan data
|
}else{
|
||||||
deleteByPeriod(listIdDokter, tglAwal, tglAkhir);
|
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);
|
||||||
|
}
|
||||||
saveRekapDetailLogbookDokter(listIdDokter, date);
|
saveRekapDetailLogbookDokter(listIdDokter, date);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -120,60 +129,65 @@ 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");
|
|
||||||
for (Map<String, Object> map : remun) {
|
if(!kinerjaDokter.isEmpty()){
|
||||||
List<String> listNorecPelayananPasienPetugas = new ArrayList<>();
|
List<Map<String, Object>> remun = (List<Map<String, Object>>) kinerjaDokter.get("data");
|
||||||
{
|
if(!remun.isEmpty()){
|
||||||
List<Map<String, Object>> detail = (List<Map<String, Object>>) map.get("detail");
|
for (Map<String, Object> map : remun) {
|
||||||
for (Map<String, Object> d : detail)
|
List<String> listNorecPelayananPasienPetugas = new ArrayList<>();
|
||||||
listNorecPelayananPasienPetugas.addAll((List<String>) d.get("norecs"));
|
{
|
||||||
}
|
List<Map<String, Object>> detail = (List<Map<String, Object>>) map.get("detail");
|
||||||
LogbookDokter logbookDokter = new LogbookDokter();
|
for (Map<String, Object> d : detail)
|
||||||
logbookDokter.setKdProfile((short) 0);
|
listNorecPelayananPasienPetugas.addAll((List<String>) d.get("norecs"));
|
||||||
logbookDokter.setStatusEnabled(true);
|
}
|
||||||
logbookDokter.setJenisLogbook("JKN");
|
LogbookDokter logbookDokter = new LogbookDokter();
|
||||||
logbookDokter.setKelompokPasien(
|
logbookDokter.setKdProfile((short) 0);
|
||||||
getKelompokPasien(Integer.parseInt(map.get("idKelompokPasien").toString())));
|
logbookDokter.setStatusEnabled(true);
|
||||||
logbookDokter.setKeterangan(map.get("keterangan").toString());
|
logbookDokter.setJenisLogbook("JKN");
|
||||||
logbookDokter.setPersenJasa(
|
logbookDokter.setKelompokPasien(
|
||||||
Double.parseDouble(map.get("persenJasa").toString().replace("%", "")));
|
getKelompokPasien(Integer.parseInt(map.get("idKelompokPasien").toString())));
|
||||||
logbookDokter.setProduk(map.get("namaProduk").toString());
|
logbookDokter.setKeterangan(map.get("keterangan").toString());
|
||||||
logbookDokter.setProdukId(Integer.parseInt(map.get("idProduk").toString()));
|
logbookDokter.setPersenJasa(
|
||||||
double hargaJasa = Double.parseDouble(map.get("hargaJasa").toString());
|
Double.parseDouble(map.get("persenJasa").toString().replace("%", "")));
|
||||||
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
|
logbookDokter.setProduk(map.get("namaProduk").toString());
|
||||||
logbookDokter
|
logbookDokter.setProdukId(Integer.parseInt(map.get("idProduk").toString()));
|
||||||
.setTarif(BigDecimal.valueOf(Double.parseDouble(map.get("hargaJual").toString())));
|
double hargaJasa = Double.parseDouble(map.get("hargaJasa").toString());
|
||||||
int jumlah = Double.valueOf(map.get("jumlah").toString()).intValue();
|
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
|
||||||
logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah));
|
logbookDokter
|
||||||
logbookDokter.setTotalTindakan(jumlah);
|
.setTarif(BigDecimal.valueOf(Double.parseDouble(map.get("hargaJual").toString())));
|
||||||
logbookDokter.setLogbookRemun(savedRemun);
|
int jumlah = Double.valueOf(map.get("jumlah").toString()).intValue();
|
||||||
LogbookDokter savedLogbookDokter = logbookDokterDao.save(logbookDokter);
|
logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah));
|
||||||
{
|
logbookDokter.setTotalTindakan(jumlah);
|
||||||
List<Map<String, Object>> detailLogbook = pelayananPasienService
|
logbookDokter.setLogbookRemun(savedRemun);
|
||||||
.detailLogbookTarifDokter(idPegawai, listNorecPelayananPasienPetugas);
|
LogbookDokter savedLogbookDokter = logbookDokterDao.save(logbookDokter);
|
||||||
List<DetailLogbookDokter> listDetailLogbookDokter = new ArrayList<>();
|
{
|
||||||
for (Map<String, Object> detail : detailLogbook) {
|
List<Map<String, Object>> detailLogbook = pelayananPasienService
|
||||||
DetailLogbookDokter detailLogbookDokter = new DetailLogbookDokter();
|
.detailLogbookTarifDokter(idPegawai, listNorecPelayananPasienPetugas);
|
||||||
detailLogbookDokter.setKdProfile((short) 0);
|
List<DetailLogbookDokter> listDetailLogbookDokter = new ArrayList<>();
|
||||||
detailLogbookDokter.setStatusEnabled(true);
|
for (Map<String, Object> detail : detailLogbook) {
|
||||||
detailLogbookDokter.setDiskon(
|
DetailLogbookDokter detailLogbookDokter = new DetailLogbookDokter();
|
||||||
BigDecimal.valueOf(Double.parseDouble(detail.get("diskon").toString())));
|
detailLogbookDokter.setKdProfile((short) 0);
|
||||||
detailLogbookDokter.setJumlahTindakan(
|
detailLogbookDokter.setStatusEnabled(true);
|
||||||
Double.valueOf(detail.get("jumlah").toString()).intValue());
|
detailLogbookDokter.setDiskon(
|
||||||
detailLogbookDokter.setJenisPelaksana(detail.get("jenisPelaksana").toString());
|
BigDecimal.valueOf(Double.parseDouble(detail.get("diskon").toString())));
|
||||||
detailLogbookDokter.setKelas(detail.get("namaKelas").toString());
|
detailLogbookDokter.setJumlahTindakan(
|
||||||
detailLogbookDokter.setNamaPasien(detail.get("namaPasien").toString());
|
Double.valueOf(detail.get("jumlah").toString()).intValue());
|
||||||
detailLogbookDokter.setNoRegistrasi(detail.get("noRegistrasi").toString());
|
detailLogbookDokter.setJenisPelaksana(detail.get("jenisPelaksana").toString());
|
||||||
detailLogbookDokter.setNoRekamMedis(detail.get("noCm").toString());
|
detailLogbookDokter.setKelas(detail.get("namaKelas").toString());
|
||||||
detailLogbookDokter.setRuangan(detail.get("namaRuangan").toString());
|
detailLogbookDokter.setNamaPasien(detail.get("namaPasien").toString());
|
||||||
detailLogbookDokter
|
detailLogbookDokter.setNoRegistrasi(detail.get("noRegistrasi").toString());
|
||||||
.setTanggalPelayanan(DateUtil.toDate(detail.get("tanggal").toString()));
|
detailLogbookDokter.setNoRekamMedis(detail.get("noCm").toString());
|
||||||
detailLogbookDokter.setTarif(
|
detailLogbookDokter.setRuangan(detail.get("namaRuangan").toString());
|
||||||
BigDecimal.valueOf(Double.parseDouble(detail.get("hargaJual").toString())));
|
detailLogbookDokter
|
||||||
detailLogbookDokter.setLogbookDokter(savedLogbookDokter);
|
.setTanggalPelayanan(DateUtil.toDate(detail.get("tanggal").toString()));
|
||||||
listDetailLogbookDokter.add(detailLogbookDokter);
|
detailLogbookDokter.setTarif(
|
||||||
|
BigDecimal.valueOf(Double.parseDouble(detail.get("hargaJual").toString())));
|
||||||
|
detailLogbookDokter.setLogbookDokter(savedLogbookDokter);
|
||||||
|
listDetailLogbookDokter.add(detailLogbookDokter);
|
||||||
|
}
|
||||||
|
detailLogbookDokterDao.save(listDetailLogbookDokter);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
detailLogbookDokterDao.save(listDetailLogbookDokter);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -184,60 +198,63 @@ 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) {
|
|
||||||
List<String> listNorecPelayananPasienPetugas = new ArrayList<>();
|
if(!ffs.isEmpty()){
|
||||||
{
|
for (Map<String, Object> fee : ffs) {
|
||||||
List<Map<String, Object>> detail = (List<Map<String, Object>>) fee.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>>) fee.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("DALAM_JAM_KERJA");
|
logbookDokter.setKdProfile((short) 0);
|
||||||
logbookDokter.setJenisRuangan(fee.get("jenisRuangan").toString().toUpperCase());
|
logbookDokter.setStatusEnabled(true);
|
||||||
logbookDokter.setKelompokPasien(
|
logbookDokter.setJenisLogbook("DALAM_JAM_KERJA");
|
||||||
getKelompokPasien(Integer.parseInt(fee.get("idKelompokPasien").toString())));
|
logbookDokter.setJenisRuangan(fee.get("jenisRuangan").toString().toUpperCase());
|
||||||
logbookDokter.setKeterangan(fee.get("keterangan").toString());
|
logbookDokter.setKelompokPasien(
|
||||||
logbookDokter.setPersenJasa(
|
getKelompokPasien(Integer.parseInt(fee.get("idKelompokPasien").toString())));
|
||||||
Double.parseDouble(fee.get("persenJasa").toString().replace("%", "")));
|
logbookDokter.setKeterangan(fee.get("keterangan").toString());
|
||||||
logbookDokter.setProduk(fee.get("namaProduk").toString());
|
logbookDokter.setPersenJasa(
|
||||||
logbookDokter.setProdukId(Integer.parseInt(fee.get("idProduk").toString()));
|
Double.parseDouble(fee.get("persenJasa").toString().replace("%", "")));
|
||||||
double hargaJasa = Double.parseDouble(fee.get("hargaJasa").toString());
|
logbookDokter.setProduk(fee.get("namaProduk").toString());
|
||||||
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
|
logbookDokter.setProdukId(Integer.parseInt(fee.get("idProduk").toString()));
|
||||||
logbookDokter
|
double hargaJasa = Double.parseDouble(fee.get("hargaJasa").toString());
|
||||||
.setTarif(BigDecimal.valueOf(Double.parseDouble(fee.get("hargaJual").toString())));
|
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
|
||||||
int jumlah = Double.valueOf(fee.get("jumlah").toString()).intValue();
|
logbookDokter
|
||||||
logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah));
|
.setTarif(BigDecimal.valueOf(Double.parseDouble(fee.get("hargaJual").toString())));
|
||||||
logbookDokter.setTotalTindakan(jumlah);
|
int jumlah = Double.valueOf(fee.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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -248,60 +265,63 @@ 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) {
|
|
||||||
List<String> listNorecPelayananPasienPetugas = new ArrayList<>();
|
if(!ffs.isEmpty()){
|
||||||
{
|
for (Map<String, Object> fee : ffs) {
|
||||||
List<Map<String, Object>> detail = (List<Map<String, Object>>) fee.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>>) fee.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("LUAR_JAM_KERJA");
|
logbookDokter.setKdProfile((short) 0);
|
||||||
logbookDokter.setJenisRuangan(fee.get("jenisRuangan").toString().toUpperCase());
|
logbookDokter.setStatusEnabled(true);
|
||||||
logbookDokter.setKelompokPasien(
|
logbookDokter.setJenisLogbook("LUAR_JAM_KERJA");
|
||||||
getKelompokPasien(Integer.parseInt(fee.get("idKelompokPasien").toString())));
|
logbookDokter.setJenisRuangan(fee.get("jenisRuangan").toString().toUpperCase());
|
||||||
logbookDokter.setKeterangan(fee.get("keterangan").toString());
|
logbookDokter.setKelompokPasien(
|
||||||
logbookDokter.setPersenJasa(
|
getKelompokPasien(Integer.parseInt(fee.get("idKelompokPasien").toString())));
|
||||||
Double.parseDouble(fee.get("persenJasa").toString().replace("%", "")));
|
logbookDokter.setKeterangan(fee.get("keterangan").toString());
|
||||||
logbookDokter.setProduk(fee.get("namaProduk").toString());
|
logbookDokter.setPersenJasa(
|
||||||
logbookDokter.setProdukId(Integer.parseInt(fee.get("idProduk").toString()));
|
Double.parseDouble(fee.get("persenJasa").toString().replace("%", "")));
|
||||||
double hargaJasa = Double.parseDouble(fee.get("hargaJasa").toString());
|
logbookDokter.setProduk(fee.get("namaProduk").toString());
|
||||||
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
|
logbookDokter.setProdukId(Integer.parseInt(fee.get("idProduk").toString()));
|
||||||
logbookDokter
|
double hargaJasa = Double.parseDouble(fee.get("hargaJasa").toString());
|
||||||
.setTarif(BigDecimal.valueOf(Double.parseDouble(fee.get("hargaJual").toString())));
|
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
|
||||||
int jumlah = Double.valueOf(fee.get("jumlah").toString()).intValue();
|
logbookDokter
|
||||||
logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah));
|
.setTarif(BigDecimal.valueOf(Double.parseDouble(fee.get("hargaJual").toString())));
|
||||||
logbookDokter.setTotalTindakan(jumlah);
|
int jumlah = Double.valueOf(fee.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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -312,58 +332,61 @@ 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) {
|
|
||||||
List<String> listNorecPelayananPasienPetugas = new ArrayList<>();
|
if(!fixedPay.isEmpty()){
|
||||||
{
|
for (Map<String, Object> pay : fixedPay) {
|
||||||
List<Map<String, Object>> detail = (List<Map<String, Object>>) pay.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>>) pay.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("FIXED_PAY");
|
logbookDokter.setKdProfile((short) 0);
|
||||||
logbookDokter.setJenisRuangan(pay.get("jenisRuangan").toString().toUpperCase());
|
logbookDokter.setStatusEnabled(true);
|
||||||
logbookDokter.setKelompokPasien(
|
logbookDokter.setJenisLogbook("FIXED_PAY");
|
||||||
getKelompokPasien(Integer.parseInt(pay.get("idKelompokPasien").toString())));
|
logbookDokter.setJenisRuangan(pay.get("jenisRuangan").toString().toUpperCase());
|
||||||
logbookDokter.setKeterangan(pay.get("keterangan").toString());
|
logbookDokter.setKelompokPasien(
|
||||||
logbookDokter.setProduk(pay.get("namaProduk").toString());
|
getKelompokPasien(Integer.parseInt(pay.get("idKelompokPasien").toString())));
|
||||||
logbookDokter.setProdukId(Integer.parseInt(pay.get("idProduk").toString()));
|
logbookDokter.setKeterangan(pay.get("keterangan").toString());
|
||||||
double hargaJasa = Double.parseDouble(pay.get("hargaJasa").toString());
|
logbookDokter.setProduk(pay.get("namaProduk").toString());
|
||||||
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
|
logbookDokter.setProdukId(Integer.parseInt(pay.get("idProduk").toString()));
|
||||||
logbookDokter
|
double hargaJasa = Double.parseDouble(pay.get("hargaJasa").toString());
|
||||||
.setTarif(BigDecimal.valueOf(Double.parseDouble(pay.get("hargaJual").toString())));
|
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
|
||||||
int jumlah = Double.valueOf(pay.get("jumlah").toString()).intValue();
|
logbookDokter
|
||||||
logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah));
|
.setTarif(BigDecimal.valueOf(Double.parseDouble(pay.get("hargaJual").toString())));
|
||||||
logbookDokter.setTotalTindakan(jumlah);
|
int jumlah = Double.valueOf(pay.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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -374,58 +397,61 @@ 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) {
|
|
||||||
List<String> listNorecPelayananPasienPetugas = new ArrayList<>();
|
if(!klaimMpp.isEmpty()){
|
||||||
{
|
for (Map<String, Object> mpp : klaimMpp) {
|
||||||
List<Map<String, Object>> detail = (List<Map<String, Object>>) mpp.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>>) mpp.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("KLAIM_MPP");
|
logbookDokter.setKdProfile((short) 0);
|
||||||
logbookDokter.setJenisRuangan(mpp.get("jenisRuangan").toString().toUpperCase());
|
logbookDokter.setStatusEnabled(true);
|
||||||
logbookDokter.setKelompokPasien(
|
logbookDokter.setJenisLogbook("KLAIM_MPP");
|
||||||
getKelompokPasien(Integer.parseInt(mpp.get("idKelompokPasien").toString())));
|
logbookDokter.setJenisRuangan(mpp.get("jenisRuangan").toString().toUpperCase());
|
||||||
logbookDokter.setKeterangan(mpp.get("keterangan").toString());
|
logbookDokter.setKelompokPasien(
|
||||||
logbookDokter.setProduk(mpp.get("namaProduk").toString());
|
getKelompokPasien(Integer.parseInt(mpp.get("idKelompokPasien").toString())));
|
||||||
logbookDokter.setProdukId(Integer.parseInt(mpp.get("idProduk").toString()));
|
logbookDokter.setKeterangan(mpp.get("keterangan").toString());
|
||||||
double hargaJasa = Double.parseDouble(mpp.get("hargaJasa").toString());
|
logbookDokter.setProduk(mpp.get("namaProduk").toString());
|
||||||
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
|
logbookDokter.setProdukId(Integer.parseInt(mpp.get("idProduk").toString()));
|
||||||
logbookDokter
|
double hargaJasa = Double.parseDouble(mpp.get("hargaJasa").toString());
|
||||||
.setTarif(BigDecimal.valueOf(Double.parseDouble(mpp.get("hargaJual").toString())));
|
logbookDokter.setRemunTindakan(BigDecimal.valueOf(hargaJasa));
|
||||||
int jumlah = Double.valueOf(mpp.get("jumlah").toString()).intValue();
|
logbookDokter
|
||||||
logbookDokter.setTotalRemunTindakan(BigDecimal.valueOf(hargaJasa * jumlah));
|
.setTarif(BigDecimal.valueOf(Double.parseDouble(mpp.get("hargaJual").toString())));
|
||||||
logbookDokter.setTotalTindakan(jumlah);
|
int jumlah = Double.valueOf(mpp.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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -204,9 +204,16 @@ 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);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,6 +11,7 @@ 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;
|
||||||
|
|
||||||
@ -23,6 +24,7 @@ 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
|
||||||
@ -41,7 +43,21 @@ 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();
|
logbookRemunService.generateRecap(null);
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@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));
|
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) {
|
||||||
@ -50,5 +66,4 @@ public class LogbookRemunController extends LocaleController<LogbookKinerjaVO> {
|
|||||||
return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
|
return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user