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

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

Browse Source
This commit is contained in:
Salman Manoe 2024-12-02 14:20:30 +07:00
commit 5ae8da95af
4 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LogbookKinerjaDetailLogServiceImpl.java
View File

@ -5,6 +5,7 @@ import com.jasamedika.medifirst2000.dao.LogbookKinerjaDetailDao;
import com.jasamedika.medifirst2000.dao.LogbookKinerjaDetailLogDao;
import com.jasamedika.medifirst2000.dto.LogbookKinerjaDetailLogDto;
import com.jasamedika.medifirst2000.dto.LogbookKinerjaDetailLogReqDto;
import com.jasamedika.medifirst2000.dto.PegawaiLogDto;
import com.jasamedika.medifirst2000.entities.LogbookKinerjaDetail;
import com.jasamedika.medifirst2000.entities.LogbookKinerjaDetailLog;
import com.jasamedika.medifirst2000.entities.Pegawai;
@ -46,9 +47,6 @@ public class LogbookKinerjaDetailLogServiceImpl implements LogbookKinerjaDetailL
@Autowired
private BaseConverterImpl<LogbookKinerjaDetailVO, LogbookKinerjaDetail> catatanKinerjaConverter;
@Autowired
private BaseConverterImpl<PegawaiVO, Pegawai> pegawaiConverter;
@Override
public void save(LogbookKinerjaDetailLogReqDto dto) {
LogbookKinerjaDetailLog.LogbookKinerjaDetailLogBuilder logBuilder = LogbookKinerjaDetailLog.builder();
@ -136,8 +134,10 @@ public class LogbookKinerjaDetailLogServiceImpl implements LogbookKinerjaDetailL
dtoBuilder.catatanKinerja(catatanKinerjaVO);
}
{
PegawaiVO pegawaiVO = pegawaiConverter.transferModelToVO(log.getPegawai(), new PegawaiVO());
dtoBuilder.pegawai(pegawaiVO);
PegawaiLogDto.PegawaiLogDtoBuilder builder = PegawaiLogDto.builder();
builder.nipPns(log.getPegawai().getNipPns());
builder.namaLengkap(log.getPegawai().getNamaLengkap());
dtoBuilder.pegawai(builder.build());
}
LogbookKinerjaDetailLogDto dto = dtoBuilder.jenisLog(log.getJenisLog()).keterangan(log.getKeterangan())
.tanggalDibuat(log.getTanggalDibuat()).build();

16
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
View File

@ -312,6 +312,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD"));
double persenRemunLabGenetika = Double.parseDouble(GetSettingDataFixed("persenRemunLabGenetika"));
double persenRemunTerapis = Double.parseDouble(GetSettingDataFixed("persenRemunTerapis"));
double persenRemunVisiteDokterKelompokBudiRahmat = Double
.parseDouble(GetSettingDataFixed("persenRemunVisiteDokterKelompokBudiRahmat"));
/*
* Persiapan filter logic remunerasi
*/
@ -336,6 +338,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
List<Integer> idsPenunjangBukanAnestesi = splitDataSettingDatafixed("pr_penunjang_nonanestesi");
List<Integer> idsDokterBPJSffs = splitDataSettingDatafixed("dokterBPJSffs");
List<Integer> idsDokterPediatrikGD = splitDataSettingDatafixed("pr_dokter_pediatrik_gd");
List<Integer> listIdPegawaiRemunKelompokBudiRahmat = splitDataSettingDatafixed(
"listIdPegawaiRemunKelompokBudiRahmat");
List<Integer> idsMonitoringIntervensi = splitDataSettingDatafixed("idMonitoringIntervensi");
List<Integer> idsMonitoringHemodinamikGagalOrgan = splitDataSettingDatafixed(
"idMonitoringHemodinamikGagalOrgan");
@ -390,6 +394,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/*
* Mapping set awal persentase jasa remunerasi dan harga jasa remunerasi
*/
if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai))
persenVisite = persenRemunVisiteDokterKelompokBudiRahmat;
for (Map<String, Object> d : listRatedPay) {
if (paketBukanFixedPay.contains(Integer.parseInt(d.get("idProduk").toString())))
d.put("hargaJual", d.get("komponenTotalTarif"));
@ -944,7 +950,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
List<Map<String, Object>> listPelayananFfs = new ArrayList<>();
List<Map<String, Object>> listPelayananNonJknLuarJamKerja = new ArrayList<>();
double capaianRemun = 0.0;
if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai)) {
if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai)
&& !listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai)) {
/*
* Dokter luar hanya mendapatkan ffs
*/
@ -1929,6 +1936,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD"));
double persenRemunLabGenetika = Double.parseDouble(GetSettingDataFixed("persenRemunLabGenetika"));
double persenRemunTerapis = Double.parseDouble(GetSettingDataFixed("persenRemunTerapis"));
double persenRemunVisiteDokterKelompokBudiRahmat = Double
.parseDouble(GetSettingDataFixed("persenRemunVisiteDokterKelompokBudiRahmat"));
/*
* Persiapan filter logic remunerasi
*/
@ -1938,6 +1947,8 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI);
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
List<Integer> listIdPegawaiRemunKelompokBudiRahmat = splitDataSettingDatafixed(
"listIdPegawaiRemunKelompokBudiRahmat");
/*
* Set persen jasa dan harga jasa pasien bpjs di ibs, icu
*/
@ -1946,6 +1957,9 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/*
* Mapping persentase jasa remunerasi
*/
if (pegawaiDao.getPegawaiByKategoryPegawai(Arrays.asList(DOKTER_LUAR)).contains(idPegawai)
&& listIdPegawaiRemunKelompokBudiRahmat.contains(idPegawai))
persenVisite = persenRemunVisiteDokterKelompokBudiRahmat;
for (Map<String, Object> d : listData) {
double hargaJual = Double.parseDouble(d.get("hargaJual").toString());
if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {

2
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/LogbookKinerjaDetailLogDto.java
View File

@ -37,6 +37,6 @@ public class LogbookKinerjaDetailLogDto {
private Date tanggalDibuat;
@Caption(value = "Pegawai")
private PegawaiVO pegawai;
private PegawaiLogDto pegawai;
}

23
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/PegawaiLogDto.java Normal file
View File

@ -0,0 +1,23 @@
package com.jasamedika.medifirst2000.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author salmanoe
* @version 1.0.0
* @since 02/12/2024
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class PegawaiLogDto {
private String namaLengkap;
private String nipPns;
}