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

Update service pelayanan pasien

Browse Source 
Penerapan persentase terapis rehab medik eksekutif di logbook dokter
This commit is contained in:
Salman Manoe 2024-05-17 07:47:45 +07:00
parent 32c90e9a17
commit 824a8b96d5
12 changed files with 130 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -326,6 +326,7 @@ public final class Master {
public static final Integer[] RAJAL = { 8, 9, 18 };
public static final Integer[] REHAB_MEDIK = { 2, 3, 4, 5 };
public static final Integer[] REKAM_MEDIK = { 15 };
public static final Integer[] TERAPI = { 2, 3, 4 };
}
public static final class Remunerasi {

22
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapJabatanProfesiDao.java
View File

@ -1,22 +1,19 @@
package com.jasamedika.medifirst2000.dao;
import com.jasamedika.medifirst2000.entities.MapJabatanProfesi;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import com.jasamedika.medifirst2000.entities.MapJabatanProfesi;
/**
* @author salmanoe
* @since Dec 31, 2021
*/
@Repository("mapProfesiJabatanDao")
public interface MapJabatanProfesiDao extends PagingAndSortingRepository<MapJabatanProfesi, Integer> {
public interface MapJabatanProfesiDao extends JpaRepository<MapJabatanProfesi, Integer> {
@Query("select new Map(mjp.id as id," + "prf.id as profesiId,prf.namaProfesi as profesi,"
+ "jb.id as jabatanId,(jb.id || ' - ' ||jb.namaJabatan) as jabatan) " + "from MapJabatanProfesi mjp "
@ -27,4 +24,11 @@ public interface MapJabatanProfesiDao extends PagingAndSortingRepository<MapJaba
@Query(value = "select mjp.* from sdm_mapjabatanprofesi_m mjp where mjp.jabatanfk = :jabatanId limit 1", nativeQuery = true)
Optional<MapJabatanProfesi> findByJabatan(@Param("jabatanId") Integer idJabatan);
@Query("select distinct mjj.pegawaiId " +
"from MapJabatanProfesi mjp, MapPegawaiJabatanToUnitKerja mjj " +
"where mjp.jabatanId = mjj.jabatanId " +
"and mjp.statusEnabled is true " +
"and mjj.statusEnabled is true " +
"and mjp.profesiId in (:listProfesiId)")
List<Integer> findIdPegawaiByProfesiIn(@Param("listProfesiId") List<Integer> listIdProfesi);
}

28
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/ProfesiDao.java
View File

@ -1,24 +1,21 @@
package com.jasamedika.medifirst2000.dao;
import com.jasamedika.medifirst2000.entities.Profesi;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;
import java.util.Map;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
import com.jasamedika.medifirst2000.entities.Profesi;
/**
* @author salmanoe
* @since Oct 8, 2021
*/
@Repository("profesiDao")
public interface ProfesiDao extends PagingAndSortingRepository<Profesi, Integer> {
public interface ProfesiDao extends JpaRepository<Profesi, Integer> {
@Query("select prf from Profesi prf where prf.statusEnabled is true order by prf.namaProfesi asc")
public List<Profesi> findAllActive();
List<Profesi> findAllActive();
String strAllActive = "select new Map(prf.id as id,prf.namaProfesi as namaProfesi) from Profesi prf where prf.statusEnabled is true";
@ -27,10 +24,10 @@ public interface ProfesiDao extends PagingAndSortingRepository<Profesi, Integer>
String srtNama = " order by prf.namaProfesi";
@Query(strAllActive + srtNama)
public List<Map<String, Object>> findByStatus();
List<Map<String, Object>> findByStatus();
@Query(strAllActive + whrJenis + srtNama)
public List<Map<String, Object>> findByStatus(@Param("jenisId") Short idJenis);
List<Map<String, Object>> findByStatus(@Param("jenisId") Short idJenis);
String strAllJabatanActive = "select new Map(prf.id as id,prf.namaProfesi as namaProfesi) "
+ "from MapPegawaiJabatanToUnitKerja mj, MapJabatanProfesi mjp " + "inner join mjp.profesi prf "
@ -39,10 +36,9 @@ public interface ProfesiDao extends PagingAndSortingRepository<Profesi, Integer>
String whrPegawai = " and mj.pegawaiId = :pegawaiId";
@Query(strAllJabatanActive + whrPegawai + srtNama)
public List<Map<String, Object>> findByStatus(@Param("pegawaiId") Integer idPegawai);
List<Map<String, Object>> findByStatus(@Param("pegawaiId") Integer idPegawai);
@Query(strAllJabatanActive + whrPegawai + whrJenis + srtNama)
public List<Map<String, Object>> findByStatus(@Param("pegawaiId") Integer idPegawai,
@Param("jenisId") Short idJenis);
List<Map<String, Object>> findByStatus(@Param("pegawaiId") Integer idPegawai,
@Param("jenisId") Short idJenis);
}

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

@ -1,12 +1,11 @@
package com.jasamedika.medifirst2000.service;
import java.util.List;
import java.util.Map;
import org.springframework.orm.jpa.JpaSystemException;
import com.jasamedika.medifirst2000.entities.MapJabatanProfesi;
import com.jasamedika.medifirst2000.vo.MapJabatanProfesiVO;
import org.springframework.orm.jpa.JpaSystemException;
import java.util.List;
import java.util.Map;
/**
* @author salmanoe
@ -14,6 +13,5 @@ import com.jasamedika.medifirst2000.vo.MapJabatanProfesiVO;
*/
public interface MapJabatanProfesiService extends BaseVoService<MapJabatanProfesi, MapJabatanProfesiVO, Integer> {
public List<Map<String, Object>> findMapping() throws JpaSystemException;
List<Map<String, Object>> findMapping() throws JpaSystemException;
}

14
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/ProfesiService.java
View File

@ -1,12 +1,11 @@
package com.jasamedika.medifirst2000.service;
import java.util.List;
import java.util.Map;
import org.springframework.orm.jpa.JpaSystemException;
import com.jasamedika.medifirst2000.entities.Profesi;
import com.jasamedika.medifirst2000.vo.ProfesiVO;
import org.springframework.orm.jpa.JpaSystemException;
import java.util.List;
import java.util.Map;
/**
* @author salmanoe
@ -14,8 +13,7 @@ import com.jasamedika.medifirst2000.vo.ProfesiVO;
*/
public interface ProfesiService extends BaseVoService<Profesi, ProfesiVO, Integer> {
public List<ProfesiVO> findAllActive() throws JpaSystemException;
List<ProfesiVO> findAllActive() throws JpaSystemException;
public List<Map<String, Object>> findByStatus(Integer idPegawai, Short idJenis) throws JpaSystemException;
List<Map<String, Object>> findByStatus(Integer idPegawai, Short idJenis) throws JpaSystemException;
}

23
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapJabatanProfesiServiceImpl.java
View File

@ -1,14 +1,5 @@
package com.jasamedika.medifirst2000.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.stereotype.Service;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.MapJabatanProfesiDao;
import com.jasamedika.medifirst2000.entities.Jabatan;
@ -20,6 +11,14 @@ import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.JabatanVO;
import com.jasamedika.medifirst2000.vo.MapJabatanProfesiVO;
import com.jasamedika.medifirst2000.vo.ProfesiVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
/**
* @author salmanoe
@ -100,7 +99,7 @@ public class MapJabatanProfesiServiceImpl extends BaseVoServiceImpl implements M
@Override
public List<MapJabatanProfesiVO> findAll() throws JpaSystemException {
List<MapJabatanProfesiVO> result = new ArrayList<MapJabatanProfesiVO>();
List<MapJabatanProfesiVO> result = new ArrayList<>();
Iterable<MapJabatanProfesi> models = mapJabatanProfesiDao.findAll();
if (CommonUtil.isNotNullOrEmpty(models)) {
@ -123,9 +122,7 @@ public class MapJabatanProfesiServiceImpl extends BaseVoServiceImpl implements M
@Override
public List<Map<String, Object>> findMapping() throws JpaSystemException {
List<Map<String, Object>> result = mapJabatanProfesiDao.findMapping();
return result;
return mapJabatanProfesiDao.findMapping();
}
}

44
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
View File

@ -44,6 +44,7 @@ import static com.jasamedika.medifirst2000.constants.Master.Kelas.NON_KELAS;
import static com.jasamedika.medifirst2000.constants.Master.KelompokPasien.KELOMPOK_BPJS;
import static com.jasamedika.medifirst2000.constants.Master.KelompokUser.TATA_REKENING;
import static com.jasamedika.medifirst2000.constants.Master.KomponenHarga.*;
import static com.jasamedika.medifirst2000.constants.Master.Profesi.TERAPI;
import static com.jasamedika.medifirst2000.constants.Master.Ruangan.*;
import static com.jasamedika.medifirst2000.constants.Master.SubUnitKerja.*;
import static com.jasamedika.medifirst2000.constants.Master.TipePegawai.PURNA_WAKTU;
@ -150,6 +151,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
@Autowired
private PasienDao pasienDao;
@Autowired
private MapJabatanProfesiDao mapJabatanProfesiDao;
@Override
public Map<String, Object> savePelayananPasien(PelayananPasienVO vo) {
Map<String, Object> result = new HashMap<>();
@ -520,6 +524,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
double persenRemunDokterPA = Double.parseDouble(GetSettingDataFixed("persenRemunDokterPA"));
double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD"));
double persenRemunLabGenetika = Double.parseDouble(GetSettingDataFixed("persenRemunLabGenetika"));
double persenRemunTerapis = Double.parseDouble(GetSettingDataFixed("persenRemunTerapis"));
/*
* Persiapan filter logic remunerasi
*/
@ -533,6 +538,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
List<Integer> drKkRadiologi = pegawaiDao.getDokterByKelompokKerja(KK_RADIOLOGI);
List<Integer> laboranRadiologList = mapPegawaiLaboratRadiologiDao.findPegawaiLaboranRadiolog();
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
List<Integer> idsRegDJPAdminNonPK = splitDataSettingDatafixed("admin_nonpk");
List<Integer> idsRegDJPMedisUtama = splitDataSettingDatafixed("medis_utama");
List<Integer> idsRegDJPPenunjangPA = splitDataSettingDatafixed("penunjang_pa");
@ -675,6 +681,12 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
d.put("hargaJasa", hargaJasa.getNilai());
if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")))
d.put("isTermasukProporsi", false);
} else if (terapisRehabMedik.contains(idPegawai) && REHAB_MEDIK.equals(d.get("idDepartemen"))
&& "Eksekutif".equals(d.get("jenisRuangan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenRemunTerapis / 100, hargaJual, d, false);
d.put("hargaJasa", hargaJasa.getNilai());
if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")))
d.put("isTermasukProporsi", false);
} else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, false);
d.put("hargaJasa", hargaJasa.getNilai());
@ -2009,6 +2021,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
double persenRemunDokterPA = Double.parseDouble(GetSettingDataFixed("persenRemunDokterPA"));
double persenRemunDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenRemunDokterUmumHD"));
double persenRemunLabGenetika = Double.parseDouble(GetSettingDataFixed("persenRemunLabGenetika"));
double persenRemunTerapis = Double.parseDouble(GetSettingDataFixed("persenRemunTerapis"));
/*
* Persiapan filter logic remunerasi
*/
@ -2016,6 +2029,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI);
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
/*
* Set persen jasa dan harga jasa pasien bpjs di ibs, icu
@ -2136,6 +2150,12 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
d.put("persenJasa", persenRadiologi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (terapisRehabMedik.contains(idPegawai) && REHAB_MEDIK.equals(d.get("idDepartemen"))
&& "Eksekutif".equals(d.get("jenisRuangan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenRemunTerapis / 100, hargaJual, d, true);
d.put("persenJasa", persenRemunTerapis + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, true);
d.put("persenJasa", persenRehabMedik + "%");
@ -2390,6 +2410,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
double persenJasaDokterPA = Double.parseDouble(GetSettingDataFixed("persenJasaDokterPA"));
double persenJasaDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenJasaDokterUmumHD"));
double persenJasaLabGenetika = Double.parseDouble(GetSettingDataFixed("persenJasaLabGenetika"));
double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis"));
/*
* Persiapan filter logic remunerasi
*/
@ -2397,6 +2418,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI);
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
/*
* Mapping persentase jasa remunerasi
@ -2493,6 +2515,12 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
d.put("persenJasa", persenRadiologi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (terapisRehabMedik.contains(idPegawai) && REHAB_MEDIK.equals(d.get("idDepartemen"))
&& "Eksekutif".equals(d.get("jenisRuangan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d, true);
d.put("persenJasa", persenJasaTerapis + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, true);
d.put("persenJasa", persenRehabMedik + "%");
@ -2645,6 +2673,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
double persenJasaDokterPA = Double.parseDouble(GetSettingDataFixed("persenJasaDokterPA"));
double persenJasaDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenJasaDokterUmumHD"));
double persenJasaLabGenetika = Double.parseDouble(GetSettingDataFixed("persenJasaLabGenetika"));
double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis"));
/*
* Persiapan filter logic remunerasi
*/
@ -2652,6 +2681,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI);
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
/*
* Mapping persentase jasa remunerasi
@ -2748,6 +2778,12 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
d.put("persenJasa", persenRadiologi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (terapisRehabMedik.contains(idPegawai) && REHAB_MEDIK.equals(d.get("idDepartemen"))
&& "Eksekutif".equals(d.get("jenisRuangan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d, true);
d.put("persenJasa", persenJasaTerapis + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, true);
d.put("persenJasa", persenRehabMedik + "%");
@ -2999,6 +3035,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
double persenJasaDokterPA = Double.parseDouble(GetSettingDataFixed("persenJasaDokterPA"));
double persenJasaDokterUmumHD = Double.parseDouble(GetSettingDataFixed("persenJasaDokterUmumHD"));
double persenJasaLabGenetika = Double.parseDouble(GetSettingDataFixed("persenJasaLabGenetika"));
double persenJasaTerapis = Double.parseDouble(GetSettingDataFixed("persenJasaTerapis"));
/*
* Persiapan filter logic remunerasi
*/
@ -3006,6 +3043,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
List<Integer> drKsmUmumList = pegawaiDao.getDokterByKelompokKerja(KK_UMUM);
List<Integer> drKkGenetika = pegawaiDao.getDokterByKelompokKerja(KK_GENETIKA);
List<Integer> drAnastesiList = pegawaiDao.getDokterByKelompokKerja(KK_ANESTESI);
List<Integer> terapisRehabMedik = mapJabatanProfesiDao.findIdPegawaiByProfesiIn(Arrays.asList(TERAPI));
List<Integer> idProdukLabGenetikaLuarRuangan = splitDataSettingDatafixed("idProdukLabGenetikaLuarRuangan");
/*
* Mapping persentase jasa remunerasi
@ -3102,6 +3140,12 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
d.put("persenJasa", persenRadiologi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (terapisRehabMedik.contains(idPegawai) && REHAB_MEDIK.equals(d.get("idDepartemen"))
&& "Eksekutif".equals(d.get("jenisRuangan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d, true);
d.put("persenJasa", persenJasaTerapis + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, true);
d.put("persenJasa", persenRehabMedik + "%");

22
jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProfesiServiceImpl.java
View File

@ -1,13 +1,5 @@
package com.jasamedika.medifirst2000.service.impl;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.stereotype.Service;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.ProfesiDao;
import com.jasamedika.medifirst2000.entities.Profesi;
@ -15,6 +7,13 @@ import com.jasamedika.medifirst2000.exception.ServiceVOException;
import com.jasamedika.medifirst2000.service.ProfesiService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.ProfesiVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* @author salmanoe
@ -76,7 +75,7 @@ public class ProfesiServiceImpl extends BaseVoServiceImpl implements ProfesiServ
@Override
public List<ProfesiVO> findAll() throws JpaSystemException {
List<ProfesiVO> result = new ArrayList<ProfesiVO>();
List<ProfesiVO> result = new ArrayList<>();
Iterable<Profesi> models = profesiDao.findAll();
if (CommonUtil.isNotNullOrEmpty(models)) {
@ -99,7 +98,7 @@ public class ProfesiServiceImpl extends BaseVoServiceImpl implements ProfesiServ
@Override
public List<ProfesiVO> findAllActive() throws JpaSystemException {
List<ProfesiVO> result = new ArrayList<ProfesiVO>();
List<ProfesiVO> result = new ArrayList<>();
Iterable<Profesi> models = profesiDao.findAllActive();
if (CommonUtil.isNotNullOrEmpty(models)) {
@ -115,7 +114,7 @@ public class ProfesiServiceImpl extends BaseVoServiceImpl implements ProfesiServ
@Override
public List<Map<String, Object>> findByStatus(Integer idPegawai, Short idJenis) throws JpaSystemException {
List<Map<String, Object>> result = new ArrayList<>();
List<Map<String, Object>> result;
if (CommonUtil.isNotNullOrEmpty(idJenis)) {
result = profesiDao.findByStatus(idPegawai, idJenis);
@ -131,5 +130,4 @@ public class ProfesiServiceImpl extends BaseVoServiceImpl implements ProfesiServ
return result;
}
}

64
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapJabatanProfesi.java
View File

@ -1,19 +1,14 @@
package com.jasamedika.medifirst2000.entities;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import com.jasamedika.medifirst2000.base.BaseActive;
import com.jasamedika.medifirst2000.helper.Caption;
import lombok.Getter;
import lombok.Setter;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import static javax.persistence.GenerationType.SEQUENCE;
/**
* @author salmanoe
@ -21,6 +16,8 @@ import com.jasamedika.medifirst2000.helper.Caption;
*/
@Entity
@Table(name = "sdm_mapjabatanprofesi_m")
@Getter
@Setter
public class MapJabatanProfesi extends BaseActive {
private static final long serialVersionUID = 3888545942252692215L;
@ -44,49 +41,8 @@ public class MapJabatanProfesi extends BaseActive {
private Integer profesiId;
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.sdm_mapjabatanprofesi_m_seq_gen")
@GeneratedValue(strategy = SEQUENCE, generator = "public.sdm_mapjabatanprofesi_m_seq_gen")
@SequenceGenerator(name = "public.sdm_mapjabatanprofesi_m_seq_gen", sequenceName = "public.sdm_mapjabatanprofesi_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
public Jabatan getJabatan() {
return jabatan;
}
public void setJabatan(Jabatan jabatan) {
this.jabatan = jabatan;
}
public Integer getJabatanId() {
return jabatanId;
}
public void setJabatanId(Integer jabatanId) {
this.jabatanId = jabatanId;
}
public Profesi getProfesi() {
return profesi;
}
public void setProfesi(Profesi profesi) {
this.profesi = profesi;
}
public Integer getProfesiId() {
return profesiId;
}
public void setProfesiId(Integer profesiId) {
this.profesiId = profesiId;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
}

47
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Profesi.java
View File

@ -1,19 +1,19 @@
package com.jasamedika.medifirst2000.entities;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import com.jasamedika.medifirst2000.base.BaseActive;
import com.jasamedika.medifirst2000.helper.Caption;
import lombok.Getter;
import lombok.Setter;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import static javax.persistence.GenerationType.SEQUENCE;
@Entity
@Table(name = "sdm_profesi_m")
@Getter
@Setter
public class Profesi extends BaseActive {
@NotNull(message = "Nama Profesi tidak boleh kosong")
@ -21,38 +21,13 @@ public class Profesi extends BaseActive {
@Caption(value = "Nama Profesi")
private String namaProfesi;
@Column(name = "jenisprofesi", nullable = true)
@Column(name = "jenisprofesi")
@Caption(value = "Jenis Profesi")
private Short jenisProfesi;
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.sdm_profesi_m_id_seq")
@GeneratedValue(strategy = SEQUENCE, generator = "public.sdm_profesi_m_id_seq")
@SequenceGenerator(name = "public.sdm_profesi_m_id_seq", sequenceName = "public.sdm_profesi_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
public String getNamaProfesi() {
return namaProfesi;
}
public void setNamaProfesi(String namaProfesi) {
this.namaProfesi = namaProfesi;
}
public Short getJenisProfesi() {
return jenisProfesi;
}
public void setJenisProfesi(Short jenisProfesi) {
this.jenisProfesi = jenisProfesi;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
}

45
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapJabatanProfesiVO.java
View File

@ -2,11 +2,15 @@ package com.jasamedika.medifirst2000.vo;
import com.jasamedika.medifirst2000.base.vo.BaseActiveVO;
import com.jasamedika.medifirst2000.helper.Caption;
import lombok.Getter;
import lombok.Setter;
/**
* @author salmanoe
* @since Dec 31, 2021
*/
@Getter
@Setter
public class MapJabatanProfesiVO extends BaseActiveVO {
@Caption(value = "Jabatan")
@ -20,45 +24,4 @@ public class MapJabatanProfesiVO extends BaseActiveVO {
private Integer profesiId;
protected Integer id;
public JabatanVO getJabatan() {
return jabatan;
}
public void setJabatan(JabatanVO jabatan) {
this.jabatan = jabatan;
}
public Integer getJabatanId() {
return jabatanId;
}
public void setJabatanId(Integer jabatanId) {
this.jabatanId = jabatanId;
}
public ProfesiVO getProfesi() {
return profesi;
}
public void setProfesi(ProfesiVO profesi) {
this.profesi = profesi;
}
public Integer getProfesiId() {
return profesiId;
}
public void setProfesiId(Integer profesiId) {
this.profesiId = profesiId;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
}

29
jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/ProfesiVO.java
View File

@ -2,7 +2,11 @@ package com.jasamedika.medifirst2000.vo;
import com.jasamedika.medifirst2000.base.vo.BaseActiveVO;
import com.jasamedika.medifirst2000.helper.Caption;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class ProfesiVO extends BaseActiveVO {
@Caption(value = "Nama Profesi")
@ -12,29 +16,4 @@ public class ProfesiVO extends BaseActiveVO {
private Short jenisProfesi;
protected Integer id;
public String getNamaProfesi() {
return namaProfesi;
}
public void setNamaProfesi(String namaProfesi) {
this.namaProfesi = namaProfesi;
}
public Short getJenisProfesi() {
return jenisProfesi;
}
public void setJenisProfesi(Short jenisProfesi) {
this.jenisProfesi = jenisProfesi;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
}