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

jasamedika-bridging/src/main/resources/hibernate.cfg.xml

@@ -2089,7 +2089,7 @@
 		<mapping class="com.jasamedika.medifirst2000.entities.TypeInteraksiProduk" />
 		<mapping class="com.jasamedika.medifirst2000.entities.TypePegawai" />
 		<mapping class="com.jasamedika.medifirst2000.entities.TypeProduk" />
-		<mapping class="com.jasamedika.medifirst2000.entities.umur" />
+		<mapping class="com.jasamedika.medifirst2000.entities.Umur" />
 		<mapping class="com.jasamedika.medifirst2000.entities.UnitBagian" />
 		<mapping class="com.jasamedika.medifirst2000.entities.UnitCost" />
 		<mapping class="com.jasamedika.medifirst2000.entities.UnitCostDetail" />

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/GolonganPPPKDao.java

@@ -3,10 +3,14 @@ package com.jasamedika.medifirst2000.dao;
 import com.jasamedika.medifirst2000.entities.GolonganPPPK;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.Optional;
+
 /**
  * @author Salman
  * @version 1.0.0
  * @since 2/21/2025
  */
 public interface GolonganPPPKDao extends JpaRepository<GolonganPPPK, String> {
+
+	Optional<GolonganPPPK> findById(String id);
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/IkiDanRemunerasiDao.java

@@ -1,13 +1,14 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import com.jasamedika.medifirst2000.entities.IkiDanRemunerasi;
 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.IkiDanRemunerasi;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 @Repository("IkiDanRemunerasiDao")
 public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRemunerasi, String> {
@@ -22,14 +23,16 @@ public interface IkiDanRemunerasiDao extends PagingAndSortingRepository<IkiDanRe
 			+ "nilaiKelompokJabatan.gradeDesc as grade,  " + "pegawai.nipPns as nipPns,  "
 			+ "pegawai.nipPns as nipPns,  " + "pegawai.namaLengkap as namaLengkap,  "
 			+ "pegawai.nilaiJabatan as nilaiJabatan,  " + "golongan.id as idGolongan,  "
-			+ "golongan.golonganPegawai as golongan,  " + "unitKerja.name as unitKerja,  "
+			+ "golongan.golonganPegawai as golongan,  " + "golonganPPPK.id as idGolonganPPPK,  "
+			+ "golonganPPPK.namaGolongan as golonganPPPK,  " + "unitKerja.name as unitKerja,  "
 			+ "unitKerja.id as idUnitKerja, " + "subUnitKerja.id as idSubUnitKerja, "
 			+ "subUnitKerja.name as subUnitKerja, " + "pegawai.id as idPegawai)   "
 			+ "from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai pegawai "
 			+ "left join pegawai.detailKelompokJabatan nilaiKelompokJabatan "
 			+ "left join mapPegawai.jabatan jabatanInternal "
 			+ "left join nilaiKelompokJabatan.kelompokJabatan kelompokJabatan "
-			+ "left join pegawai.golonganPegawai golongan " + "left join mapPegawai.subUnitKerjaPegawai subUnitKerja "
+			+ "left join pegawai.golonganPegawai golongan " + "left join pegawai.golonganPPPK golonganPPPK "
+			+ "left join mapPegawai.subUnitKerjaPegawai subUnitKerja "
 			+ "left join mapPegawai.unitKerjaPegawai unitKerja " + "where mapPegawai.isPrimary is true "
 			+ "and mapPegawai.statusEnabled is true " + "and pegawai.id=:id")
 	Map<String, Object> getEvaluasiJabatan(@Param("id") Integer id);

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MonitoringAbsenDao.java

@@ -1,15 +1,14 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.MonitoringAbsen;
+import com.jasamedika.medifirst2000.entities.Pegawai;
 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.MonitoringAbsen;
-import com.jasamedika.medifirst2000.entities.Pegawai;
+import java.util.List;
+import java.util.Map;
 
 @Repository("MonitoringAbsenDao")
 public interface MonitoringAbsenDao extends PagingAndSortingRepository<MonitoringAbsen, String> {
@@ -125,12 +124,13 @@ public interface MonitoringAbsenDao extends PagingAndSortingRepository<Monitorin
 	List<Integer> findPegawaiaAktifDanKaryawanByRuangan(@Param("idUnitKerja") Integer idUnitKerja);
 
 	@Query("select new Map(pegawai.id as idPegawai," + "pegawai.namaLengkap as nama," + "pegawai.nipPns as nipPns,"
-			+ "golongan.golonganPegawai as namaGolongan," + "jabatanInternal.namaJabatan as jabatanInternal,"
-			+ "unitKerja.name as unitKerja," + "shiftKerja.id as idKelompokShiftKerja,"
-			+ "shiftKerja.name as shiftKerja," + "shiftKerja.operatorFactorRate as headOperatorFactorRate,"
-			+ "shiftKerja.factorRate as headFactorRate) " + "from MapPegawaiJabatanToUnitKerja mapPegawai "
-			+ "left join mapPegawai.pegawai pegawai " + "left join pegawai.shiftKerja shiftKerja "
-			+ "left join pegawai.golonganPegawai golongan " + "left join mappegawai.jabatan jabatanInternal "
+			+ "golongan.golonganPegawai as namaGolongan," + "golonganPPPK.namaGolongan as golonganPPPK,"
+			+ "jabatanInternal.namaJabatan as jabatanInternal," + "unitKerja.name as unitKerja,"
+			+ "shiftKerja.id as idKelompokShiftKerja," + "shiftKerja.name as shiftKerja,"
+			+ "shiftKerja.operatorFactorRate as headOperatorFactorRate," + "shiftKerja.factorRate as headFactorRate) "
+			+ "from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai pegawai "
+			+ "left join pegawai.shiftKerja shiftKerja " + "left join pegawai.golonganPegawai golongan "
+			+ "left join pegawai.golonganPPPK golonganPPPK " + "left join mappegawai.jabatan jabatanInternal "
 			+ "left join mapPegawai.subUnitKerjaPegawai subUnitKerja "
 			+ "left join mapPegawai.unitKerjaPegawai unitKerja " + "where pegawai.statusEnabled is true "
 			+ "and mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true "

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PayRollPegawaiDao.java

@@ -1,317 +1,207 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.Pegawai;
 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.Pegawai;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 @Repository("PayRollPegawaiDao")
 public interface PayRollPegawaiDao extends PagingAndSortingRepository<Pegawai, Integer> {
-	
-	@Query("select new Map(model.id as id,"
-			+ "detailkategoripegawai.id as detailKatogoriId,"
-			+ "rangemasakerja.id as rangeMasaKerjaId,"
-			+ "pendidikan.id as pendidikanId,"
-			+ "komponenharga.id as komponenHargaId,"
-			+ "model.hargaSatuan as hargaSatuan,"
-			+ "model.factorRate as factorRate) "
-			+ "from PegawaiStrukturGajiByMaKaPe model "
-			+ "left join model.detailKategoriPegawai detailkategoripegawai "
-			+ "left join model.pendidikan pendidikan "
-			+ "left join model.komponenHarga komponenharga "
-			+ "left join model.rangeMasaKerja rangemasakerja "
+
+	@Query("select new Map(model.id as id," + "detailkategoripegawai.id as detailKatogoriId,"
+			+ "rangemasakerja.id as rangeMasaKerjaId," + "pendidikan.id as pendidikanId,"
+			+ "komponenharga.id as komponenHargaId," + "model.hargaSatuan as hargaSatuan,"
+			+ "model.factorRate as factorRate) " + "from PegawaiStrukturGajiByMaKaPe model "
+			+ "left join model.detailKategoriPegawai detailkategoripegawai " + "left join model.pendidikan pendidikan "
+			+ "left join model.komponenHarga komponenharga " + "left join model.rangeMasaKerja rangemasakerja "
 			+ "where model.detailKategoriPegawai.id=:idDetailKategoriPegawai and "
 			+ "model.rangeMasaKerja.id=:idRangeMasaKerja and model.pendidikan.id=:idPendidikan")
-	List<Map<String, Object>> findGajiByMakape(@Param("idDetailKategoriPegawai")Integer idDetailKategoriPegawai,
-			@Param("idRangeMasaKerja")Integer idRangeMasaKerja,
-			@Param("idPendidikan")Integer idPendidikan);
+	List<Map<String, Object>> findGajiByMakape(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai,
+			@Param("idRangeMasaKerja") Integer idRangeMasaKerja, @Param("idPendidikan") Integer idPendidikan);
 
-	@Query("select new Map(model.id as id,"
-			+ "detailkategoripegawai.id as detailKatogoriId,"
-			+ "rangemasakerja.id as rangeMasaKerjaId,"
-			+ "pendidikan.id as pendidikanId,"
-			+ "komponenharga.id as komponenHargaId,"
-			+ "model.hargaSatuan as hargaSatuan,"
-			+ "model.factorRate as factorRate) "
-			+ "from PegawaiStrukturGajiByMaKaPe model "
-			+ "left join model.detailKategoriPegawai detailkategoripegawai "
-			+ "left join model.pendidikan pendidikan "
-			+ "left join model.komponenHarga komponenharga "
-			+ "left join model.rangeMasaKerja rangemasakerja "
+	@Query("select new Map(model.id as id," + "detailkategoripegawai.id as detailKatogoriId,"
+			+ "rangemasakerja.id as rangeMasaKerjaId," + "pendidikan.id as pendidikanId,"
+			+ "komponenharga.id as komponenHargaId," + "model.hargaSatuan as hargaSatuan,"
+			+ "model.factorRate as factorRate) " + "from PegawaiStrukturGajiByMaKaPe model "
+			+ "left join model.detailKategoriPegawai detailkategoripegawai " + "left join model.pendidikan pendidikan "
+			+ "left join model.komponenHarga komponenharga " + "left join model.rangeMasaKerja rangemasakerja "
 			+ "where model.detailKategoriPegawai.id=:idDetailKategoriPegawai "
 			+ "and model.pendidikan.id=:idPendidikan")
-	List<Map<String, Object>> findGajiByMakape(@Param("idDetailKategoriPegawai")Integer idDetailKategoriPegawai,
-			@Param("idPendidikan")Integer idPendidikan);
+	List<Map<String, Object>> findGajiByMakape(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai,
+			@Param("idPendidikan") Integer idPendidikan);
 
-	@Query("select new Map(model.id as id,"
-			+ "jabatan.id as jabatanId,"
-			+ "komponenharga.id as komponenHargaId,"
-			+ "model.hargaSatuan as hargaSatuan,"
-			+ "model.factorRate as factorRate) "
-			+ "from PegawaiStrukturGajiByJa model "
-			+ "left join model.jabatan jabatan "
-			+ "left join model.komponenHarga komponenharga "
-			+ "where jabatan.id=:idJabatan and komponenharga.id=57")
-	List<Map<String, Object>> findGajiByJa(@Param("idJabatan")Integer idJabatan);
-	
-	@Query("select new Map(model.id as id,"
-			+ "jabatan.id as jabatanId,"
-			+ "pendidikan.id as pendidikanId,"
-			+ "komponenHarga.id as komponenHargaId,"
-			+ "model.hargaSatuan as hargaSatuan,"
-			+ "model.factorRate as factorRate) "
-			+ "from PegawaiStrukturGajiByJaPe model "
-			+ "left join model.jabatan jabatan "
-			+ "left join model.pendidikan pendidikan "
+	@Query("select new Map(model.id as id," + "jabatan.id as jabatanId," + "komponenharga.id as komponenHargaId,"
+			+ "model.hargaSatuan as hargaSatuan," + "model.factorRate as factorRate) "
+			+ "from PegawaiStrukturGajiByJa model " + "left join model.jabatan jabatan "
+			+ "left join model.komponenHarga komponenharga " + "where jabatan.id=:idJabatan and komponenharga.id=57")
+	List<Map<String, Object>> findGajiByJa(@Param("idJabatan") Integer idJabatan);
+
+	@Query("select new Map(model.id as id," + "jabatan.id as jabatanId," + "pendidikan.id as pendidikanId,"
+			+ "komponenHarga.id as komponenHargaId," + "model.hargaSatuan as hargaSatuan,"
+			+ "model.factorRate as factorRate) " + "from PegawaiStrukturGajiByJaPe model "
+			+ "left join model.jabatan jabatan " + "left join model.pendidikan pendidikan "
 			+ "left join model.komponenHarga komponenharga "
 			+ "where jabatan.id=:idJabatan and pendidikan.id=:idPendidikan")
-	List<Map<String, Object>> findGajiByJaPe(@Param("idJabatan")Integer idJabatan,
-			@Param("idPendidikan")Integer idPendidikan);
+	List<Map<String, Object>> findGajiByJaPe(@Param("idJabatan") Integer idJabatan,
+			@Param("idPendidikan") Integer idPendidikan);
 
-	@Query("select new Map(model.id as id,"
-			+ "leveltingkat.id as levelTingkatId,"
-			+ "jabatan.id as jabatanId,"
-			+ "komponenharga.id as komponenHargaId,"
-			+ "model.hargaSatuan as hargaSatuan,"
-			+ "model.factorRate as factorRate) "
-			+ "from PegawaiStrukturGajiByLTJa model "
-			+ "left join model.levelTingkat leveltingkat "
-			+ "left join model.jabatan jabatan "
+	@Query("select new Map(model.id as id," + "leveltingkat.id as levelTingkatId," + "jabatan.id as jabatanId,"
+			+ "komponenharga.id as komponenHargaId," + "model.hargaSatuan as hargaSatuan,"
+			+ "model.factorRate as factorRate) " + "from PegawaiStrukturGajiByLTJa model "
+			+ "left join model.levelTingkat leveltingkat " + "left join model.jabatan jabatan "
 			+ "left join model.komponenHarga komponenharga "
 			+ "where jabatan.id=:idJabatan and leveltingkat.id=:idLevelTingkat")
-	List<Map<String, Object>> findGajiByLTJa(@Param("idJabatan")Integer idJabatan,
-			@Param("idLevelTingkat")Integer idLevelTingkat);
+	List<Map<String, Object>> findGajiByLTJa(@Param("idJabatan") Integer idJabatan,
+			@Param("idLevelTingkat") Integer idLevelTingkat);
 
-	@Query("select new Map(model.id as id,"
-			+ "rekanan.id as rekananId,"
-			+ "rekanan.namaRekanan as namaRekanan,"
-			+ "komponenharga.id as komponenHargaId,"
-			+ "komponenharga.komponenHarga as namaKomponenHarga,"
-			+ "model.hargaSatuanPremi as hargaSatuanPremi,"
-			+ "model.persenHargaSatuanPremi as persenHargaSatuanPremi,"
-			+ "model.factorRate as factorRate,"
-			+ "model.totalFactorRatePremi as totalFactorRatePremi,"
-			+ "model.isByMonth as isByMonth,"
-			+ "model.isByYear as isByYear,"
-			+ "model.keteranganLainnya as keteranganLainnya) "
-			+ "from PegawaiSKAsuransi model "
-			+ "left join model.rekanan rekanan "
-			+ "left join model.komponenHarga komponenharga "
+	@Query("select new Map(model.id as id," + "rekanan.id as rekananId," + "rekanan.namaRekanan as namaRekanan,"
+			+ "komponenharga.id as komponenHargaId," + "komponenharga.komponenHarga as namaKomponenHarga,"
+			+ "model.hargaSatuanPremi as hargaSatuanPremi," + "model.persenHargaSatuanPremi as persenHargaSatuanPremi,"
+			+ "model.factorRate as factorRate," + "model.totalFactorRatePremi as totalFactorRatePremi,"
+			+ "model.isByMonth as isByMonth," + "model.isByYear as isByYear,"
+			+ "model.keteranganLainnya as keteranganLainnya) " + "from PegawaiSKAsuransi model "
+			+ "left join model.rekanan rekanan " + "left join model.komponenHarga komponenharga "
 			+ "where model.rekanan.id=:idRekananPenjamin and komponenharga.id=:idKomponenHarga "
 			+ "and model.statusEnabled=true")
-	List<Map<String, Object>> findGajiByAsuransi(@Param("idRekananPenjamin")Integer idRekananPenjamin,
-			@Param("idKomponenHarga")Integer idKomponenHarga);
+	List<Map<String, Object>> findGajiByAsuransi(@Param("idRekananPenjamin") Integer idRekananPenjamin,
+			@Param("idKomponenHarga") Integer idKomponenHarga);
 
-	@Query("select new Map(model.id as id,"
-			+ "golonganpegawai.id as golonganPegawaiId,"
-			+ "komponenharga.id as komponenHargaId,"
-			+ "model.hargaSatuan as hargaSatuan,"
-			+ "model.factorRate as factorRate) "
-			+ "from PegawaiStrukturGajiByGolongan model "
-			+ "left join model.golonganPegawai golonganpegawai "
-			+ "left join model.komponenHarga komponenharga "
+	@Query("select new Map(model.id as id," + "golonganpegawai.id as golonganPegawaiId,"
+			+ "komponenharga.id as komponenHargaId," + "model.hargaSatuan as hargaSatuan,"
+			+ "model.factorRate as factorRate) " + "from PegawaiStrukturGajiByGolongan model "
+			+ "left join model.golonganPegawai golonganpegawai " + "left join model.komponenHarga komponenharga "
 			+ "where golonganpegawai.id=:idGolonganPegawai and komponenharga.id=:idKomponenHarga")
-	List<Map<String, Object>> findGajiByGolongan(@Param("idGolonganPegawai")Integer idGolonganPegawai,
-			@Param("idKomponenHarga")Integer idKomponenHarga);
+	List<Map<String, Object>> findGajiByGolongan(@Param("idGolonganPegawai") Integer idGolonganPegawai,
+			@Param("idKomponenHarga") Integer idKomponenHarga);
 
-	@Query("select new Map(model.id as id,"
-			+ "golonganpegawai.id as golonganPegawaiId,"
-			+ "objekpajak.id as objekPajakId,"
-			+ "objekpajak.objekPajak as objekPajak,"
-			+ "range.id as rangeId,"
-			+ "model.persenPajak as persenPajak,"
-			+ "model.keteranganLainnya as keteranganLainnya) "
-			+ "from PegawaiSKPajak model "
-			+ "left join model.objekPajak objekpajak "
-			+ "left join model.golonganPegawai golonganpegawai "
-			+ "left join model.range range "
-			+ "where :idObjekPajak=:idObjekPajak and golonganpegawai.id=:idGolongaPegawai and "
-			+ "range.id=:idRange")
-	List<Map<String, Object>> findGajiByPajak(@Param("idObjekPajak")Integer idObjekPajak,
-			@Param("idGolongaPegawai")Integer idGolongaPegawai,@Param("idRange")Integer idRange);
+	@Query("select new Map(model.id as id," + "golonganpegawai.id as golonganPegawaiId,"
+			+ "objekpajak.id as objekPajakId," + "objekpajak.objekPajak as objekPajak," + "range.id as rangeId,"
+			+ "model.persenPajak as persenPajak," + "model.keteranganLainnya as keteranganLainnya) "
+			+ "from PegawaiSKPajak model " + "left join model.objekPajak objekpajak "
+			+ "left join model.golonganPegawai golonganpegawai " + "left join model.range range "
+			+ "where :idObjekPajak=:idObjekPajak and golonganpegawai.id=:idGolongaPegawai and " + "range.id=:idRange")
+	List<Map<String, Object>> findGajiByPajak(@Param("idObjekPajak") Integer idObjekPajak,
+			@Param("idGolongaPegawai") Integer idGolongaPegawai, @Param("idRange") Integer idRange);
 
-	@Query("select new Map(model.id,"
-			+ "model.golonganPegawai.id,"
-			+ "model.objekPajak.id,"
-			+ "model.range.id,"
-			+ "model.persenPajak,"
-			+ "model.keteranganLainnya) "
-			+ "from PegawaiSKPajak model "
+	@Query("select new Map(model.id," + "model.golonganPegawai.id," + "model.objekPajak.id," + "model.range.id,"
+			+ "model.persenPajak," + "model.keteranganLainnya) " + "from PegawaiSKPajak model "
 			+ "where model.objekPajak.id=:idObjekPajak and model.golonganPegawai.id=:idGolongaPegawai and "
 			+ "model.range.id=:idRange")
-	List<Map<String, Object>> findPegawaiByDetailKategory(@Param("idObjekPajak")Integer idObjekPajak,
-			@Param("idGolongaPegawai")Integer idGolongaPegawai,@Param("idRange")Integer idRange);
+	List<Map<String, Object>> findPegawaiByDetailKategory(@Param("idObjekPajak") Integer idObjekPajak,
+			@Param("idGolongaPegawai") Integer idGolongaPegawai, @Param("idRange") Integer idRange);
 
-	@Query("select new Map (model.namaLengkap as namaLengkap,"
-			+"golonganpegawai.golonganPegawai as golonganPegawai,"
-			+"golonganpegawai.id as golonganPegawaiId,"
-			+ "pendidikan.namaPendidikan as pendidikan,"
-			+ "pendidikan.id as pendidikanId,"
-			+"jabatanfungsional.id as jabatanId,"
-			+"jabatanfungsional.namaJabatan as namaJabatan,"
-			+"detailkategoripegawai.id as detailKategoriPegawaiId,"
-			+"detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai,"
-			+ "model.nipPns as nipPns,"
-			+ "statuspegawai.statusPegawai as statusPegawai,"
-			+"kategoripegawai.kategoryPegawai as kategoriPegawai,"
-			+ "model.tglMasuk as tglMasuk,"
-			+ "model.id as pegawaiId,"
-			+ "kelompokshift.id as kelompokShiftId,"
-			+ "ruangan.id as ruanganId,"
-			+ "ruangan.namaRuangan as namaRuangan) "
-			+"from Pegawai model "
-			+"left join model.golonganPegawai golonganpegawai "
-			+"left join model.pendidikan pendidikan "
-			+"left join model.jabatanFungsional jabatanfungsional "
-			+"left join model.detailKategoryPegawai detailkategoripegawai "
-			+"left join detailkategoripegawai.kategoryPegawai kategoripegawai "
-			+ "left join model.statusPegawai statuspegawai "
-			+ "left join model.shiftKerja kelompokshift "
+	@Query("select new Map (model.namaLengkap as namaLengkap," + "golonganpegawai.golonganPegawai as golonganPegawai,"
+			+ "golonganpegawai.id as golonganPegawaiId," + "golonganPPPK.namaGolongan as golonganPPPK,"
+			+ "golonganPPPK.id as golonganPPPKId," + "pendidikan.namaPendidikan as pendidikan,"
+			+ "pendidikan.id as pendidikanId," + "jabatanfungsional.id as jabatanId,"
+			+ "jabatanfungsional.namaJabatan as namaJabatan," + "detailkategoripegawai.id as detailKategoriPegawaiId,"
+			+ "detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai," + "model.nipPns as nipPns,"
+			+ "statuspegawai.statusPegawai as statusPegawai," + "kategoripegawai.kategoryPegawai as kategoriPegawai,"
+			+ "model.tglMasuk as tglMasuk," + "model.id as pegawaiId," + "kelompokshift.id as kelompokShiftId,"
+			+ "ruangan.id as ruanganId," + "ruangan.namaRuangan as namaRuangan) " + "from Pegawai model "
+			+ "left join model.golonganPegawai golonganpegawai " + "left join model.golonganPPPK golonganPPPK "
+			+ "left join model.pendidikan pendidikan " + "left join model.jabatanFungsional jabatanfungsional "
+			+ "left join model.detailKategoryPegawai detailkategoripegawai "
+			+ "left join detailkategoripegawai.kategoryPegawai kategoripegawai "
+			+ "left join model.statusPegawai statuspegawai " + "left join model.shiftKerja kelompokshift "
 			+ "left join model.ruangan ruangan "
-			+"where detailkategoripegawai.id = :idDetailKategoriPegawai and statuspegawai.id=2 "
+			+ "where detailkategoripegawai.id = :idDetailKategoriPegawai and statuspegawai.id=2 "
 			+ "order by model.namaLengkap")
-	List<Map<String, Object>> findPegawaiByDetailKategori(@Param("idDetailKategoriPegawai")Integer idDetailKategoriPegawai);
-	
-	@Query("select new Map(model.id as id, "
-			+ "model.komponenHarga as komponenHarga) "
-			+ "from KomponenHarga model "
+	List<Map<String, Object>> findPegawaiByDetailKategori(
+			@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
+
+	@Query("select new Map(model.id as id, " + "model.komponenHarga as komponenHarga) " + "from KomponenHarga model "
 			+ "where model.id=:idKomponenHarga")
-	Map<String,Object> findKomponenHargaNameById(@Param("idKomponenHarga")Integer idKomponenHarga);
-	
-	@Query("select new Map(model.id as id, "
-			+ "model.objekPajak as objekPajak) "
-			+ "from ObjekPajak model "
-			+ "where model.id=:idObjekPajak")
-	Map<String,Object> findObjekPajakById(@Param("idObjekPajak")Integer idObjekPajak);
-	
-	@Query("select new Map(model.id as id) from Range model where namarange='Range Masa Kerja' and (rangemin<=:umur and rangemax>=:umur)")
-	Map<String,Object> findRangeId(@Param("umur")Integer umur);
-	
-	@Query("select new Map(model.id as id,model.detailKategoryPegawai as detailKategoryPegawai) from DetailKategoryPegawai model where model.id in (:ids)")
-	List<Map<String,Object>> findDetailKategoryPegawaiBluPkwt(@Param("ids")List<Integer> ids);
-	
-	@Query("select new Map(model.id as id,model.name as name) from JenisGaji model")
-	List<Map<String,Object>> findAllJenisGaji();
-	
-	@Query("select new Map(kelompokshift.id as kelompokShifId,kelompokshift.kelompokShiftKerja as kelompokShiftKerja,"
-		+"shiftkerja.id as shiftKerjaId,shiftkerja.namaShift as shiftKerja,"
-		+ "komponenindex.id as komponenIndexId,"
-		+ "komponenindex.komponenIndex as komponenIndex) "
-		+ "from MapKelompokShiftToShift model "
-		+"left join model.kelompokShift kelompokshift "
-		+"left join model.shiftKerja shiftkerja "
-		+"left join shiftkerja.komponenIndex komponenindex "
-		+"where kelompokshift.id = :idKelompokShift")
-	List<Map<String,Object>> findKomponenIndexByIdKelompokShift(@Param("idKelompokShift")Integer idKelompokShift);
-	
-	@Query("select new Map(sum(model.nilaiIndex) as sumNilaiIndex,"
-			+ "pegawai.id as pegawaiId,"
-			+ "ruangan.id as ruaganId ) "
-			+ "from PegawaiHistoriRekapIndex model "
-		+"left join model.komponenIndex komponenindex "
-		+"left join model.strukHistory strukhistory "
-		+"left join model.pegawai pegawai "
-		+"left join strukhistory.ruangan ruangan "
-		+"where komponenindex.id in (:listKomponenIndex) and ruangan.id=:idRuangan and pegawai.id=:idPegawai "
-		+ "and to_char(strukhistory.tglAwal,'mm-yyyy')=:periodeBulan "
-		+"group by pegawai.id,ruangan.id")
-	Map<String,Object> getJumlahHari(@Param("listKomponenIndex")List<Integer> listKomponenIndex,@Param("idRuangan")Integer idRuangan,
-			@Param("idPegawai")Integer idPegawai,
-			@Param("periodeBulan")String periodeBulan);
-	
-	@Query("select new Map(model.id as id,"
-			+ "golonganpegawai.id as golonganPegawaiId,"
-			+ "komponenharga.id as komponenHargaId,"
-			+ "model.hargaSatuan as hargaSatuan,"
-			+ "model.factorRate as factorRate) "
-			+ "from PegawaiStrukturGajiByGolongan model "
-			+ "left join model.golonganPegawai golonganpegawai "
-			+ "left join model.komponenHarga komponenharga "
-			+ "where komponenharga.id=:idKomponenHarga")
-	List<Map<String, Object>> findGajiHarianLepas(@Param("idKomponenHarga")Integer idKomponenHarga);
+	Map<String, Object> findKomponenHargaNameById(@Param("idKomponenHarga") Integer idKomponenHarga);
 
-	@Query("select new Map (model.namaLengkap as namaLengkap,"
-			+"golonganpegawai.golonganPegawai as golonganPegawai,"
-			+"golonganpegawai.id as golonganPegawaiId,"
-			+ "pendidikan.namaPendidikan as pendidikan,"
-			+ "pendidikan.id as pendidikanId,"
-			+"jabatanfungsional.id as jabatanId,"
-			+"jabatanfungsional.namaJabatan as namaJabatan,"
-			+"detailkategoripegawai.id as detailKategoriPegawaiId,"
-			+"detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai,"
-			+ "model.nipPns as nipPns,"
-			+ "statuspegawai.statusPegawai as statusPegawai,"
-			+"kategoripegawai.kategoryPegawai as kategoriPegawai,"
-			+ "model.tglMasuk as tglMasuk,"
-			+ "model.id as pegawaiId,"
-			+ "kelompokshift.id as kelompokshiftId,"
-			+ "ruangan.id as ruanganId,"
-			+ "ruangan.namaRuangan as namaRuangan) "
-			+"from Pegawai model "
-			+"left join model.golonganPegawai golonganpegawai "
-			+"left join model.pendidikan pendidikan "
-			+"left join model.jabatanFungsional jabatanfungsional "
-			+"left join model.detailKategoryPegawai detailkategoripegawai "
-			+"left join detailkategoripegawai.kategoryPegawai kategoripegawai "
-			+ "left join model.statusPegawai statuspegawai "
-			+ "left join model.shiftKerja kelompokshift "
-			+ "left join model.jenisPegawai jenispegawai "
-			+ "left join model.ruangan ruangan "
-			+"where detailkategoripegawai.id = :idDetailKategoriPegawai and statuspegawai.id=2 "
-			+ "and jenispegawai.id = 1 "
-			+ "order by model.namaLengkap")
-	List<Map<String, Object>> findPegawaiByDetailKategoriDokterPsikologi(@Param("idDetailKategoriPegawai")Integer idDetailKategoriPegawai);
-	
-	@Query("select new Map (model.namaLengkap as namaLengkap,"
-			+"golonganpegawai.golonganPegawai as golonganPegawai,"
-			+"golonganpegawai.id as golonganPegawaiId,"
-			+ "pendidikan.namaPendidikan as pendidikan,"
-			+ "pendidikan.id as pendidikanId,"
-			+"jabatanfungsional.id as jabatanId,"
-			+"jabatanfungsional.namaJabatan as namaJabatan,"
-			+"detailkategoripegawai.id as detailKategoriPegawaiId,"
-			+"detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai,"
-			+ "model.nipPns as nipPns,"
-			+ "statuspegawai.statusPegawai as statusPegawai,"
-			+"kategoripegawai.kategoryPegawai as kategoriPegawai,"
-			+ "model.tglMasuk as tglMasuk,"
-			+ "model.id as pegawaiId,"
-			+ "kelompokshift.id as kelompokshiftId,"
-			+ "ruangan.id as ruanganId,"
-			+ "ruangan.namaRuangan as namaRuangan,"
-			+ "model.tglLahir as tglLahir,"
-			+ "asuransiPasien.noAsuransi as noAsuransi,"
-			+ "rekanan.id as rekananId,"
-			+ "rekanan.namaRekanan as namaRekanan) "
-			+ "from AsuransiPasien asuransiPasien "
-			+ "left join asuransiPasien.pegawai model " 
-			+"left join model.golonganPegawai golonganpegawai "
-			+"left join model.pendidikan pendidikan "
-			+"left join model.jabatanFungsional jabatanfungsional "
-			+"left join model.detailKategoryPegawai detailkategoripegawai "
-			+"left join detailkategoripegawai.kategoryPegawai kategoripegawai "
-			+ "left join model.statusPegawai statuspegawai "
-			+ "left join model.shiftKerja kelompokshift "
-			+ "left join model.ruangan ruangan "
-			+ "left join asuransiPasien.rekanan rekanan "
-			+"where rekanan.id is not null and statuspegawai.id=2 "
-			+ "and rekanan.id = :idRekanan "
+	@Query("select new Map(model.id as id, " + "model.objekPajak as objekPajak) " + "from ObjekPajak model "
+			+ "where model.id=:idObjekPajak")
+	Map<String, Object> findObjekPajakById(@Param("idObjekPajak") Integer idObjekPajak);
+
+	@Query("select new Map(model.id as id) from Range model where namarange='Range Masa Kerja' and (rangemin<=:umur and rangemax>=:umur)")
+	Map<String, Object> findRangeId(@Param("umur") Integer umur);
+
+	@Query("select new Map(model.id as id,model.detailKategoryPegawai as detailKategoryPegawai) from DetailKategoryPegawai model where model.id in (:ids)")
+	List<Map<String, Object>> findDetailKategoryPegawaiBluPkwt(@Param("ids") List<Integer> ids);
+
+	@Query("select new Map(model.id as id,model.name as name) from JenisGaji model")
+	List<Map<String, Object>> findAllJenisGaji();
+
+	@Query("select new Map(kelompokshift.id as kelompokShifId,kelompokshift.kelompokShiftKerja as kelompokShiftKerja,"
+			+ "shiftkerja.id as shiftKerjaId,shiftkerja.namaShift as shiftKerja,"
+			+ "komponenindex.id as komponenIndexId," + "komponenindex.komponenIndex as komponenIndex) "
+			+ "from MapKelompokShiftToShift model " + "left join model.kelompokShift kelompokshift "
+			+ "left join model.shiftKerja shiftkerja " + "left join shiftkerja.komponenIndex komponenindex "
+			+ "where kelompokshift.id = :idKelompokShift")
+	List<Map<String, Object>> findKomponenIndexByIdKelompokShift(@Param("idKelompokShift") Integer idKelompokShift);
+
+	@Query("select new Map(sum(model.nilaiIndex) as sumNilaiIndex," + "pegawai.id as pegawaiId,"
+			+ "ruangan.id as ruaganId ) " + "from PegawaiHistoriRekapIndex model "
+			+ "left join model.komponenIndex komponenindex " + "left join model.strukHistory strukhistory "
+			+ "left join model.pegawai pegawai " + "left join strukhistory.ruangan ruangan "
+			+ "where komponenindex.id in (:listKomponenIndex) and ruangan.id=:idRuangan and pegawai.id=:idPegawai "
+			+ "and to_char(strukhistory.tglAwal,'mm-yyyy')=:periodeBulan " + "group by pegawai.id,ruangan.id")
+	Map<String, Object> getJumlahHari(@Param("listKomponenIndex") List<Integer> listKomponenIndex,
+			@Param("idRuangan") Integer idRuangan, @Param("idPegawai") Integer idPegawai,
+			@Param("periodeBulan") String periodeBulan);
+
+	@Query("select new Map(model.id as id," + "golonganpegawai.id as golonganPegawaiId,"
+			+ "komponenharga.id as komponenHargaId," + "model.hargaSatuan as hargaSatuan,"
+			+ "model.factorRate as factorRate) " + "from PegawaiStrukturGajiByGolongan model "
+			+ "left join model.golonganPegawai golonganpegawai " + "left join model.komponenHarga komponenharga "
+			+ "where komponenharga.id=:idKomponenHarga")
+	List<Map<String, Object>> findGajiHarianLepas(@Param("idKomponenHarga") Integer idKomponenHarga);
+
+	@Query("select new Map (model.namaLengkap as namaLengkap," + "golonganpegawai.golonganPegawai as golonganPegawai,"
+			+ "golonganpegawai.id as golonganPegawaiId," + "golonganPPPK.namaGolongan as golonganPPPK,"
+			+ "golonganPPPK.id as golonganPPPKId," + "pendidikan.namaPendidikan as pendidikan,"
+			+ "pendidikan.id as pendidikanId," + "jabatanfungsional.id as jabatanId,"
+			+ "jabatanfungsional.namaJabatan as namaJabatan," + "detailkategoripegawai.id as detailKategoriPegawaiId,"
+			+ "detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai," + "model.nipPns as nipPns,"
+			+ "statuspegawai.statusPegawai as statusPegawai," + "kategoripegawai.kategoryPegawai as kategoriPegawai,"
+			+ "model.tglMasuk as tglMasuk," + "model.id as pegawaiId," + "kelompokshift.id as kelompokshiftId,"
+			+ "ruangan.id as ruanganId," + "ruangan.namaRuangan as namaRuangan) " + "from Pegawai model "
+			+ "left join model.golonganPegawai golonganpegawai " + "left join model.golonganPPPK golonganPPPK "
+			+ "left join model.pendidikan pendidikan " + "left join model.jabatanFungsional jabatanfungsional "
+			+ "left join model.detailKategoryPegawai detailkategoripegawai "
+			+ "left join detailkategoripegawai.kategoryPegawai kategoripegawai "
+			+ "left join model.statusPegawai statuspegawai " + "left join model.shiftKerja kelompokshift "
+			+ "left join model.jenisPegawai jenispegawai " + "left join model.ruangan ruangan "
+			+ "where detailkategoripegawai.id = :idDetailKategoriPegawai and statuspegawai.id=2 "
+			+ "and jenispegawai.id = 1 " + "order by model.namaLengkap")
+	List<Map<String, Object>> findPegawaiByDetailKategoriDokterPsikologi(
+			@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
+
+	@Query("select new Map (model.namaLengkap as namaLengkap," + "golonganpegawai.golonganPegawai as golonganPegawai,"
+			+ "golonganpegawai.id as golonganPegawaiId," + "golonganPPPK.namaGolongan as golonganPPPK,"
+			+ "golonganPPPK.id as golonganPPPKId," + "pendidikan.namaPendidikan as pendidikan,"
+			+ "pendidikan.id as pendidikanId," + "jabatanfungsional.id as jabatanId,"
+			+ "jabatanfungsional.namaJabatan as namaJabatan," + "detailkategoripegawai.id as detailKategoriPegawaiId,"
+			+ "detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai," + "model.nipPns as nipPns,"
+			+ "statuspegawai.statusPegawai as statusPegawai," + "kategoripegawai.kategoryPegawai as kategoriPegawai,"
+			+ "model.tglMasuk as tglMasuk," + "model.id as pegawaiId," + "kelompokshift.id as kelompokshiftId,"
+			+ "ruangan.id as ruanganId," + "ruangan.namaRuangan as namaRuangan," + "model.tglLahir as tglLahir,"
+			+ "asuransiPasien.noAsuransi as noAsuransi," + "rekanan.id as rekananId,"
+			+ "rekanan.namaRekanan as namaRekanan) " + "from AsuransiPasien asuransiPasien "
+			+ "left join asuransiPasien.pegawai model " + "left join model.golonganPegawai golonganpegawai "
+			+ "left join model.golonganPPPK golonganPPPK " + "left join model.pendidikan pendidikan "
+			+ "left join model.jabatanFungsional jabatanfungsional "
+			+ "left join model.detailKategoryPegawai detailkategoripegawai "
+			+ "left join detailkategoripegawai.kategoryPegawai kategoripegawai "
+			+ "left join model.statusPegawai statuspegawai " + "left join model.shiftKerja kelompokshift "
+			+ "left join model.ruangan ruangan " + "left join asuransiPasien.rekanan rekanan "
+			+ "where rekanan.id is not null and statuspegawai.id=2 " + "and rekanan.id = :idRekanan "
 			+ "order by model.namaLengkap")
 	List<Map<String, Object>> findPegawaiByAsuransi(@Param("idRekanan") Integer idRekanan);
 
-	@Query("select new Map(model.totalFactorRatePremi as umr, "
-			+"to_char(nosk.tglBerlakuAkhir,'yyyy') as tahun ) "
-			+"from PegawaiSKAsuransi model "
-			+"left join model.noSK nosk "
-			+"where  nosk.tglBerlakuAwal <= :periode "
-			+"and nosk.tglBerlakuAkhir >= :periode "
-			+ "and model.statusEnabled=true")
-	public List<Map<String,Object>> findUmr(@Param("periode") Date periode);
+	@Query("select new Map(model.totalFactorRatePremi as umr, " + "to_char(nosk.tglBerlakuAkhir,'yyyy') as tahun ) "
+			+ "from PegawaiSKAsuransi model " + "left join model.noSK nosk " + "where  nosk.tglBerlakuAwal <= :periode "
+			+ "and nosk.tglBerlakuAkhir >= :periode " + "and model.statusEnabled=true")
+	public List<Map<String, Object>> findUmr(@Param("periode") Date periode);
 
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PayRollReportingDao.java

@@ -1,90 +1,63 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.Pegawai;
 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.Pegawai;
+import java.util.List;
+import java.util.Map;
 
 @Repository("PayRollReportingDao")
 public interface PayRollReportingDao extends PagingAndSortingRepository<Pegawai, Integer> {
-	
-	@Query("select distinct new Map(pegawai.id as pegawaiId,"
-			+ "pegawai.nipPns as nipPns, "
-			+"pegawai.namaLengkap as namaLengkap, "
-			+"detailkategoripegawai.id as detailKategoriPegawaiId, "
-			+"detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai, "
-			+"model.hargaSatuan as hargaSatuan, "
-			+"komponenharga.id as komponenHargaId, "
-			+"komponenharga.komponenHarga as komponenHarga, "
-			+"kelompokshift.id as kelompokShiftId,"
-			+"golonganpegawai.id as golonganPegawaiId, "
-			+"golonganpegawai.golonganPegawai as golonganPegawai, "
-			+"strukhistori.tglAwal as tglAwal, "
-			+"strukhistori.tglAhir as tglAkhir) "
-			+"from PegawaiHistoriRekapGaji model "
-			+"left join model.komponenHarga komponenharga "
-			+"left join model.pegawai pegawai "
-			+"left join pegawai.detailKategoryPegawai detailkategoripegawai "
-			+"left join pegawai.golonganPegawai golonganpegawai "
-			+"left join model.strukHistory strukhistori "
-			+ "left join pegawai.shiftKerja kelompokshift "
-			+"where komponenharga.id in (:komponenHargaId) "
-			+ "and detailkategoripegawai.id=:detailKategoriPegawaiId "
-			+"and to_char(strukhistori.tglAwal,'mm-yyyy')=:periode "
-			+"order by pegawai.namaLengkap")
-	List<Map<String, Object>> reportKomponenPayroll(@Param("detailKategoriPegawaiId")Integer detailKategoriPegawaiId,
-			@Param("komponenHargaId")List<Integer> komponenHargaId,
-			@Param("periode")String periode);
-	
-	@Query("select distinct new Map(pegawai.id as pegawaiId,"
-			+ "pegawai.nipPns as nipPns, "
-			+"pegawai.namaLengkap as namaLengkap, " 
-			+"detailkategoripegawai.id as detailKategoriPegawaiId, "
-			+"detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai, "
-			+"(model.totalHargaGajiAdd+model.totalHargaGajiMin) as hargaSatuan, "
-			+"'Gaji Bersih' as komponenHarga, "
-			+"golonganpegawai.id as golonganPegawaiId, "
-			+"golonganpegawai.golonganPegawai as golonganPegawai, "
-			+"strukhistori.tglAwal as tglAwal, "
-			+"strukhistori.tglAhir as tglAkhir) "
-			+"from PegawaiHistoriRekap model "
-			+"left join model.pegawai pegawai "
-			+"left join pegawai.golonganPegawai golonganpegawai "
-			+"left join pegawai.detailKategoryPegawai detailkategoripegawai "
-			+"left join model.strukHistory strukhistori "
-			+"where to_char(strukhistori.tglAwal,'mm-yyyy')=:periode "
-			+ "and detailkategoripegawai.id=:detailKategoriPegawaiId "
-			+"order by pegawai.namaLengkap")
-	List<Map<String, Object>> reportGajiBersih(@Param("detailKategoriPegawaiId")Integer detailKategoriPegawaiId,
-			@Param("periode")String periode);
 
-	@Query("select distinct new Map(pegawai.id as pegawaiId,"
-			+ "pegawai.nipPns as nipPns, "
-			+"pegawai.namaLengkap as namaLengkap, " 
-			+"detailkategoripegawai.id as detailKategoriPegawaiId, "
-			+"detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai, "
-			+"(model.totalHargaGajiAdd+model.totalHargaGajiMin) as hargaSatuan, "
-			+"'Gaji Bersih' as komponenHarga, "
-			+"golonganpegawai.id as golonganPegawaiId, "
-			+"golonganpegawai.golonganPegawai as golonganPegawai, "
-			+"strukhistori.tglAwal as tglAwal, "
-			+"strukhistori.tglAhir as tglAkhir) "
-			+"from PegawaiHistoriRekap model "
-			+"left join model.pegawai pegawai "
-			+"left join pegawai.golonganPegawai golonganpegawai "
-			+"left join pegawai.detailKategoryPegawai detailkategoripegawai "
-			+"left join model.strukHistory strukhistori "
-			+"where to_char(strukhistori.tglAwal,'mm-yyyy')=:periode "
-			+ "and detailkategoripegawai.id=:detailKategoriPegawaiId "
-			+ "and pegawai.id=:pegawaiId "
-			+"order by pegawai.namaLengkap")
-	List<Map<String, Object>> reportGajiBersihPegawaiId(@Param("pegawaiId")Integer pegawaiId,
-			@Param("detailKategoriPegawaiId")Integer detailKategoriPegawaiId,
-			@Param("periode")String periode);
+	@Query("select distinct new Map(pegawai.id as pegawaiId," + "pegawai.nipPns as nipPns, "
+			+ "pegawai.namaLengkap as namaLengkap, " + "detailkategoripegawai.id as detailKategoriPegawaiId, "
+			+ "detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai, "
+			+ "model.hargaSatuan as hargaSatuan, " + "komponenharga.id as komponenHargaId, "
+			+ "komponenharga.komponenHarga as komponenHarga, " + "kelompokshift.id as kelompokShiftId,"
+			+ "golonganpegawai.id as golonganPegawaiId, " + "golonganpegawai.golonganPegawai as golonganPegawai, "
+			+ "golonganPPPK.id as golonganPPPKId, " + "golonganPPPK.namaGolongan as golonganPPPK, "
+			+ "strukhistori.tglAwal as tglAwal, " + "strukhistori.tglAhir as tglAkhir) "
+			+ "from PegawaiHistoriRekapGaji model " + "left join model.komponenHarga komponenharga "
+			+ "left join model.pegawai pegawai " + "left join pegawai.detailKategoryPegawai detailkategoripegawai "
+			+ "left join pegawai.golonganPegawai golonganpegawai " + "left join pegawai.golonganPPPK golonganPPPK "
+			+ "left join model.strukHistory strukhistori " + "left join pegawai.shiftKerja kelompokshift "
+			+ "where komponenharga.id in (:komponenHargaId) " + "and detailkategoripegawai.id=:detailKategoriPegawaiId "
+			+ "and to_char(strukhistori.tglAwal,'mm-yyyy')=:periode " + "order by pegawai.namaLengkap")
+	List<Map<String, Object>> reportKomponenPayroll(@Param("detailKategoriPegawaiId") Integer detailKategoriPegawaiId,
+			@Param("komponenHargaId") List<Integer> komponenHargaId, @Param("periode") String periode);
+
+	@Query("select distinct new Map(pegawai.id as pegawaiId," + "pegawai.nipPns as nipPns, "
+			+ "pegawai.namaLengkap as namaLengkap, " + "detailkategoripegawai.id as detailKategoriPegawaiId, "
+			+ "detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai, "
+			+ "(model.totalHargaGajiAdd+model.totalHargaGajiMin) as hargaSatuan, " + "'Gaji Bersih' as komponenHarga, "
+			+ "golonganpegawai.id as golonganPegawaiId, " + "golonganpegawai.golonganPegawai as golonganPegawai, "
+			+ "golonganPPPK.id as golonganPPPKId, " + "golonganPPPK.namaGolongan as golonganPPPK, "
+			+ "strukhistori.tglAwal as tglAwal, " + "strukhistori.tglAhir as tglAkhir) "
+			+ "from PegawaiHistoriRekap model " + "left join model.pegawai pegawai "
+			+ "left join pegawai.golonganPegawai golonganpegawai " + "left join pegawai.golonganPPPK golonganPPPK "
+			+ "left join pegawai.detailKategoryPegawai detailkategoripegawai "
+			+ "left join model.strukHistory strukhistori " + "where to_char(strukhistori.tglAwal,'mm-yyyy')=:periode "
+			+ "and detailkategoripegawai.id=:detailKategoriPegawaiId " + "order by pegawai.namaLengkap")
+	List<Map<String, Object>> reportGajiBersih(@Param("detailKategoriPegawaiId") Integer detailKategoriPegawaiId,
+			@Param("periode") String periode);
+
+	@Query("select distinct new Map(pegawai.id as pegawaiId," + "pegawai.nipPns as nipPns, "
+			+ "pegawai.namaLengkap as namaLengkap, " + "detailkategoripegawai.id as detailKategoriPegawaiId, "
+			+ "detailkategoripegawai.detailKategoryPegawai as detailKategoriPegawai, "
+			+ "(model.totalHargaGajiAdd+model.totalHargaGajiMin) as hargaSatuan, " + "'Gaji Bersih' as komponenHarga, "
+			+ "golonganpegawai.id as golonganPegawaiId, " + "golonganpegawai.golonganPegawai as golonganPegawai, "
+			+ "golonganPPPK.id as golonganPPPKId, " + "golonganPPPK.namaGolongan as golonganPPPK, "
+			+ "strukhistori.tglAwal as tglAwal, " + "strukhistori.tglAhir as tglAkhir) "
+			+ "from PegawaiHistoriRekap model " + "left join model.pegawai pegawai "
+			+ "left join pegawai.golonganPegawai golonganpegawai " + "left join pegawai.golonganPPPK golonganPPPK "
+			+ "left join pegawai.detailKategoryPegawai detailkategoripegawai "
+			+ "left join model.strukHistory strukhistori " + "where to_char(strukhistori.tglAwal,'mm-yyyy')=:periode "
+			+ "and detailkategoripegawai.id=:detailKategoriPegawaiId " + "and pegawai.id=:pegawaiId "
+			+ "order by pegawai.namaLengkap")
+	List<Map<String, Object>> reportGajiBersihPegawaiId(@Param("pegawaiId") Integer pegawaiId,
+			@Param("detailKategoriPegawaiId") Integer detailKategoriPegawaiId, @Param("periode") String periode);
 
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java

@@ -112,12 +112,12 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "model.email as email, " + "model.emailAlternatif as emailAlternatif, " + "model.eselonId as eselonId, "
 			+ "model.gelarBelakang as gelarBelakang, " + "model.gelarDepan as gelarDepan, "
 			+ "model.golonganDarahId as golonganDarahId, " + "model.golonganPegawaiId as golonganPegawaiId, "
-			+ "model.id as id, " + "model.idFinger as idFinger, " + "model.jabatanFungsionalId as jabatanFungsionalId, "
-			+ "mapPeg.jabatanId as jabatanInternalId, " + "model.jabatanLamarId as jabatanLamarId, "
-			+ "model.jabatanStrukturalId as jabatanStrukturalId, " + "model.jenisKelaminId as jenisKelaminId, "
-			+ "model.jenisPegawaiId as jenisPegawaiId, " + "model.jenisPegawaiLamarId as jenisPegawaiLamarId, "
-			+ "model.kategoryPegawaiId as kategoryPegawaiId, " + "model.kdProfile as kdProfile, "
-			+ "model.kedudukanId as kedudukanId, " + "model.kodeBank as kodeBank, "
+			+ "model.golonganPPPKId as golonganPPPKId, " + "model.id as id, " + "model.idFinger as idFinger, "
+			+ "model.jabatanFungsionalId as jabatanFungsionalId, " + "mapPeg.jabatanId as jabatanInternalId, "
+			+ "model.jabatanLamarId as jabatanLamarId, " + "model.jabatanStrukturalId as jabatanStrukturalId, "
+			+ "model.jenisKelaminId as jenisKelaminId, " + "model.jenisPegawaiId as jenisPegawaiId, "
+			+ "model.jenisPegawaiLamarId as jenisPegawaiLamarId, " + "model.kategoryPegawaiId as kategoryPegawaiId, "
+			+ "model.kdProfile as kdProfile, " + "model.kedudukanId as kedudukanId, " + "model.kodeBank as kodeBank, "
 			+ "model.kodeExternal as kodeExternal, " + "model.kodeGapokId as kodeGapokId, "
 			+ "model.kodePos as kodePos," + "model.kualifikasiJurusanId as kualifikasiJurusanId, "
 			+ "model.nama as nama, " + "model.namaExternal as namaExternal, " + "model.namaKeluarga as namaKeluarga, "
@@ -162,12 +162,12 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "model.email as email, " + "model.emailAlternatif as emailAlternatif, " + "model.eselonId as eselonId, "
 			+ "model.gelarBelakang as gelarBelakang, " + "model.gelarDepan as gelarDepan, "
 			+ "model.golonganDarahId as golonganDarahId, " + "model.golonganPegawaiId as golonganPegawaiId, "
-			+ "model.id as id, " + "model.idFinger as idFinger, " + "model.jabatanFungsionalId as jabatanFungsionalId, "
-			+ "mapPegawai.jabatanId as jabatanInternalId, " + "model.jabatanLamarId as jabatanLamarId, "
-			+ "model.jabatanStrukturalId as jabatanStrukturalId, " + "model.jenisKelaminId as jenisKelaminId, "
-			+ "model.jenisPegawaiId as jenisPegawaiId, " + "model.jenisPegawaiLamarId as jenisPegawaiLamarId, "
-			+ "model.kategoryPegawaiId as kategoryPegawaiId, " + "model.kdProfile as kdProfile, "
-			+ "model.kedudukanId as kedudukanId, " + "model.kodeBank as kodeBank, "
+			+ "model.golonganPPPKId as golonganPPPKId, " + "model.id as id, " + "model.idFinger as idFinger, "
+			+ "model.jabatanFungsionalId as jabatanFungsionalId, " + "mapPegawai.jabatanId as jabatanInternalId, "
+			+ "model.jabatanLamarId as jabatanLamarId, " + "model.jabatanStrukturalId as jabatanStrukturalId, "
+			+ "model.jenisKelaminId as jenisKelaminId, " + "model.jenisPegawaiId as jenisPegawaiId, "
+			+ "model.jenisPegawaiLamarId as jenisPegawaiLamarId, " + "model.kategoryPegawaiId as kategoryPegawaiId, "
+			+ "model.kdProfile as kdProfile, " + "model.kedudukanId as kedudukanId, " + "model.kodeBank as kodeBank, "
 			+ "model.kodeExternal as kodeExternal, " + "model.kodeGapokId as kodeGapokId, "
 			+ "model.kodePos as kodePos," + "model.kualifikasiJurusanId as kualifikasiJurusanId, "
 			+ "model.nama as nama, " + "model.namaExternal as namaExternal, " + "model.namaKeluarga as namaKeluarga, "
@@ -302,7 +302,8 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "pegawai.tglTerbitStr as tglTerbitStr, " + "pegawai.tglBerakhirStr as tglBerakhirStr,"
 			+ "pegawai.gelarDepan as gelarDepan, " + " pegawai.gelarBelakang as gelarBelakang, "
 			+ " pegawai.tempatLahir as tempatLahir," + "golongan.golonganPegawai as namaGolongan, "
-			+ "agama.agama as agama, " + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
+			+ "golonganPPPK.namaGolongan as golonganPPPK, " + "agama.agama as agama, "
+			+ "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
 			+ "dokumen.namaJudulDokumen as namaJudulDokumen, " + "eselon.eselon as eselon, "
 			+ "golonganDarah.golonganDarah as golonganDarah, " + "jabatanFungsional.namaJabatan as namaJabatan, "
 			+ "jabatanLamar.namaJabatan as jabatanLamar, " + "jabatanStruktural.namaJabatan as jabatanStruktural, "
@@ -321,6 +322,7 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai, " + "suku.suku as suku, "
 			+ "titlePasien.namaTitle as titlePasien, " + "typePegawai.typePegawai as typePegawai) "
 			+ "from Pegawai pegawai " + "left join pegawai.golonganPegawai golongan "
+			+ "left join pegawai.golonganPPPK golonganPPPK "
 			+ "left join pegawai.detailKategoryPegawai detailKategoryPegawai " + "left join pegawai.agama agama "
 			+ "left join pegawai.detailKelompokJabatan kelompokJabatan " + "left join pegawai.dokumen dokumen "
 			+ "left join pegawai.eselon eselon " + "left join pegawai.golonganDarah golonganDarah "
@@ -359,8 +361,8 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "pegawai.tglTerbitStr as tglTerbitStr," + "pegawai.tglBerakhirStr as tglBerakhirStr,"
 			+ "pegawai.isStrSeumurHidup as isStrSeumurHidup," + "pegawai.gelarDepan as gelarDepan,"
 			+ "pegawai.gelarBelakang as gelarBelakang," + "pegawai.tempatLahir as tempatLahir,"
-			+ "golongan.golonganPegawai as namaGolongan," + "agama.agama as agama,"
-			+ "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai,"
+			+ "golongan.golonganPegawai as namaGolongan," + "golonganPPPK.namaGolongan as golonganPPPK,"
+			+ "agama.agama as agama," + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai,"
 			+ "dokumen.namaJudulDokumen as namaJudulDokumen," + "eselon.eselon as eselon,"
 			+ "golonganDarah.golonganDarah as golonganDarah," + "pegawai.statusRhesus as rhesusGolonganDarah,"
 			+ "jabatanFungsional.namaJabatan as namaJabatan," + "jabatanLamar.namaJabatan as jabatanLamar,"
@@ -394,7 +396,7 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "left join pegawai.kualifikasiJurusan kualifikasiJurusan "
 			+ "left join pegawai.levelTingkat levelTingkat " + "left join pegawai.negara negara "
 			+ "left join pegawai.pangkat pangkat " + "left join pangkat.kdGolonganPegawai golongan "
-			+ "left join pegawai.pendidikan pendidikan "
+			+ "left join pegawai.golonganPPPK golonganPPPK " + "left join pegawai.pendidikan pendidikan "
 			+ "left join pegawai.penghasilanTidakKenaPajak penghasilanTidakKenaPajak "
 			+ "left join pegawai.ruangan ruangan " + "left join pegawai.satuanKerja satuanKerja "
 			+ "left join pegawai.rekanan rekanan " + "left join pegawai.shiftKerja shiftKerja "
@@ -436,7 +438,8 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ " pegawai.kodePos as kodePos, " + " pegawai.nilaiJabatan as nilaiJabatan, " + " pegawai.grade as grade, "
 			+ "pegawai.gelarDepan as gelarDepan, " + " pegawai.gelarBelakang as gelarBelakang, "
 			+ " pegawai.tempatLahir as tempatLahir," + "golongan.golonganPegawai as namaGolongan, "
-			+ "agama.agama as agama, " + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
+			+ "golonganPPPK.namaGolongan as golonganPPPK, " + "agama.agama as agama, "
+			+ "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
 			+ "dokumen.namaJudulDokumen as namaJudulDokumen, " + "eselon.eselon as eselon, "
 			+ "golonganDarah.golonganDarah as golonganDarah, " + "jabatanFungsional.namaJabatan as namaJabatan, "
 			+ "jabatanInternal.namaJabatan as jabatanInternal, " + "jabatanInternal.id as idJabatanInternal,"
@@ -460,6 +463,7 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai pegawai "
 			+ "left join mapPegawai.subUnitKerjaPegawai subUnitKerja "
 			+ "left join mapPegawai.unitKerjaPegawai unitKerja " + "left join pegawai.golonganPegawai golongan "
+			+ "left join pegawai.golonganPPPK golonganPPPK "
 			+ "left join pegawai.detailKategoryPegawai detailKategoryPegawai " + "left join pegawai.agama agama "
 			+ "left join pegawai.detailKelompokJabatan kelompokJabatan " + "left join pegawai.dokumen dokumen "
 			+ "left join pegawai.eselon eselon " + "left join pegawai.golonganDarah golonganDarah "
@@ -495,9 +499,10 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			@Param("tahun") String tahun);
 
 	String strQryJabatanCetak = "select new map (pegawai.id as idPegawai, " + "pegawai.namaLengkap as nama, "
-			+ "golongan.id as idGolongan,golongan.golonganPegawai as namaGolongan, " + "pegawai.noTlp as noTlp, "
-			+ "pegawai.noHandphone as noHandphone, " + "agama.agama as agama, " + "pegawai.alamat as alamat, "
-			+ "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
+			+ "golongan.id as idGolongan,golongan.golonganPegawai as namaGolongan, "
+			+ "golonganPPPK.id as idGolonganPPPK,golonganPPPK.namaGolongan as golonganPPPK, "
+			+ "pegawai.noTlp as noTlp, " + "pegawai.noHandphone as noHandphone, " + "agama.agama as agama, "
+			+ "pegawai.alamat as alamat, " + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
 			+ "dokumen.namaJudulDokumen as namaJudulDokumen, " + "eselon.eselon as eselon, "
 			+ "golonganDarah.golonganDarah as golonganDarah, " + "jabatanFungsional.namaJabatan as namaJabatan, "
 			+ "jabatanInternal.namaJabatan as jabatanInternal, " + "jabatanInternal.id as idJabatanInternal,"
@@ -520,9 +525,9 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "departemen.namaDepartemen as departemen, " + "titlePasien.namaTitle as titlePasien, "
 			+ "typePegawai.typePegawai as typePegawai) " + "from MapPegawaiJabatanToUnitKerja mappegawai "
 			+ "left join mappegawai.pegawai pegawai " + "left join pegawai.golonganPegawai golongan "
-			+ "left join pegawai.agama agama " + "left join pegawai.detailKategoryPegawai detailKategoryPegawai "
-			+ "left join pegawai.dokumen dokumen " + "left join pegawai.eselon eselon "
-			+ "left join pegawai.golonganDarah golonganDarah "
+			+ "left join pegawai.golonganPPPK golonganPPPK " + "left join pegawai.agama agama "
+			+ "left join pegawai.detailKategoryPegawai detailKategoryPegawai " + "left join pegawai.dokumen dokumen "
+			+ "left join pegawai.eselon eselon " + "left join pegawai.golonganDarah golonganDarah "
 			+ "left join pegawai.jabatanFungsional jabatanFungsional " + "left join mappegawai.jabatan jabatanInternal "
 			+ "left join pegawai.jabatanLamar jabatanLamar " + "left join pegawai.jabatanStruktural jabatanStruktural "
 			+ "left join pegawai.jenisKelamin jenisKelamin " + "left join pegawai.jenisPegawai jenisPegawai "
@@ -567,8 +572,8 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 	List<Pegawai> findAllPegawaiAktifByRuangan(@Param("idRuangan") Integer idRuangan);
 
 	@Query("select new map (pegawai.id as idPegawai, " + "pegawai.namaLengkap as nama, "
-			+ "golongan.golonganPegawai as namaGolongan, " + "agama.agama as agama, "
-			+ "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
+			+ "golongan.golonganPegawai as namaGolongan, " + "golonganPPPK.namaGolongan as golonganPPPK, "
+			+ "agama.agama as agama, " + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
 			+ "dokumen.namaJudulDokumen as namaJudulDokumen, " + "eselon.eselon as eselon, "
 			+ "golonganDarah.golonganDarah as golonganDarah, " + "jabatanFungsional.namaJabatan as namaJabatan, "
 			+ "jabatanInternal.namaJabatan as jabatanInternal, " + "jabatanInternal.id as idJabatanInternal,"
@@ -588,9 +593,10 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai, " + "suku.suku as suku, "
 			+ "titlePasien.namaTitle as titlePasien, " + "typePegawai.typePegawai as typePegawai) "
 			+ "from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai pegawai "
-			+ "left join pegawai.golonganPegawai golongan " + "left join pegawai.agama agama "
-			+ "left join pegawai.detailKategoryPegawai detailKategoryPegawai " + "left join pegawai.dokumen dokumen "
-			+ "left join pegawai.eselon eselon " + "left join pegawai.golonganDarah golonganDarah "
+			+ "left join pegawai.golonganPegawai golongan " + "left join pegawai.golonganPPPK golonganPPPK "
+			+ "left join pegawai.agama agama " + "left join pegawai.detailKategoryPegawai detailKategoryPegawai "
+			+ "left join pegawai.dokumen dokumen " + "left join pegawai.eselon eselon "
+			+ "left join pegawai.golonganDarah golonganDarah "
 			+ "left join pegawai.jabatanFungsional jabatanFungsional " + "left join mapPegawai.jabatan jabatanInternal "
 			+ "left join pegawai.jabatanLamar jabatanLamar " + "left join pegawai.jabatanStruktural jabatanStruktural "
 			+ "left join pegawai.jenisKelamin jenisKelamin " + "left join pegawai.jenisPegawai jenisPegawai "
@@ -612,9 +618,10 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 	Pegawai findPegawaiHukorById(@Param("idPegawai") Integer idPegawai);
 
 	@Query("select  NEW  Map(p.id as idPegawai, p.namaLengkap as namaLengkap, p.tglMasuk as tglMasuk, p.alamat as alamat ,jabatanInternal.namaJabatan as namaJabatan , "
-			+ "golonganPegawai.golonganPegawai as grade) " + " from MapPegawaiJabatanToUnitKerja mapPegawai "
-			+ "left join mapPegawai.pegawai p " + "left join mapPegawai.jabatan jabatanInternal "
-			+ "left join p.golonganPegawai as golonganPegawai " + "where mapPegawai.isPrimary is true "
+			+ "golonganPegawai.golonganPegawai as grade," + "golonganPPPK.namaGolongan as golonganPPPK) "
+			+ " from MapPegawaiJabatanToUnitKerja mapPegawai " + "left join mapPegawai.pegawai p "
+			+ "left join mapPegawai.jabatan jabatanInternal " + "left join p.golonganPegawai as golonganPegawai "
+			+ "left join p.golonganPPPK as golonganPPPK " + "where mapPegawai.isPrimary is true "
 			+ "and mapPegawai.statusEnabled is true " + "and p.id = :idPegawai")
 	Map<String, Object> findPegawaiForMobileById(@Param("idPegawai") Integer idPegawai);
 
@@ -712,7 +719,8 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "pegawai.namaLengkap as namaLengkap, " + " pegawai.tglLahir as tglLahir, "
 			+ "pegawai.gelarDepan as gelarDepan, " + " pegawai.gelarBelakang as gelarBelakang, "
 			+ " pegawai.tempatLahir as tempatLahir," + "golongan.golonganPegawai as namaGolongan, "
-			+ "agama.agama as agama, " + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
+			+ "golonganPPPK.namaGolongan as golonganPPPK, " + "agama.agama as agama, "
+			+ "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
 			+ "dokumen.namaJudulDokumen as namaJudulDokumen, " + "eselon.eselon as eselon, "
 			+ "golonganDarah.golonganDarah as golonganDarah, " + "jabatanFungsional.namaJabatan as namaJabatan, "
 			+ "jabatanLamar.namaJabatan as jabatanLamar, " + "jabatanStruktural.namaJabatan as jabatanStruktural, "
@@ -731,9 +739,10 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai, " + "suku.suku as suku, "
 			+ "titlePasien.namaTitle as titlePasien, " + "typePegawai.typePegawai as typePegawai,"
 			+ "pegawai.statusEnabled as statusEnabled) " + "from Pegawai pegawai "
-			+ "left join pegawai.golonganPegawai golongan " + "left join pegawai.agama agama "
-			+ "left join pegawai.detailKategoryPegawai detailKategoryPegawai " + "left join pegawai.dokumen dokumen "
-			+ "left join pegawai.eselon eselon " + "left join pegawai.golonganDarah golonganDarah "
+			+ "left join pegawai.golonganPegawai golongan " + "left join pegawai.golonganPPPK golonganPPPK "
+			+ "left join pegawai.agama agama " + "left join pegawai.detailKategoryPegawai detailKategoryPegawai "
+			+ "left join pegawai.dokumen dokumen " + "left join pegawai.eselon eselon "
+			+ "left join pegawai.golonganDarah golonganDarah "
 			+ "left join pegawai.jabatanFungsional jabatanFungsional " + "left join pegawai.jabatanLamar jabatanLamar "
 			+ "left join pegawai.jabatanStruktural jabatanStruktural " + "left join pegawai.jenisKelamin jenisKelamin "
 			+ "left join pegawai.jenisPegawai jenisPegawai " + "left join pegawai.jenisPegawaiLamar jenisPegawaiLamar "
@@ -859,7 +868,8 @@ public interface PegawaiDao extends JpaRepository<Pegawai, Integer>, JpaSpecific
 			+ "pegawai.noBPJS as noBPJS, " + "pegawai.noHandphone as noHandphone, "
 			+ "pegawai.noIdentitas as noIdentitas, " + "pegawai.noSip as noSip, " + "pegawai.noStr as noStr, "
 			+ "pegawai.noTlp as noTlp, " + "pegawai.npwp as npwp, " + "pegawai.negaraId as negaraId, "
-			+ "pegawai.pensiun as pensiun, " + "pegawai.pangkatId as pangkatId, " + "pegawai.ruanganId as ruanganId, "
+			+ "pegawai.pensiun as pensiun, " + "pegawai.pangkatId as pangkatId, "
+			+ "pegawai.golonganPPPKId as golonganPPPKId, " + "pegawai.ruanganId as ruanganId, "
 			+ "pegawai.rekananId as rekananId," + "pegawai.statusRhesus as statusRhesus, "
 			+ "pegawai.shiftKerjaId as shiftKerjaId, " + "pegawai.statusKawinId as statusKawinId, "
 			+ "pegawai.sukuId as sukuId, " + "pegawai.tempatLahir as tempatLahir, "

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiSKGajiDao.java

@@ -1,196 +1,133 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.PegawaiSKGaji;
 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.PegawaiSKGaji;
+import java.util.List;
+import java.util.Map;
 
 @Repository("PegawaiSKGajiDao")
 public interface PegawaiSKGajiDao extends PagingAndSortingRepository<PegawaiSKGaji, Integer> {
 
-	// NIP PNS, Nama Lengkap, Golongan, Pendidikan, Masa Kerja, (Jabatan), Komponen Gaji, Harga
-	@Query("select new Map(p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, g.golonganPegawai AS Golongan, pdk.namaPendidikan AS Pendidikan, "
+	// NIP PNS, Nama Lengkap, Golongan, Pendidikan, Masa Kerja, (Jabatan),
+	// Komponen Gaji, Harga
+	@Query("select new Map(p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, g.golonganPegawai AS Golongan, gp.namaGolongan AS golonganPPPK, pdk.namaPendidikan AS Pendidikan, "
 			+ "jf.namaJabatan AS Jabatan, kh.komponenHarga AS KomponenHarga, gj.hargaSatuan AS Harga) "
-			+ "from PegawaiSKGaji gj "
-			+ "left join gj.pegawai p "
-			+ "left join p.detailKategoryPegawai dkp "
-			+ "left join p.golonganPegawai g "
-			+ "left join p.pendidikan pdk "
-			+ "left join p.jabatanFungsional jf "
-			+ "left join gj.komponenHarga kh "
+			+ "from PegawaiSKGaji gj " + "left join gj.pegawai p " + "left join p.detailKategoryPegawai dkp "
+			+ "left join p.golonganPegawai g " + "left join p.golonganPPPK gp " + "left join p.pendidikan pdk "
+			+ "left join p.jabatanFungsional jf " + "left join gj.komponenHarga kh "
 			+ "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai "
 			+ "and kh.komponenHarga in(45, 52, 56, 57) ")
-	List<Map<String, Object>> findPegawaiGajiSKByKategoriPegawai(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
-	
+	List<Map<String, Object>> findPegawaiGajiSKByKategoriPegawai(
+			@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
+
 	// Gaji Pokok (ID=45)
-	@Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, pdk.namaPendidikan AS Pendidikan, "
+	@Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, gpp.namaGolongan AS golonganPPPK, pdk.namaPendidikan AS Pendidikan, "
 			+ "EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) AS MasaKerja, jf.namaJabatan AS Jabatan, kh.komponenHarga AS KomponenHarga, gjmkp.hargaSatuan AS Harga) "
-			+ "from PegawaiSKGaji gj, GajiPerMasaKerjaPendidikan gjmkp "
-			+ "left join gj.pegawai p "
-			+ "left join p.detailKategoryPegawai dkp "
-			+ "left join p.golonganPegawai gp "
-			+ "left join p.pendidikan pdk "
-			+ "left join p.jabatanFungsional jf "
-			+ "left join gj.komponenHarga kh "
-			+ "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai "
-			+ "and gj.komponenHarga.komponenHarga='Gaji Pokok' "
-			+ "and gjmkp.pendidikan=p.pendidikan "
+			+ "from PegawaiSKGaji gj, GajiPerMasaKerjaPendidikan gjmkp " + "left join gj.pegawai p "
+			+ "left join p.detailKategoryPegawai dkp " + "left join p.golonganPegawai gp "
+			+ "left join p.golonganPPPK gpp " + "left join p.pendidikan pdk " + "left join p.jabatanFungsional jf "
+			+ "left join gj.komponenHarga kh " + "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai "
+			+ "and gj.komponenHarga.komponenHarga='Gaji Pokok' " + "and gjmkp.pendidikan=p.pendidikan "
 			+ "and gjmkp.range = (select r.id from Range r where r.namaRange='Range Masa Kerja' and EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) between r.rangeMin and r.rangeMax) "
 			+ "order by NIP")
 	List<Map<String, Object>> findGajiPokokPegawai(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
-	
+
 	// Tunjangan Fungsional (ID=52)
-	@Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, pdk.namaPendidikan AS Pendidikan, "
+	@Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, gpp.namaGolongan AS golonganPPPK, pdk.namaPendidikan AS Pendidikan, "
 			+ "EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) AS MasaKerja, jf.namaJabatan AS Jabatan, kh.komponenHarga AS KomponenHarga, gjjp.hargaSatuan AS Harga) "
-			+ "from PegawaiSKGaji gj, GajiPerJabatanPendidikan gjjp "
-			+ "left join gj.pegawai p "
-			+ "left join p.detailKategoryPegawai dkp "
-			+ "left join p.golonganPegawai gp "
-			+ "left join p.pendidikan pdk "
-			+ "left join p.jabatanFungsional jf "
-			+ "left join gj.komponenHarga kh "
-			+ "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai "
-			+ "and gj.komponenHarga.komponenHarga='Tunjangan Fungsional' "
-			+ "and gjjp.jabatan=p.jabatanFungsional "
-			+ "and gjjp.pendidikan=p.pendidikan "
-			+ "order by NIP")
-	List<Map<String, Object>> findTunjanganFungsional(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
-	
+			+ "from PegawaiSKGaji gj, GajiPerJabatanPendidikan gjjp " + "left join gj.pegawai p "
+			+ "left join p.detailKategoryPegawai dkp " + "left join p.golonganPegawai gp "
+			+ "left join p.golonganPPPK gpp " + "left join p.pendidikan pdk " + "left join p.jabatanFungsional jf "
+			+ "left join gj.komponenHarga kh " + "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai "
+			+ "and gj.komponenHarga.komponenHarga='Tunjangan Fungsional' " + "and gjjp.jabatan=p.jabatanFungsional "
+			+ "and gjjp.pendidikan=p.pendidikan " + "order by NIP")
+	List<Map<String, Object>> findTunjanganFungsional(
+			@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
+
 	// Tunjangan Bahaya Radiasi (ID=56)
-	@Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, pdk.namaPendidikan AS Pendidikan, "
+	@Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, gpp.namaGolongan AS golonganPPPK, pdk.namaPendidikan AS Pendidikan, "
 			+ "EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) AS MasaKerja, jf.namaJabatan AS Jabatan, kh.komponenHarga AS KomponenHarga, gjlt.hargaSatuan AS Harga) "
 			+ "from PegawaiSKGaji gj, GajiPerLevelTingkat gjlt, MapPegawaiJabatanToUnitKerja mapPegawai "
-			+ "left join gj.pegawai p "
-			+ "left join p.detailKategoryPegawai dkp "
-			+ "left join p.golonganPegawai gp "
-			+ "left join p.pendidikan pdk "
-			+ "left join p.jabatanFungsional jf "
-			+ "left join gj.komponenHarga kh "
-			+ "where mapPegawai.pegawaiId = p.id "
-			+ "and mapPegawai.isPrimary is true "
-			+ "and mapPegawai.statusEnabled is true "
+			+ "left join gj.pegawai p " + "left join p.detailKategoryPegawai dkp " + "left join p.golonganPegawai gp "
+			+ "left join p.golonganPPPK gpp " + "left join p.pendidikan pdk " + "left join p.jabatanFungsional jf "
+			+ "left join gj.komponenHarga kh " + "where mapPegawai.pegawaiId = p.id "
+			+ "and mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true "
 			+ "and dkp.detailKategoryPegawai.id = :idDetailKategoriPegawai "
 			+ "and gj.komponenHarga.komponenHarga = 'Tunjangan Bahaya Radiasi' "
-			+ "and gjlt.jabatan = mapPegawai.jabatan "
-			+ "and gjlt.levelTingkat = p.levelTingkat "
-			+ "order by NIP")
-	List<Map<String, Object>> findTunjanganBahayaRadiasi(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
-	
+			+ "and gjlt.jabatan = mapPegawai.jabatan " + "and gjlt.levelTingkat = p.levelTingkat " + "order by NIP")
+	List<Map<String, Object>> findTunjanganBahayaRadiasi(
+			@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
+
 	// Tunjangan Layanan (ID=57)
-	@Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, pdk.namaPendidikan AS Pendidikan, "
+	@Query("select new Map(gj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, gp.golonganPegawai AS Golongan, gpp.namaGolongan AS golonganPPPK, pdk.namaPendidikan AS Pendidikan, "
 			+ "EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) AS MasaKerja, jf.namaJabatan AS Jabatan, kh.komponenHarga AS KomponenHarga, gjj.hargaSatuan AS Harga) "
 			+ "from PegawaiSKGaji gj, GajiPerJabatan gjj, MapPegawaiJabatanToUnitKerja mapPegawai "
-			+ "left join gj.pegawai p "
-			+ "left join p.detailKategoryPegawai dkp "
-			+ "left join p.golonganPegawai gp "
-			+ "left join p.pendidikan pdk "
-			+ "left join p.jabatanFungsional jf "
-			+ "left join gj.komponenHarga kh "
-			+ "where mapPegawai.pegawaiId = p.id "
-			+ "and mapPegawai.isPrimary is true "
-			+ "and mapPegawai.statusEnabled is true "
+			+ "left join gj.pegawai p " + "left join p.detailKategoryPegawai dkp " + "left join p.golonganPegawai gp "
+			+ "left join p.golonganPPPK gpp " + "left join p.pendidikan pdk " + "left join p.jabatanFungsional jf "
+			+ "left join gj.komponenHarga kh " + "where mapPegawai.pegawaiId = p.id "
+			+ "and mapPegawai.isPrimary is true " + "and mapPegawai.statusEnabled is true "
 			+ "and dkp.detailKategoryPegawai.id = :idDetailKategoriPegawai "
-			+ "and gj.komponenHarga.komponenHarga = 'Tunjangan Layanan' "
-			+ "and gjj.jabatan = mapPegawai.jabatan ")
+			+ "and gj.komponenHarga.komponenHarga = 'Tunjangan Layanan' " + "and gjj.jabatan = mapPegawai.jabatan ")
 	List<Map<String, Object>> findTunjanganLayanan(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
-	
-	
-	//@Query("select v from komponen_gaji_kotor_v v")
-	//List<Map<String, Object>> findGajiKotor(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
-	
-	//@Query("select v from komponen_gaji_bersih_v v")
-	//List<Map<String, Object>> findGajiBersih(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
-	
-	@Query("select new Map(model.id as pegawaiSkGajiId, "
-			+"suratkeputusan.id as suratKeputusanId, "
-			+"suratkeputusan.noSK as noSuratKeputusan, "
-			+"suratkeputusan.namaSK as namaSuratKeputusan, "
-			+"to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, "
-			+"to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, "
-			+"ruangan.id as ruanganId, "
-			+"ruangan.namaRuangan as namaRuangan, "
-			+"pegawai.id as pegawaiId, "
-			+"pegawai.namaLengkap as namaPegawai, "
-			+"komponenharga.id as komponenHargaId, "
-			+"komponenharga.komponenHarga as namaKomponenHarga, "
-			+"model.persenHargaSatuan as persenHargaSatuan, "
-			+"model.hargaSatuan as hargaSatuan, "
-			+"model.factorRate as factorRate, "
-			+"model.operatorFactorRate as operatorFactorRate, "
-			+"model.isByMonth as isByMonth, "
-			+"model.isByYear as isByYear, "
-			+"model.isByWeek as isByWeek, "
-			+"model.isByDay as isByDay,"
-			+"model.statusEnabled as statusEnabled "
-			+ ") "
-			+"from PegawaiSKGaji model  "
-			+"left join model.noSK suratkeputusan " 
-			+"left join suratkeputusan.ruangan ruangan " 
-			+"left join model.pegawai pegawai  "
-			+"left join model.komponenHarga komponenharga "
-			+ "where model.id =:idPegawaiSkGaji")
-	Map<String,Object> get(@Param("idPegawaiSkGaji") Integer idPegawaiSkGaji);
-	
-	@Query("select new Map(model.id as pegawaiSkGajiId, "
-			+"suratkeputusan.id as suratKeputusanId, "
-			+"suratkeputusan.noSK as noSuratKeputusan, "
-			+"suratkeputusan.namaSK as namaSuratKeputusan, "
-			+"to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, "
-			+"to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, "
-			+"ruangan.id as ruanganId, "
-			+"ruangan.namaRuangan as namaRuangan, "
-			+"pegawai.id as pegawaiId, "
-			+"pegawai.namaLengkap as namaPegawai, "
-			+"komponenharga.id as komponenHargaId, "
-			+"komponenharga.komponenHarga as namaKomponenHarga, "
-			+"model.persenHargaSatuan as persenHargaSatuan, "
-			+"model.hargaSatuan as hargaSatuan, "
-			+"model.factorRate as factorRate, "
-			+"model.operatorFactorRate as operatorFactorRate, "
-			+"model.isByMonth as isByMonth, "
-			+"model.isByYear as isByYear, "
-			+"model.isByWeek as isByWeek, "
-			+"model.isByDay as isByDay,"
-			+"model.statusEnabled as statusEnabled "
-			+ ") "
-			+"from PegawaiSKGaji model  "
-			+"left join model.noSK suratkeputusan " 
-			+"left join suratkeputusan.ruangan ruangan " 
-			+"left join model.pegawai pegawai  "
-			+"left join model.komponenHarga komponenharga "
-			+ "where pegawai.id =:idPegawai")
-	List<Map<String,Object>> getByPegawaiId(@Param("idPegawai") Integer idPegawai);
 
-	@Query("select new Map(model.id as pegawaiSkGajiId, "
-			+"suratkeputusan.id as suratKeputusanId, "
-			+"suratkeputusan.noSK as noSuratKeputusan, "
-			+"suratkeputusan.namaSK as namaSuratKeputusan, "
-			+"to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, "
-			+"to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, "
-			+"ruangan.id as ruanganId, "
-			+"ruangan.namaRuangan as namaRuangan, "
-			+"pegawai.id as pegawaiId, "
-			+"pegawai.namaLengkap as namaPegawai, "
-			+"komponenharga.id as komponenHargaId, "
-			+"komponenharga.komponenHarga as namaKomponenHarga, "
-			+"model.persenHargaSatuan as persenHargaSatuan, "
-			+"model.hargaSatuan as hargaSatuan, "
-			+"model.factorRate as factorRate, "
-			+"model.operatorFactorRate as operatorFactorRate, "
-			+"model.isByMonth as isByMonth, "
-			+"model.isByYear as isByYear, "
-			+"model.isByWeek as isByWeek, "
-			+"model.isByDay as isByDay ) "
-			+"from PegawaiSKGaji model  "
-			+"left join model.noSK suratkeputusan " 
-			+"left join suratkeputusan.ruangan ruangan " 
-			+"left join model.pegawai pegawai  "
-			+"left join model.komponenHarga komponenharga")
-	List<Map<String,Object>> getAll();	
+	// @Query("select v from komponen_gaji_kotor_v v")
+	// List<Map<String, Object>> findGajiKotor(@Param("idDetailKategoriPegawai")
+	// Integer idDetailKategoriPegawai);
+
+	// @Query("select v from komponen_gaji_bersih_v v")
+	// List<Map<String, Object>>
+	// findGajiBersih(@Param("idDetailKategoriPegawai") Integer
+	// idDetailKategoriPegawai);
+
+	@Query("select new Map(model.id as pegawaiSkGajiId, " + "suratkeputusan.id as suratKeputusanId, "
+			+ "suratkeputusan.noSK as noSuratKeputusan, " + "suratkeputusan.namaSK as namaSuratKeputusan, "
+			+ "to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, "
+			+ "to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, " + "ruangan.id as ruanganId, "
+			+ "ruangan.namaRuangan as namaRuangan, " + "pegawai.id as pegawaiId, "
+			+ "pegawai.namaLengkap as namaPegawai, " + "komponenharga.id as komponenHargaId, "
+			+ "komponenharga.komponenHarga as namaKomponenHarga, " + "model.persenHargaSatuan as persenHargaSatuan, "
+			+ "model.hargaSatuan as hargaSatuan, " + "model.factorRate as factorRate, "
+			+ "model.operatorFactorRate as operatorFactorRate, " + "model.isByMonth as isByMonth, "
+			+ "model.isByYear as isByYear, " + "model.isByWeek as isByWeek, " + "model.isByDay as isByDay,"
+			+ "model.statusEnabled as statusEnabled " + ") " + "from PegawaiSKGaji model  "
+			+ "left join model.noSK suratkeputusan " + "left join suratkeputusan.ruangan ruangan "
+			+ "left join model.pegawai pegawai  " + "left join model.komponenHarga komponenharga "
+			+ "where model.id =:idPegawaiSkGaji")
+	Map<String, Object> get(@Param("idPegawaiSkGaji") Integer idPegawaiSkGaji);
+
+	@Query("select new Map(model.id as pegawaiSkGajiId, " + "suratkeputusan.id as suratKeputusanId, "
+			+ "suratkeputusan.noSK as noSuratKeputusan, " + "suratkeputusan.namaSK as namaSuratKeputusan, "
+			+ "to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, "
+			+ "to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, " + "ruangan.id as ruanganId, "
+			+ "ruangan.namaRuangan as namaRuangan, " + "pegawai.id as pegawaiId, "
+			+ "pegawai.namaLengkap as namaPegawai, " + "komponenharga.id as komponenHargaId, "
+			+ "komponenharga.komponenHarga as namaKomponenHarga, " + "model.persenHargaSatuan as persenHargaSatuan, "
+			+ "model.hargaSatuan as hargaSatuan, " + "model.factorRate as factorRate, "
+			+ "model.operatorFactorRate as operatorFactorRate, " + "model.isByMonth as isByMonth, "
+			+ "model.isByYear as isByYear, " + "model.isByWeek as isByWeek, " + "model.isByDay as isByDay,"
+			+ "model.statusEnabled as statusEnabled " + ") " + "from PegawaiSKGaji model  "
+			+ "left join model.noSK suratkeputusan " + "left join suratkeputusan.ruangan ruangan "
+			+ "left join model.pegawai pegawai  " + "left join model.komponenHarga komponenharga "
+			+ "where pegawai.id =:idPegawai")
+	List<Map<String, Object>> getByPegawaiId(@Param("idPegawai") Integer idPegawai);
+
+	@Query("select new Map(model.id as pegawaiSkGajiId, " + "suratkeputusan.id as suratKeputusanId, "
+			+ "suratkeputusan.noSK as noSuratKeputusan, " + "suratkeputusan.namaSK as namaSuratKeputusan, "
+			+ "to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, "
+			+ "to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, " + "ruangan.id as ruanganId, "
+			+ "ruangan.namaRuangan as namaRuangan, " + "pegawai.id as pegawaiId, "
+			+ "pegawai.namaLengkap as namaPegawai, " + "komponenharga.id as komponenHargaId, "
+			+ "komponenharga.komponenHarga as namaKomponenHarga, " + "model.persenHargaSatuan as persenHargaSatuan, "
+			+ "model.hargaSatuan as hargaSatuan, " + "model.factorRate as factorRate, "
+			+ "model.operatorFactorRate as operatorFactorRate, " + "model.isByMonth as isByMonth, "
+			+ "model.isByYear as isByYear, " + "model.isByWeek as isByWeek, " + "model.isByDay as isByDay ) "
+			+ "from PegawaiSKGaji model  " + "left join model.noSK suratkeputusan "
+			+ "left join suratkeputusan.ruangan ruangan " + "left join model.pegawai pegawai  "
+			+ "left join model.komponenHarga komponenharga")
+	List<Map<String, Object>> getAll();
 
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiSKPajakDao.java

@@ -1,78 +1,60 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.PegawaiSKPajak;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.jasamedika.medifirst2000.entities.PegawaiSKPajak;
+import java.util.List;
+import java.util.Map;
 
 @Repository("PegawaiSKPajakDao")
 public interface PegawaiSKPajakDao extends CrudRepository<PegawaiSKPajak, Integer> {
 
 	// Potongan Pajak (ID=42)
 	/*
-	@Query("select new Map(pj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, g.name AS Golongan, pdk.namaPendidikan AS Pendidikan, "
-		+ "EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) AS MasaKerja, jf.namaJabatan AS Jabatan, 'PotonganPajak' AS KomponenHarga, pj.persenPajak AS Harga) "
-		+ "from PegawaiSKPajak pj " 
-		+ "left join pj.pegawai p " 
-		+ "left join p.detailKategoryPegawai dkp "
-		+ "left join p.Golongan g " 
-		+ "left join p.pendidikan pdk " 
-		+ "left join p.jabatanFungsional jf "
-		+ "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai "
-		+ "and pj.golonganPegawai and p.golonganPegawai")
-	List<Map<String, Object>> findPotonganPajak(@Param("idDetailKategoriPegawai") Integer idDetailKategoriPegawai);
-	*/
+	 * @Query("select new Map(pj.id AS ID, p.nipPns AS NIP, p.namaLengkap AS NamaLengkap, g.name AS Golongan, pdk.namaPendidikan AS Pendidikan, "
+	 * +
+	 * "EXTRACT(year FROM (current_date)) - EXTRACT(year FROM (p.tglMasuk)) AS MasaKerja, jf.namaJabatan AS Jabatan, 'PotonganPajak' AS KomponenHarga, pj.persenPajak AS Harga) "
+	 * + "from PegawaiSKPajak pj " + "left join pj.pegawai p " +
+	 * "left join p.detailKategoryPegawai dkp " + "left join p.Golongan g " +
+	 * "left join p.pendidikan pdk " + "left join p.jabatanFungsional jf " +
+	 * "where dkp.detailKategoryPegawai.id=:idDetailKategoriPegawai " +
+	 * "and pj.golonganPegawai and p.golonganPegawai") List<Map<String, Object>>
+	 * findPotonganPajak(@Param("idDetailKategoriPegawai") Integer
+	 * idDetailKategoriPegawai);
+	 */
 
-	@Query("select new Map(model.id as pegawaiSkPajakId, "
-			+"suratkeputusan.id as suratKeputusanId, "
-			+"suratkeputusan.noSK as noSuratKeputusan, "
-			+"suratkeputusan.namaSK as namaSuratKeputusan, "
-			+"to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, "
-			+"to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, "
-			+"ruangan.id as ruanganId, "
-			+"ruangan.namaRuangan as namaRuangan, "
-			+"golonganpegawai.id as golonganPegawaiId, "
-			+"golonganpegawai.golonganPegawai as golonganPegawai, "
-			+"objekpajak.id as objekpajakId, "
-			+"objekpajak.objekPajak as objekPajak, "
-			+"model.persenPajak as persenPajak, "
-			+"model.statusEnabled as statusEnabled "
-			+") from PegawaiSKPajak model  "
-			+"left join model.noSK suratkeputusan " 
-			+"left join suratkeputusan.ruangan ruangan " 
-			+"left join model.golonganPegawai golonganpegawai " 
-			+"left join model.objekPajak objekpajak "
-			+"left join model.range range "
+	@Query("select new Map(model.id as pegawaiSkPajakId, " + "suratkeputusan.id as suratKeputusanId, "
+			+ "suratkeputusan.noSK as noSuratKeputusan, " + "suratkeputusan.namaSK as namaSuratKeputusan, "
+			+ "to_char(suratkeputusan.tglBerlakuAwal,'dd-mm-yyyy') as tglBerlakuAwal, "
+			+ "to_char(suratkeputusan.tglBerlakuAkhir,'dd-mm-yyyy') as tglBerlakuAkhir, " + "ruangan.id as ruanganId, "
+			+ "ruangan.namaRuangan as namaRuangan, " + "golonganpegawai.id as golonganPegawaiId, "
+			+ "golonganpegawai.golonganPegawai as golonganPegawai, " + "golonganPPPK.id as golonganPPPKId, "
+			+ "golonganPPPK.namaGolongan as golonganPPPK, " + "objekpajak.id as objekpajakId, "
+			+ "objekpajak.objekPajak as objekPajak, " + "model.persenPajak as persenPajak, "
+			+ "model.statusEnabled as statusEnabled " + ") from PegawaiSKPajak model  "
+			+ "left join model.noSK suratkeputusan " + "left join suratkeputusan.ruangan ruangan "
+			+ "left join model.golonganPegawai golonganpegawai " + "left join model.golonganPPPK golonganPPPK "
+			+ "left join model.objekPajak objekpajak " + "left join model.range range "
 			+ "where model.id =:idPegawaiSkPajak")
-	Map<String,Object> get(@Param("idPegawaiSkPajak") Integer idPegawaiSkPajak);
-	
-	@Query("select new Map(model.id as pegawaiSkPajakId, "
-		+"suratkeputusan.id as suratKeputusanId, "
-		+"suratkeputusan.noSK as noSuratKeputusan, "
-		+"suratkeputusan.namaSK as namaSuratKeputusan, "
-		+"to_char(suratkeputusan.tglBerlakuAwal,'dd-MM-yyyy') as tglBerlakuAwal, "
-		+"to_char(suratkeputusan.tglBerlakuAkhir,'dd-MM-yyyy') as tglBerlakuAkhir, "
-		+"ruangan.id as ruanganId, "
-		+"ruangan.namaRuangan as namaRuangan, "
-		+"golonganpegawai.id as golonganPegawaiId, "
-		+"golonganpegawai.golonganPegawai as golonganPegawai, "
-		+"objekpajak.id as objekpajakId, "
-		+"objekpajak.objekPajak as objekPajak, "
-		+"model.persenPajak as persenPajak,"
-		+ "model.statusEnabled as statusEnabled "
-		+") from PegawaiSKPajak model  "
-		+"left join model.noSK suratkeputusan " 
-		+"left join suratkeputusan.ruangan ruangan " 
-		+"left join model.golonganPegawai golonganpegawai " 
-		+"left join model.objekPajak objekpajak "
-		+"left join model.range range")
-	List<Map<String,Object>> getAll();	
-	
+	Map<String, Object> get(@Param("idPegawaiSkPajak") Integer idPegawaiSkPajak);
+
+	@Query("select new Map(model.id as pegawaiSkPajakId, " + "suratkeputusan.id as suratKeputusanId, "
+			+ "suratkeputusan.noSK as noSuratKeputusan, " + "suratkeputusan.namaSK as namaSuratKeputusan, "
+			+ "to_char(suratkeputusan.tglBerlakuAwal,'dd-MM-yyyy') as tglBerlakuAwal, "
+			+ "to_char(suratkeputusan.tglBerlakuAkhir,'dd-MM-yyyy') as tglBerlakuAkhir, " + "ruangan.id as ruanganId, "
+			+ "ruangan.namaRuangan as namaRuangan, " + "golonganpegawai.id as golonganPegawaiId, "
+			+ "golonganpegawai.golonganPegawai as golonganPegawai, " + "golonganPPPK.id as golonganPPPKId, "
+			+ "golonganPPPK.namaGolongan as golonganPPPK, " + "objekpajak.id as objekpajakId, "
+			+ "objekpajak.objekPajak as objekPajak, " + "model.persenPajak as persenPajak,"
+			+ "model.statusEnabled as statusEnabled " + ") from PegawaiSKPajak model  "
+			+ "left join model.noSK suratkeputusan " + "left join suratkeputusan.ruangan ruangan "
+			+ "left join model.golonganPegawai golonganpegawai " + "left join model.golonganPPPK golonganPPPK "
+			+ "left join model.objekPajak objekpajak " + "left join model.range range")
+	List<Map<String, Object>> getAll();
+
 	@Query("select model from PegawaiSKPajak model where model.golonganPegawaiId =:golonganId  ")
 	PegawaiSKPajak findPersenPajakByGolongan(@Param("golonganId") Integer golonganId);
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PlanningPegawaiMuSaReDao.java

@@ -1,285 +1,135 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import com.jasamedika.medifirst2000.entities.PlanningPegawaiMuSaRe;
 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.PlanningPegawaiMuSaRe;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 @Repository("PlanningPegawaiMuSaReDao")
-public interface PlanningPegawaiMuSaReDao extends PagingAndSortingRepository<PlanningPegawaiMuSaRe, String>{
-	
-	@Query("select "
-			+ "a.noPlanning "
-			+ "from PlanningPegawaiMuSaRe a "
-			+ "where a.noPlanning LIKE %:kode% ")
+public interface PlanningPegawaiMuSaReDao extends PagingAndSortingRepository<PlanningPegawaiMuSaRe, String> {
+
+	@Query("select " + "a.noPlanning " + "from PlanningPegawaiMuSaRe a " + "where a.noPlanning LIKE %:kode% ")
 	List<String> noUsulan(@Param("kode") String kode);
-	
-	@Query("select count(a.noPlanning) "
-			+ "from PlanningPegawaiMuSaRe a "
-			+ "where a.noPlanning LIKE %:kode% ")
+
+	@Query("select count(a.noPlanning) " + "from PlanningPegawaiMuSaRe a " + "where a.noPlanning LIKE %:kode% ")
 	Long countNoUsulan(@Param("kode") String kode);
-	
-	@Query("select count(a.noplanning) "
-			+ "from StrukPlanning a ")
+
+	@Query("select count(a.noplanning) " + "from StrukPlanning a ")
 	Long countNoStruk();
-	
-	@Query("select NEW Map ("
-			+ "a.id as id, "
-			+ "a.namaLengkap as namaLengkap) "
-			+ "from Pegawai a "
-			+ "left join a.ruangan b "
-			+ "left join a.kategoryPegawai c "
-			+ "left join a.statusPegawai d "
+
+	@Query("select NEW Map (" + "a.id as id, " + "a.namaLengkap as namaLengkap) " + "from Pegawai a "
+			+ "left join a.ruangan b " + "left join a.kategoryPegawai c " + "left join a.statusPegawai d "
 			+ "where b.id=:id and c.id!=11 and d.id=2")
-	List<Map<String, Object>> getListPegawai(
-			@Param("id") Integer id);
-	
-	@Query("select NEW Map ("
-			+ "a.id as id, "
-			+ "a.namaLengkap as namaLengkap) "
-			+ "from Pegawai a "
+	List<Map<String, Object>> getListPegawai(@Param("id") Integer id);
+
+	@Query("select NEW Map (" + "a.id as id, " + "a.namaLengkap as namaLengkap) " + "from Pegawai a "
 			+ "left join a.ruangan b ")
 	List<Map<String, Object>> getListPegawai();
-	
-	@Query("select NEW Map ("
-			+ "a.namaLengkap as namaLengkap) "
-			+ "from Pegawai a where a.id=:id")
-	Map<String, Object> getPegawai(
-			@Param("id") Integer id);
-	
-	@Query("select NEW Map ("
-			+ "a.id as id, "
-			+ "a.namaJabatan as namaJabatan) "
-			+ "from Jabatan a "
-			+ "left join a.jenisJabatan b "
-			+ "where b.id=:id")
-	List<Map<String, Object>> getListJabatanByJenis(
-			@Param("id") Integer id);
-	
-	@Query("select NEW Map ("
-			+ "a.id as id, "
-			+ "a.namaRuangan as namaRuangan) "
-			+ "from Ruangan a")
+
+	@Query("select NEW Map (" + "a.namaLengkap as namaLengkap) " + "from Pegawai a where a.id=:id")
+	Map<String, Object> getPegawai(@Param("id") Integer id);
+
+	@Query("select NEW Map (" + "a.id as id, " + "a.namaJabatan as namaJabatan) " + "from Jabatan a "
+			+ "left join a.jenisJabatan b " + "where b.id=:id")
+	List<Map<String, Object>> getListJabatanByJenis(@Param("id") Integer id);
+
+	@Query("select NEW Map (" + "a.id as id, " + "a.namaRuangan as namaRuangan) " + "from Ruangan a")
 	List<Map<String, Object>> getListRuanganMutasi();
-	
-	@Query("select NEW Map ("
-			+ "a.id as id, "
-			+ "a.eselon as eselon) "
-			+ "from Eselon a")
+
+	@Query("select NEW Map (" + "a.id as id, " + "a.eselon as eselon) " + "from Eselon a")
 	List<Map<String, Object>> getListEselon();
-	
-	@Query("select NEW Map ("
-			+ "a.id as id, "
-			+ "a.golonganPegawai as namaPangkat) "
-			+ "from GolonganPegawai a")
+
+	@Query("select NEW Map (" + "a.id as id, " + "a.golonganPegawai as namaPangkat) " + "from GolonganPegawai a")
 	List<Map<String, Object>> getListGolongan();
-	
-	@Query("select NEW Map ("
-			+ "b.id as jabatanFungsionalId, "
-			+ "b.namaJabatan as jabatanFungsional, "
-			+ "c.id as jabatanInternalId, "
-			+ "c.namaJabatan as jabatanInternal, "
-			+ "d.id as ruanganId, "
-			+ "d.namaRuangan as namaRuangan, "
-			+ "e.id as eselonId, "
-			+ "e.eselon as eselon, "
-			+ "f.id as pangkatId, "
-			+ "f.golonganPegawai as namaPangkat) "
-			+ "from MapPegawaiJabatanToUnitKerja m "
-			+ "left join m.pegawai a "
-			+ "left join a.jabatanFungsional b "
-			+ "left join m.jabatan c "
-			+ "left join a.ruangan d "
-			+ "left join a.eselon e "
-			+ "left join a.golonganPegawai f "
-			+ "where m.isPrimary is true "
-			+ "and m.statusEnabled is true "
-			+ "and a.id=:id")
-	Map<String, Object> getDataMuSaReByPegawai(
-			@Param("id") Integer id);
-	
-	@Query("select NEW Map ("
-			+ "a.id as id, "
-			+ "a.jenisHukuman as jenisHukuman) "
-			+ "from JenisHukuman a")
+
+	@Query("select NEW Map (" + "b.id as jabatanFungsionalId, " + "b.namaJabatan as jabatanFungsional, "
+			+ "c.id as jabatanInternalId, " + "c.namaJabatan as jabatanInternal, " + "d.id as ruanganId, "
+			+ "d.namaRuangan as namaRuangan, " + "e.id as eselonId, " + "e.eselon as eselon, " + "f.id as pangkatId, "
+			+ "f.golonganPegawai as namaPangkat, " + "g.id as golonganPPPKId, " + "g.namaGolongan as golonganPPPK) "
+			+ "from MapPegawaiJabatanToUnitKerja m " + "left join m.pegawai a " + "left join a.jabatanFungsional b "
+			+ "left join m.jabatan c " + "left join a.ruangan d " + "left join a.eselon e "
+			+ "left join a.golonganPegawai f " + "left join a.golonganPPPK g " + "where m.isPrimary is true "
+			+ "and m.statusEnabled is true " + "and a.id=:id")
+	Map<String, Object> getDataMuSaReByPegawai(@Param("id") Integer id);
+
+	@Query("select NEW Map (" + "a.id as id, " + "a.jenisHukuman as jenisHukuman) " + "from JenisHukuman a")
 	List<Map<String, Object>> getJenisHukuman();
-	
-	@Query("select NEW Map ("
-			+ "a.id as id, "
-			+ "a.name as suratKeputusan) "
-			+ "from JenisSuratKeputusan a ")
+
+	@Query("select NEW Map (" + "a.id as id, " + "a.name as suratKeputusan) " + "from JenisSuratKeputusan a ")
 	List<Map<String, Object>> listJenisSuratKeputusan();
-	
-	@Query("select NEW Map ("
-			+ "a.id as id, "
-			+ "a.statusPegawai as statusPegawai) "
-			+ "from StatusPegawai a")
+
+	@Query("select NEW Map (" + "a.id as id, " + "a.statusPegawai as statusPegawai) " + "from StatusPegawai a")
 	List<Map<String, Object>> getListStatusPegawai();
-	
-	@Query("select NEW Map ("
-			+ "a.id as kedudukan,"
-			+ "a.name as namaKedudukan) "
-			+ "from Kedudukan a")
+
+	@Query("select NEW Map (" + "a.id as kedudukan," + "a.name as namaKedudukan) " + "from Kedudukan a")
 	List<Map<String, Object>> getListKedudukan();
-	
-	@Query("select NEW Map ("
-			+ "a.id as id, "
-			+ "a.name as name) "
-			+ "from StatusKawin a")
+
+	@Query("select NEW Map (" + "a.id as id, " + "a.name as name) " + "from StatusKawin a")
 	List<Map<String, Object>> getListStatusKawin();
-	
-	//------------------------------------------------------------------------------------
-	
-	@Query("select NEW Map ("
-			+ "a.pensiun as pensiun, "
-			+ "b.namaJabatan as jabatanFungsional, "
-			+ "b.id as jabatanFungsionalId, "
-			+ "c.namaJabatan as jabatanInternal, "
-			+ "c.id as jabatanInternalId, "
-			+ "d.namaJabatan as jabatanStruktural, "
-			+ "d.id as jabatanStrukturalId, "
-			+ "e.namaRuangan as namaRuangan, "
-			+ "e.id as namaRuanganId, "
-			+ "f.eselon as eselon, "
-			+ "f.id as eselonId, "
-			+ "g.golonganPegawai as namaGolongan, "
-			+ "g.id as golonganId, "
-			+ "h.statusPegawai as statusPegawai, "
-			+ "h.id as statusPegawaiId, "
-			+ "i.statusPerkawinan as statusKawin, "
-			+ "i.id as statusKawinId, "
-			+ "j.name as kedudukan, "
-			+ "j.id as kedudukanId) "
-			+ "from MapPegawaiJabatanToUnitKerja m "
-			+ "left join m.pegawai a "
-			+ "left join a.jabatanFungsional b "
-			+ "left join m.jabatan c "
-			+ "left join a.jabatanStruktural d "
-			+ "left join a.ruangan e "
-			+ "left join a.eselon f "
-			+ "left join a.golonganPegawai g "
-			+ "left join a.statusPegawai h "
-			+ "left join a.statusKawin i "
-			+ "left join a.kedudukan j "
-			+ "where m.isPrimary is true "
-			+ "and m.statusEnabled is true "
-			+ "and a.id=:id")
-	Map<String, Object> getDataPegawaiMuSaRe(
-			@Param("id") Integer id);
-	
-	@Query("select NEW Map ("
-			+ "b.id as id, "
-			+ "b.reportDisplay as grade) "
-			+ "from EvaluasiJabatan a "
-			+ "left join a.grade b "
-			+ "left join a.pegawai c "
-			+ "where c.id=:id and a.tahun=:tahun")
-	Map<String, Object> getGradeByPegawai(
-			@Param("id") Integer id, 
-			@Param("tahun") Integer tahun);
-	
-	@Query("select NEW Map ("
-			+ "a.id as id, "
-			+ "a.jenisKeputusan as jenisKeputusan) "
-			+ "from JenisKeputusan a "
-			+ "where a.statusEnabled is true "
-			+ "order by a.id")
+
+	// ------------------------------------------------------------------------------------
+
+	@Query("select NEW Map (" + "a.pensiun as pensiun, " + "b.namaJabatan as jabatanFungsional, "
+			+ "b.id as jabatanFungsionalId, " + "c.namaJabatan as jabatanInternal, " + "c.id as jabatanInternalId, "
+			+ "d.namaJabatan as jabatanStruktural, " + "d.id as jabatanStrukturalId, "
+			+ "e.namaRuangan as namaRuangan, " + "e.id as namaRuanganId, " + "f.eselon as eselon, "
+			+ "f.id as eselonId, " + "g.golonganPegawai as namaGolongan, " + "g.id as golonganId, "
+			+ "gp.namaGolongan as golonganPPPK, " + "gp.id as golonganPPPKId, " + "h.statusPegawai as statusPegawai, "
+			+ "h.id as statusPegawaiId, " + "i.statusPerkawinan as statusKawin, " + "i.id as statusKawinId, "
+			+ "j.name as kedudukan, " + "j.id as kedudukanId) " + "from MapPegawaiJabatanToUnitKerja m "
+			+ "left join m.pegawai a " + "left join a.jabatanFungsional b " + "left join m.jabatan c "
+			+ "left join a.jabatanStruktural d " + "left join a.ruangan e " + "left join a.eselon f "
+			+ "left join a.golonganPegawai g " + "left join a.golonganPPPK gp " + "left join a.statusPegawai h "
+			+ "left join a.statusKawin i " + "left join a.kedudukan j " + "where m.isPrimary is true "
+			+ "and m.statusEnabled is true " + "and a.id=:id")
+	Map<String, Object> getDataPegawaiMuSaRe(@Param("id") Integer id);
+
+	@Query("select NEW Map (" + "b.id as id, " + "b.reportDisplay as grade) " + "from EvaluasiJabatan a "
+			+ "left join a.grade b " + "left join a.pegawai c " + "where c.id=:id and a.tahun=:tahun")
+	Map<String, Object> getGradeByPegawai(@Param("id") Integer id, @Param("tahun") Integer tahun);
+
+	@Query("select NEW Map (" + "a.id as id, " + "a.jenisKeputusan as jenisKeputusan) " + "from JenisKeputusan a "
+			+ "where a.statusEnabled is true " + "order by a.id")
 	List<Map<String, Object>> getListJenisKeputusan();
-	
-	@Query("select NEW Map ("
-			+ "a.noRec as noRec,"
-			+ "a.statusMusare as statusMusare,"
-			+ "b.id as pegawaiId,"
-			+ "c.id as ruanganId,"
-			+ "d.id as jabatanStrukturalId,"
-			+ "e.id as jabatanFungsionalId,"
-			+ "f.id as jabatanInternalId,"
-			+ "g.id as eselonId,"
-			+ "h.id as pangkatId) "
-			+ "from PlanningPegawaiMuSaRe a "
-			+ "left join a.pegawai b "
-			+ "left join a.ruanganExec c "
-			+ "left join a.jabatanStrukturalExec d "
-			+ "left join a.jabatanFungsionalExec e "
-			+ "left join a.jabatanInternalExec f "
-			+ "left join a.eselonExec g "
-			+ "left join a.pangkatExec h "
-			+ "where a.approvalStatus=1 and "
-			+ "date(a.tglPlanning)=date(:date) "
-			+ "and a.statusEnabled is null")
-	List<Map<String, Object>> getDataPlanningByDate(
-			@Param("date") Date date);
-	
-	@Query("select NEW Map ("
-			+ "a.nipPns as nip,"
-			+ "a.namaLengkap as namaPegawai,"
-			+ "b.namaJabatan as jabatan) "
-			+ "from MapPegawaiJabatanToUnitKerja m "
-			+ "left join m.pegawai a "
-			+ "left join m.jabatan b "
-			+ "where m.isPrimary is true "
-			+ "and m.statusEnabled is true "
-			+ "and a.id=:id")
-	Map<String, Object> getHeaderHistory(
-			@Param("id") Integer id);
-	
-	@Query("select NEW Map ("
-			+ "a.noRec as noRec,"
-			+ "c.jenisHukuman as jenisHukuman,"
-			+ "d.noSK as noSK,"
-			+ "d.tglTTSK as tglSk,"
-			+ "d.tglBerlakuAwal as tglMulai,"
-			+ "d.tglBerlakuAkhir as tglSelesai,"
-			+ "a.deskripsiMutasiSanksiResignExec as keterangan) "
-			+ "from PlanningPegawaiMuSaRe a "
-			+ "left join a.pegawai b "
-			+ "left join a.jenisHukumanExec c "
-			+ "left join a.noSk d "
-			+ "where b.id=:id and "
-			+ "a.statusMusare=2 and "
+
+	@Query("select NEW Map (" + "a.noRec as noRec," + "a.statusMusare as statusMusare," + "b.id as pegawaiId,"
+			+ "c.id as ruanganId," + "d.id as jabatanStrukturalId," + "e.id as jabatanFungsionalId,"
+			+ "f.id as jabatanInternalId," + "g.id as eselonId," + "h.id as pangkatId) "
+			+ "from PlanningPegawaiMuSaRe a " + "left join a.pegawai b " + "left join a.ruanganExec c "
+			+ "left join a.jabatanStrukturalExec d " + "left join a.jabatanFungsionalExec e "
+			+ "left join a.jabatanInternalExec f " + "left join a.eselonExec g " + "left join a.pangkatExec h "
+			+ "where a.approvalStatus=1 and " + "date(a.tglPlanning)=date(:date) " + "and a.statusEnabled is null")
+	List<Map<String, Object>> getDataPlanningByDate(@Param("date") Date date);
+
+	@Query("select NEW Map (" + "a.nipPns as nip," + "a.namaLengkap as namaPegawai," + "b.namaJabatan as jabatan) "
+			+ "from MapPegawaiJabatanToUnitKerja m " + "left join m.pegawai a " + "left join m.jabatan b "
+			+ "where m.isPrimary is true " + "and m.statusEnabled is true " + "and a.id=:id")
+	Map<String, Object> getHeaderHistory(@Param("id") Integer id);
+
+	@Query("select NEW Map (" + "a.noRec as noRec," + "c.jenisHukuman as jenisHukuman," + "d.noSK as noSK,"
+			+ "d.tglTTSK as tglSk," + "d.tglBerlakuAwal as tglMulai," + "d.tglBerlakuAkhir as tglSelesai,"
+			+ "a.deskripsiMutasiSanksiResignExec as keterangan) " + "from PlanningPegawaiMuSaRe a "
+			+ "left join a.pegawai b " + "left join a.jenisHukumanExec c " + "left join a.noSk d "
+			+ "where b.id=:id and " + "a.statusMusare=2 and " + "a.approvalStatus=1")
+	List<Map<String, Object>> getHistoryExecSanksi(@Param("id") Integer id);
+
+	@Query("select NEW Map (" + "a.noRec as noRec," + "c.noSK as noSK," + "c.tglTTSK as tglSk,"
+			+ "c.tglBerlakuAwal as tglMulai," + "a.deskripsiMutasiSanksiResignExec as keterangan,"
+			+ "d.name as pangkatGolongan) " + "from PlanningPegawaiMuSaRe a " + "left join a.pegawai b "
+			+ "left join a.noSk c " + "left join a.pangkatExec d " + "where b.id=:id and " + "a.statusMusare=1 and "
 			+ "a.approvalStatus=1")
-	List<Map<String, Object>> getHistoryExecSanksi(
-			@Param("id") Integer id);
-	
-	@Query("select NEW Map ("
-			+ "a.noRec as noRec,"
-			+ "c.noSK as noSK,"
-			+ "c.tglTTSK as tglSk,"
-			+ "c.tglBerlakuAwal as tglMulai,"
-			+ "a.deskripsiMutasiSanksiResignExec as keterangan,"
-			+ "d.name as pangkatGolongan) "
-			+ "from PlanningPegawaiMuSaRe a "
-			+ "left join a.pegawai b "
-			+ "left join a.noSk c "
-			+ "left join a.pangkatExec d "
-			+ "where b.id=:id and "
-			+ "a.statusMusare=1 and "
-			+ "a.approvalStatus=1")
-	List<Map<String, Object>> getHistoryExecPangkat(
-			@Param("id") Integer id);
-	
-	@Query("select NEW Map ("
-			+ "a.noRec as noRec,"
-			+ "c.noSK as noSK,"
-			+ "c.tglTTSK as tglSk,"
-			+ "c.tglBerlakuAwal as tglMulaiBerlaku,"
-			+ "a.deskripsiMutasiSanksiResignExec as keterangan,"
-			+ "d.namaRuangan as satuanKerja,"
-			+ "e.namaJabatan as jabatan,"
-			+ "f.eselon as eselon) "
-			+ "from PlanningPegawaiMuSaRe a "
-			+ "left join a.pegawai b "
-			+ "left join a.noSk c "
-			+ "left join a.ruanganExec d "
-			+ "left join a.jabatanInternalExec e "
-			+ "left join a.eselonExec f "
-			+ "where b.id=:id and "
-			+ "a.statusMusare=1 and "
-			+ "a.approvalStatus=1")
-	List<Map<String, Object>> getHistoryExecJabatan(
-			@Param("id") Integer id);
+	List<Map<String, Object>> getHistoryExecPangkat(@Param("id") Integer id);
+
+	@Query("select NEW Map (" + "a.noRec as noRec," + "c.noSK as noSK," + "c.tglTTSK as tglSk,"
+			+ "c.tglBerlakuAwal as tglMulaiBerlaku," + "a.deskripsiMutasiSanksiResignExec as keterangan,"
+			+ "d.namaRuangan as satuanKerja," + "e.namaJabatan as jabatan," + "f.eselon as eselon) "
+			+ "from PlanningPegawaiMuSaRe a " + "left join a.pegawai b " + "left join a.noSk c "
+			+ "left join a.ruanganExec d " + "left join a.jabatanInternalExec e " + "left join a.eselonExec f "
+			+ "where b.id=:id and " + "a.statusMusare=1 and " + "a.approvalStatus=1")
+	List<Map<String, Object>> getHistoryExecJabatan(@Param("id") Integer id);
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PlanningPegawaiStatusDao.java

@@ -1,14 +1,13 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.PlanningPegawaiStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.jasamedika.medifirst2000.entities.PlanningPegawaiStatus;
+import java.util.List;
+import java.util.Map;
 
 @Repository("PlanningPegawaiStatusDao")
 public interface PlanningPegawaiStatusDao extends JpaRepository<PlanningPegawaiStatus, String> {
@@ -307,16 +306,18 @@ public interface PlanningPegawaiStatusDao extends JpaRepository<PlanningPegawaiS
 
 	@Query("select new Map(pegawai.namaLengkap as namaLengkap, " + "coalesce(pegawai.nipPns, pegawai.nip) as nip, "
 			+ "pangkat.namaPangkat || ' / ' || golongan.golonganPegawai as pangkatGol, "
-			+ "jabatan.namaJabatan as namaJabatan, " + "transaksiCuti.statusPegawaiPlanId as idPlanning, "
-			+ "statusPegawai.statusPegawai as statusPegawai, " + "tglCuti.tgl as tglCuti) "
+			+ "golonganPPPK.namaGolongan as golonganPPPK, " + "jabatan.namaJabatan as namaJabatan, "
+			+ "transaksiCuti.statusPegawaiPlanId as idPlanning, " + "statusPegawai.statusPegawai as statusPegawai, "
+			+ "tglCuti.tgl as tglCuti) "
 			+ "from MapPegawaiJabatanToUnitKerja mappingJabatan, PlanningPegawaiStatus transaksiCuti "
 			+ "left join mappingJabatan.pegawai pegawai " + "left join mappingJabatan.jabatan jabatan "
 			+ "left join transaksiCuti.listTanggal tglCuti "
 			+ "left join transaksiCuti.statusPegawaiPlan statusPegawai " + "left join pegawai.pangkat pangkat "
-			+ "left join pangkat.kdGolonganPegawai golongan " + "where transaksiCuti.pegawaiId = pegawai.id "
-			+ "and mappingJabatan.pegawaiId = transaksiCuti.pegawaiId " + "and mappingJabatan.statusEnabled is true "
-			+ "and pegawai.statusEnabled is true " + "and mappingJabatan.isPrimary is true "
-			+ "and tglCuti.statusEnabled is true " + "and transaksiCuti.noRec = :norec")
+			+ "left join pangkat.kdGolonganPegawai golongan " + "left join pegawai.golonganPPPK golonganPPPK "
+			+ "where transaksiCuti.pegawaiId = pegawai.id " + "and mappingJabatan.pegawaiId = transaksiCuti.pegawaiId "
+			+ "and mappingJabatan.statusEnabled is true " + "and pegawai.statusEnabled is true "
+			+ "and mappingJabatan.isPrimary is true " + "and tglCuti.statusEnabled is true "
+			+ "and transaksiCuti.noRec = :norec")
 	List<Map<String, Object>> getCetakCutiLuarNegeri(@Param("norec") String norec);
 
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/GajiPegawaiDaoCustomImpl.java

@@ -1,16 +1,14 @@
 package com.jasamedika.medifirst2000.dao.custom.impl;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.Query;
-
-import org.springframework.stereotype.Repository;
-
 import com.jasamedika.medifirst2000.dao.custom.GajiPegawaiDaoCustom;
 import com.jasamedika.medifirst2000.dao.custom.base.impl.CoreDaoImpl;
 import com.jasamedika.medifirst2000.entities.PegawaiHistoriRekapGaji;
 import com.jasamedika.medifirst2000.util.CommonUtil;
+import org.springframework.stereotype.Repository;
+
+import javax.persistence.Query;
+import java.util.List;
+import java.util.Map;
 
 @Repository
 public class GajiPegawaiDaoCustomImpl extends CoreDaoImpl<PegawaiHistoriRekapGaji> implements GajiPegawaiDaoCustom {
@@ -187,11 +185,13 @@ public class GajiPegawaiDaoCustomImpl extends CoreDaoImpl<PegawaiHistoriRekapGaj
 				"select distinct new map(sh.noRec as noRec,ruangan.namaRuangan as namaRuangan,jg.name as jenisGaji,"
 						+ "kt.kelompokTransaksi as kelTransaksi,dkp.detailKategoryPegawai as detailKategori,"
 						+ "SUM(rg.hargaSatuan) as total,"
-						+ "gp.golonganPegawai as golPegawai,pgw.bankRekeningAtasNama as rekeningAtasNama,pgw.bankRekeningNama as namaBank,"
+						+ "gp.golonganPegawai as golPegawai,gpp.namaGolongan as golonganPPPK,"
+						+ "pgw.bankRekeningAtasNama as rekeningAtasNama,pgw.bankRekeningNama as namaBank,"
 						+ "pgw.bankRekeningNomor as noRekening,pgw.id as idPegawai,pgw.namaLengkap as namaPegawai,"
 						+ "pgw.nipPns as nipPns) from PegawaiHistoriRekapGaji rg left join rg.strukHistory sh left join sh.ruangan ruangan "
 						+ "left join sh.jenisGaji jg left join sh.kelompokTransaksi kt "
 						+ "left join rg.komponenHarga kh left join rg.pegawai pgw left join pgw.golonganPegawai gp "
+						+ "left join pgw.golonganPPPK gpp"
 						+ "left join pgw.detailKategoryPegawai dkp where sh.tglHistori is not null ");
 
 		if (CommonUtil.isNotNullOrEmpty(dateStart) && CommonUtil.isNotNullOrEmpty(dateEnd)) {
@@ -212,7 +212,7 @@ public class GajiPegawaiDaoCustomImpl extends CoreDaoImpl<PegawaiHistoriRekapGaj
 
 		buffer.append(
 				"group by sh.noRec,pgw.id,dkp.detailKategoryPegawai,ruangan.namaRuangan,jg.name,kt.kelompokTransaksi,"
-						+ "gp.golonganPegawai,pgw.nomorRekening,pgw.namaLengkap,pgw.nipPns ");
+						+ "gp.golonganPegawai,gpp.golonganPPPK,pgw.nomorRekening,pgw.namaLengkap,pgw.nipPns ");
 
 		buffer.append("order by pgw.namaLengkap asc ");
 

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/custom/impl/PegawaiDaoCustomImpl.java

@@ -40,8 +40,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 		buffer.append(" pegawai.id as idPegawai, " + " pegawai.nama as nama, " + " pegawai.namaLengkap as namaLengkap, "
 				+ " pegawai.tglLahir as tglLahir, " + " pegawai.tempatLahir as tempatLahir,"
 				+ " pegawai.gelarDepan as gelarDepan," + " pegawai.gelarBelakang as gelarBelakang,"
-				+ " golongan.golonganPegawai as namaGolongan, " + " agama.agama as agama, "
-				+ " detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
+				+ " golongan.golonganPegawai as namaGolongan, " + " golonganPPPK.namaGolongan as golonganPPPK, "
+				+ " agama.agama as agama, " + " detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
 				+ " dokumen.namaJudulDokumen as namaJudulDokumen, " + " eselon.eselon as eselon, "
 				+ " golonganDarah.golonganDarah as golonganDarah, " + " jabatanFungsional.namaJabatan as namaJabatan, "
 				+ " jabatanInternal.namaJabatan as jabatanInternal, " + " jabatanInternal.id as idJabatanInternal,"
@@ -63,8 +63,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 				+ " statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai, " + " suku.suku as suku, "
 				+ " titlePasien.namaTitle as titlePasien, " + " typePegawai.typePegawai as typePegawai) "
 				+ " from MapPegawaiJabatanToUnitKerja mapPegawai  " + " left join mapPegawai.pegawai pegawai "
-				+ " left join pegawai.golonganPegawai golongan  " + " left join pegawai.agama agama "
-				+ " left join pegawai.detailKategoryPegawai detailKategoryPegawai "
+				+ " left join pegawai.golonganPegawai golongan " + " left join pegawai.golonganPPPK golonganPPPK "
+				+ " left join pegawai.agama agama " + " left join pegawai.detailKategoryPegawai detailKategoryPegawai "
 				+ " left join pegawai.dokumen dokumen " + " left join pegawai.eselon eselon "
 				+ " left join pegawai.golonganDarah golonganDarah "
 				+ " left join pegawai.jabatanFungsional jabatanFungsional "
@@ -122,6 +122,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 		buffer.append(" ( ");
 		buffer.append(" p.nipPns , p.namaLengkap ,p.tglLahir , " + "p.tempatLahir , p.noHandphone," + "p.alamat , "
 				+ "jabatanInternal.kdJabatan,jabatanInternal.namaJabatan, " + "golongan.id,golongan.golonganPegawai, "
+				+ "golonganPPPK.id as golonganPPPKId,golonganPPPK.namaGolongan as golonganPPPK, "
 				+ " statusKawin.statusPerkawinan, statusKawin.id, " + "agama.agama, agama.kdAgama, "
 				+ " satuanKerja.kdSatuanKerja,satuanKerja.satuanKerja , "
 				+ " jabatanStruktural.kdJabatan ,jabatanStruktural.namaJabatan, "
@@ -129,9 +130,9 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 				+ " jabatanFungsional.kdJabatan ,jabatanFungsional.namaJabatan");
 		buffer.append(" ) ");
 		buffer.append("from Pegawai p " + " left join p.jabatanInternal jabatanInternal"
-				+ " left join p.golonganPegawai golongan " + " left join p.statusKawin statusKawin "
-				+ " left join p.agama agama " + " left join p.satuanKerja satuanKerja "
-				+ " left join p.jabatanStruktural jabatanStruktural "
+				+ " left join p.golonganPegawai golongan " + " left join p.golonganPPPK golonganPPPK "
+				+ " left join p.statusKawin statusKawin " + " left join p.agama agama "
+				+ " left join p.satuanKerja satuanKerja " + " left join p.jabatanStruktural jabatanStruktural "
 				+ " left join p.jabatanFungsional jabatanFungsional " + " left join p.jenisKelamin jenisKelamin "
 				+ " left join p.jenisPegawai jenisPegawai " + " where p.statusEnabled is true and jenisPegawai=12  "
 				+ " order by p.namaLengkap ");
@@ -151,8 +152,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 		buffer.append(" ( ");
 		buffer.append(" pegawai.id as idPegawai, " + " pegawai.namaLengkap as nama, "
 				+ " pegawai.tglLahir as tglLahir, " + " pegawai.tempatLahir as tempatLahir,"
-				+ " golongan.name as namaGolongan, " + " agama.agama as agama, "
-				+ " detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
+				+ " golongan.golonganPegawai as namaGolongan, " + " golonganPPPK.namaGolongan as golonganPPPK, "
+				+ " agama.agama as agama, " + " detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
 				+ " dokumen.namaJudulDokumen as namaJudulDokumen, " + " eselon.eselon as eselon, "
 				+ " golonganDarah.golonganDarah as golonganDarah, " + " jabatanFungsional.namaJabatan as namaJabatan, "
 				+ " jabatanInternal.namaJabatan as jabatanInternal, " + " jabatanInternal.id as idJabatanInternal,"
@@ -173,8 +174,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 				+ " statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai, " + " suku.suku as suku, "
 				+ " titlePasien.namaTitle as titlePasien, " + " typePegawai.typePegawai as typePegawai) "
 				+ " MapPegawaiJabatanToUnitKerja mapPegawai  " + " left join mapPegawai.pegawai pegawai "
-				+ " left join pegawai.golonganPegawai golongan  " + " left join pegawai.agama agama "
-				+ " left join pegawai.detailKategoryPegawai detailKategoryPegawai "
+				+ " left join pegawai.golonganPegawai golongan  " + " left join pegawai.golonganPPPK golonganPPPK  "
+				+ " left join pegawai.agama agama " + " left join pegawai.detailKategoryPegawai detailKategoryPegawai "
 				+ " left join pegawai.dokumen dokumen " + " left join pegawai.eselon eselon "
 				+ " left join pegawai.golonganDarah golonganDarah "
 				+ " left join pegawai.jabatanFungsional jabatanFungsional "
@@ -212,8 +213,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 		buffer.append(" ( ");
 		buffer.append(" pegawai.id as idPegawai, " + " pegawai.namaLengkap as nama, "
 				+ " pegawai.tglLahir as tglLahir, " + " pegawai.tempatLahir as tempatLahir,"
-				+ " golongan.golonganPegawai as namaGolongan, " + " agama.agama as agama, "
-				+ " detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
+				+ " golongan.golonganPegawai as namaGolongan, " + " golonganPPPK.namaGolongan as golonganPPPK, "
+				+ " agama.agama as agama, " + " detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai, "
 				+ " dokumen.namaJudulDokumen as namaJudulDokumen, " + " eselon.eselon as eselon, "
 				+ " golonganDarah.golonganDarah as golonganDarah, " + " jabatanFungsional.namaJabatan as namaJabatan, "
 				+ " jabatanInternal.namaJabatan as jabatanInternal, " + " jabatanInternal.id as idJabatanInternal,"
@@ -234,8 +235,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 				+ " statusPerkawinanPegawai.statusPerkawinan as statusPerkawinanPegawai, " + " suku.suku as suku, "
 				+ " titlePasien.namaTitle as titlePasien, " + " typePegawai.typePegawai as typePegawai) "
 				+ " from MapPegawaiJabatanToUnitKerja mapPegawai  " + " left join mapPegawai.pegawai pegawai "
-				+ " left join pegawai.golonganPegawai golongan  " + " left join pegawai.agama agama "
-				+ " left join pegawai.detailKategoryPegawai detailKategoryPegawai "
+				+ " left join pegawai.golonganPegawai golongan  " + " left join pegawai.golonganPPPK golonganPPPK  "
+				+ " left join pegawai.agama agama " + " left join pegawai.detailKategoryPegawai detailKategoryPegawai "
 				+ " left join pegawai.dokumen dokumen " + " left join pegawai.eselon eselon "
 				+ " left join pegawai.golonganDarah golonganDarah "
 				+ " left join pegawai.jabatanFungsional jabatanFungsional "
@@ -304,8 +305,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 				+ "pegawai.tglTerbitStr as tglTerbitStr," + "pegawai.tglBerakhirStr as tglBerakhirStr,"
 				+ "pegawai.isStrSeumurHidup as isStrSeumurHidup," + "pegawai.gelarDepan as gelarDepan,"
 				+ "pegawai.gelarBelakang as gelarBelakang," + "pegawai.tempatLahir as tempatLahir,"
-				+ "golongan.golonganPegawai as namaGolongan," + "agama.agama as agama,"
-				+ "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai,"
+				+ "golongan.golonganPegawai as namaGolongan," + "golonganPPPK.namaGolongan as golonganPPPK,"
+				+ "agama.agama as agama," + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai,"
 				+ "dokumen.namaJudulDokumen as namaJudulDokumen," + "eselon.eselon as eselon,"
 				+ "golonganDarah.golonganDarah as golonganDarah," + "pegawai.statusRhesus as rhesusGolonganDarah,"
 				+ "jabatanFungsional.namaJabatan as namaJabatan," + "jabatanLamar.namaJabatan as jabatanLamar,"
@@ -341,7 +342,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 				+ "left join pegawai.kualifikasiJurusan kualifikasiJurusan "
 				+ "left join pegawai.levelTingkat levelTingkat " + "left join pegawai.negara negara "
 				+ "left join pegawai.pangkat pangkat " + "left join pangkat.kdGolonganPegawai golongan "
-				+ "left join pegawai.pendidikan pendidikan "
+				+ "left join pegawai.golonganPPPK golonganPPPK " + "left join pegawai.pendidikan pendidikan "
 				+ "left join pegawai.penghasilanTidakKenaPajak penghasilanTidakKenaPajak "
 				+ "left join pegawai.ruangan ruangan " + "left join pegawai.satuanKerja satuanKerja "
 				+ "left join pegawai.rekanan rekanan " + "left join pegawai.shiftKerja shiftKerja "
@@ -445,8 +446,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 				+ "pegawai.noStr as noStr," + "pegawai.tglTerbitStr as tglTerbitStr,"
 				+ "pegawai.tglBerakhirStr as tglBerakhirStr," + "pegawai.gelarDepan as gelarDepan,"
 				+ "pegawai.gelarBelakang as gelarBelakang," + "pegawai.tempatLahir as tempatLahir,"
-				+ "golongan.golonganPegawai as namaGolongan," + "agama.agama as agama,"
-				+ "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai,"
+				+ "golongan.golonganPegawai as namaGolongan," + "golonganPPPK.namaGolongan as golonganPPPK,"
+				+ "agama.agama as agama," + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai,"
 				+ "dokumen.namaJudulDokumen as namaJudulDokumen," + "eselon.eselon as eselon,"
 				+ "golonganDarah.golonganDarah as golonganDarah," + "pegawai.statusRhesus as rhesusGolonganDarah,"
 				+ "jabatanFungsional.namaJabatan as namaJabatan," + "jabatanLamar.namaJabatan as jabatanLamar,"
@@ -482,7 +483,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 				+ "left join pegawai.kualifikasiJurusan kualifikasiJurusan "
 				+ "left join pegawai.levelTingkat levelTingkat " + "left join pegawai.negara negara "
 				+ "left join pegawai.pangkat pangkat " + "left join pangkat.kdGolonganPegawai golongan "
-				+ "left join pegawai.pendidikan pendidikan "
+				+ "left join pegawai.golonganPPPK golonganPPPK " + "left join pegawai.pendidikan pendidikan "
 				+ "left join pegawai.penghasilanTidakKenaPajak penghasilanTidakKenaPajak "
 				+ "left join pegawai.ruangan ruangan " + "left join pegawai.satuanKerja satuanKerja "
 				+ "left join pegawai.rekanan rekanan " + "left join pegawai.shiftKerja shiftKerja "
@@ -552,8 +553,8 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 				+ "pegawai.noStr as noStr," + "pegawai.tglTerbitStr as tglTerbitStr,"
 				+ "pegawai.tglBerakhirStr as tglBerakhirStr," + "pegawai.gelarDepan as gelarDepan,"
 				+ "pegawai.gelarBelakang as gelarBelakang," + "pegawai.tempatLahir as tempatLahir,"
-				+ "golongan.golonganPegawai as namaGolongan," + "agama.agama as agama,"
-				+ "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai,"
+				+ "golongan.golonganPegawai as namaGolongan," + "golonganPPPK.namaGolongan as golonganPPPK,"
+				+ "agama.agama as agama," + "detailKategoryPegawai.detailKategoryPegawai as detailKategoryPegawai,"
 				+ "dokumen.namaJudulDokumen as namaJudulDokumen," + "eselon.eselon as eselon,"
 				+ "golonganDarah.golonganDarah as golonganDarah," + "pegawai.statusRhesus as rhesusGolonganDarah,"
 				+ "jabatanFungsional.namaJabatan as namaJabatan," + "jabatanLamar.namaJabatan as jabatanLamar,"
@@ -592,7 +593,7 @@ public class PegawaiDaoCustomImpl extends CoreDaoImpl<Pegawai> implements Pegawa
 				+ "left join pegawai.kualifikasiJurusan kualifikasiJurusan "
 				+ "left join pegawai.levelTingkat levelTingkat " + "left join pegawai.negara negara "
 				+ "left join pegawai.pangkat pangkat " + "left join pangkat.kdGolonganPegawai golongan "
-				+ "left join pegawai.pendidikan pendidikan "
+				+ "left join pegawai.golonganPPPK golonganPPPK " + "left join pegawai.pendidikan pendidikan "
 				+ "left join pegawai.penghasilanTidakKenaPajak penghasilanTidakKenaPajak " +
 				// "left join pegawai.range range "+
 				"left join pegawai.ruangan ruangan " + "left join pegawai.satuanKerja satuanKerja "

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AsesmenGiziAwalServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.Map;
  * Implement class for PreskripsiDietService
  * 
  * @author Adik
- * @param <T>
+ * 
  */
 
 
@@ -57,8 +57,8 @@ public class AsesmenGiziAwalServiceImpl extends BaseVoServiceImpl implements Ase
 		AsesmenGiziAwal asesmenGiziAwal=new AsesmenGiziAwal();
 		asesmentConverter.setUseGson(true);
 		asesmenGiziAwal = asesmentConverter.transferVOToModel(vo, asesmenGiziAwal);
-		if(CommonUtil.isNotNullOrEmpty(vo.getPasien())){
-			asesmenGiziAwal.setPasienDaftar(pasienConverter.transferVOToModel(vo.getPasien(), new AntrianPasienDiPeriksa()));
+		if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
+			asesmenGiziAwal.setPasienDaftar(pasienConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
 		}
 		asesmenGiziAwal.setTanggalPendaftaran(vo.getTanggalPendaftaran());
 		

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/GajiPegawaiServiceImpl.java

@@ -1,55 +1,19 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
-import com.jasamedika.medifirst2000.dao.RuanganDao;
-import com.jasamedika.medifirst2000.dao.StrukBuktiPengeluaranCaraBayarDao;
-import com.jasamedika.medifirst2000.dao.StrukBuktiPengeluaranDao;
-import com.jasamedika.medifirst2000.dao.StrukPelayananDao;
-import com.jasamedika.medifirst2000.dao.StrukPelayananPenjaminDao;
-import com.jasamedika.medifirst2000.dao.StrukVerifikasiDao;
+import com.jasamedika.medifirst2000.dao.*;
 import com.jasamedika.medifirst2000.dao.custom.GajiPegawaiDaoCustom;
-import com.jasamedika.medifirst2000.entities.BankAccount;
-import com.jasamedika.medifirst2000.entities.CaraBayar;
-import com.jasamedika.medifirst2000.entities.DetailKamar;
-import com.jasamedika.medifirst2000.entities.JenisKartu;
-import com.jasamedika.medifirst2000.entities.KelompokPasien;
-import com.jasamedika.medifirst2000.entities.KelompokTransaksi;
-import com.jasamedika.medifirst2000.entities.LoginUser;
-import com.jasamedika.medifirst2000.entities.Pasien;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
-import com.jasamedika.medifirst2000.entities.Pegawai;
-import com.jasamedika.medifirst2000.entities.Rekanan;
-import com.jasamedika.medifirst2000.entities.Ruangan;
-import com.jasamedika.medifirst2000.entities.StrukBuktiPenerimaan;
-import com.jasamedika.medifirst2000.entities.StrukBuktiPengeluaran;
-import com.jasamedika.medifirst2000.entities.StrukBuktiPengeluaranCaraBayar;
-import com.jasamedika.medifirst2000.entities.StrukClosing;
-import com.jasamedika.medifirst2000.entities.StrukPelayanan;
-import com.jasamedika.medifirst2000.entities.StrukPelayananPenjamin;
-import com.jasamedika.medifirst2000.entities.StrukVerifikasi;
+import com.jasamedika.medifirst2000.entities.*;
 import com.jasamedika.medifirst2000.service.GajiPegawaiService;
 import com.jasamedika.medifirst2000.service.LoginUserService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.util.DateUtil;
-import com.jasamedika.medifirst2000.vo.BankAccountVO;
-import com.jasamedika.medifirst2000.vo.CaraBayarVO;
-import com.jasamedika.medifirst2000.vo.JenisKartuVO;
-import com.jasamedika.medifirst2000.vo.KelompokTransaksiVO;
-import com.jasamedika.medifirst2000.vo.MappingKirimDokumenPasienVO;
-import com.jasamedika.medifirst2000.vo.StrukBuktiPengeluaranCaraBayarVO;
-import com.jasamedika.medifirst2000.vo.StrukBuktiPengeluaranVO;
-import com.jasamedika.medifirst2000.vo.StrukClosingVO;
-import com.jasamedika.medifirst2000.vo.StrukVerifikasiVO;
+import com.jasamedika.medifirst2000.vo.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
 
 @Service("GajiPegawaiService")
 public class GajiPegawaiServiceImpl extends BaseVoServiceImpl implements GajiPegawaiService {
@@ -177,6 +141,7 @@ public class GajiPegawaiServiceImpl extends BaseVoServiceImpl implements GajiPeg
 				data1.put("kelTransaksi", map1.get("kelTransaksi"));
 				data1.put("total", map1.get("total"));
 				data1.put("golPegawai", map1.get("golPegawai"));
+				data1.put("golonganPPPK", map1.get("golonganPPPK"));
 				data1.put("rekeningAtasNama", map1.get("rekeningAtasNama"));
 				data1.put("namaBank", map1.get("namaBank"));
 				data1.put("noRekening", map1.get("noRekening"));

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PayRollReportingServiceImpl.java

@@ -1,17 +1,5 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.jasamedika.medifirst2000.dao.JabatanDao;
 import com.jasamedika.medifirst2000.dao.PayRollPegawaiDao;
 import com.jasamedika.medifirst2000.dao.PayRollReportingDao;
 import com.jasamedika.medifirst2000.dao.PegawaiDao;
@@ -20,7 +8,16 @@ import com.jasamedika.medifirst2000.dto.PayRollReportUangMakanDto;
 import com.jasamedika.medifirst2000.entities.Pegawai;
 import com.jasamedika.medifirst2000.service.PayRollPegawaiService;
 import com.jasamedika.medifirst2000.service.PayRollReportingService;
-import com.jasamedika.medifirst2000.util.DateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service("PayRollReportingService")
 public class PayRollReportingServiceImpl extends BaseVoServiceImpl implements PayRollReportingService {
@@ -55,6 +52,7 @@ public class PayRollReportingServiceImpl extends BaseVoServiceImpl implements Pa
 			String nipPns=(String) map.get("nipPns");
 			Integer golonganPegawaiId=(Integer) map.get("golonganPegawaiId");
 			String golonganPegawai=(String) map.get("golonganPegawai");
+			String golonganPPPK=(String) map.get("golonganPPPK");
 			String namaLengkap=(String) map.get("namaLengkap");
 			BigDecimal hargaSatuan=(BigDecimal) map.get("hargaSatuan");
 			Integer komponenHargaId=(Integer) map.get("komponenHargaId");
@@ -63,6 +61,7 @@ public class PayRollReportingServiceImpl extends BaseVoServiceImpl implements Pa
 			mapKomponen.put("nip", nipPns);
 			mapKomponen.put("namaPegawai", namaLengkap);
 			mapKomponen.put("golongan", golonganPegawai);
+			mapKomponen.put("golonganPPPK", golonganPPPK);
 			mapKomponen.put("jumlahKehadiran", new Long(0));
 			mapKomponen.put("tarifUangMakanPerHari", new Double(0));
 			mapKomponen.put("jumlahKotor","");
@@ -166,6 +165,7 @@ public class PayRollReportingServiceImpl extends BaseVoServiceImpl implements Pa
 			String nipPns=(String) map.get("nipPns");
 			Integer golonganPegawaiId=(Integer) map.get("golonganPegawaiId");
 			String golonganPegawai=(String) map.get("golonganPegawai");
+			String golonganPPPK=(String) map.get("golonganPPPK");
 			String namaLengkap=(String) map.get("namaLengkap");
 			BigDecimal hargaSatuan=(BigDecimal) map.get("hargaSatuan");
 			Integer komponenHargaId=(Integer) map.get("komponenHargaId");
@@ -174,6 +174,7 @@ public class PayRollReportingServiceImpl extends BaseVoServiceImpl implements Pa
 			mapKomponen.put("nip", nipPns);
 			mapKomponen.put("namaPegawai", namaLengkap);
 			mapKomponen.put("golongan", golonganPegawai);
+			mapKomponen.put("golonganPPPK", golonganPPPK);
 			mapKomponen.put("jumlahKehadiran", 0);
 			mapKomponen.put("tarifUangMakanPerHari",0);
 			mapKomponen.put("jumlahKotor",0);

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiMutasiSanksiResignServiceImpl.java

@@ -1,51 +1,22 @@
 package com.jasamedika.medifirst2000.service.impl;
 
+import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
+import com.jasamedika.medifirst2000.dao.*;
+import com.jasamedika.medifirst2000.dao.custom.PlanningPegawaiMuSaReDaoCustom;
+import com.jasamedika.medifirst2000.entities.*;
+import com.jasamedika.medifirst2000.service.LoginUserService;
+import com.jasamedika.medifirst2000.service.PegawaiMutasiSanksiResignService;
+import com.jasamedika.medifirst2000.util.CommonUtil;
+import com.jasamedika.medifirst2000.util.DateUtil;
+import com.jasamedika.medifirst2000.vo.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
-import com.jasamedika.medifirst2000.dao.EselonDao;
-import com.jasamedika.medifirst2000.dao.GolonganDao;
-import com.jasamedika.medifirst2000.dao.JabatanDao;
-import com.jasamedika.medifirst2000.dao.PegawaiDao;
-import com.jasamedika.medifirst2000.dao.PlanningPegawaiMuSaReDao;
-import com.jasamedika.medifirst2000.dao.PlanningPegawaiStatusDao;
-import com.jasamedika.medifirst2000.dao.RuanganDao;
-import com.jasamedika.medifirst2000.dao.StatusPegawaiDao;
-import com.jasamedika.medifirst2000.dao.StrukPlanningDao;
-import com.jasamedika.medifirst2000.dao.SuratKeputusanDao;
-import com.jasamedika.medifirst2000.dao.custom.PlanningPegawaiMuSaReDaoCustom;
-import com.jasamedika.medifirst2000.entities.Eselon;
-import com.jasamedika.medifirst2000.entities.Golongan;
-import com.jasamedika.medifirst2000.entities.Jabatan;
-import com.jasamedika.medifirst2000.entities.JenisHukuman;
-import com.jasamedika.medifirst2000.entities.JenisKeputusan;
-import com.jasamedika.medifirst2000.entities.Pegawai;
-import com.jasamedika.medifirst2000.entities.PlanningPegawaiMuSaRe;
-import com.jasamedika.medifirst2000.entities.PlanningPegawaiStatus;
-import com.jasamedika.medifirst2000.entities.Ruangan;
-import com.jasamedika.medifirst2000.entities.StatusPegawai;
-import com.jasamedika.medifirst2000.entities.StrukPlanning;
-import com.jasamedika.medifirst2000.entities.SuratKeputusan;
-import com.jasamedika.medifirst2000.service.LoginUserService;
-import com.jasamedika.medifirst2000.service.PegawaiMutasiSanksiResignService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.util.DateUtil;
-import com.jasamedika.medifirst2000.vo.EselonVO;
-import com.jasamedika.medifirst2000.vo.GolonganVO;
-import com.jasamedika.medifirst2000.vo.JabatanVO;
-import com.jasamedika.medifirst2000.vo.JenisHukumanVO;
-import com.jasamedika.medifirst2000.vo.JenisKeputusanVO;
-import com.jasamedika.medifirst2000.vo.PegawaiVO;
-import com.jasamedika.medifirst2000.vo.PlanningPegawaiMuSaReVO;
-import com.jasamedika.medifirst2000.vo.RuanganVO;
-import com.jasamedika.medifirst2000.vo.StrukPlanningVO;
-
 @Service("PegawaiMutasiSanksiResignService")
 public class PegawaiMutasiSanksiResignServiceImpl implements PegawaiMutasiSanksiResignService{
 
@@ -246,6 +217,13 @@ public class PegawaiMutasiSanksiResignServiceImpl implements PegawaiMutasiSanksi
 			result.put("pangkatId", 0);
 			result.put("namaPangkat", "-");
 		}
+		if(CommonUtil.isNotNullOrEmpty(data.get("golonganPPPKId"))){
+			result.put("golonganPPPKId", data.get("golonganPPPKId"));
+			result.put("golonganPPPK", data.get("golonganPPPK"));
+		} else{
+			result.put("golonganPPPKId", "-");
+			result.put("golonganPPPK", "-");
+		}
 		return result;
 	}
 	

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PegawaiServiceImpl.java

@@ -147,6 +147,9 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 	@Autowired
 	private RekananDao rekananDao;
 
+	@Autowired
+	private GolonganPPPKDao golonganPPPKDao;
+
 	@Autowired
 	private PegawaiDaoCustom pegawaiDaoCustom;
 
@@ -1818,6 +1821,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 			if (CommonUtil.isNotNullOrEmpty(jabatanFungsional)) {
 				result.put("jabatanFungsional", jabatanFungsional);
 			}
+			result.remove("jabatanFungsionalId");
 		}
 		if (CommonUtil.isNotNullOrEmpty(result.get("jabatanInternalId"))) {
 			Map<String, Object> jabatanInternal = jabatanDao
@@ -1825,6 +1829,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 			if (CommonUtil.isNotNullOrEmpty(jabatanInternal)) {
 				result.put("jabatanInternal", jabatanInternal);
 			}
+			result.remove("jabatanInternalId");
 		}
 		if (CommonUtil.isNotNullOrEmpty(result.get("jabatanLamarId"))) {
 			Map<String, Object> jabatanLamar = jabatanDao
@@ -1832,6 +1837,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 			if (CommonUtil.isNotNullOrEmpty(jabatanLamar)) {
 				result.put("jabatanLamar", jabatanLamar);
 			}
+			result.remove("jabatanLamarId");
 		}
 		if (CommonUtil.isNotNullOrEmpty(result.get("jabatanStrukturalId"))) {
 			Map<String, Object> jabatanStruktural = jabatanDao
@@ -1839,6 +1845,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 			if (CommonUtil.isNotNullOrEmpty(jabatanStruktural)) {
 				result.put("jabatanStruktural", jabatanStruktural);
 			}
+			result.remove("jabatanStrukturalId");
 		}
 		if (CommonUtil.isNotNullOrEmpty(result.get("jenisKelaminId"))) {
 			Map<String, Object> jenisKelamin = jenisKelaminDao
@@ -1895,12 +1902,20 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 			}
 			result.remove("pangkatId");
 		}
+		if (CommonUtil.isNotNullOrEmpty(result.get("golonganPPPKId"))) {
+			Optional<GolonganPPPK> byId = golonganPPPKDao.findById(result.get("golonganPPPKId").toString());
+            byId.ifPresent(golonganPPPK -> {
+				result.put("golonganPPPK", golonganPPPK);
+				result.remove("golonganPPPKId");
+			});
+		}
 		if (CommonUtil.isNotNullOrEmpty(result.get("rekananId"))) {
 			Map<String, Object> rekanan = rekananDao
 					.getRekananById(Integer.parseInt(result.get("rekananId").toString()));
 			if (CommonUtil.isNotNullOrEmpty(rekanan)) {
 				result.put("rekanan", rekanan);
 			}
+			result.remove("rekananId");
 		}
 		if (CommonUtil.isNotNullOrEmpty(result.get("ruanganId"))) {
 			Map<String, Object> ruangan = ruanganDao
@@ -1908,6 +1923,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 			if (CommonUtil.isNotNullOrEmpty(ruangan)) {
 				result.put("ruangan", ruangan);
 			}
+			result.remove("ruanganId");
 		}
 		if (CommonUtil.isNotNullOrEmpty(result.get("shiftKerjaId"))) {
 			Map<String, Object> shiftKerja = kelompokShiftDao
@@ -1938,6 +1954,7 @@ public class PegawaiServiceImpl extends BaseVoServiceImpl implements PegawaiServ
 			if (CommonUtil.isNotNullOrEmpty(typePegawai)) {
 				result.put("typePegawai", typePegawai);
 			}
+			result.remove("typePegawaiId");
 		}
 
 		return result;

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SWOT.java

@@ -1,15 +1,16 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "SWOT_M")
 public class SWOT extends BaseMaster {
@@ -18,26 +19,10 @@ public class SWOT extends BaseMaster {
 	@Caption(value = "Nama Faktor")
 	private String namaFaktor;
 
-	public String getNamaFaktor() {
-		return namaFaktor;
-	}
-
-	public void setNamaFaktor(String namaFaktor) {
-		this.namaFaktor = namaFaktor;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.swot_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.swot_m_id_seq", sequenceName = "public.swot_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.swot_m_id_seq")
+	@SequenceGenerator(name = "public.swot_m_id_seq", sequenceName = "public.swot_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SurveiDetail.java

@@ -1,43 +1,25 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class PasienDaftar
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "SurveiDetail_M")
-
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class SurveiDetail extends BaseMaster {
 
@@ -47,53 +29,21 @@ public class SurveiDetail extends BaseMaster {
 	@JsonBackReference
 	private Survei survei;
 
-	public Survei getSurvei() {
-		return survei;
-	}
-
-	public void setSurvei(Survei survei) {
-		this.survei = survei;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@Column(name = "survei", insertable = false, updatable = false, nullable = true)
+	@Column(name = "survei", insertable = false, updatable = false)
 	private Integer surveiId;
 
 	@Column(name = "name", nullable = false)
 	@Caption(value = "name")
 	private String name;
 
-	@Column(name = "report", nullable = true)
+	@Column(name = "report")
 	@Caption(value = "report")
 	private String report;
 
-	public String getReport() {
-		return report;
-	}
-
-	public void setReport(String report) {
-		this.report = report;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.surveidetail_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.surveidetail_m_id_seq", sequenceName = "public.surveidetail_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.surveidetail_m_id_seq")
+	@SequenceGenerator(name = "public.surveidetail_m_id_seq", sequenceName = "public.surveidetail_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SurveyKepuasanPelanggan.java

@@ -1,52 +1,35 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "SurveyKepuasanPelanggan_T")
 public class SurveyKepuasanPelanggan extends BaseTransaction {
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectParameterKepuasanFk")
-	@NotNull(message="Parameter Kepuasan tidak boleh kosong")
-	@Caption(value="Parameter Kepuasan")
+	@NotNull(message = "Parameter Kepuasan tidak boleh kosong")
+	@Caption(value = "Parameter Kepuasan")
 	private ParameterKepuasan parameterKepuasan;
-	
-	@Column(name = "ObjectParameterKepuasanFk", insertable=false,updatable=false, nullable = false)
+
+	@Column(name = "ObjectParameterKepuasanFk", insertable = false, updatable = false, nullable = false)
 	private Integer parameterKepuasanId;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectGambarMukaKepuasanFk")
-	@NotNull(message="Gambar Muka Kepuasan tidak boleh kosong")
-	@Caption(value="Gambar Muka Kepuasan")
+	@NotNull(message = "Gambar Muka Kepuasan tidak boleh kosong")
+	@Caption(value = "Gambar Muka Kepuasan")
 	private GambarMukaKepuasan gambarMukaKepuasan;
-	
-	@Column(name = "ObjectGambarMukaKepuasanFk", insertable=false,updatable=false, nullable = false)
+
+	@Column(name = "ObjectGambarMukaKepuasanFk", insertable = false, updatable = false, nullable = false)
 	private Integer gambarMukaKepuasanId;
 
-	public GambarMukaKepuasan getGambarMukaKepuasan() {
-		return gambarMukaKepuasan;
-	}
-
-	public void setGambarMukaKepuasan(GambarMukaKepuasan gambarMukaKepuasan) {
-		this.gambarMukaKepuasan = gambarMukaKepuasan;
-	}
-
-	public ParameterKepuasan getParameterKepuasan() {
-		return parameterKepuasan;
-	}
-
-	public void setParameterKepuasan(ParameterKepuasan parameterKepuasan) {
-		this.parameterKepuasan = parameterKepuasan;
-	}
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/SwabAlatPermukaan.java

@@ -1,22 +1,18 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Type;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+import java.util.Date;
+
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "SwabAlatPermukaan_M")
 public class SwabAlatPermukaan extends BaseMaster {
@@ -25,12 +21,12 @@ public class SwabAlatPermukaan extends BaseMaster {
 	@Column(name = "Tanggal")
 	private Date tanggal;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@Caption(value = "Tanggal")
 	@JoinColumn(name = "ObjectNamaRuanganFk")
 	private Ruangan namaRuangan;
 
-	@Column(name = "ObjectNamaRuanganFk", nullable = true, insertable = false, updatable = false)
+	@Column(name = "ObjectNamaRuanganFk", insertable = false, updatable = false)
 	private Integer namaRuanganId;
 
 	@Caption(value = "Jenis Alat")
@@ -40,86 +36,19 @@ public class SwabAlatPermukaan extends BaseMaster {
 	@Caption(value = "Hasil Pemeriksaan")
 	@Column(name = "HasilPemeriksaan")
 	private String hasilPemeriksaan;
-	
+
 	@Caption(value = "File Name")
 	@Column(name = "FileName")
 	private String fileName;
 
 	@Caption(value = "File")
 	@Column(name = "File")
-	@Type(type = "org.hibernate.type.BinaryType")
 	private byte[] file;
 
-	public Date getTanggal() {
-		return tanggal;
-	}
-
-	public void setTanggal(Date tanggal) {
-		this.tanggal = tanggal;
-	}
-
-	public Ruangan getNamaRuangan() {
-		return namaRuangan;
-	}
-
-	public void setNamaRuangan(Ruangan namaRuangan) {
-		this.namaRuangan = namaRuangan;
-	}
-
-	public Integer getNamaRuanganId() {
-		return namaRuanganId;
-	}
-
-	public void setNamaRuanganId(Integer namaRuanganId) {
-		this.namaRuanganId = namaRuanganId;
-	}
-
-	public String getJenisAlat() {
-		return jenisAlat;
-	}
-
-	public void setJenisAlat(String jenisAlat) {
-		this.jenisAlat = jenisAlat;
-	}
-
-	public String getHasilPemeriksaan() {
-		return hasilPemeriksaan;
-	}
-
-	public void setHasilPemeriksaan(String hasilPemeriksaan) {
-		this.hasilPemeriksaan = hasilPemeriksaan;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.swabalatpermukaan_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.swabalatpermukaan_m_id_seq", sequenceName = "public.swabalatpermukaan_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.swabalatpermukaan_m_id_seq")
+	@SequenceGenerator(name = "public.swabalatpermukaan_m_id_seq", sequenceName = "public.swabalatpermukaan_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getFileName() {
-		return fileName;
-	}
-
-	public void setFileName(String fileName) {
-		this.fileName = fileName;
-	}
-
-	public byte[] getFile() {
-		return file;
-	}
-
-	public void setFile(byte[] file) {
-		this.file = file;
-	}
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TOWS.java

@@ -1,15 +1,16 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "TOWS_M")
 public class TOWS extends BaseMaster {
@@ -18,26 +19,10 @@ public class TOWS extends BaseMaster {
 	@Caption("Jenis TOWS")
 	private String jenisTOWS;
 
-	public String getJenisTOWS() {
-		return jenisTOWS;
-	}
-
-	public void setJenisTOWS(String jenisTOWS) {
-		this.jenisTOWS = jenisTOWS;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tows_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tows_m_id_seq", sequenceName = "public.tows_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tows_m_id_seq")
+	@SequenceGenerator(name = "public.tows_m_id_seq", sequenceName = "public.tows_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TabelAcuanIndeksIKI.java

@@ -1,16 +1,16 @@
 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 com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "tabelAcuanIndeksIKI")
 public class TabelAcuanIndeksIKI extends BaseMaster {
@@ -28,53 +28,13 @@ public class TabelAcuanIndeksIKI extends BaseMaster {
 	private Double indeks;
 
 	@Caption(value = "kriteria")
-	@Column(name = "kriteria", nullable = true)
+	@Column(name = "kriteria")
 	private String kriteria;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.TabelAcuanIndeksIKI_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.TabelAcuanIndeksIKI_m_id_seq")
 	@SequenceGenerator(name = "public.TabelAcuanIndeksIKI_m_id_seq", sequenceName = "public.TabelAcuanIndeksIKI_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Double getNilaiBawah() {
-		return nilaiBawah;
-	}
-
-	public void setNilaiBawah(Double nilaiBawah) {
-		this.nilaiBawah = nilaiBawah;
-	}
-
-	public Double getNilaiAtas() {
-		return nilaiAtas;
-	}
-
-	public void setNilaiAtas(Double nilaiAtas) {
-		this.nilaiAtas = nilaiAtas;
-	}
-
-	public Double getIndeks() {
-		return indeks;
-	}
-
-	public void setIndeks(Double indeks) {
-		this.indeks = indeks;
-	}
-
-	public String getKriteria() {
-		return kriteria;
-	}
-
-	public void setKriteria(String kriteria) {
-		this.kriteria = kriteria;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TahapanAkreditasi.java

@@ -1,96 +1,50 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class TahapanAkreditasi
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TahapanAkreditasi_M")
 public class TahapanAkreditasi extends BaseMaster {
+
 	@NotNull(message = "Kd Tahapan Akreditasi tidak boleh kosong")
 	@Column(name = "KdTahapanAkreditasi", nullable = false)
 	@Caption(value = "Kode Tahapan Akreditasi")
 	private Byte kdTahapanAkreditasi;
 
-	public void setKdTahapanAkreditasi(Byte kdTahapanAkreditasi) {
-		this.kdTahapanAkreditasi = kdTahapanAkreditasi;
-	}
-
-	public Byte getKdTahapanAkreditasi() {
-		return this.kdTahapanAkreditasi;
-	}
-
 	@NotNull(message = "QTahapan Akreditasi tidak boleh kosong")
 	@Column(name = "QTahapanAkreditasi", nullable = false)
 	@Caption(value = "QTahapan Akreditasi")
 	private Byte qTahapanAkreditasi;
 
-	public void setqTahapanAkreditasi(Byte qTahapanAkreditasi) {
-		this.qTahapanAkreditasi = qTahapanAkreditasi;
-	}
-
-	public Byte getqTahapanAkreditasi() {
-		return this.qTahapanAkreditasi;
-	}
-
 	@NotNull(message = "Qty Unit Di Akreditasi tidak boleh kosong")
 	@Column(name = "QtyUnitDiAkreditasi", nullable = false)
 	@Caption(value = "Qty Unit Di Akreditasi")
 	private Byte qtyUnitDiAkreditasi;
 
-	public void setqtyUnitDiAkreditasi(Byte qtyUnitDiAkreditasi) {
-		this.qtyUnitDiAkreditasi = qtyUnitDiAkreditasi;
-	}
-
-	public Byte getqtyUnitDiAkreditasi() {
-		return this.qtyUnitDiAkreditasi;
-	}
-
 	@NotNull(message = "Tahapan Akreditasi tidak boleh kosong")
 	@Column(name = "TahapanAkreditasi", nullable = false, length = 30)
 	@Caption(value = "Tahapan Akreditasi")
 	private String tahapanAkreditasi;
 
-	public void setahapanAkreditasi(String tahapanAkreditasi) {
-		this.tahapanAkreditasi = tahapanAkreditasi;
-	}
-
-	public String getTahapanAkreditasi() {
-		return this.tahapanAkreditasi;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tahapanakreditasi_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tahapanakreditasi_m_id_seq", sequenceName = "public.tahapanakreditasi_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tahapanakreditasi_m_id_seq")
+	@SequenceGenerator(name = "public.tahapanakreditasi_m_id_seq", sequenceName = "public.tahapanakreditasi_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TahapanRekrutmenTest.java

@@ -1,69 +1,36 @@
 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.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "TahapanRekrutmenTest_M")
-public class TahapanRekrutmenTest extends BaseMaster{
+public class TahapanRekrutmenTest extends BaseMaster {
+
 	@Column(name = "noUrut", nullable = false, length = 100)
 	@Caption(value = "noUrut")
 	private Integer noUrut;
 
 	@ManyToOne
 	@JoinColumn(name = "produkrsFk")
-	@Caption(value = "produkrsFk")	
-	private Produk produkRs; //produk rekrutmen seleksi
-	
-	@Column(name = "produkrsFk", insertable = false, updatable = false,nullable = false)	
+	@Caption(value = "produkrsFk")
+	private Produk produkRs;
+
+	@Column(name = "produkrsFk", insertable = false, updatable = false, nullable = false)
 	private Integer produkRsId;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tahapanrekrutmentest_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tahapanrekrutmentest_m_id_seq", sequenceName = "public.tahapanrekrutmentest_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tahapanrekrutmentest_m_id_seq")
+	@SequenceGenerator(name = "public.tahapanrekrutmentest_m_id_seq", sequenceName = "public.tahapanrekrutmentest_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public Integer getNoUrut() {
-		return noUrut;
-	}
-
-	public void setNoUrut(Integer noUrut) {
-		this.noUrut = noUrut;
-	}
-
-	public Produk getProdukRs() {
-		return produkRs;
-	}
-
-	public void setProdukRs(Produk produkRs) {
-		this.produkRs = produkRs;
-	}
-
-	public Integer getProdukRsId() {
-		return produkRsId;
-	}
-
-	public void setProdukRsId(Integer produkRsId) {
-		this.produkRsId = produkRsId;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TahunPerolehan.java

@@ -1,18 +1,18 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
 
-@Entity // @Audited
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
+@Entity
 @Table(name = "TahunPerolehan_M")
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class TahunPerolehan extends BaseMaster {
@@ -21,26 +21,10 @@ public class TahunPerolehan extends BaseMaster {
 	@Caption(value = "Tahun Perolehan")
 	private String tahunPerolehan;
 
-	public String getTahunPerolehan() {
-		return tahunPerolehan;
-	}
-
-	public void setTahunPerolehan(String tahunPerolehan) {
-		this.tahunPerolehan = tahunPerolehan;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tahunperolehan_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tahunperolehan_m_id_seq", sequenceName = "public.tahunperolehan_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tahunperolehan_m_id_seq")
+	@SequenceGenerator(name = "public.tahunperolehan_m_id_seq", sequenceName = "public.tahunperolehan_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TahunUmr.java

@@ -1,44 +1,31 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.*;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.jasamedika.medifirst2000.base.BaseTransaction;
-
-
-import javax.validation.constraints.NotNull;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
 
 /**
- *  class TahunUmr
+ * class TahunUmr
  * 
  * @author Generator
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "sdm_TahunUmr_T")
-public class TahunUmr  extends BaseTransaction{
-	@Column(name = "Id", nullable = false , length = 100)
-	 @Caption(value = "Id")
-	private Integer id ;
-	public Integer getId() {
-		return id ;
-	}
-	public void setId(Integer id ) {
-		this.id  = id ;
-	}
+public class TahunUmr extends BaseTransaction {
 
-	@Column(name = "Name", nullable = false , length = 100)
-	 @Caption(value = "Name")
-	private String name ;
-	public String getName() {
-		return name ;
-	}
-	public void setName(String name ) {
-		this.name  = name ;
-	}
+	@Column(name = "Id", nullable = false, length = 100)
+	@Caption(value = "Id")
+	private Integer id;
 
+	@Column(name = "Name", nullable = false, length = 100)
+	@Caption(value = "Name")
+	private String name;
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TandaGejala.java

@@ -1,83 +1,45 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class TandaGejala
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TandaGejala_M")
 public class TandaGejala extends BaseMaster {
+
 	@NotNull(message = "Kd Tanda Gejala tidak boleh kosong")
 	@Column(name = "KdTandaGejala", nullable = false)
 	@Caption(value = "Kode Tanda Gejala")
 	private Byte kdTandaGejala;
 
-	public void setKdTandaGejala(Byte kdTandaGejala) {
-		this.kdTandaGejala = kdTandaGejala;
-	}
-
-	public Byte getKdTandaGejala() {
-		return this.kdTandaGejala;
-	}
-
 	@NotNull(message = "QTanda Gejala tidak boleh kosong")
 	@Column(name = "QTandaGejala", nullable = false)
 	@Caption(value = "QTanda Gejala")
 	private Byte qTandaGejala;
 
-	public void setqTandaGejala(Byte qTandaGejala) {
-		this.qTandaGejala = qTandaGejala;
-	}
-
-	public Byte getqTandaGejala() {
-		return this.qTandaGejala;
-	}
-
 	@NotNull(message = "Tanda Gejala tidak boleh kosong")
 	@Column(name = "TandaGejala", nullable = false, length = 50)
 	@Caption(value = "Tanda Gejala")
 	private String tandaGejala;
 
-	public void setandaGejala(String tandaGejala) {
-		this.tandaGejala = tandaGejala;
-	}
-
-	public String getTandaGejala() {
-		return this.tandaGejala;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tandagejala_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tandagejala_m_id_seq", sequenceName = "public.tandagejala_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tandagejala_m_id_seq")
+	@SequenceGenerator(name = "public.tandagejala_m_id_seq", sequenceName = "public.tandagejala_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TandaJasa.java

@@ -1,57 +1,34 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "TandaJasa_M")
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class TandaJasa extends BaseMaster {
 
-	@Column(name = "KdTandaJasa", nullable = true)
+	@Column(name = "KdTandaJasa")
 	@Caption(value = "kd Tanda Jasa")
 	private String kdTandaJasa;
 
-	@Column(name = "NamaTandaJasa", nullable = true)
+	@Column(name = "NamaTandaJasa")
 	@Caption(value = "NamaTandaJasa")
 	private String namaTandaJasa;
 
-	public String getKdTandaJasa() {
-		return kdTandaJasa;
-	}
-
-	public void setKdTandaJasa(String kdTandaJasa) {
-		this.kdTandaJasa = kdTandaJasa;
-	}
-
-	public String getNamaTandaJasa() {
-		return namaTandaJasa;
-	}
-
-	public void setNamaTandaJasa(String namaTandaJasa) {
-		this.namaTandaJasa = namaTandaJasa;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tandajasa_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tandajasa_m_id_seq", sequenceName = "public.tandajasa_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tandajasa_m_id_seq")
+	@SequenceGenerator(name = "public.tandajasa_m_id_seq", sequenceName = "public.tandajasa_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TandaKehidupan.java

@@ -1,53 +1,37 @@
 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.Table;
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 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;
 
 /**
- *  class TandaKehidupan
+ * class TandaKehidupan
  * 
  * @author Generator
  */
-@Entity 
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_TandaKehidupan_M")
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class TandaKehidupan extends BaseMaster {
-	@NotNull(message="Name tidak boleh kosong")
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_TandaKehidupan_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.RM_TandaKehidupan_M_id_seq", sequenceName = "public.RM_TandaKehidupan_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_TandaKehidupan_M_id_seq")
+	@SequenceGenerator(name = "public.RM_TandaKehidupan_M_id_seq", sequenceName = "public.RM_TandaKehidupan_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TandaVitalDetail.java

@@ -1,207 +1,79 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+@Getter
+@Setter
 @Entity
-@Table(name="TandaVitalDetail_T")
+@Table(name = "TandaVitalDetail_T")
 public class TandaVitalDetail extends BaseTransaction {
-	@Column(name = "ObjectAnestesiLokalFk", nullable=false)
+
+	@Column(name = "ObjectAnestesiLokalFk", nullable = false)
 	private String anestesiLokalId;
 
 	@ManyToOne
 	@JoinColumn(name = "ObjectAsuhanKeperawatanPeriOperatifFk")
-	@Caption(value="AsuhanKeperawatanPeriOperatif")
+	@Caption(value = "AsuhanKeperawatanPeriOperatif")
 	private AsuhanKeperawatanPeriOperatif tandaVital;
 
-	@Column(name = "ObjectAsuhanKeperawatanPeriOperatifFk", insertable=false, updatable=false, nullable=false)
+	@Column(name = "ObjectAsuhanKeperawatanPeriOperatifFk", insertable = false, updatable = false, nullable = false)
 	private Integer tandaVitalId;
 
-	@Column(name = "c15", length = 50, nullable = true)
+	@Column(name = "c15", length = 50)
 	@Caption(value = "c15")
 	private String c15;
 
-	@Column(name = "c30", length = 50, nullable = true)
+	@Column(name = "c30", length = 50)
 	@Caption(value = "c30")
 	private String c30;
-	
-	@Column(name = "c35", length = 50, nullable = true)
+
+	@Column(name = "c35", length = 50)
 	@Caption(value = "c35")
 	private String c35;
-	
-	@Column(name = "c45", length = 50, nullable = true)
+
+	@Column(name = "c45", length = 50)
 	@Caption(value = "c45")
 	private String c45;
-	
-	@Column(name = "c60", length = 50, nullable = true)
+
+	@Column(name = "c60", length = 50)
 	@Caption(value = "c60")
 	private String c60;
-	
-	@Column(name = "c75", length = 50, nullable = true)
+
+	@Column(name = "c75", length = 50)
 	@Caption(value = "c75")
 	private String c75;
-	
-	@Column(name = "c90", length = 50, nullable = true)
+
+	@Column(name = "c90", length = 50)
 	@Caption(value = "c90")
 	private String c90;
-	
-	@Column(name = "c105", length = 50, nullable = true)
+
+	@Column(name = "c105", length = 50)
 	@Caption(value = "c105")
 	private String c105;
-	
-	@Column(name = "c120", length = 50, nullable = true)
+
+	@Column(name = "c120", length = 50)
 	@Caption(value = "c120")
 	private String c120;
-	
-	@Column(name = "c135", length = 50, nullable = true)
+
+	@Column(name = "c135", length = 50)
 	@Caption(value = "c135")
 	private String c135;
-	
-	@Column(name = "c165", length = 50, nullable = true)
+
+	@Column(name = "c165", length = 50)
 	@Caption(value = "c165")
 	private String c165;
-	
-	@Column(name = "c180", length = 50, nullable = true)
+
+	@Column(name = "c180", length = 50)
 	@Caption(value = "c180")
 	private String c180;
-	
-	@Column(name = "c195", length = 50, nullable = true)
+
+	@Column(name = "c195", length = 50)
 	@Caption(value = "c195")
 	private String c195;
 
-	public String getAnestesiLokalId() {
-		return anestesiLokalId;
-	}
-
-	public void setAnestesiLokalId(String anestesiLokalId) {
-		this.anestesiLokalId = anestesiLokalId;
-	}
-
-	public AsuhanKeperawatanPeriOperatif getTandaVital() {
-		return tandaVital;
-	}
-
-	public void setTandaVital(AsuhanKeperawatanPeriOperatif tandaVital) {
-		this.tandaVital = tandaVital;
-	}
-
-	public Integer getTandaVitalId() {
-		return tandaVitalId;
-	}
-
-	public void setTandaVitalId(Integer tandaVitalId) {
-		this.tandaVitalId = tandaVitalId;
-	}
-
-	public String getC15() {
-		return c15;
-	}
-
-	public void setC15(String c15) {
-		this.c15 = c15;
-	}
-
-	public String getC30() {
-		return c30;
-	}
-
-	public void setC30(String c30) {
-		this.c30 = c30;
-	}
-
-	public String getC35() {
-		return c35;
-	}
-
-	public void setC35(String c35) {
-		this.c35 = c35;
-	}
-
-	public String getC45() {
-		return c45;
-	}
-
-	public void setC45(String c45) {
-		this.c45 = c45;
-	}
-
-	public String getC60() {
-		return c60;
-	}
-
-	public void setC60(String c60) {
-		this.c60 = c60;
-	}
-
-	public String getC75() {
-		return c75;
-	}
-
-	public void setC75(String c75) {
-		this.c75 = c75;
-	}
-
-	public String getC90() {
-		return c90;
-	}
-
-	public void setC90(String c90) {
-		this.c90 = c90;
-	}
-
-	public String getC105() {
-		return c105;
-	}
-
-	public void setC105(String c105) {
-		this.c105 = c105;
-	}
-
-	public String getC120() {
-		return c120;
-	}
-
-	public void setC120(String c120) {
-		this.c120 = c120;
-	}
-
-	public String getC135() {
-		return c135;
-	}
-
-	public void setC135(String c135) {
-		this.c135 = c135;
-	}
-
-	public String getC165() {
-		return c165;
-	}
-
-	public void setC165(String c165) {
-		this.c165 = c165;
-	}
-
-	public String getC180() {
-		return c180;
-	}
-
-	public void setC180(String c180) {
-		this.c180 = c180;
-	}
-
-	public String getC195() {
-		return c195;
-	}
-
-	public void setC195(String c195) {
-		this.c195 = c195;
-	}
-	
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Tanggapan.java

@@ -1,17 +1,17 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-// Aplikasi Kesling - SarPras
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "Tanggapan_M")
 public class Tanggapan extends BaseMaster {
@@ -21,26 +21,10 @@ public class Tanggapan extends BaseMaster {
 	@Caption(value = "Nama")
 	private String nama;
 
-	public String getNama() {
-		return nama;
-	}
-
-	public void setNama(String nama) {
-		this.nama = nama;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tanggapan_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tanggapan_m_id_seq", sequenceName = "public.tanggapan_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tanggapan_m_id_seq")
+	@SequenceGenerator(name = "public.tanggapan_m_id_seq", sequenceName = "public.tanggapan_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Tanggungan.java

@@ -1,58 +1,37 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
 import javax.persistence.*;
 
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.jasamedika.medifirst2000.base.BaseMaster;
-
-
-import javax.validation.constraints.NotNull;
-import com.jasamedika.medifirst2000.helper.Caption;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
- *  class Tanggungan
+ * class Tanggungan
  * 
  * @author Generator
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "sdm_Tanggungan_M")
-public class Tanggungan  extends BaseMaster{
-	
-	@Column(name = "Kode", nullable = false , length = 100)
-	 @Caption(value = "Kode")
-	private Integer kode ;
-	public Integer getKode() {
-		return kode ;
-	}
-	public void setKode(Integer kode ) {
-		this.kode  = kode ;
-	}
+public class Tanggungan extends BaseMaster {
 
-	@Column(name = "Name", nullable = false , length = 100)
-	 @Caption(value = "Name")
-	private String name ;
-	public String getName() {
-		return name ;
-	}
-	public void setName(String name ) {
-		this.name  = name ;
-	}
+	@Column(name = "Kode", nullable = false, length = 100)
+	@Caption(value = "Kode")
+	private Integer kode;
 
+	@Column(name = "Name", nullable = false, length = 100)
+	@Caption(value = "Name")
+	private String name;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.sdm_Tanggungan_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.sdm_Tanggungan_M_id_seq", sequenceName = "public.sdm_Tanggungan_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.sdm_Tanggungan_M_id_seq")
+	@SequenceGenerator(name = "public.sdm_Tanggungan_M_id_seq", sequenceName = "public.sdm_Tanggungan_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TargetIndikator.java

@@ -1,18 +1,17 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "TargetIndikator_M")
 public class TargetIndikator extends BaseMaster {
@@ -26,7 +25,7 @@ public class TargetIndikator extends BaseMaster {
 	@Column(name = "ObjectKamusIndikatorFK", insertable = false, updatable = false, nullable = false)
 	private Integer kamusIndikatorId;
 
-	@Column(name = "target", nullable = true, length = 200)
+	@Column(name = "target", length = 200)
 	@Caption(value = "target")
 	private String target;
 
@@ -34,50 +33,10 @@ public class TargetIndikator extends BaseMaster {
 	@Caption(value = "tahun")
 	private Integer tahun;
 
-	public String getTarget() {
-		return target;
-	}
-
-	public void setTarget(String target) {
-		this.target = target;
-	}
-
-	public KamusIndikator getKamusIndikator() {
-		return kamusIndikator;
-	}
-
-	public void setKamusIndikator(KamusIndikator kamusIndikator) {
-		this.kamusIndikator = kamusIndikator;
-	}
-
-	public Integer getTahun() {
-		return tahun;
-	}
-
-	public void setTahun(Integer tahun) {
-		this.tahun = tahun;
-	}
-
-	public Integer getKamusIndikatorId() {
-		return kamusIndikatorId;
-	}
-
-	public void setKamusIndikatorId(Integer kamusIndikatorId) {
-		this.kamusIndikatorId = kamusIndikatorId;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.targetindikator_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.targetindikator_m_id_seq", sequenceName = "public.targetindikator_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.targetindikator_m_id_seq")
+	@SequenceGenerator(name = "public.targetindikator_m_id_seq", sequenceName = "public.targetindikator_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TargetLayanan.java

@@ -1,26 +1,26 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+import java.util.Date;
+
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.TemporalType.DATE;
+import static javax.persistence.TemporalType.TIMESTAMP;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "TargetLayanan_T")
 public class TargetLayanan extends BaseTransaction {
 
 	private static final long serialVersionUID = -8426274186046883050L;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "objectunitkerjafk")
 	@Caption(value = "Unit Kerja")
 	private UnitKerjaPegawai unitKerjaPegawai;
@@ -28,7 +28,7 @@ public class TargetLayanan extends BaseTransaction {
 	@Column(name = "objectunitkerjafk", insertable = false, updatable = false)
 	private Integer unitKerjaPegawaiId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "objectsubunitkerjafk")
 	@Caption(value = "Subunit Kerja")
 	private SubUnitKerjaPegawai subUnitKerjaPegawai;
@@ -37,16 +37,16 @@ public class TargetLayanan extends BaseTransaction {
 	private Integer subUnitKerjaPegawaiId;
 
 	@Column(name = "tglhitung")
-	@Temporal(TemporalType.TIMESTAMP)
+	@Temporal(TIMESTAMP)
 	@Caption(value = "Tanggal Hitung")
 	private Date tglHitung;
 
 	@Column(name = "periode")
-	@Temporal(TemporalType.DATE)
+	@Temporal(DATE)
 	@Caption(value = "Periode")
 	private Date periode;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "objectindikatordetailfk")
 	@Caption(value = "Indikator Kinerja")
 	private IndikatorKinerjaDetail indikatorDetail;
@@ -62,84 +62,4 @@ public class TargetLayanan extends BaseTransaction {
 	@Caption(value = "Target")
 	private Double target;
 
-	public UnitKerjaPegawai getUnitKerjaPegawai() {
-		return unitKerjaPegawai;
-	}
-
-	public void setUnitKerjaPegawai(UnitKerjaPegawai unitKerjaPegawai) {
-		this.unitKerjaPegawai = unitKerjaPegawai;
-	}
-
-	public Integer getUnitKerjaPegawaiId() {
-		return unitKerjaPegawaiId;
-	}
-
-	public void setUnitKerjaPegawaiId(Integer unitKerjaPegawaiId) {
-		this.unitKerjaPegawaiId = unitKerjaPegawaiId;
-	}
-
-	public SubUnitKerjaPegawai getSubUnitKerjaPegawai() {
-		return subUnitKerjaPegawai;
-	}
-
-	public void setSubUnitKerjaPegawai(SubUnitKerjaPegawai subUnitKerjaPegawai) {
-		this.subUnitKerjaPegawai = subUnitKerjaPegawai;
-	}
-
-	public Integer getSubUnitKerjaPegawaiId() {
-		return subUnitKerjaPegawaiId;
-	}
-
-	public void setSubUnitKerjaPegawaiId(Integer subUnitKerjaPegawaiId) {
-		this.subUnitKerjaPegawaiId = subUnitKerjaPegawaiId;
-	}
-
-	public Date getTglHitung() {
-		return tglHitung;
-	}
-
-	public void setTglHitung(Date tglHitung) {
-		this.tglHitung = tglHitung;
-	}
-
-	public Date getPeriode() {
-		return periode;
-	}
-
-	public void setPeriode(Date periode) {
-		this.periode = periode;
-	}
-
-	public IndikatorKinerjaDetail getIndikatorDetail() {
-		return indikatorDetail;
-	}
-
-	public void setIndikatorDetail(IndikatorKinerjaDetail indikatorDetail) {
-		this.indikatorDetail = indikatorDetail;
-	}
-
-	public Integer getIndikatorDetailId() {
-		return indikatorDetailId;
-	}
-
-	public void setIndikatorDetailId(Integer indikatorDetailId) {
-		this.indikatorDetailId = indikatorDetailId;
-	}
-
-	public Double getCapaian() {
-		return capaian;
-	}
-
-	public void setCapaian(Double capaian) {
-		this.capaian = capaian;
-	}
-
-	public Double getTarget() {
-		return target;
-	}
-
-	public void setTarget(Double target) {
-		this.target = target;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TargetRemunDokter.java

@@ -3,31 +3,32 @@
  */
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.TemporalType.DATE;
+import static javax.persistence.TemporalType.TIMESTAMP;
 
 /**
  * @author Salman
  * @since Mar 21, 2023
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "sdm_targetremundokter_t")
 public class TargetRemunDokter extends BaseTransaction {
+
 	private static final long serialVersionUID = 5486941281838920996L;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "objectunitkerjafk")
 	@NotNull(message = "Unit kerja harus diisi")
 	@Caption(value = "Unit Kerja")
@@ -36,7 +37,7 @@ public class TargetRemunDokter extends BaseTransaction {
 	@Column(name = "objectunitkerjafk", insertable = false, updatable = false, nullable = false)
 	private Integer unitKerjaPegawaiId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "objectsubunitkerjafk")
 	@NotNull(message = "Subunit kerja harus diisi")
 	@Caption(value = "Subunit Kerja")
@@ -46,13 +47,13 @@ public class TargetRemunDokter extends BaseTransaction {
 	private Integer subUnitKerjaPegawaiId;
 
 	@Column(name = "tglinput", nullable = false)
-	@Temporal(TemporalType.TIMESTAMP)
+	@Temporal(TIMESTAMP)
 	@NotNull(message = "Tanggal Input harus diisi")
 	@Caption(value = "Tanggal Input")
 	private Date tglInput;
 
 	@Column(name = "tmt", nullable = false)
-	@Temporal(TemporalType.DATE)
+	@Temporal(DATE)
 	@NotNull(message = "TMT harus diisi")
 	@Caption(value = "TMT")
 	private Date tmt;
@@ -62,59 +63,4 @@ public class TargetRemunDokter extends BaseTransaction {
 	@Caption(value = "Rupiah target")
 	private Double rupiahTarget;
 
-	public UnitKerjaPegawai getUnitKerjaPegawai() {
-		return unitKerjaPegawai;
-	}
-
-	public void setUnitKerjaPegawai(UnitKerjaPegawai unitKerjaPegawai) {
-		this.unitKerjaPegawai = unitKerjaPegawai;
-	}
-
-	public Integer getUnitKerjaPegawaiId() {
-		return unitKerjaPegawaiId;
-	}
-
-	public void setUnitKerjaPegawaiId(Integer unitKerjaPegawaiId) {
-		this.unitKerjaPegawaiId = unitKerjaPegawaiId;
-	}
-
-	public SubUnitKerjaPegawai getSubUnitKerjaPegawai() {
-		return subUnitKerjaPegawai;
-	}
-
-	public void setSubUnitKerjaPegawai(SubUnitKerjaPegawai subUnitKerjaPegawai) {
-		this.subUnitKerjaPegawai = subUnitKerjaPegawai;
-	}
-
-	public Integer getSubUnitKerjaPegawaiId() {
-		return subUnitKerjaPegawaiId;
-	}
-
-	public void setSubUnitKerjaPegawaiId(Integer subUnitKerjaPegawaiId) {
-		this.subUnitKerjaPegawaiId = subUnitKerjaPegawaiId;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public Date getTmt() {
-		return tmt;
-	}
-
-	public void setTmt(Date tmt) {
-		this.tmt = tmt;
-	}
-
-	public Double getRupiahTarget() {
-		return rupiahTarget;
-	}
-
-	public void setRupiahTarget(Double rupiahTarget) {
-		this.rupiahTarget = rupiahTarget;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TargetRemunDokterDetail.java

@@ -3,31 +3,32 @@
  */
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.TemporalType.DATE;
+import static javax.persistence.TemporalType.TIMESTAMP;
 
 /**
  * @author Salman
  * @since Mar 21, 2023 2:34:40 PM
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "sdm_targetremundokterdetail_t")
 public class TargetRemunDokterDetail extends BaseTransaction {
+
 	private static final long serialVersionUID = 5245756229984218978L;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "targetremunfk")
 	@Caption(value = "Target Remun")
 	private TargetRemunDokter targetRemun;
@@ -35,7 +36,7 @@ public class TargetRemunDokterDetail extends BaseTransaction {
 	@Column(name = "targetremunfk", columnDefinition = "CHAR(32)", insertable = false, updatable = false)
 	private String targetRemunId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "objectpegawaifk")
 	@NotNull(message = "Pegawai harus diisi")
 	@Caption(value = "Pegawai")
@@ -48,73 +49,17 @@ public class TargetRemunDokterDetail extends BaseTransaction {
 	@NotNull(message = "Rupiah target harus diisi")
 	@Caption(value = "Rupiah target")
 	private Double rupiah;
-	
+
 	@Column(name = "tglinput", nullable = false)
-	@Temporal(TemporalType.TIMESTAMP)
+	@Temporal(TIMESTAMP)
 	@NotNull(message = "Tanggal Input harus diisi")
 	@Caption(value = "Tanggal Input")
 	private Date tglInput;
 
 	@Column(name = "tmt", nullable = false)
-	@Temporal(TemporalType.DATE)
+	@Temporal(DATE)
 	@NotNull(message = "TMT harus diisi")
 	@Caption(value = "TMT")
 	private Date tmt;
 
-	public TargetRemunDokter getTargetRemun() {
-		return targetRemun;
-	}
-
-	public void setTargetRemun(TargetRemunDokter targetRemun) {
-		this.targetRemun = targetRemun;
-	}
-
-	public String getTargetRemunId() {
-		return targetRemunId;
-	}
-
-	public void setTargetRemunId(String targetRemunId) {
-		this.targetRemunId = targetRemunId;
-	}
-
-	public Pegawai getPegawai() {
-		return pegawai;
-	}
-
-	public void setPegawai(Pegawai pegawai) {
-		this.pegawai = pegawai;
-	}
-
-	public Integer getPegawaiId() {
-		return pegawaiId;
-	}
-
-	public void setPegawaiId(Integer pegawaiId) {
-		this.pegawaiId = pegawaiId;
-	}
-
-	public Double getRupiah() {
-		return rupiah;
-	}
-
-	public void setRupiah(Double rupiah) {
-		this.rupiah = rupiah;
-	}
-	
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public Date getTmt() {
-		return tmt;
-	}
-
-	public void setTmt(Date tmt) {
-		this.tmt = tmt;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TargetSkorDokter.java

@@ -1,31 +1,31 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.TemporalType.DATE;
+import static javax.persistence.TemporalType.TIMESTAMP;
 
 /**
  * @author salmanoe
  * @since Dec 21, 2021
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "sdm_targetskordokter_t")
 public class TargetSkorDokter extends BaseTransaction {
 
 	private static final long serialVersionUID = -8292175982556567518L;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "objectunitkerjafk")
 	@NotNull(message = "Unit kerja harus diisi")
 	@Caption(value = "Unit Kerja")
@@ -34,7 +34,7 @@ public class TargetSkorDokter extends BaseTransaction {
 	@Column(name = "objectunitkerjafk", insertable = false, updatable = false, nullable = false)
 	private Integer unitKerjaPegawaiId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "objectsubunitkerjafk")
 	@NotNull(message = "Subunit kerja harus diisi")
 	@Caption(value = "Subunit Kerja")
@@ -44,13 +44,13 @@ public class TargetSkorDokter extends BaseTransaction {
 	private Integer subUnitKerjaPegawaiId;
 
 	@Column(name = "tglhitung", nullable = false)
-	@Temporal(TemporalType.TIMESTAMP)
+	@Temporal(TIMESTAMP)
 	@NotNull(message = "Tanggal hitung harus diisi")
 	@Caption(value = "Tanggal Hitung")
 	private Date tglHitung;
 
 	@Column(name = "tmt", nullable = false)
-	@Temporal(TemporalType.DATE)
+	@Temporal(DATE)
 	@NotNull(message = "TMT harus diisi")
 	@Caption(value = "TMT")
 	private Date tmt;
@@ -60,60 +60,4 @@ public class TargetSkorDokter extends BaseTransaction {
 	@Caption(value = "Total Skor Dasar")
 	private Double totalSkorDasar;
 
-	public UnitKerjaPegawai getUnitKerjaPegawai() {
-		return unitKerjaPegawai;
-	}
-
-	public void setUnitKerjaPegawai(UnitKerjaPegawai unitKerjaPegawai) {
-		this.unitKerjaPegawai = unitKerjaPegawai;
-	}
-
-	public Integer getUnitKerjaPegawaiId() {
-		return unitKerjaPegawaiId;
-	}
-
-	public void setUnitKerjaPegawaiId(Integer unitKerjaPegawaiId) {
-		this.unitKerjaPegawaiId = unitKerjaPegawaiId;
-	}
-
-	public SubUnitKerjaPegawai getSubUnitKerjaPegawai() {
-		return subUnitKerjaPegawai;
-	}
-
-	public void setSubUnitKerjaPegawai(SubUnitKerjaPegawai subUnitKerjaPegawai) {
-		this.subUnitKerjaPegawai = subUnitKerjaPegawai;
-	}
-
-	public Integer getSubUnitKerjaPegawaiId() {
-		return subUnitKerjaPegawaiId;
-	}
-
-	public void setSubUnitKerjaPegawaiId(Integer subUnitKerjaPegawaiId) {
-		this.subUnitKerjaPegawaiId = subUnitKerjaPegawaiId;
-	}
-
-	public Date getTglHitung() {
-		return tglHitung;
-	}
-
-	public void setTglHitung(Date tglHitung) {
-		this.tglHitung = tglHitung;
-	}
-
-	public Date getTmt() {
-		return tmt;
-	}
-
-	public void setTmt(Date tmt) {
-		this.tmt = tmt;
-	}
-
-	public Double getTotalSkorDasar() {
-		return totalSkorDasar;
-	}
-
-	public void setTotalSkorDasar(Double totalSkorDasar) {
-		this.totalSkorDasar = totalSkorDasar;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TargetSkorDokterDetail.java

@@ -1,27 +1,28 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.FetchType.LAZY;
 
 /**
  * @author salmanoe
  * @since Dec 23, 2021
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "sdm_targetskordokterdetail_t")
 public class TargetSkorDokterDetail extends BaseTransaction {
 
 	private static final long serialVersionUID = -6511663625942070891L;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "targetskorfk")
 	@NotNull(message = "Target skor dasar harus diisi")
 	@Caption(value = "Target Skor")
@@ -30,7 +31,7 @@ public class TargetSkorDokterDetail extends BaseTransaction {
 	@Column(name = "targetskorfk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false)
 	private String targetSkorId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "objectpegawaifk")
 	@NotNull(message = "Pegawai harus diisi")
 	@Caption(value = "Pegawai")
@@ -44,44 +45,4 @@ public class TargetSkorDokterDetail extends BaseTransaction {
 	@Caption(value = "Skor")
 	private Double skor;
 
-	public TargetSkorDokter getTargetSkor() {
-		return targetSkor;
-	}
-
-	public void setTargetSkor(TargetSkorDokter targetSkor) {
-		this.targetSkor = targetSkor;
-	}
-
-	public String getTargetSkorId() {
-		return targetSkorId;
-	}
-
-	public void setTargetSkorId(String targetSkorId) {
-		this.targetSkorId = targetSkorId;
-	}
-
-	public Pegawai getPegawai() {
-		return pegawai;
-	}
-
-	public void setPegawai(Pegawai pegawai) {
-		this.pegawai = pegawai;
-	}
-
-	public Integer getPegawaiId() {
-		return pegawaiId;
-	}
-
-	public void setPegawaiId(Integer pegawaiId) {
-		this.pegawaiId = pegawaiId;
-	}
-
-	public Double getSkor() {
-		return skor;
-	}
-
-	public void setSkor(Double skor) {
-		this.skor = skor;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TarifRegulerPaket.java

@@ -20,6 +20,7 @@ import static javax.persistence.FetchType.LAZY;
 @Entity
 @Table(name = "tarifregulerpaket_m", uniqueConstraints = @UniqueConstraint(columnNames = { "mappaketfk", "kelasfk" }))
 public class TarifRegulerPaket extends BaseTransaction {
+
 	private static final long serialVersionUID = 1763466609980920417L;
 
 	@ManyToOne(fetch = LAZY)
@@ -44,4 +45,5 @@ public class TarifRegulerPaket extends BaseTransaction {
 	@Column(name = "tarifsatuan", nullable = false)
 	@Caption(value = "Tarif satuan")
 	private Double tarifSatuan;
+
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TataCara.java

@@ -1,50 +1,35 @@
 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.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
- *  class TataCara
+ * class TataCara
  * 
  * @author Generator
  */
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_TataCara_M")
 public class TataCara extends BaseMaster {
-	@NotNull(message="Name tidak boleh kosong")
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
-
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_TataCara_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.RM_TataCara_M_id_seq", sequenceName = "public.RM_TataCara_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_TataCara_M_id_seq")
+	@SequenceGenerator(name = "public.RM_TataCara_M_id_seq", sequenceName = "public.RM_TataCara_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TeknikKhusus.java

@@ -1,79 +1,38 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
-
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TeknikKhusus_T")
-public class TeknikKhusus extends BaseTransaction{
-	
+public class TeknikKhusus extends BaseTransaction {
+
 	@ManyToOne
 	@JoinColumn(name = "PerencanaanAnestesiFk")
 	@NotNull(message = "Perencanaan Anestesi tidak boleh kosong")
 	private PerencanaanAnestesi perencanaanAnestesi;
-	
-	@Column(name = "PerencanaanAnestesiFk", insertable=false,updatable=false)
+
+	@Column(name = "PerencanaanAnestesiFk", insertable = false, updatable = false)
 	private String perencanaanAnestesiId;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "TeknikKhususDetailFk")
 	@NotNull(message = "Teknik Khusus Detail tidak boleh kosong")
 	private TeknikKhususDetail teknikKhususDetail;
-	
-	@Column(name = "TeknikKhususDetailFk", insertable=false,updatable=false)
+
+	@Column(name = "TeknikKhususDetailFk", insertable = false, updatable = false)
 	private Integer teknikKhususDetailId;
-	
+
 	@NotNull(message = "Is Nilai tidak boleh kosong")
 	@Column(name = "isNilai")
 	@Caption(value = "Is Nilai")
 	private Boolean isNilai;
-	
-	public Boolean getIsNilai() {
-		return isNilai;
-	}
-
-	public void setIsNilai(Boolean isNilai) {
-		this.isNilai = isNilai;
-	}
-
-	public PerencanaanAnestesi getPerencanaanAnestesi() {
-		return perencanaanAnestesi;
-	}
-
-	public void setPerencanaanAnestesi(PerencanaanAnestesi perencanaanAnestesi) {
-		this.perencanaanAnestesi = perencanaanAnestesi;
-	}
-
-	public String getPerencanaanAnestesiId() {
-		return perencanaanAnestesiId;
-	}
-
-	public void setPerencanaanAnestesiId(String perencanaanAnestesiId) {
-		this.perencanaanAnestesiId = perencanaanAnestesiId;
-	}
-
-	public TeknikKhususDetail getTeknikKhususDetail() {
-		return teknikKhususDetail;
-	}
-
-	public void setTeknikKhususDetail(TeknikKhususDetail teknikKhususDetail) {
-		this.teknikKhususDetail = teknikKhususDetail;
-	}
-
-	public Integer getTeknikKhususDetailId() {
-		return teknikKhususDetailId;
-	}
-
-	public void setTeknikKhususDetailId(Integer teknikKhususDetailId) {
-		this.teknikKhususDetailId = teknikKhususDetailId;
-	}
-
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TeknikKhususDetail.java

@@ -1,46 +1,30 @@
 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.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
 
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_TeknikKhusus_M")
-public class TeknikKhususDetail extends BaseMaster{
-	
-	@NotNull(message="Name tidak boleh kosong")
+public class TeknikKhususDetail extends BaseMaster {
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_TeknikKhusus_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.RM_TeknikKhusus_M_id_seq", sequenceName = "public.RM_TeknikKhusus_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_TeknikKhusus_M_id_seq")
+	@SequenceGenerator(name = "public.RM_TeknikKhusus_M_id_seq", sequenceName = "public.RM_TeknikKhusus_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TeknikMenyusui.java

@@ -1,50 +1,35 @@
 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.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
- *  class TeknikMenyusui
+ * class TeknikMenyusui
  * 
  * @author Generator
  */
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_TeknikMenyusui_M")
 public class TeknikMenyusui extends BaseMaster {
-	@NotNull(message="Name tidak boleh kosong")
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
-
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_TeknikMenyusui_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.RM_TeknikMenyusui_M_id_seq", sequenceName = "public.RM_TeknikMenyusui_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_TeknikMenyusui_M_id_seq")
+	@SequenceGenerator(name = "public.RM_TeknikMenyusui_M_id_seq", sequenceName = "public.RM_TeknikMenyusui_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TempatLahirBayi.java

@@ -1,83 +1,38 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class TempatLahirBayi
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TempatLahirBayi_M")
 public class TempatLahirBayi extends BaseMaster {
+
 	@Caption(value = "Kode Tempat Lahir Bayi")
 	private Byte kdTempatLahirBayi;
 
-	@NotNull(message = "Kd Tempat Lahir Bayi tidak boleh kosong")
-	@Column(name = "KdTempatLahirBayi", nullable = false)
-	public Byte getKdTempatLahirBayi() {
-		return kdTempatLahirBayi;
-	}
-
-	public void setKdTempatLahirBayi(Byte kdTempatLahirBayi) {
-		this.kdTempatLahirBayi = kdTempatLahirBayi;
-	}
-
 	@Caption(value = "QTempat Lahir Bayi")
 	private Byte qTempatLahirBayi;
 
-	public void setqTempatLahirBayi(Byte qTempatLahirBayi) {
-		this.qTempatLahirBayi = qTempatLahirBayi;
-	}
-
-	@NotNull(message = "QTempat Lahir Bayi tidak boleh kosong")
-	@Column(name = "QTempatLahirBayi", nullable = false)
-	public Byte getqTempatLahirBayi() {
-		return this.qTempatLahirBayi;
-	}
-
 	@Caption(value = "Tempat Lahir Bayi")
 	private String namaTempatLahirBayi;
 
-	@NotNull(message = "Tempat Lahir Bayi tidak boleh kosong")
-	@Column(name = "TempatLahirBayi", nullable = false, length = 50)
-	public String getNamaTempatLahirBayi() {
-		return namaTempatLahirBayi;
-	}
-
-	public void setNamaTempatLahirBayi(String namaTempatLahirBayi) {
-		this.namaTempatLahirBayi = namaTempatLahirBayi;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tempatlahirbayi_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tempatlahirbayi_m_id_seq", sequenceName = "public.tempatlahirbayi_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tempatlahirbayi_m_id_seq")
+	@SequenceGenerator(name = "public.tempatlahirbayi_m_id_seq", sequenceName = "public.tempatlahirbayi_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TempatPersalinan.java

@@ -1,50 +1,35 @@
 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.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
- *  class TempatPersalinan
+ * class TempatPersalinan
  * 
  * @author Generator
  */
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_TempatPersalinan_M")
 public class TempatPersalinan extends BaseMaster {
-	@NotNull(message="Name tidak boleh kosong")
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_TempatPersalinan_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.RM_TempatPersalinan_M_id_seq", sequenceName = "public.RM_TempatPersalinan_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_TempatPersalinan_M_id_seq")
+	@SequenceGenerator(name = "public.RM_TempatPersalinan_M_id_seq", sequenceName = "public.RM_TempatPersalinan_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TempatTidur.java

@@ -1,64 +1,43 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-
-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.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class TempatTidur
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TempatTidur_M")
 public class TempatTidur extends BaseMaster {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectKamarFk")
 	@NotNull(message = "Kd Kamar tidak boleh kosong")
-
 	@Caption(value = "Object Kamar")
 	private Kamar kamar;
 
-	public void setKamar(Kamar kamar) {
-		this.kamar = kamar;
-	}
-
-	public Kamar getKamar() {
-		return this.kamar;
-	}
-
 	@Column(name = "ObjectKamarFk", insertable = false, updatable = false)
 	private Integer kamarId;
 
 	@ManyToOne
 	@JoinColumn(name = "ObjectStatusBedFk")
 	@NotNull(message = "Kd Status Bed tidak boleh kosong")
-
 	@Caption(value = "Object Status Bed")
 	private StatusBed statusBed;
 
-	public void setStatusBed(StatusBed statusBed) {
-		this.statusBed = statusBed;
-	}
-
-	public StatusBed getStatusBed() {
-		return this.statusBed;
-	}
-
 	@Column(name = "ObjectStatusBedFk", insertable = false, updatable = false, nullable = false)
 	private Integer statusBedId;
 
@@ -67,79 +46,23 @@ public class TempatTidur extends BaseMaster {
 	@Caption(value = "Nomor Bed")
 	private Byte nomorBed;
 
-	public void setNomorBed(Byte nomorBed) {
-		this.nomorBed = nomorBed;
-	}
-
-	public Byte getNomorBed() {
-		return this.nomorBed;
-	}
-
-	public Integer getKamarId() {
-		return kamarId;
-	}
-
-	public void setKamarId(Integer kamarId) {
-		this.kamarId = kamarId;
-	}
-
-	public Integer getStatusBedId() {
-		return statusBedId;
-	}
-
-	public void setStatusBedId(Integer statusBedId) {
-		this.statusBedId = statusBedId;
-	}
-	
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "ObjectRuangPerawatanKemenkesFk",nullable = true)
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "ObjectRuangPerawatanKemenkesFk")
 	@Caption(value = "RuangPerawatanKemenkes")
 	private RuangPerawatanKemenkes ruangPerawatanKemenkes;
 
-	public RuangPerawatanKemenkes getRuangPerawatanKemenkes() {
-		return ruangPerawatanKemenkes;
-	}
-
-	public void setRuangPerawatanKemenkes(RuangPerawatanKemenkes ruangPerawatanKemenkes) {
-		this.ruangPerawatanKemenkes = ruangPerawatanKemenkes;
-	}
-	
 	@Column(name = "ObjectRuangPerawatanKemenkesFk", insertable = false, updatable = false)
 	private Integer ruangPerawatanKemenkesId;
-	
-	public Integer getRuangPerawatanKemenkesId() {
-		return ruangPerawatanKemenkesId;
-	}
-
-	public void setRuangPerawatanKemenkesId(Integer ruangPerawatanKemenkesId) {
-		this.ruangPerawatanKemenkesId = ruangPerawatanKemenkesId;
-	}
 
 	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name = "createddate")
 	@Caption(value = "Created Date")
 	private Date createdDate;
 
-	public Date getCreatedDate() {
-		return createdDate;
-	}
-
-	public void setCreatedDate(Date createdDate) {
-		this.createdDate = createdDate;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tempattidur_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tempattidur_m_id_seq", sequenceName = "public.tempattidur_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tempattidur_m_id_seq")
+	@SequenceGenerator(name = "public.tempattidur_m_id_seq", sequenceName = "public.tempattidur_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TempatTinggal.java

@@ -1,50 +1,35 @@
 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.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
- *  class TempatTinggal
+ * class TempatTinggal
  * 
  * @author Generator
  */
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_TempatTinggal_M")
 public class TempatTinggal extends BaseMaster {
-	@NotNull(message="Name tidak boleh kosong")
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
-
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_TempatTinggal_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.RM_TempatTinggal_M_id_seq", sequenceName = "public.RM_TempatTinggal_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_TempatTinggal_M_id_seq")
+	@SequenceGenerator(name = "public.RM_TempatTinggal_M_id_seq", sequenceName = "public.RM_TempatTinggal_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Tenaga.java

@@ -1,34 +1,22 @@
 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.Table;
-import javax.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
 
-import org.hibernate.envers.Audited;
+import javax.persistence.*;
 
-import com.jasamedika.medifirst2000.helper.Caption;
+import static javax.persistence.GenerationType.SEQUENCE;
 
-
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_Tenaga_M")
 public class Tenaga extends BaseKeyValueMaster {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_Tenaga_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.RM_Tenaga_M_id_seq", sequenceName = "public.RM_Tenaga_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_Tenaga_M_id_seq")
+	@SequenceGenerator(name = "public.RM_Tenaga_M_id_seq", sequenceName = "public.RM_Tenaga_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TenagaPengajar.java

@@ -1,79 +1,44 @@
 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.OneToMany;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
- *  class ProgramPendidikan
+ * class ProgramPendidikan
  * 
  * @author Lukman Hakim
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "tenagapengajar_m")
-public class TenagaPengajar  extends BaseMaster{
-	
-	@Column(name = "unit_kerja", nullable = true , length = 100)
-	 @Caption(value = "Unit Kerja")
-	private String unitKerja ;
-	
-	@ManyToOne(fetch = FetchType.LAZY)
+public class TenagaPengajar extends BaseMaster {
+
+	@Column(name = "unit_kerja", length = 100)
+	@Caption(value = "Unit Kerja")
+	private String unitKerja;
+
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "pegawaiFk")
 	@Caption(value = "Pegawai Tenaga pengajar")
-	private Pegawai pegawai; 
-	
-	@ManyToOne(fetch = FetchType.LAZY)
+	private Pegawai pegawai;
+
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "jurusanPeminatanFk")
 	@Caption(value = "Jurusan Peminatan")
-	private JurusanPeminatan jurusanPeminatan; 
+	private JurusanPeminatan jurusanPeminatan;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tenagapengajar_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tenagapengajar_m_id_seq", sequenceName = "public.tenagapengajar_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tenagapengajar_m_id_seq")
+	@SequenceGenerator(name = "public.tenagapengajar_m_id_seq", sequenceName = "public.tenagapengajar_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getUnitKerja() {
-		return unitKerja;
-	}
-
-	public void setUnitKerja(String unitKerja) {
-		this.unitKerja = unitKerja;
-	}
-
-	public Pegawai getPegawai() {
-		return pegawai;
-	}
-
-	public void setPegawai(Pegawai pegawai) {
-		this.pegawai = pegawai;
-	}
-
-	public JurusanPeminatan getJurusanPeminatan() {
-		return jurusanPeminatan;
-	}
-
-	public void setJurusanPeminatan(JurusanPeminatan jurusanPeminatan) {
-		this.jurusanPeminatan = jurusanPeminatan;
-	}
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TerapiSaatPindahDetail.java

@@ -1,109 +1,45 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.base.BaseTransaction;
+import lombok.Getter;
+import lombok.Setter;
 
-@Entity //@Audited
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@Entity
 @Table(name = "TerapiSaatPindahDetail_T")
-@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class TerapiSaatPindahDetail extends BaseTransaction {
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObatFk")
 	@NotNull(message = "Obat tidak boleh kosong")
-	private Produk obat ;
-	
+	private Produk obat;
+
 	@Column(name = "ObatFk", insertable = false, updatable = false)
 	private Integer obatId;
-	
+
 	@ManyToOne
-	@JoinColumn(name = "TransferPasienInternalFk", nullable=true)	
+	@JoinColumn(name = "TransferPasienInternalFk")
 	private TransferPasienInternal transferPasienInternal;
-	
-	@Column(name = "TransferPasienInternalFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = true)
+
+	@Column(name = "TransferPasienInternalFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false)
 	private String transferPasienInternalId;
-	
+
 	@Column(name = "jumlah")
 	private Double jumlah;
-	
+
 	@Column(name = "dosis")
 	private String dosis;
-	
+
 	@Column(name = "frekuensi")
 	private String frekuensi;
-	
+
 	@Column(name = "caraPemberian")
 	private String caraPemberian;
 
-	public Produk getObat() {
-		return obat;
-	}
-
-	public void setObat(Produk obat) {
-		this.obat = obat;
-	}
-
-	public Integer getObatId() {
-		return obatId;
-	}
-
-	public void setObatId(Integer obatId) {
-		this.obatId = obatId;
-	}
-
-	public TransferPasienInternal getTransferPasienInternal() {
-		return transferPasienInternal;
-	}
-
-	public void setTransferPasienInternal(TransferPasienInternal transferPasienInternal) {
-		this.transferPasienInternal = transferPasienInternal;
-	}
-
-	public String getTransferPasienInternalId() {
-		return transferPasienInternalId;
-	}
-
-	public void setTransferPasienInternalId(String transferPasienInternalId) {
-		this.transferPasienInternalId = transferPasienInternalId;
-	}
-
-	public Double getJumlah() {
-		return jumlah;
-	}
-
-	public void setJumlah(Double jumlah) {
-		this.jumlah = jumlah;
-	}
-
-	public String getDosis() {
-		return dosis;
-	}
-
-	public void setDosis(String dosis) {
-		this.dosis = dosis;
-	}
-
-	public String getFrekuensi() {
-		return frekuensi;
-	}
-
-	public void setFrekuensi(String frekuensi) {
-		this.frekuensi = frekuensi;
-	}
-
-	public String getCaraPemberian() {
-		return caraPemberian;
-	}
-
-	public void setCaraPemberian(String caraPemberian) {
-		this.caraPemberian = caraPemberian;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TesPsikologi.java

@@ -1,67 +1,35 @@
 package com.jasamedika.medifirst2000.entities;
 
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
-
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TesPsikologi_T")
-public class TesPsikologi extends BaseTransaction{
-	
+public class TesPsikologi extends BaseTransaction {
+
 	@ManyToOne
 	@JoinColumn(name = "PengkajianAwalPsikologiFk")
 	@NotNull(message = "Pengkajian Awal Psikologi tidak boleh kosong")
 	private PengkajianAwalPsikologi pengkajianAwalPsikologi;
-	
+
 	@Column(name = "tanggal")
 	@Caption(value = "Tanggal")
 	private Date tanggal;
-	
+
 	@Column(name = "jenisTes")
 	@Caption(value = "Jenis Tes")
 	private String jenisTes;
-	
+
 	@Column(name = "tujuan")
 	@Caption(value = "Tujuan")
 	private String tujuan;
 
-	public PengkajianAwalPsikologi getPengkajianAwalPsikologi() {
-		return pengkajianAwalPsikologi;
-	}
-
-	public void setPengkajianAwalPsikologi(PengkajianAwalPsikologi pengkajianAwalPsikologi) {
-		this.pengkajianAwalPsikologi = pengkajianAwalPsikologi;
-	}
-
-	public Date getTanggal() {
-		return tanggal;
-	}
-
-	public void setTanggal(Date tanggal) {
-		this.tanggal = tanggal;
-	}
-
-	public String getJenisTes() {
-		return jenisTes;
-	}
-
-	public void setJenisTes(String jenisTes) {
-		this.jenisTes = jenisTes;
-	}
-
-	public String getTujuan() {
-		return tujuan;
-	}
-
-	public void setTujuan(String tujuan) {
-		this.tujuan = tujuan;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Tht.java

@@ -1,84 +1,45 @@
 package com.jasamedika.medifirst2000.entities;
 
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-import com.google.gson.annotations.Expose;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;
+import static javax.persistence.CascadeType.ALL;
+import static javax.persistence.FetchType.LAZY;
 
+@Getter
+@Setter
 @Entity
 @Table(name = "Tht_t")
-public class Tht extends BaseTransaction{
+public class Tht extends BaseTransaction {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectantrianPasienDiPeriksaFk")
 	@Caption(value = "Object antrianPasienDiPeriksa")
 	private AntrianPasienDiPeriksa antrianPasienDiPeriksa;
 
-	@Column(name = "ObjectantrianPasienDiPeriksaFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false,nullable=true)
+	@Column(name = "ObjectantrianPasienDiPeriksaFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false)
 	private String antrianPasienDiPeriksaId;
-	
-	@OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "tht")
+
+	@OneToMany(cascade = ALL, fetch = LAZY, mappedBy = "tht")
 	@Caption(value = "thtData")
-	private Set<ThtData> children=new HashSet<ThtData>();
-	
-	@Column(name = "id", nullable = true, length = 50)
+	private Set<ThtData> children = new HashSet<>();
+
+	@Column(name = "id", length = 50)
 	@Caption(value = "id")
 	private Integer id;
 
-	@Column(name = "title", nullable = true, length = 50)
+	@Column(name = "title", length = 50)
 	@Caption(value = "title")
 	private String title;
 
-	@Column(name = "image", nullable = true, length = 50)
+	@Column(name = "image", length = 50)
 	@Caption(value = "image")
 	private String image;
-	
-	public AntrianPasienDiPeriksa getAntrianPasienDiPeriksa() {
-		return antrianPasienDiPeriksa;
-	}
-	public void setAntrianPasienDiPeriksa(AntrianPasienDiPeriksa antrianPasienDiPeriksa) {
-		this.antrianPasienDiPeriksa = antrianPasienDiPeriksa;
-	}
-	public Set<ThtData> getChildren() {
-		return children;
-	}
-	public void setChildren(Set<ThtData> children) {
-		this.children = children;
-	}
-	public String getTitle() {
-		return title;
-	}
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	public String getImage() {
-		return image;
-	}
-	public void setImage(String image) {
-		this.image = image;
-	}
-	public String getAntrianPasienDiPeriksaId() {
-		return antrianPasienDiPeriksaId;
-	}
-	public void setAntrianPasienDiPeriksaId(String antrianPasienDiPeriksaId) {
-		this.antrianPasienDiPeriksaId = antrianPasienDiPeriksaId;
-	}
-	public Integer getId() {
-		return id;
-	}
-	public void setId(Integer id) {
-		this.id = id;
-	}
 
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ThtData.java

@@ -1,77 +1,40 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "ThtData_t")
-public class ThtData extends BaseTransaction{
+public class ThtData extends BaseTransaction {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectthtFk")
 	@Caption(value = "Object tht")
 	private Tht tht;
 
-	@Column(name = "ObjectthtFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false,nullable=true)
+	@Column(name = "ObjectthtFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false)
 	private String thtId;
 
-	@Column(name = "id", nullable = true, length = 50)
+	@Column(name = "id", length = 50)
 	@Caption(value = "id")
 	private Integer id;
 
-	@Column(name = "title", nullable = true, length = 50)
+	@Column(name = "title", length = 50)
 	@Caption(value = "title")
 	private String title;
 
-	@Column(name = "item", nullable = true, length = 50)
+	@Column(name = "item", length = 50)
 	@Caption(value = "item")
 	private String item;
 
-	@Column(name = "value", nullable = true, length = 50)
+	@Column(name = "value", length = 50)
 	@Caption(value = "value")
 	private String value;
-	
-	public Tht getTht() {
-		return tht;
-	}
-	public void setTht(Tht tht) {
-		this.tht = tht;
-	}
-	public String getTitle() {
-		return title;
-	}
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	public String getItem() {
-		return item;
-	}
-	public void setItem(String item) {
-		this.item = item;
-	}
-	public String getValue() {
-		return value;
-	}
-	public void setValue(String value) {
-		this.value = value;
-	}
-	public String getThtId() {
-		return thtId;
-	}
-	public void setThtId(String thtId) {
-		this.thtId = thtId;
-	}
-	public Integer getId() {
-		return id;
-	}
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	
-	
+
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TidurIstirahat.java

@@ -1,65 +1,41 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "TidurIstirahat_T")
+public class TidurIstirahat extends BaseTransaction {
 
-@Entity 
-@Table(name="TidurIstirahat_T")
-public class TidurIstirahat extends BaseTransaction{
 	@ManyToOne
 	@JoinColumn(name = "ObjectPasienDaftarFk")
-	@NotNull(message="PasienDaftar Harus Diisi")
-	@Caption(value="PasienDaftar")
+	@NotNull(message = "PasienDaftar Harus Diisi")
+	@Caption(value = "PasienDaftar")
 	private AntrianPasienDiPeriksa pasienDaftar;
-	
-	@Column(name = "ObjectPasienDaftarFk", insertable=false,updatable=false, nullable=false)
+
+	@Column(name = "ObjectPasienDaftarFk", insertable = false, updatable = false, nullable = false)
 	private String pasienDaftarId;
 
 	@NotNull(message = "Tgl Input tidak boleh kosong")
 	@Column(name = "tglInput", nullable = false)
 	@Caption(value = "Tgl Input")
 	private Date tglInput;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectLamaTidurFk")
-	@NotNull(message="Object LamaTidur Harus Diisi")
-	@Caption(value="Object Lama Tidur")
+	@NotNull(message = "Object LamaTidur Harus Diisi")
+	@Caption(value = "Object Lama Tidur")
 	private StatusLamaTidur lamaTidur;
 
-	@Column(name = "ObjectLamaTidurFk", insertable=false,updatable=false, nullable=false)
+	@Column(name = "ObjectLamaTidurFk", insertable = false, updatable = false, nullable = false)
 	private Integer lamaTidurId;
 
-	public AntrianPasienDiPeriksa getPasienDaftar() {
-		return pasienDaftar;
-	}
-
-	public void setPasienDaftar(AntrianPasienDiPeriksa pasienDaftar) {
-		this.pasienDaftar = pasienDaftar;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public StatusLamaTidur getLamaTidur() {
-		return lamaTidur;
-	}
-
-	public void setLamaTidur(StatusLamaTidur lamaTidur) {
-		this.lamaTidur = lamaTidur;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TimeOutControl.java

@@ -3,26 +3,31 @@ package com.jasamedika.medifirst2000.entities;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.util.HashSet;
 import java.util.Set;
 
+import static javax.persistence.CascadeType.ALL;
+import static javax.persistence.FetchType.LAZY;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "TimeOutControl_T")
 public class TimeOutControl extends BaseTransaction {
 
 	private static final long serialVersionUID = 6694087323989936958L;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectPasienFk")
-//	@NotNull(message = "Pasien tidak boleh kosong")
 	private AntrianPasienDiPeriksa pasienDaftar;
-	
-	@Column(name = "ObjectPasienFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = true)
+
+	@Column(name = "ObjectPasienFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false)
 	private String pasienId;
-	
 
 	@NotNull(message = "Hal Khusus tidak boleh kosong")
 	@Column(name = "HalKhusus", nullable = false)
@@ -42,7 +47,7 @@ public class TimeOutControl extends BaseTransaction {
 	@ManyToOne
 	@JoinColumn(name = "ObjectFotoRadiologiFk")
 	@NotNull(message = "Foto Radiologi tidak boleh kosong")
-	private StatusYaTidak fotoRadiologi; // Ya atau tidak
+	private StatusYaTidak fotoRadiologi;
 
 	@Column(name = "ObjectFotoRadiologiFk", insertable = false, updatable = false, nullable = false)
 	private Integer fotoRadiologiId;
@@ -50,94 +55,13 @@ public class TimeOutControl extends BaseTransaction {
 	@ManyToOne
 	@JoinColumn(name = "ObjectStatusAntibiotikProfilaksisFk")
 	@NotNull(message = "Status Antibiotik Profilaksis tidak boleh kosong")
-	private StatusYaTidak statusAntibiotikProfilaksis; // Ya atau tidak
+	private StatusYaTidak statusAntibiotikProfilaksis;
 
 	@Column(name = "ObjectStatusAntibiotikProfilaksisFk", insertable = false, updatable = false, nullable = false)
 	private Integer statusAntibiotikProfilaksisId;
 
 	@JsonBackReference
-	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "timeOutControl")
-	private Set<Pelaksana> pelaksana = new HashSet<Pelaksana>();
+	@OneToMany(cascade = ALL, fetch = LAZY, mappedBy = "timeOutControl")
+	private Set<Pelaksana> pelaksana = new HashSet<>();
 
-	public Set<Pelaksana> getPelaksana() {
-		return pelaksana;
-	}
-
-	public void setPelaksana(Set<Pelaksana> pelaksana) {
-		this.pelaksana = pelaksana;
-	}
-
-	public String getHalKhusus() {
-		return halKhusus;
-	}
-
-	public void setHalKhusus(String halKhusus) {
-		this.halKhusus = halKhusus;
-	}
-
-	public String getNamaAntibiotik() {
-		return namaAntibiotik;
-	}
-
-	public void setNamaAntibiotik(String namaAntibiotik) {
-		this.namaAntibiotik = namaAntibiotik;
-	}
-
-	public String getDosisAntibiotik() {
-		return dosisAntibiotik;
-	}
-
-	public void setDosisAntibiotik(String dosisAntibiotik) {
-		this.dosisAntibiotik = dosisAntibiotik;
-	}
-
-	public StatusYaTidak getFotoRadiologi() {
-		return fotoRadiologi;
-	}
-
-	public void setFotoRadiologi(StatusYaTidak fotoRadiologi) {
-		this.fotoRadiologi = fotoRadiologi;
-	}
-
-	public Integer getFotoRadiologiId() {
-		return fotoRadiologiId;
-	}
-
-	public void setFotoRadiologiId(Integer fotoRadiologiId) {
-		this.fotoRadiologiId = fotoRadiologiId;
-	}
-
-	public StatusYaTidak getStatusAntibiotikProfilaksis() {
-		return statusAntibiotikProfilaksis;
-	}
-
-	public void setStatusAntibiotikProfilaksis(StatusYaTidak statusAntibiotikProfilaksis) {
-		this.statusAntibiotikProfilaksis = statusAntibiotikProfilaksis;
-	}
-
-	public Integer getStatusAntibiotikProfilaksisId() {
-		return statusAntibiotikProfilaksisId;
-	}
-
-	public void setStatusAntibiotikProfilaksisId(Integer statusAntibiotikProfilaksisId) {
-		this.statusAntibiotikProfilaksisId = statusAntibiotikProfilaksisId;
-	}
-
-	public AntrianPasienDiPeriksa getPasienDaftar() {
-		return pasienDaftar;
-	}
-
-	public void setPasienDaftar(AntrianPasienDiPeriksa pasienDaftar) {
-		this.pasienDaftar = pasienDaftar;
-	}
-
-	public String getPasienId() {
-		return pasienId;
-	}
-
-	public void setPasienId(String pasienId) {
-		this.pasienId = pasienId;
-	}
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TindakLanjutGizi.java

@@ -1,66 +1,35 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
-
 /**
- *  class PosisiRahim
+ * class PosisiRahim
  * 
  * @author Generator
  */
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TindakLanjutGizi_T")
 public class TindakLanjutGizi extends BaseTransaction {
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectAsesmenGiziAwal")
-	@NotNull(message="Asesmen Gizi Awal Harus Diisi")
-	@Caption(value="Asesen Gizi Awal")
+	@NotNull(message = "Asesmen Gizi Awal Harus Diisi")
+	@Caption(value = "Asesen Gizi Awal")
 	private AsesmenGiziAwal asesmenGiziAwal;
-	
-	@Column(name = "ObjectAsesmenGiziAwal", insertable=false,updatable=false,nullable = false)
+
+	@Column(name = "ObjectAsesmenGiziAwal", insertable = false, updatable = false, nullable = false)
 	private String asesmenGiziAwalId;
-	
+
 	@Column(name = "value")
-	@Caption(value="value")
+	@Caption(value = "value")
 	private String value;
 
-
-	public AsesmenGiziAwal getAsesmenGiziAwal() {
-		return asesmenGiziAwal;
-	}
-
-
-	public void setAsesmenGiziAwal(AsesmenGiziAwal asesmenGiziAwal) {
-		this.asesmenGiziAwal = asesmenGiziAwal;
-	}
-
-
-	public String getAsesmenGiziAwalId() {
-		return asesmenGiziAwalId;
-	}
-
-
-	public void setAsesmenGiziAwalId(String asesmenGiziAwalId) {
-		this.asesmenGiziAwalId = asesmenGiziAwalId;
-	}
-
-
-	public String getValue() {
-		return value;
-	}
-
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
 }
-

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Tindakan.java

@@ -1,50 +1,35 @@
 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.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class Tindakan
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_Tindakan_M")
 public class Tindakan extends BaseMaster {
+
 	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_Tindakan_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.RM_Tindakan_M_id_seq", sequenceName = "public.RM_Tindakan_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_Tindakan_M_id_seq")
+	@SequenceGenerator(name = "public.RM_Tindakan_M_id_seq", sequenceName = "public.RM_Tindakan_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TindakanKedokteran.java

@@ -1,50 +1,35 @@
 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.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
- *  class TindakanKedokteran
+ * class TindakanKedokteran
  * 
  * @author Generator
  */
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_TindakanKedokteran_M")
 public class TindakanKedokteran extends BaseMaster {
-	@NotNull(message="Name tidak boleh kosong")
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_TindakanKedokteran_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.RM_TindakanKedokteran_M_id_seq", sequenceName = "public.RM_TindakanKedokteran_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_TindakanKedokteran_M_id_seq")
+	@SequenceGenerator(name = "public.RM_TindakanKedokteran_M_id_seq", sequenceName = "public.RM_TindakanKedokteran_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TindakanKeselamatanKerja.java

@@ -1,93 +1,45 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 @Entity
-@Table(name="TindakanKeselamatanKerja_T")
-public class TindakanKeselamatanKerja extends BaseTransaction{
+@Table(name = "TindakanKeselamatanKerja_T")
+public class TindakanKeselamatanKerja extends BaseTransaction {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectKecelakaanKerjaFk")
-	@NotNull(message="KecelakaanKerja tidak boleh kosong")
-	@Caption(value="Kecelakaan Kerja")
+	@NotNull(message = "KecelakaanKerja tidak boleh kosong")
+	@Caption(value = "Kecelakaan Kerja")
 	private KecelakaanKerja kecelakaanKerja;
-	
-	@Column(name = "ObjectKecelakaanKerjaFk", insertable=false,updatable=false,nullable=false)
+
+	@Column(name = "ObjectKecelakaanKerjaFk", insertable = false, updatable = false, nullable = false)
 	private String kecelakaanKerjaId;
-	
-	@Column(name= "jenisTindakan")
-	@NotNull(message="Jenis Tindakan Tidak boleh kosong")
-	@Caption(value="Jenis Tindakan")
+
+	@Column(name = "jenisTindakan")
+	@NotNull(message = "Jenis Tindakan Tidak boleh kosong")
+	@Caption(value = "Jenis Tindakan")
 	private String jenisTindakan;
-	
-	@Column(name= "rencanaTindakan")
-	@Caption(value="Rencana Tindakan")
+
+	@Column(name = "rencanaTindakan")
+	@Caption(value = "Rencana Tindakan")
 	private String rencanaTindakan;
-	
-	@Column(name= "target")
-	@NotNull(message="Target Tidak boleh kosong")
-	@Caption(value="Target")
+
+	@Column(name = "target")
+	@NotNull(message = "Target Tidak boleh kosong")
+	@Caption(value = "Target")
 	private String target;
-	
-	@Column(name= "wewenang")
-	@NotNull(message="Wewenang Tidak boleh kosong")
-	@Caption(value="Wewenang")
+
+	@Column(name = "wewenang")
+	@NotNull(message = "Wewenang Tidak boleh kosong")
+	@Caption(value = "Wewenang")
 	private String wewenang;
 
-	public String getJenisTindakan() {
-		return jenisTindakan;
-	}
-
-	public void setJenisTindakan(String jenisTindakan) {
-		this.jenisTindakan = jenisTindakan;
-	}
-
-	public String getRencanaTindakan() {
-		return rencanaTindakan;
-	}
-
-	public void setRencanaTindakan(String rencanaTindakan) {
-		this.rencanaTindakan = rencanaTindakan;
-	}
-
-	public String getTarget() {
-		return target;
-	}
-
-	public void setTarget(String target) {
-		this.target = target;
-	}
-
-	public String getWewenang() {
-		return wewenang;
-	}
-
-	public void setWewenang(String wewenang) {
-		this.wewenang = wewenang;
-	}
-
-	public KecelakaanKerja getKecelakaanKerja() {
-		return kecelakaanKerja;
-	}
-
-	public void setKecelakaanKerja(KecelakaanKerja kecelakaanKerja) {
-		this.kecelakaanKerja = kecelakaanKerja;
-	}
-
-	public String getKecelakaanKerjaId() {
-		return kecelakaanKerjaId;
-	}
-
-	public void setKecelakaanKerjaId(String kecelakaanKerjaId) {
-		this.kecelakaanKerjaId = kecelakaanKerjaId;
-	}
-	
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TindakanLain.java

@@ -1,39 +1,25 @@
 package com.jasamedika.medifirst2000.entities;
 
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;
-
-@Entity 
+@Getter
+@Setter
+@Entity
 @Table(name = "TindakanLain_T")
 public class TindakanLain extends MedicalRecordTransaction {
-	
+
 	@Column(name = "Inhalasi", length = 100)
-	@Caption(value="Inhalasi")
+	@Caption(value = "Inhalasi")
 	private String inhalasi;
-	
+
 	@Column(name = "JamObat", length = 100)
-	@Caption(value="Jam Obat")
-	private String jamObat;	
-	
-	public String getInhalasi() {
-		return inhalasi;
-	}
+	@Caption(value = "Jam Obat")
+	private String jamObat;
 
-	public void setInhalasi(String inhalasi) {
-		this.inhalasi = inhalasi;
-	}
-
-	public String getJamObat() {
-		return jamObat;
-	}
-
-	public void setJamObat(String jamObat) {
-		this.jamObat = jamObat;
-	}	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TindakanMedis.java

@@ -1,42 +1,32 @@
 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.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 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;
 
 /**
  * class TindakanMedis
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TindakanMedis_M")
 public class TindakanMedis extends BaseMaster {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectDepartemenFk")
 	@NotNull(message = "Object Departemen Harus Diisi")
 	@Caption(value = "Object Departemen")
 	private Departemen departemen;
 
-	public void setDepartemen(Departemen departemen) {
-		this.departemen = departemen;
-	}
-
-	@NotNull(message = "Kd Departemen tidak boleh kosong")
-
-	public Departemen getDepartemen() {
-		return this.departemen;
-	}
-
 	@Column(name = "ObjectDepartemenFk", insertable = false, updatable = false)
 	private Integer departemenId;
 
@@ -46,86 +36,22 @@ public class TindakanMedis extends BaseMaster {
 	@Caption(value = "Object Jenis Tindakan Medis")
 	private JenisTindakanMedis jenisTindakanMedis;
 
-	public void setJenisTindakanMedis(JenisTindakanMedis jenisTindakanMedis) {
-		this.jenisTindakanMedis = jenisTindakanMedis;
-	}
-
-	@NotNull(message = "Kd Jenis Tindakan Medis tidak boleh kosong")
-
-	public JenisTindakanMedis getJenisTindakanMedis() {
-		return this.jenisTindakanMedis;
-	}
-
 	@Column(name = "ObjectJenisTindakanMedisFk", insertable = false, updatable = false)
 	private Integer jenisTindakanMedisId;
 
 	@Caption(value = "Kode Tindakan Medis")
 	private String kdTindakanMedis;
 
-	@NotNull(message = "Kd Tindakan Medis tidak boleh kosong")
-	@Column(name = "KdTindakanMedis", nullable = false, length = 4)
-	public String getKdTindakanMedis() {
-		return kdTindakanMedis;
-	}
-
-	public void setKdTindakanMedis(String kdTindakanMedis) {
-		this.kdTindakanMedis = kdTindakanMedis;
-	}
-
 	@Caption(value = "QTindakan Medis")
 	private short qTindakanMedis;
 
-	public void setqTindakanMedis(short qTindakanMedis) {
-		this.qTindakanMedis = qTindakanMedis;
-	}
-
-	@NotNull(message = "QTindakan Medis tidak boleh kosong")
-	@Column(name = "QTindakanMedis", nullable = false)
-	public short getqTindakanMedis() {
-		return this.qTindakanMedis;
-	}
-
 	@Caption(value = "Tindakan Medis")
 	private String namaTindakanMedis;
 
-	public Integer getDepartemenId() {
-		return departemenId;
-	}
-
-	public void setDepartemenId(Integer departemenId) {
-		this.departemenId = departemenId;
-	}
-
-	public Integer getJenisTindakanMedisId() {
-		return jenisTindakanMedisId;
-	}
-
-	public void setJenisTindakanMedisId(Integer jenisTindakanMedisId) {
-		this.jenisTindakanMedisId = jenisTindakanMedisId;
-	}
-
-	@NotNull(message = "Tindakan Medis tidak boleh kosong")
-	@Column(name = "TindakanMedis", nullable = false, length = 50)
-	public String getNamaTindakanMedis() {
-		return namaTindakanMedis;
-	}
-
-	public void setNamaTindakanMedis(String namaTindakanMedis) {
-		this.namaTindakanMedis = namaTindakanMedis;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tindakanmedis_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tindakanmedis_m_id_seq", sequenceName = "public.tindakanmedis_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tindakanmedis_m_id_seq")
+	@SequenceGenerator(name = "public.tindakanmedis_m_id_seq", sequenceName = "public.tindakanmedis_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TingkatKelulusan.java

@@ -1,24 +1,25 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TingkatKelulusan_M")
 public class TingkatKelulusan extends BaseMaster {
+
 	@NotNull(message = "Tingkat Kelulusan tidak boleh kosong")
 	@Column(name = "TingkatKelulusan", nullable = false, length = 100)
 	@Caption(value = "Tingkat Kelulusan")
@@ -34,42 +35,10 @@ public class TingkatKelulusan extends BaseMaster {
 	@Caption(value = "QTingkatKelulusan")
 	private short qTingkatKelulusan;
 
-	public String getTingkatKelulusan() {
-		return tingkatKelulusan;
-	}
-
-	public void setTingkatKelulusan(String tingkatKelulusan) {
-		this.tingkatKelulusan = tingkatKelulusan;
-	}
-
-	public short getKdTingkatKelulusan() {
-		return KdTingkatKelulusan;
-	}
-
-	public void setKdTingkatKelulusan(short kdTingkatKelulusan) {
-		KdTingkatKelulusan = kdTingkatKelulusan;
-	}
-
-	public short getqTingkatKelulusan() {
-		return qTingkatKelulusan;
-	}
-
-	public void setqTingkatKelulusan(short qTingkatKelulusan) {
-		this.qTingkatKelulusan = qTingkatKelulusan;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tingkatkelulusan_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tingkatkelulusan_m_id_seq", sequenceName = "public.tingkatkelulusan_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tingkatkelulusan_m_id_seq")
+	@SequenceGenerator(name = "public.tingkatkelulusan_m_id_seq", sequenceName = "public.tingkatkelulusan_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TingkatResiko.java

@@ -1,15 +1,16 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "TingkatResiko_M")
 public class TingkatResiko extends BaseMaster {
@@ -22,34 +23,10 @@ public class TingkatResiko extends BaseMaster {
 	@Caption(value = "Warna")
 	private String warna;
 
-	public String getTingkatResiko() {
-		return tingkatResiko;
-	}
-
-	public void setTingkatResiko(String tingkatResiko) {
-		this.tingkatResiko = tingkatResiko;
-	}
-
-	public String getWarna() {
-		return warna;
-	}
-
-	public void setWarna(String warna) {
-		this.warna = warna;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tingkatresiko_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tingkatresiko_m_id_seq", sequenceName = "public.tingkatresiko_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tingkatresiko_m_id_seq")
+	@SequenceGenerator(name = "public.tingkatresiko_m_id_seq", sequenceName = "public.tingkatresiko_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TipeKeanggotaan.java

@@ -1,48 +1,35 @@
 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.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
- *  class AkibatHaid
+ * class AkibatHaid
  * 
  * @author Generator
  */
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "SDM_TipeKeanggotaan_M")
 public class TipeKeanggotaan extends BaseMaster {
-	@NotNull(message="Name tidak boleh kosong")
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.SDM_TipeKeanggotaan_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.SDM_TipeKeanggotaan_M_id_seq", sequenceName = "public.SDM_TipeKeanggotaan_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.SDM_TipeKeanggotaan_M_id_seq")
+	@SequenceGenerator(name = "public.SDM_TipeKeanggotaan_M_id_seq", sequenceName = "public.SDM_TipeKeanggotaan_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TipeKoleksi.java

@@ -1,48 +1,35 @@
 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.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
- *  class AkibatHaid
+ * class AkibatHaid
  * 
  * @author Generator
  */
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "SDM_TipeKoleksi_M")
 public class TipeKoleksi extends BaseMaster {
-	@NotNull(message="Name tidak boleh kosong")
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.SDM_TipeKoleksi_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.SDM_TipeKoleksi_M_id_seq", sequenceName = "public.SDM_TipeKoleksi_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.SDM_TipeKoleksi_M_id_seq")
+	@SequenceGenerator(name = "public.SDM_TipeKoleksi_M_id_seq", sequenceName = "public.SDM_TipeKoleksi_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TipeMakanan.java

@@ -1,50 +1,35 @@
 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.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
- *  class CaraLahir
+ * class CaraLahir
  * 
  * @author Generator
  */
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_TipeMakanan_M")
 public class TipeMakanan extends BaseMaster {
-	@NotNull(message="Name tidak boleh kosong")
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_TipeMakanan_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.RM_TipeMakanan_M_id_seq", sequenceName = "public.RM_TipeMakanan_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_TipeMakanan_M_id_seq")
+	@SequenceGenerator(name = "public.RM_TipeMakanan_M_id_seq", sequenceName = "public.RM_TipeMakanan_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TipePenanganan.java

@@ -1,50 +1,35 @@
 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.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
- *  class TipePenanganan
+ * class TipePenanganan
  * 
  * @author Generator
  */
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_TipePenanganan_M")
 public class TipePenanganan extends BaseMaster {
-	@NotNull(message="Name tidak boleh kosong")
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_TipePenanganan_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.RM_TipePenanganan_M_id_seq", sequenceName = "public.RM_TipePenanganan_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_TipePenanganan_M_id_seq")
+	@SequenceGenerator(name = "public.RM_TipePenanganan_M_id_seq", sequenceName = "public.RM_TipePenanganan_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TipePengirimSurat.java

@@ -1,45 +1,30 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "TipePengirimSurat_M")
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class TipePengirimSurat extends BaseMaster {
 
-	@Column(name = "Name", nullable = true, length = 100)
+	@Column(name = "Name", length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tipepengirimsurat_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tipepengirimsurat_m_id_seq", sequenceName = "public.tipepengirimsurat_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tipepengirimsurat_m_id_seq")
+	@SequenceGenerator(name = "public.tipepengirimsurat_m_id_seq", sequenceName = "public.tipepengirimsurat_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TitlePasien.java

@@ -1,159 +1,64 @@
 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.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 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;
 
 /**
  * class TitlePasien
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TitlePasien_M")
 public class TitlePasien extends BaseMaster {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectJenisKelaminFk")
-
 	@Caption(value = "Object Jenis Kelamin")
 	private JenisKelamin jenisKelamin;
 
-	public void setJenisKelamin(JenisKelamin jenisKelamin) {
-		this.jenisKelamin = jenisKelamin;
-	}
-
-	public JenisKelamin getJenisKelamin() {
-		return this.jenisKelamin;
-	}
-
 	@Column(name = "ObjectJenisKelaminFk", insertable = false, updatable = false)
 	private Integer jenisKelaminId;
 
 	@ManyToOne
 	@JoinColumn(name = "ObjectStatusPerkawinanFk")
-
 	@Caption(value = "Object Status Perkawinan")
 	private StatusPerkawinan statusPerkawinan;
 
-	public void setStatusPerkawinan(StatusPerkawinan statusPerkawinan) {
-		this.statusPerkawinan = statusPerkawinan;
-	}
-
-	public StatusPerkawinan getStatusPerkawinan() {
-		return this.statusPerkawinan;
-	}
-
 	@Column(name = "ObjectStatusPerkawinanFk", insertable = false, updatable = false)
 	private Integer statusPerkawinanId;
-	/*
-	 * @ManyToOne
-	 * 
-	 * @JoinColumn(name = "ObjectTitleFk")
-	 * 
-	 * @NotNull(message="Kd Title tidak boleh kosong")
-	 * 
-	 * @Caption(value="Object Title") private TitlePegawai title;
-	 * 
-	 * public void setitle(TitlePegawai title) { this.title = title; }
-	 * 
-	 * 
-	 * public TitlePegawai getTitle(){ return this.title; }
-	 * 
-	 * @Column(name = "ObjectTitleFk", insertable=false,updatable=false) private
-	 * Integer titleId;
-	 */
-	@Column(name = "MaxAge", nullable = true)
+
+	@Column(name = "MaxAge")
 	@Caption(value = "Max Age")
 	private short maxAge;
 
-	public void setMaxAge(short maxAge) {
-		this.maxAge = maxAge;
-	}
-
-	public short getMaxAge() {
-		return this.maxAge;
-	}
-
-	@Column(name = "MinAge", nullable = true)
+	@Column(name = "MinAge")
 	@Caption(value = "Min Age")
 	private short minAge;
 
-	public void setMinAge(short minAge) {
-		this.minAge = minAge;
-	}
-
-	public short getMinAge() {
-		return this.minAge;
-	}
-
 	@NotNull(message = "Nama Title tidak boleh kosong")
 	@Column(name = "NamaTitle", nullable = false, length = 5)
 	@Caption(value = "Nama Title")
 	private String namaTitle;
 
-	public void setNamaTitle(String namaTitle) {
-		this.namaTitle = namaTitle;
-	}
-
-	public String getNamaTitle() {
-		return this.namaTitle;
-	}
-
 	@NotNull(message = "QTitle tidak boleh kosong")
 	@Column(name = "QTitle", nullable = false)
 	@Caption(value = "QTitle")
 	private Byte qTitle;
 
-	public void setqTitle(Byte qTitle) {
-		this.qTitle = qTitle;
-	}
-
-	public Byte getqTitle() {
-		return this.qTitle;
-	}
-
-	public Integer getJenisKelaminId() {
-		return jenisKelaminId;
-	}
-
-	public void setJenisKelaminId(Integer jenisKelaminId) {
-		this.jenisKelaminId = jenisKelaminId;
-	}
-
-	public Integer getStatusPerkawinanId() {
-		return statusPerkawinanId;
-	}
-
-	public void setStatusPerkawinanId(Integer statusPerkawinanId) {
-		this.statusPerkawinanId = statusPerkawinanId;
-	}
-	/*
-	 * public Integer getTitleId() { return titleId; }
-	 * 
-	 * public void setitleId(Integer titleId) { this.titleId = titleId; }
-	 */
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.titlepasien_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.titlepasien_m_id_seq", sequenceName = "public.titlepasien_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.titlepasien_m_id_seq")
+	@SequenceGenerator(name = "public.titlepasien_m_id_seq", sequenceName = "public.titlepasien_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TitlePegawai.java

@@ -1,32 +1,26 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class TitlePegawai
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TitlePegawai_M")
 public class TitlePegawai extends BaseMaster {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectTitleFk")
 	@NotNull(message = "Object Title Harus Diisi")
@@ -41,57 +35,15 @@ public class TitlePegawai extends BaseMaster {
 	@Caption(value = "Nama Title")
 	private String namaTitle;
 
-	public void setNamaTitle(String namaTitle) {
-		this.namaTitle = namaTitle;
-	}
-
-	public String getNamaTitle() {
-		return this.namaTitle;
-	}
-
 	@NotNull(message = "QTitle tidak boleh kosong")
 	@Column(name = "QTitle", nullable = false)
 	@Caption(value = "QTitle")
 	private Byte qTitle;
 
-	public void setqTitle(Byte qTitle) {
-		this.qTitle = qTitle;
-	}
-
-	public Byte getqTitle() {
-		return this.qTitle;
-	}
-
-	public Integer getTitleId() {
-		return titleId;
-	}
-
-	@NotNull(message = "Kd Title tidak boleh kosong")
-	@Column(name = "KdTitle", nullable = false)
-	public TitlePasien getTitle() {
-		return title;
-	}
-
-	public void setitle(TitlePasien title) {
-		this.title = title;
-	}
-
-	public void setitleId(Integer titleId) {
-		this.titleId = titleId;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.titlepegawai_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.titlepegawai_m_id_seq", sequenceName = "public.titlepegawai_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.titlepegawai_m_id_seq")
+	@SequenceGenerator(name = "public.titlepegawai_m_id_seq", sequenceName = "public.titlepegawai_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Tor.java

@@ -1,29 +1,24 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.envers.Audited;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class Tor
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "Tor_M")
 public class Tor extends BaseMaster {
 
@@ -32,39 +27,39 @@ public class Tor extends BaseMaster {
 	@Caption(value = "No Rab")
 	private String noRab;
 
-	@Column(name = "title1", nullable = true)
+	@Column(name = "title1")
 	@Caption(value = "Title 1")
 	private String title1;
 
-	@Column(name = "title2", nullable = true)
+	@Column(name = "title2")
 	@Caption(value = "Title 2")
 	private String title2;
 
-	@Column(name = "title3", nullable = true)
+	@Column(name = "title3")
 	@Caption(value = "Title 3")
 	private String title3;
 
-	@Column(name = "latarBelakang", nullable = true)
+	@Column(name = "latarBelakang")
 	@Caption(value = "latarBelakang")
 	private String latarBelakang;
 
-	@Column(name = "penerimaManfaat", nullable = true)
+	@Column(name = "penerimaManfaat")
 	@Caption(value = "Penerima Manfaat")
 	private String penerimaManfaat;
 
-	@Column(name = "strategiPencapaiKeluaran", nullable = true)
+	@Column(name = "strategiPencapaiKeluaran")
 	@Caption(value = "Strategi Pencapai Keluaran")
 	private String strategiPencapaiKeluaran;
 
-	@Column(name = "kurunWaktuPencapaiKeluaran", nullable = true)
+	@Column(name = "kurunWaktuPencapaiKeluaran")
 	@Caption(value = "Kurun Waktu Pencapai Keluaran")
 	private String kurunWaktuPencapaiKeluaran;
 
-	@Column(name = "biayaYangDikeluarkan", nullable = true)
+	@Column(name = "biayaYangDikeluarkan")
 	@Caption(value = "Biaya Yang Dikeluarkan")
 	private String biayaYangDikeluarkan;
 
-	@Column(name = "tanggal", nullable = true)
+	@Column(name = "tanggal")
 	@Caption(value = "Tanggal")
 	private Date tanggal;
 
@@ -76,114 +71,10 @@ public class Tor extends BaseMaster {
 	@Column(name = "ObjectJabatanFk", insertable = false, updatable = false)
 	private Integer jabatanId;
 
-	public String getNoRab() {
-		return noRab;
-	}
-
-	public void setNoRab(String noRab) {
-		this.noRab = noRab;
-	}
-
-	public String getTitle1() {
-		return title1;
-	}
-
-	public void setTitle1(String title1) {
-		this.title1 = title1;
-	}
-
-	public String getTitle2() {
-		return title2;
-	}
-
-	public void setTitle2(String title2) {
-		this.title2 = title2;
-	}
-
-	public String getTitle3() {
-		return title3;
-	}
-
-	public void setTitle3(String title3) {
-		this.title3 = title3;
-	}
-
-	public String getLatarBelakang() {
-		return latarBelakang;
-	}
-
-	public void setLatarBelakang(String latarBelakang) {
-		this.latarBelakang = latarBelakang;
-	}
-
-	public String getPenerimaManfaat() {
-		return penerimaManfaat;
-	}
-
-	public void setPenerimaManfaat(String penerimaManfaat) {
-		this.penerimaManfaat = penerimaManfaat;
-	}
-
-	public String getStrategiPencapaiKeluaran() {
-		return strategiPencapaiKeluaran;
-	}
-
-	public void setStrategiPencapaiKeluaran(String strategiPencapaiKeluaran) {
-		this.strategiPencapaiKeluaran = strategiPencapaiKeluaran;
-	}
-
-	public String getKurunWaktuPencapaiKeluaran() {
-		return kurunWaktuPencapaiKeluaran;
-	}
-
-	public void setKurunWaktuPencapaiKeluaran(String kurunWaktuPencapaiKeluaran) {
-		this.kurunWaktuPencapaiKeluaran = kurunWaktuPencapaiKeluaran;
-	}
-
-	public String getBiayaYangDikeluarkan() {
-		return biayaYangDikeluarkan;
-	}
-
-	public void setBiayaYangDikeluarkan(String biayaYangDikeluarkan) {
-		this.biayaYangDikeluarkan = biayaYangDikeluarkan;
-	}
-
-	public Date getTanggal() {
-		return tanggal;
-	}
-
-	public void setTanggal(Date tanggal) {
-		this.tanggal = tanggal;
-	}
-
-	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;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.tor_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.tor_m_id_seq", sequenceName = "public.tor_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.tor_m_id_seq")
+	@SequenceGenerator(name = "public.tor_m_id_seq", sequenceName = "public.tor_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TransferPasienExsternal.java

@@ -1,274 +1,100 @@
 package com.jasamedika.medifirst2000.entities;
 
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
-
 /**
  * class StatusKemandirian
  * 
  * @author Generator
  */
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TransferPasienExsternal_T")
 public class TransferPasienExsternal extends MedicalRecordTransaction {
-	
-	@Caption(value="TanggalMasuk")
+
+	@Caption(value = "TanggalMasuk")
 	private Date tanggalMasuk;
-	
-	@Caption(value="TanggalPindah")
+
+	@Caption(value = "TanggalPindah")
 	private Date tanggalpindah;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectAsalRuanganRawatFk")
-	@Caption(value="Asal Ruang Rawat")
+	@Caption(value = "Asal Ruang Rawat")
 	private Ruangan asalRuanganRawat;
 
-	@Column(name = "ObjectAsalRuanganRawatFk", insertable=false,updatable=false)
+	@Column(name = "ObjectAsalRuanganRawatFk", insertable = false, updatable = false)
 	private Integer asalRuanganRawatId;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectRuangRawatSelanjutnyaFk")
-	@Caption(value="Ruang Rawat Selanjutnya")
+	@Caption(value = "Ruang Rawat Selanjutnya")
 	private Ruangan ruangRawatSelanjutnya;
 
-	@Column(name = "ObjectRuangRawatSelanjutnyaFk", insertable=false,updatable=false)
+	@Column(name = "ObjectRuangRawatSelanjutnyaFk", insertable = false, updatable = false)
 	private Integer ruangRawatSelanjutnyaId;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectIsPasienDiberiTahuAlasanPemindahan")
-	@Caption(value="Pasien Diberitahu Alasan Pemindahan")
+	@Caption(value = "Pasien Diberitahu Alasan Pemindahan")
 	private StatusYaTidak isPasienDiberiTahuAlasanPemindahan;
-	
-	@Column(name = "ObjectIsPasienDiberiTahuAlasanPemindahan", insertable=false,updatable=false)
+
+	@Column(name = "ObjectIsPasienDiberiTahuAlasanPemindahan", insertable = false, updatable = false)
 	private Integer isPasienDiberiTahuAlasanPemindahanId;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectIsKeluargaDiberiTahuAlasanPemindahan")
-	@Caption(value="Pasien Diberitahu Alasan Pemindahan")
+	@Caption(value = "Pasien Diberitahu Alasan Pemindahan")
 	private StatusYaTidak isKeluargaDiberiTahuAlasanPemindahan;
-	
-	@Column(name = "ObjectIsKeluargaDiberiTahuAlasanPemindahan", insertable=false,updatable=false)
+
+	@Column(name = "ObjectIsKeluargaDiberiTahuAlasanPemindahan", insertable = false, updatable = false)
 	private Integer isKeluargaDiberiTahuAlasanPemindahanId;
-	
-	@Caption(value="namaKeluarga")
+
+	@Caption(value = "namaKeluarga")
 	private String namaKeluarga;
-	
-	@Caption(value="hubunganKeluarga")
+
+	@Caption(value = "hubunganKeluarga")
 	private String hubunganKeluarga;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectDokterJaga")
-	@Caption(value="Dokter Jaga")
+	@Caption(value = "Dokter Jaga")
 	private Pegawai dokterJaga;
-	
-	@Column(name = "ObjectDokterJaga", insertable=false,updatable=false)
+
+	@Column(name = "ObjectDokterJaga", insertable = false, updatable = false)
 	private Integer dokterJagaId;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectKeadaanPasien")
-	@Caption(value="Dokter Jaga")
+	@Caption(value = "Dokter Jaga")
 	private KeadaanPasien keadaanPasien;
-	
-	@Column(name = "ObjectKeadaanPasien", insertable=false,updatable=false)
+
+	@Column(name = "ObjectKeadaanPasien", insertable = false, updatable = false)
 	private Integer keadaanPasienId;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectFasilitas")
-	@Caption(value="Fasilitas")
+	@Caption(value = "Fasilitas")
 	private Fasilitas fasilitas;
-	
-	@Column(name = "ObjectFasilitas", insertable=false,updatable=false)
+
+	@Column(name = "ObjectFasilitas", insertable = false, updatable = false)
 	private Integer fasilitasId;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectTenaga")
-	@Caption(value="Tenaga")
+	@Caption(value = "Tenaga")
 	private Tenaga tenaga;
-	
-	@Column(name = "ObjectTenaga", insertable=false,updatable=false)
+
+	@Column(name = "ObjectTenaga", insertable = false, updatable = false)
 	private Integer tenagaId;
-	
+
 	@Column(name = "lainLain")
 	private String lainLain;
-	
-	public Date getTanggalMasuk() {
-		return tanggalMasuk;
-	}
-
-	public void setTanggalMasuk(Date tanggalMasuk) {
-		this.tanggalMasuk = tanggalMasuk;
-	}
-
-	public Ruangan getAsalRuanganRawat() {
-		return asalRuanganRawat;
-	}
-
-	public void setAsalRuanganRawat(Ruangan asalRuanganRawat) {
-		this.asalRuanganRawat = asalRuanganRawat;
-	}
-
-	public Integer getAsalRuanganRawatId() {
-		return asalRuanganRawatId;
-	}
-
-	public void setAsalRuanganRawatId(Integer asalRuanganRawatId) {
-		this.asalRuanganRawatId = asalRuanganRawatId;
-	}
-
-	public Ruangan getRuangRawatSelanjutnya() {
-		return ruangRawatSelanjutnya;
-	}
-
-	public void setRuangRawatSelanjutnya(Ruangan ruangRawatSelanjutnya) {
-		this.ruangRawatSelanjutnya = ruangRawatSelanjutnya;
-	}
-
-	public Integer getRuangRawatSelanjutnyaId() {
-		return ruangRawatSelanjutnyaId;
-	}
-
-	public void setRuangRawatSelanjutnyaId(Integer ruangRawatSelanjutnyaId) {
-		this.ruangRawatSelanjutnyaId = ruangRawatSelanjutnyaId;
-	}
-
-	public StatusYaTidak getIsPasienDiberiTahuAlasanPemindahan() {
-		return isPasienDiberiTahuAlasanPemindahan;
-	}
-
-	public void setIsPasienDiberiTahuAlasanPemindahan(StatusYaTidak isPasienDiberiTahuAlasanPemindahan) {
-		this.isPasienDiberiTahuAlasanPemindahan = isPasienDiberiTahuAlasanPemindahan;
-	}
-
-	public Integer getIsPasienDiberiTahuAlasanPemindahanId() {
-		return isPasienDiberiTahuAlasanPemindahanId;
-	}
-
-	public void setIsPasienDiberiTahuAlasanPemindahanId(Integer isPasienDiberiTahuAlasanPemindahanId) {
-		this.isPasienDiberiTahuAlasanPemindahanId = isPasienDiberiTahuAlasanPemindahanId;
-	}
-
-	public StatusYaTidak getIsKeluargaDiberiTahuAlasanPemindahan() {
-		return isKeluargaDiberiTahuAlasanPemindahan;
-	}
-
-	public void setIsKeluargaDiberiTahuAlasanPemindahan(StatusYaTidak isKeluargaDiberiTahuAlasanPemindahan) {
-		this.isKeluargaDiberiTahuAlasanPemindahan = isKeluargaDiberiTahuAlasanPemindahan;
-	}
-
-	public Integer getIsKeluargaDiberiTahuAlasanPemindahanId() {
-		return isKeluargaDiberiTahuAlasanPemindahanId;
-	}
-
-	public void setIsKeluargaDiberiTahuAlasanPemindahanId(Integer isKeluargaDiberiTahuAlasanPemindahanId) {
-		this.isKeluargaDiberiTahuAlasanPemindahanId = isKeluargaDiberiTahuAlasanPemindahanId;
-	}
-
-	public String getNamaKeluarga() {
-		return namaKeluarga;
-	}
-
-	public void setNamaKeluarga(String namaKeluarga) {
-		this.namaKeluarga = namaKeluarga;
-	}
-
-	public String getHubunganKeluarga() {
-		return hubunganKeluarga;
-	}
-
-	public void setHubunganKeluarga(String hubunganKeluarga) {
-		this.hubunganKeluarga = hubunganKeluarga;
-	}
-
-	public Date getTanggalpindah() {
-		return tanggalpindah;
-	}
-
-	public void setTanggalpindah(Date tanggalpindah) {
-		this.tanggalpindah = tanggalpindah;
-	}
-
-
-	public Integer getDokterJagaId() {
-		return dokterJagaId;
-	}
-
-	public void setDokterJagaId(Integer dokterJagaId) {
-		this.dokterJagaId = dokterJagaId;
-	}
-
-
-	public KeadaanPasien getKeadaanPasien() {
-		return keadaanPasien;
-	}
-
-	public void setKeadaanPasien(KeadaanPasien keadaanPasien) {
-		this.keadaanPasien = keadaanPasien;
-	}
-
-	public Integer getKeadaanPasienId() {
-		return keadaanPasienId;
-	}
-
-	public void setKeadaanPasienId(Integer keadaanPasienId) {
-		this.keadaanPasienId = keadaanPasienId;
-	}
-
-	public Fasilitas getFasilitas() {
-		return fasilitas;
-	}
-
-	public void setFasilitas(Fasilitas fasilitas) {
-		this.fasilitas = fasilitas;
-	}
-
-	public Integer getFasilitasId() {
-		return fasilitasId;
-	}
-
-	public void setFasilitasId(Integer fasilitasId) {
-		this.fasilitasId = fasilitasId;
-	}
-
-	public Tenaga getTenaga() {
-		return tenaga;
-	}
-
-	public void setTenaga(Tenaga tenaga) {
-		this.tenaga = tenaga;
-	}
-
-	public Integer getTenagaId() {
-		return tenagaId;
-	}
-
-	public void setTenagaId(Integer tenagaId) {
-		this.tenagaId = tenagaId;
-	}
-
-	public String getLainLain() {
-		return lainLain;
-	}
-
-	public void setLainLain(String lainLain) {
-		this.lainLain = lainLain;
-	}
-
-	public Pegawai getDokterJaga() {
-		return dokterJaga;
-	}
-
-	public void setDokterJaga(Pegawai dokterJaga) {
-		this.dokterJaga = dokterJaga;
-	}
-
-	
-	
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TransportasiPasien.java

@@ -1,83 +1,45 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class TransportasiPasien
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TransportasiPasien_M")
 public class TransportasiPasien extends BaseMaster {
+
 	@NotNull(message = "Kd Transportasi tidak boleh kosong")
 	@Column(name = "KdTransportasi", nullable = false)
 	@Caption(value = "Kode Transportasi")
 	private Byte kdTransportasi;
 
-	public void setKdTransportasi(Byte kdTransportasi) {
-		this.kdTransportasi = kdTransportasi;
-	}
-
-	public Byte getKdTransportasi() {
-		return this.kdTransportasi;
-	}
-
 	@NotNull(message = "Nama Transportasi tidak boleh kosong")
 	@Column(name = "NamaTransportasi", nullable = false, length = 30)
 	@Caption(value = "Nama Transportasi")
 	private String namaTransportasi;
 
-	public void setNamaTransportasi(String namaTransportasi) {
-		this.namaTransportasi = namaTransportasi;
-	}
-
-	public String getNamaTransportasi() {
-		return this.namaTransportasi;
-	}
-
 	@NotNull(message = "QTransportasi tidak boleh kosong")
 	@Column(name = "QTransportasi", nullable = false)
 	@Caption(value = "QTransportasi")
 	private Byte qTransportasi;
 
-	public void setqTransportasi(Byte qTransportasi) {
-		this.qTransportasi = qTransportasi;
-	}
-
-	public Byte getqTransportasi() {
-		return this.qTransportasi;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.transportasipasien_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.transportasipasien_m_id_seq", sequenceName = "public.transportasipasien_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.transportasipasien_m_id_seq")
+	@SequenceGenerator(name = "public.transportasipasien_m_id_seq", sequenceName = "public.transportasipasien_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Triase.java

@@ -1,93 +1,45 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class Triase
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "Triase_M")
 public class Triase extends BaseMaster {
+
 	@NotNull(message = "Kd Triase tidak boleh kosong")
 	@Column(name = "KdTriase", nullable = false)
 	@Caption(value = "Kode Triase")
 	private Byte triase;
 
-	public void setKdTriase(Byte triase) {
-		this.triase = triase;
-	}
-
-	public Byte getKdTriase() {
-		return this.triase;
-	}
-
 	@NotNull(message = "Nama Triase tidak boleh kosong")
 	@Column(name = "NamaTriase", nullable = false, length = 20)
 	@Caption(value = "Nama Triase")
 	private String namaTriase;
 
-	public void setNamaTriase(String namaTriase) {
-		this.namaTriase = namaTriase;
-	}
-
-	public String getNamaTriase() {
-		return this.namaTriase;
-	}
-
 	@NotNull(message = "QTriase tidak boleh kosong")
 	@Column(name = "QTriase", nullable = false)
 	@Caption(value = "QTriase")
 	private Byte qTriase;
 
-	public void setqTriase(Byte qTriase) {
-		this.qTriase = qTriase;
-	}
-
-	public Byte getqTriase() {
-		return this.qTriase;
-	}
-
-	@NotNull(message = "Kd Triase tidak boleh kosong")
-	@Column(name = "KdTriase", nullable = false)
-	public Byte getTriase() {
-		return triase;
-	}
-
-	public void setriase(Byte triase) {
-		this.triase = triase;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.triase_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.triase_m_id_seq", sequenceName = "public.triase_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.triase_m_id_seq")
+	@SequenceGenerator(name = "public.triase_m_id_seq", sequenceName = "public.triase_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TumorMarker.java

@@ -1,78 +1,45 @@
 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.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
- *  class TumorMarker
+ * class TumorMarker
  * 
  * @author Generator
  */
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_TumorMarker_M")
 public class TumorMarker extends BaseMaster {
-	@NotNull(message="Name tidak boleh kosong")
+
+	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-	public String getName()
-	{
-		 return this.name;
-	}
 
-
-	@NotNull(message="Info tidak boleh kosong")
+	@NotNull(message = "Info tidak boleh kosong")
 	@Column(name = "Info", nullable = false, length = 100)
 	@Caption(value = "Info")
 	private String info;
-	public void setInfo(String info)
-	{
-		this.info = info;
-	}
-	public String getInfo()
-	{
-		 return this.info;
-	}
 
-
-	@NotNull(message="InfoMsg tidak boleh kosong")
+	@NotNull(message = "InfoMsg tidak boleh kosong")
 	@Column(name = "InfoMsg", nullable = false, length = 100)
 	@Caption(value = "InfoMsg")
 	private String infoMsg;
-	public void setInfoMsg(String infoMsg)
-	{
-		this.infoMsg = infoMsg;
-	}
-	public String getInfoMsg()
-	{
-		 return this.infoMsg;
-	}
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_TumorMarker_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.RM_TumorMarker_M_id_seq", sequenceName = "public.RM_TumorMarker_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.RM_TumorMarker_M_id_seq")
+	@SequenceGenerator(name = "public.RM_TumorMarker_M_id_seq", sequenceName = "public.RM_TumorMarker_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TypeInteraksiProduk.java

@@ -1,73 +1,63 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.envers.Audited;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class Agama
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TypeInteraksiProduk_M")
 public class TypeInteraksiProduk extends BaseMaster {
-	
+
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.type_interaksi_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.type_interaksi_m_id_seq", sequenceName = "public.type_interaksi_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.type_interaksi_m_id_seq")
+	@SequenceGenerator(name = "public.type_interaksi_m_id_seq", sequenceName = "public.type_interaksi_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
-	
-	
+
 	@NotNull(message = "nama Type Interaksi tidak boleh kosong")
 	@Column(name = "namaTypeInteraksi", nullable = false, length = 100)
 	@Caption(value = "namaTypeInteraksi")
 	private String namaTypeInteraksi;
 
-
 	@NotNull(message = "kd Type Interaksi tidak boleh kosong")
 	@Column(name = "kdTypeInteraksi", nullable = false)
 	@Caption(value = "kd Type Interaksi")
-	private Byte kdTypeInteraksi  ;
-
+	private Byte kdTypeInteraksi;
 
 	@NotNull(message = "q Type Interaksi tidak boleh kosong")
 	@Column(name = "qTypeInteraksi", nullable = false)
 	@Caption(value = "qTypeInteraksi")
 	private short qTypeInteraksi;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectDepartemenFk")
 	@NotNull(message = "Kd Departemen tidak boleh kosong")
 	@Caption(value = "Object Departemen")
 	private Departemen departemen;
 
-	@Column(name = "ObjectDepartemenFk", insertable = false, updatable = false,nullable=false)
+	@Column(name = "ObjectDepartemenFk", insertable = false, updatable = false, nullable = false)
 	private Integer departemenId;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectGeneralKelompokProdukFk")
 	@NotNull(message = "General Kelompok Produk tidak boleh kosong")
 	@Caption(value = "General Kelompok Produk")
 	private GeneralKelompokProduk generalKelompokProduk;
 
-	@Column(name = "ObjectGeneralKelompokProdukFk", insertable = false, updatable = false,nullable=false)
+	@Column(name = "ObjectGeneralKelompokProdukFk", insertable = false, updatable = false, nullable = false)
 	private Integer generalKelompokProdukId;
 
-
-
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TypePegawai.java

@@ -1,80 +1,45 @@
 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.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 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;
 
 /**
  * class TypePegawai
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TypePegawai_M")
-//@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class TypePegawai extends BaseMaster {
+
 	@NotNull(message = "Kd Type Pegawai tidak boleh kosong")
 	@Column(name = "KdTypePegawai", nullable = false)
 	@Caption(value = "Kode Type Pegawai")
 	private Byte kdTypePegawai;
 
-	public void setKdTypePegawai(Byte kdTypePegawai) {
-		this.kdTypePegawai = kdTypePegawai;
-	}
-
-	public Byte getKdTypePegawai() {
-		return this.kdTypePegawai;
-	}
-
 	@NotNull(message = "QType Pegawai tidak boleh kosong")
 	@Column(name = "QTypePegawai", nullable = false)
 	@Caption(value = "QType Pegawai")
 	private Byte qTypePegawai;
 
-	public void setqTypePegawai(Byte qTypePegawai) {
-		this.qTypePegawai = qTypePegawai;
-	}
-
-	public Byte getqTypePegawai() {
-		return this.qTypePegawai;
-	}
-
 	@NotNull(message = "Type Pegawai tidak boleh kosong")
 	@Column(name = "TypePegawai", nullable = false, length = 30)
 	@Caption(value = "Type Pegawai")
 	private String typePegawai;
 
-	public void setypePegawai(String typePegawai) {
-		this.typePegawai = typePegawai;
-	}
-
-	public String getTypePegawai() {
-		return this.typePegawai;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.typepegawai_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.typepegawai_m_id_seq", sequenceName = "public.typepegawai_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.typepegawai_m_id_seq")
+	@SequenceGenerator(name = "public.typepegawai_m_id_seq", sequenceName = "public.typepegawai_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public void setTypePegawai(String typePegawai) {
-		this.typePegawai = typePegawai;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/TypeProduk.java

@@ -1,84 +1,51 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class TypeProduk
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "TypeProduk_M")
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class TypeProduk extends BaseMaster {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectDepartemenFk")
 	@NotNull(message = "Kd Departemen tidak boleh kosong")
-
 	@Caption(value = "Object Departemen")
 	private Departemen departemen;
 
-	public void setDepartemen(Departemen departemen) {
-		this.departemen = departemen;
-	}
-
-	public Departemen getDepartemen() {
-		return this.departemen;
-	}
-
 	@Column(name = "ObjectDepartemenFk", insertable = false, updatable = false)
 	private Integer departemenId;
 
 	@ManyToOne
 	@JoinColumn(name = "ObjectKelompokProdukFk")
-
 	@Caption(value = "Object Kelompok Produk")
 	private KelompokProduk kelompokProduk;
 
-	public void setKelompokProduk(KelompokProduk kelompokProduk) {
-		this.kelompokProduk = kelompokProduk;
-	}
-
-	public KelompokProduk getKelompokProduk() {
-		return this.kelompokProduk;
-	}
-
 	@Column(name = "ObjectKelompokProdukFk", insertable = false, updatable = false, nullable = false)
 	private Integer kelompokProdukId;
 
 	@ManyToOne
 	@JoinColumn(name = "ObjectMerkProdukFk")
 	@NotNull(message = "Kd Merk Produk tidak boleh kosong")
-
 	@Caption(value = "Object Merk Produk")
 	private MerkProduk merkProduk;
 
-	public void setMerkProduk(MerkProduk merkProduk) {
-		this.merkProduk = merkProduk;
-	}
-
-	public MerkProduk getMerkProduk() {
-		return this.merkProduk;
-	}
-
 	@Column(name = "ObjectMerkProdukFk", insertable = false, updatable = false)
 	private Integer merkProdukId;
 
@@ -87,52 +54,20 @@ public class TypeProduk extends BaseMaster {
 	@Caption(value = "Kode Type Produk")
 	private short kdTypeProduk;
 
-	public void setKdTypeProduk(short kdTypeProduk) {
-		this.kdTypeProduk = kdTypeProduk;
-	}
-
-	public short getKdTypeProduk() {
-		return this.kdTypeProduk;
-	}
-
 	@NotNull(message = "QType Produk tidak boleh kosong")
 	@Column(name = "QTypeProduk", nullable = false)
 	@Caption(value = "QType Produk")
 	private short qTypeProduk;
 
-	public void setqTypeProduk(short qTypeProduk) {
-		this.qTypeProduk = qTypeProduk;
-	}
-
-	public short getqTypeProduk() {
-		return this.qTypeProduk;
-	}
-
 	@NotNull(message = "Type Produk tidak boleh kosong")
 	@Column(name = "TypeProduk", nullable = false, length = 30)
 	@Caption(value = "Type Produk")
 	private String typeProduk;
 
-	public void setypeProduk(String typeProduk) {
-		this.typeProduk = typeProduk;
-	}
-
-	public String getTypeProduk() {
-		return this.typeProduk;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.typeproduk_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.typeproduk_m_id_seq", sequenceName = "public.typeproduk_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.typeproduk_m_id_seq")
+	@SequenceGenerator(name = "public.typeproduk_m_id_seq", sequenceName = "public.typeproduk_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Umur.java

@@ -0,0 +1,35 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseMaster;
+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;
+
+/**
+ * class umur
+ * 
+ * @author Generator
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "RM_umur_M")
+public class Umur extends BaseMaster {
+
+	@NotNull(message = "Name tidak boleh kosong")
+	@Column(name = "Name", nullable = false, length = 100)
+	@Caption(value = "Name")
+	private String name;
+
+	@Id
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.umur_m_id_seq")
+	@SequenceGenerator(name = "public.umur_m_id_seq", sequenceName = "public.umur_m_id_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Integer id;
+
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UnitBagian.java

@@ -1,83 +1,45 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class UnitBagian
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "UnitBagian_M")
 public class UnitBagian extends BaseMaster {
+
 	@NotNull(message = "Kd Unit Bagian tidak boleh kosong")
 	@Column(name = "KdUnitBagian", nullable = false)
 	@Caption(value = "Kode Unit Bagian")
 	private Byte kdUnitBagian;
 
-	public void setKdUnitBagian(Byte kdUnitBagian) {
-		this.kdUnitBagian = kdUnitBagian;
-	}
-
-	public Byte getKdUnitBagian() {
-		return this.kdUnitBagian;
-	}
-
 	@NotNull(message = "QUnit Bagian tidak boleh kosong")
 	@Column(name = "QUnitBagian", nullable = false)
 	@Caption(value = "QUnit Bagian")
 	private Byte qUnitBagian;
 
-	public void setqUnitBagian(Byte qUnitBagian) {
-		this.qUnitBagian = qUnitBagian;
-	}
-
-	public Byte getqUnitBagian() {
-		return this.qUnitBagian;
-	}
-
 	@NotNull(message = "Unit Bagian tidak boleh kosong")
 	@Column(name = "UnitBagian", nullable = false, length = 50)
 	@Caption(value = "Unit Bagian")
 	private String unitBagian;
 
-	public void setUnitBagian(String unitBagian) {
-		this.unitBagian = unitBagian;
-	}
-
-	public String getUnitBagian() {
-		return this.unitBagian;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.unitbagian_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.unitbagian_m_id_seq", sequenceName = "public.unitbagian_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.unitbagian_m_id_seq")
+	@SequenceGenerator(name = "public.unitbagian_m_id_seq", sequenceName = "public.unitbagian_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UnitCost.java

@@ -1,134 +1,51 @@
 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.Table;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "UnitCost_M")
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class UnitCost extends BaseMaster {
 
-	 
-	
-	@Column(name = "KodeUnitCost", nullable = true)
+	@Column(name = "KodeUnitCost")
 	@Caption(value = "KodeUnitCost")
 	private String kodeUnitCost;
-	
-	@Column(name = "NamaUnitCost", nullable = true)
+
+	@Column(name = "NamaUnitCost")
 	@Caption(value = "NamaUnitCost")
 	private String namaUnitCost;
 
-	/*@JsonManagedReference
-	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "unitCost")
-	@Caption(value = "unitCostDetailSet")
-	private Set<UnitCostDetail> unitCostDetailSet = new HashSet<UnitCostDetail>();*/
-
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "produkFK")
 	@Caption(value = "Produk Tindakan")
 	private Produk produk;
 
-	@Column(name = "produkFK", insertable = false, updatable = false, nullable = true)
+	@Column(name = "produkFK", insertable = false, updatable = false)
 	private Integer produkId;
 
 	@ManyToOne
 	@JoinColumn(name = "ruanganFk")
 	@Caption(value = "Object Ruangan")
 	private Ruangan ruangan;
-	
-	@Column(name = "ruanganFk", insertable = false, updatable = false, nullable = true)
+
+	@Column(name = "ruanganFk", insertable = false, updatable = false)
 	private Integer ruanganId;
-	
-	/*public Set<UnitCostDetail> getUnitCostDetail() {
-		return unitCostDetailSet;
-	}	
-*/
-	 
 
-
-	public String getNamaUnitCost() {
-		return namaUnitCost;
-	}
-
-	public void setNamaUnitCost(String namaUnitCost) {
-		this.namaUnitCost = namaUnitCost;
-	}
-
-/*	public Set<UnitCostDetail> getUnitCostDetailSet() {
-		return unitCostDetailSet;
-	}
-
-	public void setUnitCostDetailSet(Set<UnitCostDetail> unitCostDetailSet) {
-		this.unitCostDetailSet = unitCostDetailSet;
-	}
-*/
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.unitcost_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.unitcost_m_id_seq", sequenceName = "public.unitcost_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.unitcost_m_id_seq")
+	@SequenceGenerator(name = "public.unitcost_m_id_seq", sequenceName = "public.unitcost_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public Produk getProduk() {
-		return produk;
-	}
-
-	public void setProduk(Produk produk) {
-		this.produk = produk;
-	}
-
-	public Integer getProdukId() {
-		return produkId;
-	}
-
-	public void setProdukId(Integer produkId) {
-		this.produkId = produkId;
-	}
-
-	public Ruangan getRuangan() {
-		return ruangan;
-	}
-
-	public void setRuangan(Ruangan ruangan) {
-		this.ruangan = ruangan;
-	}
-
-	public Integer getRuanganId() {
-		return ruanganId;
-	}
-
-	public void setRuanganId(Integer ruanganId) {
-		this.ruanganId = ruanganId;
-	}
-
-
-
-	public String getKodeUnitCost() {
-		return kodeUnitCost;
-	}
-
-
-
-	public void setKodeUnitCost(String kodeUnitCost) {
-		this.kodeUnitCost = kodeUnitCost;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UnitCostDetail.java

@@ -1,15 +1,14 @@
 package com.jasamedika.medifirst2000.entities;
 
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "UnitCostDetail_T")
 public class UnitCostDetail extends BaseTransaction {
@@ -18,145 +17,40 @@ public class UnitCostDetail extends BaseTransaction {
 	@JoinColumn(name = "ObjectUnitCostFk")
 	@Caption(value = "Object Unit Cost")
 	private UnitCost unitCost;
-	
-	@Column(name = "ObjectUnitCostFk", insertable = false, updatable = false, nullable = true)
+
+	@Column(name = "ObjectUnitCostFk", insertable = false, updatable = false)
 	private Integer unitCostId;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectUnitCostDetailJenisFk")
 	@Caption(value = "Object Unit Cost Detail Jenis")
 	private UnitCostDetailJenis unitCostDetailJenis;
-	
-	@Column(name = "ObjectUnitCostDetailJenisFk", insertable = false, updatable = false, nullable = true)
+
+	@Column(name = "ObjectUnitCostDetailJenisFk", insertable = false, updatable = false)
 	private Integer unitCostDetailJenisId;
 
 	@ManyToOne
 	@JoinColumn(name = "ObjectProdukFk")
 	@Caption(value = "Produk Unit Cost")
 	private Produk produk;
-	
-	@Column(name = "ObjectProdukFk", insertable = false, updatable = false, nullable = true)
+
+	@Column(name = "ObjectProdukFk", insertable = false, updatable = false)
 	private Integer produkId;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectSatuanStandarFk")
 	@Caption(value = "Object Satuan Standar")
 	private SatuanStandar satuanStandar;
-	
-	@Column(name = "ObjectSatuanStandarFk", insertable = false, updatable = false, nullable = true)
+
+	@Column(name = "ObjectSatuanStandarFk", insertable = false, updatable = false)
 	private Integer satuanStandarId;
-	
-	
-	
-	
-	 
-	/*@ManyToOne
-	@JoinColumn(name = "ObjectHargaNettoProdukByTerimaFk")
-	@Caption(value = "Object Harga Netto Produk By Terima")
-	private HargaNettoProdukByTerima hargaNettoProdukByTerima;
-	
-	@Column(name = "ObjectHargaNettoProdukByTerimaFk", insertable = false, updatable = false, nullable = true)
-	private Integer hargaNettoProdukByTerimaNoRec;
-	*/
-	@Column(name = "Qty", nullable = true)
+
+	@Column(name = "Qty")
 	@Caption(value = "Qty")
 	private Integer qty;
 
-	@Column(name = "harga", nullable = true)
+	@Column(name = "harga")
 	@Caption(value = "Harga")
 	private Double harga;
-	
-	 
 
-
-	/*@JsonManagedReference
-	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "departemenFk")
-	@Caption(value = "Departemen FK")
-	private HashSet<Departemen> instalasiDepartemen = new HashSet<Departemen>();*/
-	public UnitCostDetailJenis getUnitCostDetailJenis() {
-		return unitCostDetailJenis;
-	}
-
-	public void setUnitCostDetailJenis(UnitCostDetailJenis unitCostDetailJenis) {
-		this.unitCostDetailJenis = unitCostDetailJenis;
-	}
-
-	public Integer getUnitCostDetailJenisId() {
-		return unitCostDetailJenisId;
-	}
-
-	public void setUnitCostDetailJenisId(Integer unitCostDetailJenisId) {
-		this.unitCostDetailJenisId = unitCostDetailJenisId;
-	}
-
-	public Produk getProduk() {
-		return produk;
-	}
-
-	public void setProduk(Produk produk) {
-		this.produk = produk;
-	}
-
-	public Integer getProdukId() {
-		return produkId;
-	}
-
-	public void setProdukId(Integer produkId) {
-		this.produkId = produkId;
-	}
-
-	public SatuanStandar getSatuanStandar() {
-		return satuanStandar;
-	}
-
-	public void setSatuanStandar(SatuanStandar satuanStandar) {
-		this.satuanStandar = satuanStandar;
-	}
-
-	public Integer getSatuanStandarId() {
-		return satuanStandarId;
-	}
-
-	public void setSatuanStandarId(Integer satuanStandarId) {
-		this.satuanStandarId = satuanStandarId;
-	}
-
-	 
-
-	public UnitCost getUnitCost() {
-		return unitCost;
-	}
-
-	public Integer getUnitCostId() {
-		return unitCostId;
-	}
-
-	public void setUnitCostId(Integer unitCostId) {
-		this.unitCostId = unitCostId;
-	}
-
-	public Integer getQty() {
-		return qty;
-	}
-
-	public void setQty(Integer qty) {
-		this.qty = qty;
-	}
-
-	public Double getHarga() {
-		return harga;
-	}
-
-	public void setHarga(Double harga) {
-		this.harga = harga;
-	}
-
-	 
-
-	public void setUnitCost(UnitCost unitCost) {
-		this.unitCost = unitCost;
-	}
- 
-
-	 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UnitCostDetailJenis.java

@@ -1,82 +1,40 @@
 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.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "UnitCostDetailJenis_M")
-public class UnitCostDetailJenis extends  BaseMaster {
-	
+public class UnitCostDetailJenis extends BaseMaster {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectUnitCostJenisFk")
 	@Caption(value = "Object Unit Cost Jenis")
 	private UnitCostJenis unitCostJenis;
-	
-	@Column(name = "ObjectUnitCostJenisFk", insertable = false, updatable = false, nullable = true)
+
+	@Column(name = "ObjectUnitCostJenisFk", insertable = false, updatable = false)
 	private Integer unitCostJenisId;
-	
-	@Column(name = "KdUnitCostDetailJenis", nullable = true)
+
+	@Column(name = "KdUnitCostDetailJenis")
 	@Caption(value = "KdUnitCostDetailJenis")
 	private String kdUnitCostDetailJenis;
-	
-	@Column(name = "NamaUnitCostDetailJenis", nullable = true)
+
+	@Column(name = "NamaUnitCostDetailJenis")
 	@Caption(value = "NamaUnitCostDetailJenis")
 	private String namaUnitCostDetailJenis;
 
-	public UnitCostJenis getUnitCostJenis() {
-		return unitCostJenis;
-	}
-
-	public void setUnitCostJenis(UnitCostJenis unitCostJenis) {
-		this.unitCostJenis = unitCostJenis;
-	}
-
-	public Integer getUnitCostJenisId() {
-		return unitCostJenisId;
-	}
-
-	public void setUnitCostJenisId(Integer unitCostJenisId) {
-		this.unitCostJenisId = unitCostJenisId;
-	}
-
-	public String getKdUnitCostDetailJenis() {
-		return kdUnitCostDetailJenis;
-	}
-
-	public void setKdUnitCostDetailJenis(String kdUnitCostDetailJenis) {
-		this.kdUnitCostDetailJenis = kdUnitCostDetailJenis;
-	}
-
-	public String getNamaUnitCostDetailJenis() {
-		return namaUnitCostDetailJenis;
-	}
-
-	public void setNamaUnitCostDetailJenis(String namaUnitCostDetailJenis) {
-		this.namaUnitCostDetailJenis = namaUnitCostDetailJenis;
-	}
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.unitcostdetailjenis_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.unitcostdetailjenis_m_id_seq", sequenceName = "public.unitcostdetailjenis_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.unitcostdetailjenis_m_id_seq")
+	@SequenceGenerator(name = "public.unitcostdetailjenis_m_id_seq", sequenceName = "public.unitcostdetailjenis_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	
-
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UnitCostJenis.java

@@ -1,57 +1,32 @@
 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.Table;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "UnitCostJenis_M")
 public class UnitCostJenis extends BaseMaster {
-	
+
 	@Column(name = "KdJenisUnitCost", nullable = false)
 	@Caption(value = "KdJenisUnitCost")
 	private String kdJenisUnitCost;
-	
-	@Column(name = "NamaJenisUnitCost", nullable = true)
+
+	@Column(name = "NamaJenisUnitCost")
 	@Caption(value = "NamaJenisUnitCost")
 	private String namaJenisUnitCost;
 
-
-	public String getKdJenisUnitCost() {
-		return kdJenisUnitCost;
-	}
-
-	public void setKdJenisUnitCost(String kdJenisUnitCost) {
-		this.kdJenisUnitCost = kdJenisUnitCost;
-	}
-
-	public String getNamaJenisUnitCost() {
-		return namaJenisUnitCost;
-	}
-
-	public void setNamaJenisUnitCost(String namaJenisUnitCost) {
-		this.namaJenisUnitCost = namaJenisUnitCost;
-	}
-
-	
-	
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.unitcostjenis_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.unitcostjenis_m_id_seq", sequenceName = "public.unitcostjenis_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.unitcostjenis_m_id_seq")
+	@SequenceGenerator(name = "public.unitcostjenis_m_id_seq", sequenceName = "public.unitcostjenis_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UnitKerja.java

@@ -1,124 +1,44 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import java.util.HashSet;
-import java.util.Set;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.persistence.*;
 
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class UnitKerja
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "UnitKerja_M")
 public class UnitKerja extends BaseMaster {
+
 	@Caption(value = "Kode Pimpinan")
 	private String kdPimpinan;
 
-	@Column(name = "KdPimpinan", nullable = true, length = 5)
-	public String getKdPimpinan() {
-		return kdPimpinan;
-	}
-
-	public void setKdPimpinan(String kdPimpinan) {
-		this.kdPimpinan = kdPimpinan;
-	}
-
 	@Caption(value = "Kode Unit Kerja")
 	private Byte kdUnitKerja;
 
-	@NotNull(message = "Kd Unit Kerja tidak boleh kosong")
-	@Column(name = "KdUnitKerja", nullable = false)
-	public Byte getKdUnitKerja() {
-		return kdUnitKerja;
-	}
-
-	public void setKdUnitKerja(Byte kdUnitKerja) {
-		this.kdUnitKerja = kdUnitKerja;
-	}
-
 	@Caption(value = "No Unit Kerja")
 	private String noUnitKerja;
 
-	@Column(name = "NoUnitKerja", nullable = true, length = 50)
-	public String getNoUnitKerja() {
-		return noUnitKerja;
-	}
-
-	public void setNoUnitKerja(String noUnitKerja) {
-		this.noUnitKerja = noUnitKerja;
-	}
-
 	@Caption(value = "QUnit Kerja")
 	private Byte qUnitKerja;
 
-	@NotNull(message = "QUnit Kerja Q Unit Kerja tidak boleh kosong")
-	@Column(name = "QUnitKerjaQUnitKerja", nullable = false)
-	public Byte getqUnitKerja() {
-		return qUnitKerja;
-	}
-
-	public void setqUnitKerja(Byte qUnitKerja) {
-		this.qUnitKerja = qUnitKerja;
-	}
-
 	@Caption(value = "Unit Kerja")
 	private String namaUnitKerja;
 
-	@NotNull(message = "Unit Kerja tidak boleh kosong")
-	@Column(name = "UnitKerja", nullable = false, length = 100)
-	public String getNamaUnitKerja() {
-		return namaUnitKerja;
-	}
-
-	public void setNamaUnitKerja(String namaUnitKerja) {
-		this.namaUnitKerja = namaUnitKerja;
-	}
-
-	/*
-	 * @JsonManagedReference
-	 * 
-	 * @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy =
-	 * "kdunitkerja") private Set<JenisSatuanKerja> JenisSatuanKerjaSet = new
-	 * HashSet<JenisSatuanKerja>();
-	 * 
-	 * public Set<JenisSatuanKerja> getJenisSatuanKerjaSet() { return
-	 * JenisSatuanKerjaSet; }
-	 * 
-	 * public void setJenisSatuanKerjaSet(Set<JenisSatuanKerja>
-	 * jenisSatuanKerjaSet) { JenisSatuanKerjaSet = jenisSatuanKerjaSet; }
-	 */
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.unitkerja_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.unitkerja_m_id_seq", sequenceName = "public.unitkerja_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.unitkerja_m_id_seq")
+	@SequenceGenerator(name = "public.unitkerja_m_id_seq", sequenceName = "public.unitkerja_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UnitKerjaPegawai.java

@@ -1,39 +1,24 @@
 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 com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 
+import javax.persistence.*;
+
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
 @Entity
 @Table(name = "UnitKerjaPegawai_M")
 public class UnitKerjaPegawai extends BaseKeyValueMaster {
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.unitkerjapegawai_m_id_seq")
-	@SequenceGenerator(name = "public.unitkerjapegawai_m_id_seq", sequenceName = "public.unitkerjapegawai_m_id_seq", allocationSize = 1)
-	@Column(name = "id")
-	protected Integer id;
-
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "objectjabatankepalafk")
-	@Caption(value = "Jabatan Kepala")
-	private Jabatan jabatanKepala;
-
-	@Column(name = "objectjabatankepalafk", insertable = false, updatable = false, nullable = true)
-	private Integer jabatanKepalaId;
-
-	public UnitKerjaPegawai() {
-	}
-
 	public UnitKerjaPegawai(Integer id) {
 		super();
 		this.id = id;
@@ -45,33 +30,19 @@ public class UnitKerjaPegawai extends BaseKeyValueMaster {
 		this.setName(name);
 	}
 
-	public Integer getId() {
-		return id;
-	}
+	@Id
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.unitkerjapegawai_m_id_seq")
+	@SequenceGenerator(name = "public.unitkerjapegawai_m_id_seq", sequenceName = "public.unitkerjapegawai_m_id_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Integer id;
 
-	public void setId(Integer id) {
-		this.id = id;
-	}
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "objectjabatankepalafk")
+	@Caption(value = "Jabatan Kepala")
+	@ToString.Exclude
+	private Jabatan jabatanKepala;
 
-	public Jabatan getJabatanKepala() {
-		return jabatanKepala;
-	}
-
-	public void setJabatanKepala(Jabatan jabatanKepala) {
-		this.jabatanKepala = jabatanKepala;
-	}
-
-	public Integer getJabatanKepalaId() {
-		return jabatanKepalaId;
-	}
-
-	public void setJabatanKepalaId(Integer jabatanKepalaId) {
-		this.jabatanKepalaId = jabatanKepalaId;
-	}
-	
-	@Override
-	public String toString() {
-		return "UnitKerjaPegawai [id=" + id + ", name=" + getName() + ", statusEnabled=" + statusEnabled + "]";
-	}
+	@Column(name = "objectjabatankepalafk", insertable = false, updatable = false)
+	private Integer jabatanKepalaId;
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UnitLaporan.java

@@ -1,46 +1,31 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class UnitLaporan
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "UnitLaporan_M")
 public class UnitLaporan extends BaseMaster {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectKelompokProdukFk")
-
 	@Caption(value = "Object Kelompok Produk")
 	private KelompokProduk kelompokProduk;
 
-	public void setKelompokProduk(KelompokProduk kelompokProduk) {
-		this.kelompokProduk = kelompokProduk;
-	}
-
-	public KelompokProduk getKelompokProduk() {
-		return this.kelompokProduk;
-	}
-
 	@Column(name = "ObjectKelompokProdukFk", insertable = false, updatable = false)
 	private Integer kelompokProdukId;
 
@@ -49,28 +34,11 @@ public class UnitLaporan extends BaseMaster {
 	@Caption(value = "Kode Unit Laporan")
 	private Byte kdUnitLaporan;
 
-	public void setKdUnitLaporan(Byte kdUnitLaporan) {
-		this.kdUnitLaporan = kdUnitLaporan;
-	}
-
-	public Byte getKdUnitLaporan() {
-		return this.kdUnitLaporan;
-	}
-
 	@ManyToOne
 	@JoinColumn(name = "ObjectUnitLaporanHeadFk")
-
 	@Caption(value = "Object Unit Laporan Head")
 	private UnitLaporan unitLaporanHead;
 
-	public void setUnitLaporanHead(UnitLaporan unitLaporanHead) {
-		this.unitLaporanHead = unitLaporanHead;
-	}
-
-	public UnitLaporan getUnitLaporanHead() {
-		return this.unitLaporanHead;
-	}
-
 	@Column(name = "ObjectUnitLaporanHeadFk", insertable = false, updatable = false)
 	private Integer unitLaporanHeadId;
 
@@ -79,52 +47,20 @@ public class UnitLaporan extends BaseMaster {
 	@Caption(value = "No Urut")
 	private Byte noUrut;
 
-	public void setNoUrut(Byte noUrut) {
-		this.noUrut = noUrut;
-	}
-
-	public Byte getNoUrut() {
-		return this.noUrut;
-	}
-
 	@NotNull(message = "QUnit Laporan tidak boleh kosong")
 	@Column(name = "QUnitLaporan", nullable = false)
 	@Caption(value = "QUnit Laporan")
 	private Byte qUnitLaporan;
 
-	public void setqUnitLaporan(Byte qUnitLaporan) {
-		this.qUnitLaporan = qUnitLaporan;
-	}
-
-	public Byte getqUnitLaporan() {
-		return this.qUnitLaporan;
-	}
-
 	@NotNull(message = "Unit Laporan tidak boleh kosong")
 	@Column(name = "UnitLaporan", nullable = false, length = 50)
 	@Caption(value = "Unit Laporan")
 	private String unitLaporan;
 
-	public void setUnitLaporan(String unitLaporan) {
-		this.unitLaporan = unitLaporan;
-	}
-
-	public String getUnitLaporan() {
-		return this.unitLaporan;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.unitlaporan_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.unitlaporan_m_id_seq", sequenceName = "public.unitlaporan_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.unitlaporan_m_id_seq")
+	@SequenceGenerator(name = "public.unitlaporan_m_id_seq", sequenceName = "public.unitlaporan_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UnitOrg.java

@@ -1,71 +1,40 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "UnitOrg_M")
 public class UnitOrg extends BaseMaster {
 
 	@NotNull(message = "Unit Org tidak boleh kosong")
 	@Caption(value = "Unit Org")
-	@Column(name = "UnitOrg", nullable = true, length = 200)
+	@Column(name = "UnitOrg", length = 200)
 	private String namaUnitOrg;
 
 	@NotNull(message = "Kode Unit Org tidak boleh kosong")
 	@Caption(value = "Kode Unit Org")
-	@Column(name = "KodeUnitOrg", nullable = true, length = 50)
+	@Column(name = "KodeUnitOrg", length = 50)
 	private String kodeUnitOrg;
 
 	@NotNull(message = "Keterangan tidak boleh kosong")
 	@Caption(value = "Keterangan")
-	@Column(name = "Keterangan", nullable = true, length = 200)
+	@Column(name = "Keterangan", length = 200)
 	private String ketUnitOrg;
 
-	public String getNamaUnitOrg() {
-		return namaUnitOrg;
-	}
-
-	public void setNamaUnitOrg(String namaUnitOrg) {
-		this.namaUnitOrg = namaUnitOrg;
-	}
-
-	public String getKodeUnitOrg() {
-		return kodeUnitOrg;
-	}
-
-	public void setKodeUnitOrg(String kodeUnitOrg) {
-		this.kodeUnitOrg = kodeUnitOrg;
-	}
-
-	public String getKetUnitOrg() {
-		return ketUnitOrg;
-	}
-
-	public void setKetUnitOrg(String ketUnitOrg) {
-		this.ketUnitOrg = ketUnitOrg;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.unitorg_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.unitorg_m_id_seq", sequenceName = "public.unitorg_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.unitorg_m_id_seq")
+	@SequenceGenerator(name = "public.unitorg_m_id_seq", sequenceName = "public.unitorg_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UnitPengelolaPrakarsaSurat.java

@@ -1,19 +1,17 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "UnitPengelolaPrakarsaSurat_M")
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
@@ -24,61 +22,21 @@ public class UnitPengelolaPrakarsaSurat extends BaseMaster {
 	@Caption(value = "Klasifikasi Arsip")
 	private UnitPengelolaPrakarsaSurat unitPengelolaPrakarsaSurat;
 
-	@Column(name = "ObjectUnitPengelolaPrakarsaSuratHead", insertable = false, updatable = false, nullable = true)
+	@Column(name = "ObjectUnitPengelolaPrakarsaSuratHead", insertable = false, updatable = false)
 	private Integer unitPengelolaPrakarsaSuratId;
 
-	@Column(name = "unitKerja", nullable = true, length = 100)
+	@Column(name = "unitKerja", length = 100)
 	@Caption(value = "unitKerja")
 	private String unitKerja;
 
-	@Column(name = "kodeUnitPengelolaPrakarsaSurat", nullable = true, length = 100)
+	@Column(name = "kodeUnitPengelolaPrakarsaSurat", length = 100)
 	@Caption(value = "kode Unit Pengelola Prakarsa Surat")
 	private String kodeUnitPengelolaPrakarsaSurat;
 
-	public UnitPengelolaPrakarsaSurat getUnitPengelolaPrakarsaSurat() {
-		return unitPengelolaPrakarsaSurat;
-	}
-
-	public void setUnitPengelolaPrakarsaSurat(UnitPengelolaPrakarsaSurat unitPengelolaPrakarsaSurat) {
-		this.unitPengelolaPrakarsaSurat = unitPengelolaPrakarsaSurat;
-	}
-
-	public Integer getUnitPengelolaPrakarsaSuratId() {
-		return unitPengelolaPrakarsaSuratId;
-	}
-
-	public void setUnitPengelolaPrakarsaSuratId(Integer unitPengelolaPrakarsaSuratId) {
-		this.unitPengelolaPrakarsaSuratId = unitPengelolaPrakarsaSuratId;
-	}
-
-	public String getUnitKerja() {
-		return unitKerja;
-	}
-
-	public void setUnitKerja(String unitKerja) {
-		this.unitKerja = unitKerja;
-	}
-
-	public String getKodeUnitPengelolaPrakarsaSurat() {
-		return kodeUnitPengelolaPrakarsaSurat;
-	}
-
-	public void setKodeUnitPengelolaPrakarsaSurat(String kodeUnitPengelolaPrakarsaSurat) {
-		this.kodeUnitPengelolaPrakarsaSurat = kodeUnitPengelolaPrakarsaSurat;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.unitpengelolaprakarsasurat_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.unitpengelolaprakarsasurat_m_id_seq", sequenceName = "public.unitpengelolaprakarsasurat_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.unitpengelolaprakarsasurat_m_id_seq")
+	@SequenceGenerator(name = "public.unitpengelolaprakarsasurat_m_id_seq", sequenceName = "public.unitpengelolaprakarsasurat_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UraianKegiatan.java

@@ -1,70 +1,37 @@
 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.Table;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
-@Table(name="sdm_uraiankegiatan_m")
+@Table(name = "sdm_uraiankegiatan_m")
 public class UraianKegiatan extends BaseMaster {
-	
+
 	@Caption(value = "Nama Uraian Kegiatan")
-	@Column(name = "namauraiankegiatan", nullable = true)
+	@Column(name = "namauraiankegiatan")
 	private String namaUraianKegiatan;
-	
-	@ManyToOne(fetch = FetchType.LAZY, optional=true)
-	@JoinColumn(name = "objectprogramkegiatanfk", nullable=true)
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "objectprogramkegiatanfk")
 	@Caption(value = "Program Kegiatan")
 	private ProgramKegiatan programKegiatan;
-	
-	@Column(name = "objectprogramkegiatanfk", insertable = false, updatable = false, nullable = true)
+
+	@Column(name = "objectprogramkegiatanfk", insertable = false, updatable = false)
 	private Integer idProgramKegiatan;
-	
+
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.sdm_uraiankegiatan_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.sdm_uraiankegiatan_m_id_seq", sequenceName = "public.sdm_uraiankegiatan_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.sdm_uraiankegiatan_m_id_seq")
+	@SequenceGenerator(name = "public.sdm_uraiankegiatan_m_id_seq", sequenceName = "public.sdm_uraiankegiatan_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public String getNamaUraianKegiatan() {
-		return namaUraianKegiatan;
-	}
-
-	public void setNamaUraianKegiatan(String namaUraianKegiatan) {
-		this.namaUraianKegiatan = namaUraianKegiatan;
-	}
-
-	public ProgramKegiatan getProgramKegiatan() {
-		return programKegiatan;
-	}
-
-	public void setProgramKegiatan(ProgramKegiatan programKegiatan) {
-		this.programKegiatan = programKegiatan;
-	}
-
-	public Integer getIdProgramKegiatan() {
-		return idProgramKegiatan;
-	}
-
-	public void setIdProgramKegiatan(Integer idProgramKegiatan) {
-		this.idProgramKegiatan = idProgramKegiatan;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UraianTugas.java

@@ -1,79 +1,46 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.*;
-import com.jasamedika.medifirst2000.entities.KategoryTugas;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.jasamedika.medifirst2000.base.BaseTransaction;
-
-import javax.validation.constraints.NotNull;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 
 /**
  * class UraianTugas
  * 
  * @author Generator
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "sdm_UraianTugas_T")
 public class UraianTugas extends BaseTransaction {
+
 	@Column(name = "Id", nullable = false, length = 100)
 	@Caption(value = "Id")
 	private Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
 	@ManyToOne
 	@JoinColumn(name = "Ruangan")
-
 	@Caption(value = "Kategory Tugas")
 	private Ruangan ruangan;
-	@Column(name = "Ruangan", insertable = false, updatable = false,nullable=true)
+
+	@Column(name = "Ruangan", insertable = false, updatable = false)
 	private Integer ruanganId;
 
-	public Ruangan getRuangan() {
-		return ruangan;
-	}
-
-	public void setRuangan(Ruangan ruangan) {
-		this.ruangan = ruangan;
-	}
-
 	@ManyToOne
 	@JoinColumn(name = "KategoryTugasFk")
 	@NotNull(message = "Kategory Tugas Harus Diisi")
 	@Caption(value = "Kategory Tugas")
 	private KategoryTugas kategoryTugas;
 
-	public KategoryTugas getKategoryTugas() {
-		return kategoryTugas;
-	}
-
-	public void setKategoryTugas(KategoryTugas kategoryTugas) {
-		this.kategoryTugas = kategoryTugas;
-	}
-
 	@Column(name = "KategoryTugasFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false)
 	private String kategoryTugasId;
 
@@ -81,36 +48,12 @@ public class UraianTugas extends BaseTransaction {
 	@Caption(value = "Query")
 	private String query;
 
-	public String getQuery() {
-		return query;
-	}
-
-	public void setQuery(String query) {
-		this.query = query;
-	}
-
 	@Column(name = "TargetPerMonth", nullable = false, length = 100)
 	@Caption(value = "TargetPerMonth")
 	private Integer targetPerMonth;
 
-	public Integer getTargetPerMonth() {
-		return targetPerMonth;
-	}
-
-	public void setTargetPerMonth(Integer targetPerMonth) {
-		this.targetPerMonth = targetPerMonth;
-	}
-
 	@Column(name = "Bobot", nullable = false, length = 100)
 	@Caption(value = "Bobot")
 	private Integer bobot;
 
-	public Integer getBobot() {
-		return bobot;
-	}
-
-	public void setBobot(Integer bobot) {
-		this.bobot = bobot;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UraianTugasFlexible.java

@@ -1,138 +1,59 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+import java.util.Date;
+
+import static javax.persistence.FetchType.LAZY;
+
+@Getter
+@Setter
 @Entity
-@Table(name="UraianTugasFlexible_T")
-public class UraianTugasFlexible extends BaseTransaction{
-	
-	@ManyToOne(fetch=FetchType.LAZY)
-	@Caption(value="Object Pegawai")
-	@JoinColumn(name="ObjectPegawaiFk")
+@Table(name = "UraianTugasFlexible_T")
+public class UraianTugasFlexible extends BaseTransaction {
+
+	@ManyToOne(fetch = LAZY)
+	@Caption(value = "Object Pegawai")
+	@JoinColumn(name = "ObjectPegawaiFk")
 	private Pegawai pegawai;
-	
-	@Column(name="ObjectPegawaiFk", nullable=true, insertable=false, updatable=false)
+
+	@Column(name = "ObjectPegawaiFk", insertable = false, updatable = false)
 	private Integer pegawaiId;
-	
-	@ManyToOne(fetch=FetchType.LAZY)
-	@Caption(value="Object Atasan")
-	@JoinColumn(name="ObjectAtasanFk")
+
+	@ManyToOne(fetch = LAZY)
+	@Caption(value = "Object Atasan")
+	@JoinColumn(name = "ObjectAtasanFk")
 	private Pegawai atasan;
-	
-	@Column(name="ObjectAtasanFk", nullable=true, insertable=false, updatable=false)
+
+	@Column(name = "ObjectAtasanFk", insertable = false, updatable = false)
 	private Integer atasanId;
-	
-	@Caption(value="Approval Status")
-	@Column(name="ApprovalStatus", nullable=true)
+
+	@Caption(value = "Approval Status")
+	@Column(name = "ApprovalStatus")
 	private Boolean approvalStatus;
-	
-	@Caption(value="rincianKegiatan")
-	@Column(name="rincianKegiatan", nullable=true)
+
+	@Caption(value = "rincianKegiatan")
+	@Column(name = "rincianKegiatan")
 	private String rincianKegiatan;
-	
-	@Caption(value="satuan")
-	@Column(name="satuan", nullable=true)
+
+	@Caption(value = "satuan")
+	@Column(name = "satuan")
 	private String satuan;
-	
-	@Caption(value="waktu")
-	@Column(name="waktu", nullable=true)
+
+	@Caption(value = "waktu")
+	@Column(name = "waktu")
 	private Integer waktu;
-	
-	@Caption(value="volume")
-	@Column(name="volume", nullable=true)
+
+	@Caption(value = "volume")
+	@Column(name = "volume")
 	private Integer volume;
-	
-	@Caption(value="tgl")
-	@Column(name="tgl", nullable=true)
+
+	@Caption(value = "tgl")
+	@Column(name = "tgl")
 	private Date tgl;
 
-	public Pegawai getPegawai() {
-		return pegawai;
-	}
-
-	public void setPegawai(Pegawai pegawai) {
-		this.pegawai = pegawai;
-	}
-
-	public Integer getPegawaiId() {
-		return pegawaiId;
-	}
-
-	public void setPegawaiId(Integer pegawaiId) {
-		this.pegawaiId = pegawaiId;
-	}
-
-	public Pegawai getAtasan() {
-		return atasan;
-	}
-
-	public void setAtasan(Pegawai atasan) {
-		this.atasan = atasan;
-	}
-
-	public Integer getAtasanId() {
-		return atasanId;
-	}
-
-	public void setAtasanId(Integer atasanId) {
-		this.atasanId = atasanId;
-	}
-
-	public Boolean getApprovalStatus() {
-		return approvalStatus;
-	}
-
-	public void setApprovalStatus(Boolean approvalStatus) {
-		this.approvalStatus = approvalStatus;
-	}
-
-	public String getRincianKegiatan() {
-		return rincianKegiatan;
-	}
-
-	public void setRincianKegiatan(String rincianKegiatan) {
-		this.rincianKegiatan = rincianKegiatan;
-	}
-
-	public String getSatuan() {
-		return satuan;
-	}
-
-	public void setSatuan(String satuan) {
-		this.satuan = satuan;
-	}
-
-	public Integer getWaktu() {
-		return waktu;
-	}
-
-	public void setWaktu(Integer waktu) {
-		this.waktu = waktu;
-	}
-
-	public Integer getVolume() {
-		return volume;
-	}
-
-	public void setVolume(Integer volume) {
-		this.volume = volume;
-	}
-
-	public Date getTgl() {
-		return tgl;
-	}
-
-	public void setTgl(Date tgl) {
-		this.tgl = tgl;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UraianTugasM.java

@@ -1,23 +1,22 @@
 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.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-@Entity // @Audited
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
+@Entity
 @Table(name = "sdm_UraianTugas_M")
 public class UraianTugasM extends BaseMaster {
 
 	@Caption(value = "periode")
-	@Column(name = "periode", nullable = true)
+	@Column(name = "periode")
 	private String periode;
 
 	@ManyToOne
@@ -25,7 +24,7 @@ public class UraianTugasM extends BaseMaster {
 	@Caption(value = "Object Jabatan")
 	private Jabatan jabatan;
 
-	@Column(name = "ObjectJabatanFk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "ObjectJabatanFk", insertable = false, updatable = false)
 	private Integer jabatanId;
 
 	@ManyToOne
@@ -33,7 +32,7 @@ public class UraianTugasM extends BaseMaster {
 	@Caption(value = "Object Rincian Tugas")
 	private RincianKegiatan rincianKegiatan;
 
-	@Column(name = "ObjectRincianTugasFk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "ObjectRincianTugasFk", insertable = false, updatable = false)
 	private Integer rincianKegiatanId;
 
 	@ManyToOne
@@ -41,7 +40,7 @@ public class UraianTugasM extends BaseMaster {
 	@Caption(value = "Object Dokumen Tugas")
 	private Dokumen dokumen;
 
-	@Column(name = "ObjectDokumenFk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "ObjectDokumenFk", insertable = false, updatable = false)
 	private Integer dokumenId;
 
 	@ManyToOne
@@ -49,105 +48,13 @@ public class UraianTugasM extends BaseMaster {
 	@Caption(value = "Object Pelaksanaan Tugas")
 	private PelaksanaanTugas pelaksanaanTugas;
 
-	@Column(name = "ObjectPelaksanaanTugasFk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "ObjectPelaksanaanTugasFk", insertable = false, updatable = false)
 	private Integer pelaksanaanTugasId;
 
-	// @Caption(value = "Lama Kegiatan")
-	// @Column(name = "LamaKegiatan", nullable = true)
-	// private Integer lamaKegiatan;
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.sdm_UraianTugas_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.sdm_UraianTugas_M_id_seq", sequenceName = "public.sdm_UraianTugas_M_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.sdm_UraianTugas_M_id_seq")
+	@SequenceGenerator(name = "public.sdm_UraianTugas_M_id_seq", sequenceName = "public.sdm_UraianTugas_M_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public String getPeriode() {
-		return periode;
-	}
-
-	public void setPeriode(String periode) {
-		this.periode = periode;
-	}
-
-	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 RincianKegiatan getRincianKegiatan() {
-		return rincianKegiatan;
-	}
-
-	public void setRincianKegiatan(RincianKegiatan rincianKegiatan) {
-		this.rincianKegiatan = rincianKegiatan;
-	}
-
-	public Integer getRincianKegiatanId() {
-		return rincianKegiatanId;
-	}
-
-	public void setRincianKegiatanId(Integer rincianKegiatanId) {
-		this.rincianKegiatanId = rincianKegiatanId;
-	}
-
-	public Dokumen getDokumen() {
-		return dokumen;
-	}
-
-	public void setDokumen(Dokumen dokumen) {
-		this.dokumen = dokumen;
-	}
-
-	public Integer getDokumenId() {
-		return dokumenId;
-	}
-
-	public void setDokumenId(Integer dokumenId) {
-		this.dokumenId = dokumenId;
-	}
-
-	public PelaksanaanTugas getPelaksanaanTugas() {
-		return pelaksanaanTugas;
-	}
-
-	public void setPelaksanaanTugas(PelaksanaanTugas pelaksanaanTugas) {
-		this.pelaksanaanTugas = pelaksanaanTugas;
-	}
-
-	public Integer getPelaksanaanTugasId() {
-		return pelaksanaanTugasId;
-	}
-
-	public void setPelaksanaanTugasId(Integer pelaksanaanTugasId) {
-		this.pelaksanaanTugasId = pelaksanaanTugasId;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	// public Integer getLamaKegiatan() {
-	// return lamaKegiatan;
-	// }
-	//
-	// public void setLamaKegiatan(Integer lamaKegiatan) {
-	// this.lamaKegiatan = lamaKegiatan;
-	// }
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UraianTugasTransaksi.java

@@ -1,159 +1,66 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;import javax.persistence.CascadeType;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-@Entity //@Audited
+import javax.persistence.*;
+import java.util.ArrayList;
+import java.util.List;
+
+import static javax.persistence.CascadeType.ALL;
+import static javax.persistence.FetchType.LAZY;
+
+@Getter
+@Setter
+@Entity
 @Table(name = "sdm_UraianTugasTransaksi_T")
-public class UraianTugasTransaksi extends BaseTransaction{	
-	
+public class UraianTugasTransaksi extends BaseTransaction {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectRincianTugasFk")
 	@Caption(value = "Object Rincian Tugas")
 	private RincianKegiatan rincianKegiatan;
-	
-	@Column(name = "ObjectRincianTugasFk", insertable = false, updatable = false, nullable = true)
-	private Integer rincianKegiatanId;	
-	
+
+	@Column(name = "ObjectRincianTugasFk", insertable = false, updatable = false)
+	private Integer rincianKegiatanId;
+
 	@Caption(value = "Total")
-	@Column(name = "total", nullable = true)
-	private Double total;	
-	
+	@Column(name = "total")
+	private Double total;
+
 	@Caption(value = "Nilai")
-	@Column(name = "nilai", nullable = true)
+	@Column(name = "nilai")
 	private Double nilai;
-	
+
 	@Caption(value = "Hasil")
-	@Column(name = "hasil", nullable = true)
+	@Column(name = "hasil")
 	private Double hasil;
-	
+
 	@Caption(value = "periode")
-	@Column(name = "periode", nullable = true)
+	@Column(name = "periode")
 	private String periode;
-		
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectPegawaiFk")
 	@Caption(value = "Object Pegawai")
 	private Pegawai pegawai;
-	
-	@Column(name = "ObjectPegawaiFk", insertable = false, updatable = false, nullable = true)
+
+	@Column(name = "ObjectPegawaiFk", insertable = false, updatable = false)
 	private Integer pegawaiId;
-	
+
 	@Caption(value = "Target")
-	@Column(name = "target", nullable = true)
+	@Column(name = "target")
 	private Double target;
-	
+
 	@Caption(value = "Bobot")
-	@Column(name = "bobot", nullable = true)
-	private Double bobot;		
-	
+	@Column(name = "bobot")
+	private Double bobot;
+
 	@JsonManagedReference
-	@OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "uraianTugasTransaksi")
-	private List<DetailUraianTugasTransaksi> detailUraianTugas = new ArrayList<DetailUraianTugasTransaksi>();
-	
-	public RincianKegiatan getRincianKegiatan() {
-		return rincianKegiatan;
-	}
+	@OneToMany(cascade = ALL, fetch = LAZY, mappedBy = "uraianTugasTransaksi")
+	private List<DetailUraianTugasTransaksi> detailUraianTugas = new ArrayList<>();
 
-	public void setRincianKegiatan(RincianKegiatan rincianKegiatan) {
-		this.rincianKegiatan = rincianKegiatan;
-	}
-
-	public Integer getRincianKegiatanId() {
-		return rincianKegiatanId;
-	}
-
-	public void setRincianKegiatanId(Integer rincianKegiatanId) {
-		this.rincianKegiatanId = rincianKegiatanId;
-	}
-
-	public Double getTotal() {
-		return total;
-	}
-
-	public void setTotal(Double total) {
-		this.total = total;
-	}
-
-	public Double getNilai() {
-		return nilai;
-	}
-
-	public void setNilai(Double nilai) {
-		this.nilai = nilai;
-	}
-
-	public Double getHasil() {
-		return hasil;
-	}
-
-	public void setHasil(Double hasil) {
-		this.hasil = hasil;
-	}
-
-	public String getPeriode() {
-		return periode;
-	}
-
-	public void setPeriode(String periode) {
-		this.periode = periode;
-	}
-
-	public Pegawai getPegawai() {
-		return pegawai;
-	}
-
-	public void setPegawai(Pegawai pegawai) {
-		this.pegawai = pegawai;
-	}
-
-	public Integer getPegawaiId() {
-		return pegawaiId;
-	}
-
-	public void setPegawaiId(Integer pegawaiId) {
-		this.pegawaiId = pegawaiId;
-	}
-
-	public List<DetailUraianTugasTransaksi> getDetailUraianTugas() {
-		return detailUraianTugas;
-	}
-
-	public void setDetailUraianTugas(List<DetailUraianTugasTransaksi> detailUraianTugas) {
-		this.detailUraianTugas = detailUraianTugas;
-	}	
-	
-	public Double getTarget() {
-		return target;
-	}
-
-	public void setTarget(Double target) {
-		this.target = target;
-	}
-
-	public Double getBobot() {
-		return bobot;
-	}
-
-	public void setBobot(Double bobot) {
-		this.bobot = bobot;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Urin.java

@@ -1,50 +1,35 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class Urin
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_Urin_M")
 public class Urin extends BaseMaster {
+
 	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.urin_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.urin_m_id_seq", sequenceName = "public.urin_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.urin_m_id_seq")
+	@SequenceGenerator(name = "public.urin_m_id_seq", sequenceName = "public.urin_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UrinAlatGenitalia.java

@@ -1,45 +1,30 @@
 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.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 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;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "rm_UrinAlatGenitalia_M")
 public class UrinAlatGenitalia extends BaseMaster {
+
 	@NotNull(message = "Name tidak boleh kosong")
 	@Column(name = "Name", nullable = false, length = 100)
 	@Caption(value = "Name")
 	private String name;
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return this.name;
-
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.urinalatgenitalia_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.urinalatgenitalia_m_id_seq", sequenceName = "public.urinalatgenitalia_m_id_seq", allocationSize = 1)
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.urinalatgenitalia_m_id_seq")
+	@SequenceGenerator(name = "public.urinalatgenitalia_m_id_seq", sequenceName = "public.urinalatgenitalia_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }