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

Merge branch 'dev/remun/logbook-tarif' into prod/base

Browse Source
This commit is contained in:
Salman Manoe 2025-02-03 09:49:47 +07:00
commit a4b51b2ecb
8 changed files with 96 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/constants/Master.java
View File

@ -244,6 +244,7 @@ public final class Master {
public static final Integer[] JASA_MEDIS = { 21, 22, 35 };
public static final Integer[] JASA_PARAMEDIS = { 25, 26, 27 };
public static final Integer[] JASA_SARANA = { 6, 38 };
public static final Integer JASA_TERAPIS = 25;
public static final Integer SPOG_ASISTEN = 206;
public static final Integer SPOG_OPERATOR = 201;
public static final Integer TOTAL_TARIF = 210;
@ -274,6 +275,12 @@ public final class Master {
public static final Long BATAS_TERLAMBAT = 15L; // 15_Menit
}
public static final class NilaiKelompokJabatan {
public static final Integer[] MEDIK = { 3, 4, 5, 6, 10, 11, 12 };
public static final Integer[] PENUNJANG_MEDIK = { 22, 23, 24, 25, 26 };
public static final Integer[] NURSE = { 17, 18, 19, 20, 21 };
}
public static final class Pegawai {
public static final Integer[] ADMINISTRATOR = { 0, 320272 };
public static final Integer[] LOGIN_ADMIN = { 320263, 320264 };

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

@ -262,11 +262,11 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends JpaRepository<MapPegawa
@Param("idUnitKerja") Integer idUnitKerja);
@Query("select distinct new Map(subunit.id as id, subunit.name as name) " + "from MapPegawaiJabatanToUnitKerja map "
+ "left join map.jabatan jab " + "left join map.subUnitKerjaPegawai subunit " + "where map.statusEnabled is true "
+ "and map.unitKerjaPegawaiId = :idUnitKerja " + "and jab.kelompokJabatanId = :kelompokJabatanId "
+ "order by subunit.name")
+ "left join map.jabatan jab " + "left join map.subUnitKerjaPegawai subunit "
+ "where map.statusEnabled is true " + "and map.unitKerjaPegawaiId = :idUnitKerja "
+ "and jab.kelompokJabatanId = :kelompokJabatanId " + "order by subunit.name")
List<Map<String, Object>> getMapSubunitKerjaMonitoringByKelompokJabatan(@Param("idUnitKerja") Integer idUnitKerja,
@Param("kelompokJabatanId") Integer IdKelompokJabatan);
@Param("kelompokJabatanId") Integer IdKelompokJabatan);
@Query("select distinct mapp.pegawaiId from MapPegawaiJabatanToUnitKerja mapp "
+ "where mapp.statusEnabled is true and mapp.pegawaiId is not null and mapp.unitKerjaPegawaiId = :idUnitKerja")
@ -517,13 +517,14 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends JpaRepository<MapPegawa
List<Integer> findPegawaiIdByUnitKerjaIdAndJabatanId(@Param("unitKerjaId") List<Integer> unitKerjaId,
@Param("jabatanId") List<Integer> jabatanId);
@Query("select mj.pegawaiId from MapPegawaiJabatanToUnitKerja mj " + "where mj.statusEnabled is true "
+ "and mj.subUnitKerjaPegawaiId in (:subUnitKerjaIdIn)")
Set<Integer> findPegawaiIdBySubUnitKerjaIn(@Param("subUnitKerjaIdIn") List<Integer> subUnitKerjaIdIn);
@Query(value = "select exists(select 1 from mappegawaijabatantounitkerja_m mj "
+ "where mj.statusenabled is true and mj.objectpegawaifk = :pegawaiId "
+ "and mj.objectjabatanfk in (:listJabatanId))", nativeQuery = true)
boolean existsByPegawaiIdAndJabatanIdIn(@Param("pegawaiId") Integer idPegawai,
@Param("listJabatanId") List<Integer> idJabatanList);
@Query("select mj.pegawaiId from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg "
+ "where mj.statusEnabled is true " + "and pg.statusEnabled is true "
+ "and mj.unitKerjaPegawaiId in (:listUnitKerjaId) " + "and pg.jenisPegawaiId = 1")
Set<Integer> findDokterByUnitKerja(@Param("listUnitKerjaId") List<Integer> listIdUnitKerja);
}

41
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/BaseVoService.java
View File

@ -1,12 +1,11 @@
package com.jasamedika.medifirst2000.service;
import com.jasamedika.medifirst2000.exception.ServiceVOException;
import org.springframework.orm.jpa.JpaSystemException;
import java.util.List;
import java.util.Map;
import org.springframework.orm.jpa.JpaSystemException;
import com.jasamedika.medifirst2000.exception.ServiceVOException;
/**
* View Object service
*
@ -19,53 +18,39 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
* @author Roberto
*/
public interface BaseVoService<T, V, K> {
/**
* Add model from VO
*
* @param vo
* @return
*/
public V add(V vo) throws JpaSystemException, ServiceVOException;
V add(V vo) throws JpaSystemException, ServiceVOException;
/**
* Update model from vo
*
* @param vo
* @return
*/
public V update(V vo) throws JpaSystemException, ServiceVOException;
V update(V vo) throws JpaSystemException, ServiceVOException;
/**
* Delete model by primary key
*
* @param key
* @return
*/
public Boolean delete(K key) throws JpaSystemException;
Boolean delete(K key) throws JpaSystemException;
/**
* Find by Id
*
* Find by ID
*
* @param key
* primary key
* @return
*/
public V findById(K key) throws JpaSystemException;
V findById(K key) throws JpaSystemException;
/**
* Find all model to vo
*
* @return
*/
public List<V> findAll() throws JpaSystemException;
List<V> findAll() throws JpaSystemException;
/**
* Find all model to vo by page and limit and sort and dir parameter
*
* @return
*/
public Map<String, Object> findAllWithPageAndLimitAndSortByAndDirectionParameter(
Integer page, Integer limit, String sort, String dir);
Map<String, Object> findAllWithPageAndLimitAndSortByAndDirectionParameter(Integer page, Integer limit,
String sort, String dir);
}

2
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MapPegawaiJabatanToUnitKerjaService.java
View File

@ -67,4 +67,6 @@ public interface MapPegawaiJabatanToUnitKerjaService {
List<Map<String, Object>> getlistPegawaiByUnitKerja(Integer unitKerjaPegawaiId);
AuthorizationDto get(EmailDto dto);
String getJenisLogbook(Integer idPegawai);
}

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

@ -36,7 +36,7 @@ import static com.jasamedika.medifirst2000.constants.Master.Profesi.TERAPI;
*/
@Service
@Transactional
public class LogbookRemunServiceImpl implements LogbookRemunService {
public class LogbookRemunServiceImpl extends BaseVoServiceImpl implements LogbookRemunService {
private static final Logger LOGGER = LoggerFactory.getLogger(LogbookRemunServiceImpl.class);
@ -58,9 +58,6 @@ public class LogbookRemunServiceImpl implements LogbookRemunService {
@Autowired
private MapPegawaiJabatanToUnitKerjaDao mapPegawaiJabatanToUnitKerjaDao;
@Autowired
private SubUnitKerjaDao subUnitKerjaDao;
@Autowired
private MapJabatanProfesiDao mapJabatanProfesiDao;
@ -72,16 +69,15 @@ public class LogbookRemunServiceImpl implements LogbookRemunService {
Date date = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
Date tglAwal = DateUtil.startMonth(date);
Date tglAkhir = DateUtil.endMonth(date);
List<Integer> subUnitKerjaIn = subUnitKerjaDao.findAllKelompokKerjaMedisId();
Set<Integer> idPegawaiKelompokKerja = mapPegawaiJabatanToUnitKerjaDao
.findPegawaiIdBySubUnitKerjaIn(subUnitKerjaIn);
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
idPegawaiKelompokKerja.addAll(terapisRehabMedik);
if (!idPegawaiKelompokKerja.isEmpty()) {
Set<Integer> listIdDokter = mapPegawaiJabatanToUnitKerjaDao
.findDokterByUnitKerja(splitDataSettingDatafixed("listIdUnitKerjaKsm"));
List<Integer> listTerapis = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
listIdDokter.addAll(listTerapis);
if (!listIdDokter.isEmpty()) {
// Delete untuk pembaharuan data
deleteByPeriod(idPegawaiKelompokKerja, tglAwal, tglAkhir);
deleteByPeriod(listIdDokter, tglAwal, tglAkhir);
}
saveRekapDetailLogbookDokter(idPegawaiKelompokKerja, date);
saveRekapDetailLogbookDokter(listIdDokter, date);
}
public void deleteByPeriod(Set<Integer> idPegawai, Date tglAwal, Date tglAkhir) {
@ -198,7 +194,7 @@ public class LogbookRemunServiceImpl implements LogbookRemunService {
LogbookDokter logbookDokter = new LogbookDokter();
logbookDokter.setKdProfile((short) 0);
logbookDokter.setStatusEnabled(true);
logbookDokter.setJenisLogbook("NON_JKN_DALAM_JAM_KERJA");
logbookDokter.setJenisLogbook("DALAM_JAM_KERJA");
logbookDokter.setJenisRuangan(fee.get("jenisRuangan").toString().toUpperCase());
logbookDokter.setKelompokPasien(
getKelompokPasien(Integer.parseInt(fee.get("idKelompokPasien").toString())));
@ -262,7 +258,7 @@ public class LogbookRemunServiceImpl implements LogbookRemunService {
LogbookDokter logbookDokter = new LogbookDokter();
logbookDokter.setKdProfile((short) 0);
logbookDokter.setStatusEnabled(true);
logbookDokter.setJenisLogbook("NON_JKN_LUAR_JAM_KERJA");
logbookDokter.setJenisLogbook("LUAR_JAM_KERJA");
logbookDokter.setJenisRuangan(fee.get("jenisRuangan").toString().toUpperCase());
logbookDokter.setKelompokPasien(
getKelompokPasien(Integer.parseInt(fee.get("idKelompokPasien").toString())));

21
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
View File

@ -1750,4 +1750,25 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
return byEmailOrEmailAlternatif.map(pegawai -> AuthorizationDto.builder().pegawaiId(pegawai.getId())
.email(pegawai.getEmail()).emailAlternatif(pegawai.getEmailAlternatif()).build()).orElse(null);
}
@Override
public String getJenisLogbook(Integer idPegawai) {
List<MapPegawaiJabatanToUnitKerja> byPegawaiId = mapPegawaiJabatanToUnitKerjaDao.findByPegawaiId(idPegawai);
Optional<MapPegawaiJabatanToUnitKerja> anyMedik = byPegawaiId.stream()
.filter(m -> Arrays.asList(Master.NilaiKelompokJabatan.MEDIK).contains(m.getGradeId())).findAny();
Optional<MapPegawaiJabatanToUnitKerja> anyPenunjangMedik = byPegawaiId.stream()
.filter(m -> Arrays.asList(Master.NilaiKelompokJabatan.PENUNJANG_MEDIK).contains(m.getGradeId()))
.findAny();
Optional<MapPegawaiJabatanToUnitKerja> anyNurse = byPegawaiId.stream()
.filter(m -> Arrays.asList(Master.NilaiKelompokJabatan.NURSE).contains(m.getGradeId())).findAny();
if (anyMedik.isPresent()) {
return "Logbook-Tarif Dokter";
} else if (anyPenunjangMedik.isPresent()) {
return "Logbook-Tarif Paramedis";
} else if (anyNurse.isPresent()) {
return "Logbook-Tarif Perawat";
} else {
return "Logbook Tarif";
}
}
}

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

@ -1604,6 +1604,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
private List<Map<String, Object>> transformPelayananPaket(Integer idPegawai, List<Map<String, Object>> listData) {
List<Integer> drKsmObgyn = pegawaiDao.getDokterByKsm(KSM_OBGYN);
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
SimpleDateFormat month = new SimpleDateFormat("MMM-yyyy", new Locale("in", "ID"));
List<MapProdukPaket> paketList = mapProdukPaketDao.findAll();
List<Integer> allProdukEntriId = paketList.stream().map(MapProdukPaket::getProdukEntriId)
@ -1774,6 +1775,17 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
: byDetailTarifNonKelas.get().getHargaSatuan()));
}
}
} else if (terapisRehabMedik.contains(idPegawai)
&& !Arrays.asList(GRUP_RAWAT_INAP).contains(Integer.parseInt(d.get("idDepartemen").toString()))
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()
.filter(dt -> dt.getProdukId().equals(d.get("idProduk")))
.filter(dt -> dt.getKelasId().equals(d.get("idKelas")))
.filter(dt -> dt.getKomponenHargaId().equals(JASA_TERAPIS)).findFirst();
byDetailTarifNonKelas.ifPresent(hargaNettoProdukByKelasD -> d.put("hargaJasa",
CommonUtil.isNotNullOrEmpty(byDetailTarifNonKelas.get().getHargaNetto1())
? byDetailTarifNonKelas.get().getHargaNetto1()
: byDetailTarifNonKelas.get().getHargaSatuan()));
} else if (!Arrays.asList(GRUP_RAWAT_INAP).contains(Integer.parseInt(d.get("idDepartemen").toString()))
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
Optional<HargaNettoProdukByKelasD> byDetailTarifNonKelas = tarifDetailNonKelas.stream()

45
jasamedika-sdm/src/main/java/com/jasamedika/medifirst2000/controller/MapPegawaiJabatanToUnitKerjaController.java
View File

@ -1,28 +1,5 @@
package com.jasamedika.medifirst2000.controller;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.jasamedika.medifirst2000.constants.Constants;
import com.jasamedika.medifirst2000.constants.Master;
import com.jasamedika.medifirst2000.constants.MessageResource;
@ -32,6 +9,22 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
import com.jasamedika.medifirst2000.service.MapPegawaiJabatanToUnitKerjaService;
import com.jasamedika.medifirst2000.util.rest.RestUtil;
import com.jasamedika.medifirst2000.vo.MapPegawaiJabatanToUnitKerjaVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("/map-pegawai-jabatan-unitkerja")
@ -369,4 +362,10 @@ public class MapPegawaiJabatanToUnitKerjaController extends LocaleController<Map
return RestUtil.getJsonHttptatus(HttpStatus.CONFLICT, mapHeaderMessage);
}
}
@RequestMapping(value = "/logbook-title/{idPegawai}", method = RequestMethod.GET)
public ResponseEntity<String> logbookTitle(@PathVariable("idPegawai") Integer idPegawai) {
String jenisLogbook = mapPegawaiJabatanToUnitKerjaService.getJenisLogbook(idPegawai);
return RestUtil.getJsonResponse(jenisLogbook, HttpStatus.OK);
}
}