Merge branch 'master' into dev-deploy

jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/MigrasiPasienController.java

@@ -0,0 +1,39 @@
+package com.jasamedika.medifirst2000.controller;
+
+import com.jasamedika.medifirst2000.etl.pasien.dto.PasienDto;
+import com.jasamedika.medifirst2000.service.MigrasiPasienService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 06/11/2023
+ */
+@RestController
+@RequestMapping("/migrasi/pasien")
+public class MigrasiPasienController {
+
+	@Autowired
+	private MigrasiPasienService migrasiPasienService;
+
+	@RequestMapping(value = "/init", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Object> initiateMigrasiPasien() {
+		migrasiPasienService.init();
+		return new ResponseEntity<>(null, HttpStatus.OK);
+	}
+
+	@RequestMapping(value = "/extraction/transformation", method = GET, produces = APPLICATION_JSON_VALUE)
+	public ResponseEntity<Object> extractAndTransform() {
+		List<PasienDto> dto = migrasiPasienService.extractAndTransform();
+		return new ResponseEntity<>(dto, HttpStatus.OK);
+	}
+}

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

@@ -16,6 +16,16 @@ public final class Master {
 	public static final String TIDAK_ADA_PERUBAHAN_DATA = "Tidak Ada Perubahan Data!";
 	public static final String VISIT = "visit";
 
+	public static final class CaraMeninggal {
+		public static final Integer ATAS_48_JAM = 8;
+		public static final Integer ATAS_8_JAM = 10;
+		public static final Integer BAWAH_DAN_48_JAM = 7;
+		public static final Integer BAWAH_DAN_8_JAM = 9;
+		public static final Integer BLUECODE = 12;
+		public static final Integer DOA = 11;
+		public static final Integer[] LAHIR = { 5, 6, 13 };
+	}
+
 	public static final class Departemen {
 		public static final Integer BEDAH_SENTRAL = 25;
 		public static final Integer[] GRUP_RAWAT_INAP = { 16, 25, 26, 35 };
@@ -98,6 +108,13 @@ public final class Master {
 		public static final Integer[] LEVEL_KEPALA = { 3, 4 };
 	}
 
+	public static final class JenisAlamat {
+		public static final Integer DOMISILI = 4;
+		public static final Integer IDENTITAS = 3;
+		public static final Integer KANTOR = 2;
+		public static final Integer RUMAH = 1;
+	}
+
 	public static final class JenisKomponenGaji {
 		public static final Integer GAJI = 1;
 		public static final Integer REMUNERASI = 2;
@@ -180,30 +197,28 @@ public final class Master {
 	}
 
 	public static final class KomponenGaji {
-		public static final Integer FEE_FOR_ON_SITE = 5;
 		public static final Integer FEE_FOR_SERVICE = 4;
 		public static final Integer GAJI_POKOK = 1;
 		public static final Integer SIMPANAN_WAJIB_KOPERASI_GAJI = 14;
 		public static final Integer SIMPANAN_WAJIB_KOPERASI_REMUNERASI = 38;
+		public static final Integer KELEBIHAN_JAM_KERJA = 43;
 		public static final Integer KELEBIHAN_TUNJANGAN = 40;
+		public static final Integer PEMBULATAN = 42;
 		public static final Integer PINJAMAN_KOPERASI_GAJI = 15;
 		public static final Integer PINJAMAN_KOPERASI_REMUNERASI = 35;
 		public static final Integer POTONGAN_BPJSK = 20;
 		public static final Integer POTONGAN_BPJSTK = 21;
 		public static final Integer POTONGAN_LAIN = 33;
 		public static final Integer POTONGAN_OBAT = 16;
-		public static final Integer POTONGAN_PPH_21_REMUNERASI = 36;
+		public static final Integer POTONGAN_PPH = 8;
-		public static final Integer POTONGAN_PPH_21_REMUNERASI_OPERASIONAL = 37;
+		public static final Integer POTONGAN_PPH_REMUNERASI = 36;
-		public static final Integer POTONGAN_PPH_21_UANG_MAKAN = 12;
+		public static final Integer POTONGAN_PPH_REMUNERASI_OPERASIONAL = 37;
 		public static final Integer POTONGAN_RAWAT_INAP = 17;
 		public static final Integer POTONGAN_RAWAT_JALAN = 18;
-		public static final Integer PFK = 31;
+		public static final Integer POTONGAN_UANG_MAKAN = 12;
-		public static final Integer PPH = 8;
+		public static final Integer POTONGAN_PFK = 31;
-		public static final Integer PPH_FEE_FOR_ON_SITE = 11;
+		public static final Integer REMUNERASI_KINERJA = 2;
-		public static final Integer PPH_FEE_FOR_SERVICE = 10;
+		public static final Integer REMUNERASI_MANAJERIAL = 44;
-		public static final Integer PPH_REMUNERASI = 9;
-		public static final Integer PPH_UANG_LEMBUR = 13;
-		public static final Integer REMUNERASI = 2;
 		public static final Integer REMUNERASI_OPERASIONAL = 3;
 		public static final Integer REMUNERASI_TAMBAHAN_DIKLITJAR = 22;
 		public static final Integer REMUNERASI_TAMBAHAN_LAIN = 23;
@@ -214,10 +229,10 @@ public final class Master {
 		public static final Integer TUNJANGAN_BERAS = 29;
 		public static final Integer TUNJANGAN_FUNGSIONAL = 28;
 		public static final Integer TUNJANGAN_ISTRI_SUAMI = 24;
-		public static final Integer TUNJANGAN_PNS = 26;
+		public static final Integer TUNJANGAN_KOMPENSASI = 41;
 		public static final Integer TUNJANGAN_PPH = 30;
 		public static final Integer TUNJANGAN_STRUKTURAL = 27;
-		public static final Integer UANG_LEMBUR = 7;
+		public static final Integer TUNJANGAN_UMUM = 26;
 		public static final Integer UANG_MAKAN = 6;
 		public static final Integer WAKAF_DLL = 39;
 	}
@@ -264,11 +279,31 @@ public final class Master {
 		public static final Integer[] RESTRICTED_EMPLOYEE = { 0, 89093, 320263, 320264, 320270, 320271, 320272 }; // pegawai_injected
 	}
 
+	public static final class Pekerjaan {
+		public static final Integer BUMN = 11;
+		public static final Integer[] PEGAWAI_SWASTA_ATAU_WIRAUSAHA = { 4, 7 };
+		public static final Integer PNS = 5;
+		public static final Integer TIDAK_BEKERJA = 1;
+		public static final Integer TNI_ATAU_POLRI = 6;
+	}
+
 	public static final class PenangguhanCuti {
 		public static final String[] NONSHIFT_J = { "Jumat" };
 		public static final String[] NONSHIFT_SK = { "Senin", "Selasa", "Rabu", "Kamis" };
 	}
 
+	public static final class Pendidikan {
+		public static final Integer[] D1_SAMPAI_D3_SEDERAJAT = { 5, 6, 7 };
+		public static final Integer D4 = 8;
+		public static final Integer S1 = 9;
+		public static final Integer S2 = 10;
+		public static final Integer S3 = 11;
+		public static final Integer SD = 2;
+		public static final Integer SLTA_SEDERAJAT = 4;
+		public static final Integer SLTP_SEDERAJAT = 3;
+		public static final Integer TIDAK_SEKOLAH = 0;
+	}
+
 	public static final class PengajuanCuti {
 		public static final Integer BELUM_DISETUJUI = 0;
 		public static final Integer DITANGGUHKAN = 3;
@@ -358,6 +393,13 @@ public final class Master {
 		public static final Integer[] TUGAS_LUAR = { 28 };
 	}
 
+	public static final class StatusPerkawinan {
+		public static final Integer BELUM_KAWIN = 1;
+		public static final Integer CERAI_HIDUP = 4;
+		public static final Integer CERAI_MATI = 5;
+		public static final Integer KAWIN = 2;
+	}
+
 	public static final class SubKategoriPegawai {
 		public static final Integer DOKTER_FARMAKOLOGI = 1;
 	}

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

@@ -1,44 +1,41 @@
 package com.jasamedika.medifirst2000.dao;
 
+import com.jasamedika.medifirst2000.entities.Alamat;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-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.Alamat;
-
 /**
  * Repository class for Alamat
  * 
  * @author Askur
  */
-@Repository("AlamatDao")
+public interface AlamatDao extends JpaRepository<Alamat, Integer> {
-public interface AlamatDao extends PagingAndSortingRepository<Alamat, Integer> {
 	@Query("select model from Alamat model where model.pasien.namaPasien=:nama")
-	public List<Alamat> findAlamatBynamaPasien(@Param("nama") String nama);
+	List<Alamat> findAlamatBynamaPasien(@Param("nama") String nama);
 
 	@Query("select model from Alamat model where model.pasien.namaPasien=:nama")
-	public List<Alamat> findAlamatByNamaNoCm(@Param("nama") String nama);
+	List<Alamat> findAlamatByNamaNoCm(@Param("nama") String nama);
 
 	@Query("select model from Alamat model where model.pasien.id=:id")
-	public Alamat findAlamatByPasienId(@Param("id") Integer id);
+	Alamat findAlamatByPasienId(@Param("id") Integer id);
 
 	@Query("select model from Alamat model where model.pasien.namaPasien=:nama")
-	public Page<Alamat> findPageAlamatBynamaPasien(@Param("nama") String nama, Pageable Page);
+	Page<Alamat> findPageAlamatBynamaPasien(@Param("nama") String nama, Pageable Page);
 
 	@Query("select new map(model.id as id, model.pasien.namaPasien as nama) from Alamat model")
-	public List<Map<String, String>> getMapAlamat();
+	List<Map<String, String>> getMapAlamat();
 
 	@Query(value = "SELECT " + "alamatlengkap AS NAMA " + "FROM Alamat", nativeQuery = true)
 	List<Object[]> getNativeAlamat();
 
 	@Query("select p from Alamat p left join fetch p.desaKelurahan d where p.pasienId=:id")
-	public List<Alamat> findAlamatByIdPasien(@Param("id") Integer id);
+	List<Alamat> findAlamatByIdPasien(@Param("id") Integer id);
 
 	@Query("select new Map(a.alamatLengkap as alamat," + "p.namaPropinsi as namaprop,"
 			+ "b.namaKotaKabupaten as namadati2," + "c.namaKecamatan as namakec," + "d.namaDesaKelurahan as namakel) "
@@ -52,4 +49,6 @@ public interface AlamatDao extends PagingAndSortingRepository<Alamat, Integer> {
 			+ "left join a.desaKelurahan dk " + "left join a.propinsi p " + "where a.pasien.id=:patientId")
 	Map<String, Object> findFullAddressByPatientId(@Param("patientId") Integer pasienId);
 
+	@Query("select alm from Alamat alm where alm.pasienId in (:listIdPasien)")
+	List<Alamat> findByPasienIdIn(@Param("listIdPasien") List<Integer> listIdPasien);
 }

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

@@ -1,56 +1,37 @@
 package com.jasamedika.medifirst2000.dao;
 
+import com.jasamedika.medifirst2000.entities.AsuransiPasien;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.data.jpa.repository.Query;
+public interface AsuransiPasienDao extends JpaRepository<AsuransiPasien, Integer> {
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.data.repository.query.Param;
-import org.springframework.stereotype.Repository;
 
-import com.jasamedika.medifirst2000.entities.AsuransiPasien;
+	@Query("select new Map(model.id as asuransiPasienId," + "pegawai.id as pegawaiId,"
+			+ "pegawai.namaLengkap as namaPegawai," + "pegawai.nipPns as nipPegawai," + "pegawai.tglLahir as tglLahir,"
+			+ "rekanan.id as rekananAsuransiId," + "rekanan.namaRekanan as rekananNamaAsuransi,"
+			+ "model.namaPeserta as namaPesertaAsuransi," + "hubunganpeserta.id as hubunganPesertaId,"
+			+ "hubunganpeserta.hubunganPeserta as namaHubunganPeserta," + "model.noAsuransi as noKartuPolis" + ") "
+			+ "from AsuransiPasien model " + "left join model.pegawai pegawai " + "left join model.rekanan rekanan "
+			+ "left join model.hubunganPeserta hubunganpeserta "
+			+ "where pegawai.id is not null and model.id=:idAsuransiPasien")
+	Map<String, Object> get(@Param("idAsuransiPasien") Integer idAsuransiPasien);
 
-@Repository("AsuransiPasienDao")
+	@Query("select new Map(model.id as asuransiPasienId," + "pegawai.id as pegawaiId,"
-public interface AsuransiPasienDao extends PagingAndSortingRepository<AsuransiPasien, Integer>{
+			+ "pegawai.namaLengkap as namaPegawai," + "pegawai.nipPns as nipPegawai," + "pegawai.tglLahir as tglLahir,"
-	@Query("select new Map(model.id as asuransiPasienId,"
+			+ "rekanan.id as rekananAsuransiId," + "rekanan.namaRekanan as rekananNamaAsuransi,"
-		+"pegawai.id as pegawaiId,"
+			+ "model.namaPeserta as namaPesertaAsuransi," + "hubunganpeserta.id as hubunganPesertaId,"
-		+"pegawai.namaLengkap as namaPegawai,"
+			+ "hubunganpeserta.hubunganPeserta as namaHubunganPeserta," + "model.noAsuransi as noKartuPolis" + ") "
-		+"pegawai.nipPns as nipPegawai,"
+			+ "from AsuransiPasien model " + "left join model.pegawai pegawai " + "left join model.rekanan rekanan "
-		+"pegawai.tglLahir as tglLahir,"
+			+ "left join model.hubunganPeserta hubunganpeserta " + "where pegawai.id is not null")
-		+"rekanan.id as rekananAsuransiId,"
+	List<Map<String, Object>> getAll();
-		+"rekanan.namaRekanan as rekananNamaAsuransi,"
-		+"model.namaPeserta as namaPesertaAsuransi,"
-		+"hubunganpeserta.id as hubunganPesertaId,"
-		+"hubunganpeserta.hubunganPeserta as namaHubunganPeserta,"
-		+"model.noAsuransi as noKartuPolis"
-		+") " 
-		+"from AsuransiPasien model "
-		+"left join model.pegawai pegawai "
-		+"left join model.rekanan rekanan "
-		+"left join model.hubunganPeserta hubunganpeserta "
-		+"where pegawai.id is not null and model.id=:idAsuransiPasien")
-	Map<String,Object> get(@Param("idAsuransiPasien") Integer idAsuransiPasien);
-	
-	@Query("select new Map(model.id as asuransiPasienId,"
-			+"pegawai.id as pegawaiId,"
-			+"pegawai.namaLengkap as namaPegawai,"
-			+"pegawai.nipPns as nipPegawai,"
-			+"pegawai.tglLahir as tglLahir,"
-			+"rekanan.id as rekananAsuransiId,"
-			+"rekanan.namaRekanan as rekananNamaAsuransi,"
-			+"model.namaPeserta as namaPesertaAsuransi,"
-			+"hubunganpeserta.id as hubunganPesertaId,"
-			+"hubunganpeserta.hubunganPeserta as namaHubunganPeserta,"
-			+"model.noAsuransi as noKartuPolis"
-			+") " 
-			+"from AsuransiPasien model "
-			+"left join model.pegawai pegawai "
-			+"left join model.rekanan rekanan "
-			+"left join model.hubunganPeserta hubunganpeserta "
-			+"where pegawai.id is not null")
-	List<Map<String,Object>> getAll();
 
 	@Query("select model from AsuransiPasien model left join model.noCm pasien where model.noAsuransi=:noAsuransi and pasien.id = :idPasien")
-	AsuransiPasien getAsuransiByPasien(@Param("noAsuransi") String noAsuransi,@Param("idPasien") Integer idPasien);
+	AsuransiPasien getAsuransiByPasien(@Param("noAsuransi") String noAsuransi, @Param("idPasien") Integer idPasien);
 
+	@Query("select ap from AsuransiPasien ap where ap.noCmId in (:listIdPasien)")
+	List<AsuransiPasien> findByPasienIdIn(@Param("listIdPasien") List<Integer> listIdPasien);
 }

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

@@ -0,0 +1,15 @@
+package com.jasamedika.medifirst2000.dao;
+
+import com.jasamedika.medifirst2000.entities.DokumenVedika;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 16/11/2023
+ */
+public interface DokumenVedikaDao extends JpaRepository<DokumenVedika, Integer> {
+    List<DokumenVedika> findByPasienNoMrIn(List<String> listPasienNoCm);
+}

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

@@ -1,18 +1,14 @@
 package com.jasamedika.medifirst2000.dao;
 
+import com.jasamedika.medifirst2000.entities.KategoryPegawai;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
 import java.util.Map;
 
-import org.springframework.data.jpa.repository.Query;
+public interface KategoryPegawaiDao extends JpaRepository<KategoryPegawai, Integer> {
-import org.springframework.data.repository.PagingAndSortingRepository;
+	@Query("select new Map(model.id as id, model.kategoryPegawai as kategoryPegawai) " + "from KategoryPegawai model "
-import org.springframework.data.repository.query.Param;
+			+ "where model.id = :kategoryPegawaiId " + "and model.statusEnabled is true")
-import org.springframework.stereotype.Repository;
+	Map<String, Object> getKategoryPegawaiById(@Param("kategoryPegawaiId") Integer kategoryPegawaiId);
-
-import com.jasamedika.medifirst2000.entities.KategoryPegawai;
-
-@Repository("KategoryPegawaiDao")
-public interface KategoryPegawaiDao extends PagingAndSortingRepository<KategoryPegawai, Integer> {
-	
-	@Query("select new Map(model.id as id, model.kategoryPegawai as kategoryPegawai) from KategoryPegawai model where model.id = :kategoryPegawaiId and model.statusEnabled is true")
-	public Map<String, Object> getKategoryPegawaiById(@Param("kategoryPegawaiId") Integer kategoryPegawaiId);
-
 }

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

@@ -0,0 +1,20 @@
+package com.jasamedika.medifirst2000.dao;
+
+import com.jasamedika.medifirst2000.entities.MigrasiPasien;
+import com.jasamedika.medifirst2000.entities.Pasien;
+import com.jasamedika.medifirst2000.etl.pasien.constant.StatusMigrasi;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 06/11/2023
+ */
+public interface MigrasiPasienDao extends JpaRepository<MigrasiPasien, String> {
+	@Query("select mp.pasien from MigrasiPasien mp where mp.statusMigrasi in (:listStatusMigrasi)")
+	List<Pasien> findPasienByStatusMigrasiIn(@Param("listStatusMigrasi") List<StatusMigrasi> statusMigrasiList);
+}

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

@@ -3,17 +3,15 @@ package com.jasamedika.medifirst2000.dao;
 import com.jasamedika.medifirst2000.dto.StrukPelayananDto;
 import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
 import com.jasamedika.medifirst2000.entities.PasienDaftar;
+import org.springframework.data.jpa.repository.JpaRepository;
 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 java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-@Repository("PasienDaftarDao")
+public interface PasienDaftarDao extends JpaRepository<PasienDaftar, String> {
-public interface PasienDaftarDao extends PagingAndSortingRepository<PasienDaftar, String> {
 	@Query("select p from PasienDaftar p where  date(p.tglPulang) between date(:start) and date(:until)")
 	List<PasienDaftar> findByPasienPulang(@Param("start") Date start, @Param("until") Date until);
 
@@ -315,4 +313,8 @@ public interface PasienDaftarDao extends PagingAndSortingRepository<PasienDaftar
 			+ "and vp.kode = :kodeVoucher " + "and pd.noRegistrasi <> :noRegistrasi")
 	List<PasienDaftar> findByPasienAndVoucherAndNoRegistrasiNot(@Param("pasienId") Integer pasienId,
 			@Param("kodeVoucher") String kodeVoucher, @Param("noRegistrasi") String noRegistrasi);
+
+	@Query("select new Map(pd.pasienId as idPasien,pd.penyebabKematianId as idCaraMeninggal) " + "from PasienDaftar pd "
+			+ "where pd.pasienId in (:listIdPasien)")
+	List<Map<String, Object>> findPenyebabKematianByPasienIdIn(@Param("listIdPasien") List<Integer> listIdPasien);
 }

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

@@ -116,8 +116,18 @@ public interface PasienDao extends JpaRepository<Pasien, Integer> {
 			+ "or length(ps.noidentitas) <> 16) " + "order by ps.statusenabled, ps.tgldaftar desc", nativeQuery = true)
 	List<Pasien> findByValidBpjs();
 
+	@Query("select anak from Pasien ibu, Pasien anak " + "where ibu.noCm = anak.reportDisplay "
+			+ "and ibu.statusEnabled is true and anak.statusEnabled is true " + "and ibu.noCm in (:listNoCmIbu)")
+	List<Pasien> findAnakByNoCmOfIbu(@Param("listNoCmIbu") List<String> listNoCmIbu);
+
 	@Query("select new Map(ibu.id as idIbu,anak.id as idAnak) " + "from Pasien ibu, Pasien anak "
 			+ "where ibu.noCm = anak.reportDisplay " + "and ibu.statusEnabled is true and anak.statusEnabled is true "
 			+ "and ibu.id in (:listIdIbu)")
-	List<Map<String, Object>> findIdByNoCmOfIbu(@Param("listIdIbu") Set<Integer> listIdIbu);
+	List<Map<String, Object>> findIdByIdOfIbu(@Param("listIdIbu") Set<Integer> listIdIbu);
+
+	@Query(value = "select ps.* from pasien_m ps " + "where ps.statusenabled is true " + "and ps.nocm ~ '^[0-9\\.]+$' "
+			+ "and length(ps.nocm) = 8 " + "and cast(ps.nocm as integer) < 10000000 "
+			+ "and ps.id not in (select mp.pasienfk from migrasipasien_t mp) "
+			+ "order by cast(ps.nocm as integer) desc " + "limit 100", nativeQuery = true)
+	List<Pasien> find100LatestByNotMigrateYet();
 }

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

@@ -1,43 +1,30 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.Date;
-
-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.PemakaianAsuransi;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.Date;
 
 /**
  * Repository class for PemakaianAsuransi
  * 
  * @author Generator
  */
-@Repository("PemakaianAsuransiDao")
+public interface PemakaianAsuransiDao extends JpaRepository<PemakaianAsuransi, String> {
-public interface PemakaianAsuransiDao extends PagingAndSortingRepository<PemakaianAsuransi, String> {
 
-	@Query("select p from PemakaianAsuransi p "
+	@Query("select p from PemakaianAsuransi p " + "left join p.pasienDaftar a " + "left join a.pasien b "
-			+ "left join p.pasienDaftar a "
+			+ "where b.noCm=:noCm " + "and p.kdProfile=:kdProfile " + "and date(a.tglRegistrasi)=:tglRegistrasi ")
-			+ "left join a.pasien b "
+	PemakaianAsuransi finByNoCmAndTglRegistrasi(@Param("noCm") String noCm, @Param("kdProfile") short kdProfile,
-			+ "where b.noCm=:noCm "
-			+ "and p.kdProfile=:kdProfile "
-			+ "and date(a.tglRegistrasi)=:tglRegistrasi ")
-	PemakaianAsuransi finByNoCmAndTglRegistrasi(
-			@Param("noCm") String noCm, 
-			@Param("kdProfile") short kdProfile, 
 			@Param("tglRegistrasi") Date tglRegistrasi);
 
 	@Query("select p from PemakaianAsuransi p where p.noSep=:noSep")
-	PemakaianAsuransi finByNoSep(
+	PemakaianAsuransi finByNoSep(@Param("noSep") String noSep);
-			@Param("noSep") String noSep);
 
 	@Query("select a from PemakaianAsuransi a left join a.pasienDaftar b where a.noRec=:noRec")
 	PemakaianAsuransi findByPasienDaftarPasienDaftarNoRec(@Param("noRec") String noRec);
 
-	@Query("select p from PemakaianAsuransi p "
+	@Query("select p from PemakaianAsuransi p " + "left join p.pasienDaftar a " + "where a.noRec=:noRec")
-			+ "left join p.pasienDaftar a "
-			+ "where a.noRec=:noRec")
 	PemakaianAsuransi findByPasienDaftar(@Param("noRec") String noRec);
-	
 }

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

@@ -26,7 +26,8 @@ public interface SlipGajiDao extends JpaRepository<SlipGaji, String> {
 	List<Integer> findPegawaiKomponenByBulan(@Param("start") Date start, @Param("end") Date end);
 
 	@Query("select new Map(sg.id as id,pg.id as idPegawai,pg.namaLengkap as namaPegawai,"
-			+ "coalesce(pg.nipPns,'-') as nip) " + "from SlipGaji sg " + "inner join sg.pegawai pg "
+			+ "coalesce(pg.nipPns,'-') as nip," + "coalesce(kp.kategoryPegawai,'-') as statusKepegawaian) "
+			+ "from SlipGaji sg " + "inner join sg.pegawai pg " + "left join pg.kategoryPegawai kp "
 			+ "where sg.bulan between :start and :end " + "order by pg.namaLengkap")
 	List<Map<String, Object>> findAllByBulan(@Param("start") Date start, @Param("end") Date end);
 }

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MigrasiPasienService.java

@@ -0,0 +1,16 @@
+package com.jasamedika.medifirst2000.service;
+
+import com.jasamedika.medifirst2000.etl.pasien.dto.PasienDto;
+
+import java.util.List;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 06/11/2023
+ */
+public interface MigrasiPasienService {
+	void init();
+
+	List<PasienDto> extractAndTransform();
+}

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

@@ -0,0 +1,275 @@
+package com.jasamedika.medifirst2000.service.impl;
+
+import com.jasamedika.medifirst2000.constants.Master;
+import com.jasamedika.medifirst2000.dao.*;
+import com.jasamedika.medifirst2000.entities.*;
+import com.jasamedika.medifirst2000.etl.pasien.constant.StatusMigrasi;
+import com.jasamedika.medifirst2000.etl.pasien.dto.*;
+import com.jasamedika.medifirst2000.service.MigrasiPasienService;
+import com.jasamedika.medifirst2000.util.CommonUtil;
+import org.apache.commons.lang.math.NumberUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.ZoneId;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.jasamedika.medifirst2000.etl.pasien.constant.CaraMeninggal.*;
+import static com.jasamedika.medifirst2000.etl.pasien.constant.HubunganKeluarga.ANAK;
+import static com.jasamedika.medifirst2000.etl.pasien.constant.JenisAlamat.DOMISILI;
+import static com.jasamedika.medifirst2000.etl.pasien.constant.JenisAlamat.IDENTITAS;
+import static com.jasamedika.medifirst2000.etl.pasien.constant.JenisIdentitas.KTP;
+import static com.jasamedika.medifirst2000.etl.pasien.constant.Pekerjaan.*;
+import static com.jasamedika.medifirst2000.etl.pasien.constant.Pendidikan.*;
+import static com.jasamedika.medifirst2000.etl.pasien.constant.StatusMigrasi.BELUM_KIRIM;
+import static com.jasamedika.medifirst2000.etl.pasien.constant.StatusMigrasi.PEMBAHARUAN;
+import static com.jasamedika.medifirst2000.etl.pasien.constant.StatusPerkawinan.*;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 06/11/2023
+ */
+@Service
+@Transactional
+public class MigrasiPasienServiceImpl implements MigrasiPasienService {
+	@Autowired
+	private MigrasiPasienDao migrasiPasienDao;
+
+	@Autowired
+	private PasienDaftarDao pasienDaftarDao;
+
+	@Autowired
+	private PasienDao pasienDao;
+
+	@Autowired
+	private AlamatDao alamatDao;
+
+	@Autowired
+	private DokumenVedikaDao dokumenVedikaDao;
+
+	@Autowired
+	private AsuransiPasienDao asuransiPasienDao;
+
+	@Override
+	public void init() {
+		List<MigrasiPasien> models = new ArrayList<>();
+		List<Pasien> oneHundredPasien = pasienDao.find100LatestByNotMigrateYet();
+		List<Integer> oneHundredIdPasien = oneHundredPasien.stream().map(Pasien::getId).collect(Collectors.toList());
+		oneHundredIdPasien.forEach(id -> {
+			MigrasiPasien migrasiPasien = new MigrasiPasien();
+			Pasien pasien = new Pasien();
+			pasien.setId(id);
+			migrasiPasien.setPasien(pasien);
+			migrasiPasien.setKdProfile((short) 0);
+			migrasiPasien.setStatusEnabled(true);
+			models.add(migrasiPasien);
+		});
+		migrasiPasienDao.save(models);
+	}
+
+	@Override
+	public List<PasienDto> extractAndTransform() {
+		List<StatusMigrasi> statusMigrasiList = new ArrayList<>(Arrays.asList(BELUM_KIRIM, PEMBAHARUAN));
+		List<Pasien> listPasien = migrasiPasienDao.findPasienByStatusMigrasiIn(statusMigrasiList);
+		List<Integer> listIdPasien = listPasien.stream().map(Pasien::getId).collect(Collectors.toList());
+		List<String> listNoCmPasien = listPasien.stream().map(Pasien::getNoCm).collect(Collectors.toList());
+		List<Map<String, Object>> listCaraMeninggal = pasienDaftarDao.findPenyebabKematianByPasienIdIn(listIdPasien);
+		List<Alamat> listAlamat = alamatDao.findByPasienIdIn(listIdPasien);
+		List<DokumenVedika> listDokumenVedika = dokumenVedikaDao.findByPasienNoMrIn(listNoCmPasien);
+		List<Pasien> listPasienAnak = pasienDao.findAnakByNoCmOfIbu(listNoCmPasien);
+		List<AsuransiPasien> listAsuransi = asuransiPasienDao.findByPasienIdIn(listIdPasien);
+		List<PasienDto> dtoList = new ArrayList<>();
+		listPasien.forEach(pasien -> {
+			PasienDto.PasienDtoBuilder dtoBuilder = PasienDto.builder();
+			dtoBuilder.noRekamMedis(pasien.getNoCm());
+			dtoBuilder.namaLengkap(pasien.getNamaPasien());
+			dtoBuilder.namaPanggilan(pasien.getNamaDepan());
+			dtoBuilder.tempatLahir(pasien.getTempatLahir());
+			if (CommonUtil.isNotNullOrEmpty(pasien.getTglLahir()))
+				dtoBuilder.tanggalLahir(
+						pasien.getTglLahir().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+			dtoBuilder.surel(pasien.getEmail());
+			if (CommonUtil.isNotNullOrEmpty(pasien.getTitlePasienId()))
+				dtoBuilder.sapaan(SapaanDto.builder().id(pasien.getTitlePasienId().longValue()).build());
+			dtoBuilder.identitas(new HashSet<>(Collections.singletonList(
+					IdentitasDto.builder().jenisIdentitas(JenisIdentitasDto.builder().id(KTP.id()).build())
+							.noIdentitas(pasien.getNoIdentitas()).build())));
+			if (CommonUtil.isNotNullOrEmpty(pasien.getJenisKelaminId()))
+				dtoBuilder.jenisKelamin(JenisKelaminDto.builder().id(pasien.getJenisKelaminId().longValue()).build());
+			if (CommonUtil.isNotNullOrEmpty(pasien.getGolonganDarahId()))
+				dtoBuilder
+						.golonganDarah(GolonganDarahDto.builder().id(pasien.getGolonganDarahId().longValue()).build());
+			listCaraMeninggal.stream().filter(c -> pasien.getId().equals(c.get("idPasien"))).findFirst()
+					.ifPresent(c -> {
+						if (CommonUtil.isNotNullOrEmpty(c.get("idPenyebabKematian"))) {
+							if (Master.CaraMeninggal.BAWAH_DAN_48_JAM.equals(c.get("idPenyebabKematian")))
+								dtoBuilder.caraMeninggal(CaraMeninggalDto.builder().id(BAWAH_DAN_48_JAM.id()).build());
+							if (Master.CaraMeninggal.ATAS_48_JAM.equals(c.get("idPenyebabKematian")))
+								dtoBuilder.caraMeninggal(CaraMeninggalDto.builder().id(ATAS_48_JAM.id()).build());
+							if (Master.CaraMeninggal.BAWAH_DAN_8_JAM.equals(c.get("idPenyebabKematian")))
+								dtoBuilder.caraMeninggal(CaraMeninggalDto.builder().id(BAWAH_DAN_8_JAM.id()).build());
+							if (Master.CaraMeninggal.ATAS_8_JAM.equals(c.get("idPenyebabKematian")))
+								dtoBuilder.caraMeninggal(CaraMeninggalDto.builder().id(ATAS_8_JAM.id()).build());
+							if (Master.CaraMeninggal.DOA.equals(c.get("idPenyebabKematian")))
+								dtoBuilder.caraMeninggal(CaraMeninggalDto.builder().id(DOA.id()).build());
+							if (Master.CaraMeninggal.BLUECODE.equals(c.get("idPenyebabKematian")))
+								dtoBuilder.caraMeninggal(CaraMeninggalDto.builder().id(BLUECODE.id()).build());
+							if (Arrays.asList(Master.CaraMeninggal.LAHIR)
+									.contains(Integer.parseInt(c.get("idPenyebabKematian").toString())))
+								dtoBuilder.caraMeninggal(CaraMeninggalDto.builder().id(LAHIR.id()).build());
+						}
+					});
+			if (CommonUtil.isNotNullOrEmpty(pasien.getKebangsaanId()))
+				dtoBuilder
+						.kewarganegaraan(KewarganegaraanDto.builder().id(pasien.getKebangsaanId().longValue()).build());
+			if (CommonUtil.isNotNullOrEmpty(pasien.getNegaraId()))
+				dtoBuilder.negara(NegaraDto.builder().id(pasien.getNegaraId().longValue()).build());
+			if (CommonUtil.isNotNullOrEmpty(pasien.getAgamaId()))
+				dtoBuilder.agama(AgamaDto.builder().id(pasien.getAgamaId().longValue()).build());
+			{
+				if (Master.Pendidikan.TIDAK_SEKOLAH.equals(pasien.getPendidikanId()))
+					dtoBuilder.pendidikan(PendidikanDto.builder().id(TIDAK_SEKOLAH.id()).build());
+				if (Master.Pendidikan.SD.equals(pasien.getPendidikanId()))
+					dtoBuilder.pendidikan(PendidikanDto.builder().id(SD.id()).build());
+				if (Master.Pendidikan.SLTP_SEDERAJAT.equals(pasien.getPendidikanId()))
+					dtoBuilder.pendidikan(PendidikanDto.builder().id(SLTP_SEDERAJAT.id()).build());
+				if (Master.Pendidikan.SLTA_SEDERAJAT.equals(pasien.getPendidikanId()))
+					dtoBuilder.pendidikan(PendidikanDto.builder().id(SLTA_SEDERAJAT.id()).build());
+				if (Arrays.asList(Master.Pendidikan.D1_SAMPAI_D3_SEDERAJAT).contains(pasien.getPendidikanId()))
+					dtoBuilder.pendidikan(PendidikanDto.builder().id(D1_SAMPAI_D3_SEDERAJAT.id()).build());
+				if (Master.Pendidikan.D4.equals(pasien.getPendidikanId()))
+					dtoBuilder.pendidikan(PendidikanDto.builder().id(D4.id()).build());
+				if (Master.Pendidikan.S1.equals(pasien.getPendidikanId()))
+					dtoBuilder.pendidikan(PendidikanDto.builder().id(S1.id()).build());
+				if (Master.Pendidikan.S2.equals(pasien.getPendidikanId()))
+					dtoBuilder.pendidikan(PendidikanDto.builder().id(S2.id()).build());
+				if (Master.Pendidikan.S3.equals(pasien.getPendidikanId()))
+					dtoBuilder.pendidikan(PendidikanDto.builder().id(S3.id()).build());
+			}
+			{
+				List<Alamat> alamatPasien = listAlamat.stream()
+						.filter(alamat -> pasien.getId().equals(alamat.getPasienId())).collect(Collectors.toList());
+				dtoBuilder.alamat(setAlamat(alamatPasien));
+			}
+			{
+				Set<GawaiDto> gawaiDto = new HashSet<>();
+				if (NumberUtils.isNumber(pasien.getNoTelepon()) && pasien.getNoTelepon().charAt(0) == '0')
+					gawaiDto.add(GawaiDto.builder().noGawai(Long.parseLong("62" + pasien.getNoTelepon())).build());
+				if (NumberUtils.isNumber(pasien.getNoHp()) && pasien.getNoHp().charAt(0) == '0')
+					gawaiDto.add(GawaiDto.builder().noGawai(Long.parseLong("62" + pasien.getNoHp())).build());
+				dtoBuilder.gawai(gawaiDto);
+			}
+			{
+				if (Master.Pekerjaan.TIDAK_BEKERJA.equals(pasien.getPekerjaanId()))
+					dtoBuilder.pekerjaan(PekerjaanDto.builder().id(TIDAK_BEKERJA.id()).build());
+				if (Master.Pekerjaan.PNS.equals(pasien.getPekerjaanId()))
+					dtoBuilder.pekerjaan(PekerjaanDto.builder().id(PNS.id()).build());
+				if (Master.Pekerjaan.TNI_ATAU_POLRI.equals(pasien.getPekerjaanId()))
+					dtoBuilder.pekerjaan(PekerjaanDto.builder().id(TNI_ATAU_POLRI.id()).build());
+				if (Master.Pekerjaan.BUMN.equals(pasien.getPekerjaanId()))
+					dtoBuilder.pekerjaan(PekerjaanDto.builder().id(BUMN.id()).build());
+				if (Arrays.asList(Master.Pekerjaan.PEGAWAI_SWASTA_ATAU_WIRAUSAHA).contains(pasien.getPekerjaanId()))
+					dtoBuilder.pekerjaan(PekerjaanDto.builder().id(PEGAWAI_SWASTA_ATAU_WIRAUSAHA.id()).build());
+			}
+			{
+				if (Master.StatusPerkawinan.BELUM_KAWIN.equals(pasien.getStatusPerkawinanId()))
+					dtoBuilder.statusPerkawinan(StatusPerkawinanDto.builder().id(BELUM_KAWIN.id()).build());
+				if (Master.StatusPerkawinan.KAWIN.equals(pasien.getStatusPerkawinanId()))
+					dtoBuilder.statusPerkawinan(StatusPerkawinanDto.builder().id(KAWIN.id()).build());
+				if (Master.StatusPerkawinan.CERAI_HIDUP.equals(pasien.getStatusPerkawinanId()))
+					dtoBuilder.statusPerkawinan(StatusPerkawinanDto.builder().id(CERAI_HIDUP.id()).build());
+				if (Master.StatusPerkawinan.CERAI_MATI.equals(pasien.getStatusPerkawinanId()))
+					dtoBuilder.statusPerkawinan(StatusPerkawinanDto.builder().id(CERAI_MATI.id()).build());
+			}
+			{
+				dtoBuilder.berkas(setBerkas(listDokumenVedika));
+			}
+			{
+				List<Pasien> pasienAnak = listPasienAnak.stream()
+						.filter(anak -> pasien.getNoCm().equals(anak.getReportDisplay())).collect(Collectors.toList());
+				dtoBuilder.keluarga(setAnak(pasienAnak));
+			}
+			{
+				List<AsuransiPasien> asuransiPasien = listAsuransi.stream()
+						.filter(asuransi -> pasien.getId().equals(asuransi.getNoCmId())).collect(Collectors.toList());
+				dtoBuilder.jaminan(setJaminan(asuransiPasien));
+			}
+			dtoList.add(dtoBuilder.build());
+		});
+		return dtoList;
+	}
+
+	private Set<AlamatDto> setAlamat(List<Alamat> listAlamat) {
+		Set<AlamatDto> dtoList = new HashSet<>();
+		listAlamat.forEach(alamat -> {
+			AlamatDto.AlamatDtoBuilder dtoBuilder = AlamatDto.builder();
+			dtoBuilder.alamat(alamat.getAlamatLengkap());
+			if (CommonUtil.isNotNullOrEmpty(alamat.getRtrw())) {
+				if (alamat.getRtrw().split(" ")[0].equals("RT"))
+					dtoBuilder.rt(Integer.parseInt(alamat.getRtrw().split(" ")[1]));
+				if (alamat.getRtrw().split(" ")[2].equals("RW"))
+					dtoBuilder.rw(Integer.parseInt(alamat.getRtrw().split(" ")[3]));
+			}
+			if (NumberUtils.isNumber(alamat.getKodePos()))
+				dtoBuilder.kodePos(Integer.valueOf(alamat.getKodePos()));
+			{
+				if (Master.JenisAlamat.IDENTITAS.equals(alamat.getJenisAlamatId()))
+					dtoBuilder.jenisAlamat(JenisAlamatDto.builder().id(IDENTITAS.id()).build());
+				if (Master.JenisAlamat.DOMISILI.equals(alamat.getJenisAlamatId()))
+					dtoBuilder.jenisAlamat(JenisAlamatDto.builder().id(DOMISILI.id()).build());
+			}
+			if (CommonUtil.isNotNullOrEmpty(alamat.getDesaKelurahan())
+					&& CommonUtil.isNotNullOrEmpty(alamat.getDesaKelurahan().getMigrasiKelurahanDesaId()))
+				dtoBuilder.kelurahanDesa(
+						KelurahanDesaDto.builder().id(alamat.getDesaKelurahan().getMigrasiKelurahanDesaId()).build());
+			if (CommonUtil.isNotNullOrEmpty(alamat.getNegaraId()))
+				dtoBuilder.negara(NegaraDto.builder().id(alamat.getNegaraId().longValue()).build());
+			dtoList.add(dtoBuilder.build());
+		});
+		return dtoList;
+	}
+
+	private Set<BerkasDto> setBerkas(List<DokumenVedika> listDokumenVedika) {
+		Set<BerkasDto> dtoList = new HashSet<>();
+		listDokumenVedika.forEach(dokumenVedika -> {
+			BerkasDto.BerkasDtoBuilder dtoBuilder = BerkasDto.builder();
+			dtoBuilder.judulBerkas(dokumenVedika.getNamaFile());
+			dtoBuilder.lokasiBerkas(dokumenVedika.getUrl());
+			if (CommonUtil.isNotNullOrEmpty(dokumenVedika.getJenisBerkasId()))
+				dtoBuilder
+						.jenisBerkas(JenisBerkasDto.builder().id(dokumenVedika.getJenisBerkasId().longValue()).build());
+			dtoList.add(dtoBuilder.build());
+		});
+		return dtoList;
+	}
+
+	private Set<KeluargaDto> setAnak(List<Pasien> listPasienAnak) {
+		Set<KeluargaDto> dtoList = new HashSet<>();
+		listPasienAnak.forEach(anak -> {
+			KeluargaDto.KeluargaDtoBuilder dtoBuilder = KeluargaDto.builder();
+			dtoBuilder.namaLengkap(anak.getNamaPasien());
+			dtoBuilder.namaPanggilan(anak.getNamaDepan());
+			dtoBuilder.surel(anak.getEmail());
+			if (NumberUtils.isNumber(anak.getNoHp()) && anak.getNoHp().charAt(0) == '0')
+				dtoBuilder.noGawai(Long.parseLong("62" + anak.getNoHp()));
+			dtoBuilder.hubunganKeluarga(HubunganKeluargaDto.builder().id(ANAK.id()).build());
+			dtoList.add(dtoBuilder.build());
+		});
+		return dtoList;
+	}
+
+	private Set<JaminanDto> setJaminan(List<AsuransiPasien> listAsuransiPasien) {
+		Set<JaminanDto> dtoList = new HashSet<>();
+		listAsuransiPasien.forEach(asuransi -> {
+			JaminanDto.JaminanDtoBuilder dtoBuilder = JaminanDto.builder();
+			dtoBuilder.nomorKartu(asuransi.getNoAsuransi());
+			if (CommonUtil.isNotNullOrEmpty(asuransi.getRekanan()))
+				dtoBuilder.asuransi(AsuransiDto.builder().asuransi(asuransi.getRekanan().getNamaRekanan()).build());
+			dtoList.add(dtoBuilder.build());
+		});
+		return dtoList;
+	}
+}

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

@@ -1631,7 +1631,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
 				.findPasienPaketDiRanapByDokter(drKsmObgyn, allProdukEntriId);
 		Set<Integer> setIdIbu = ibuPaketDiRanapByDokter.stream()
 				.map(pasien -> Integer.parseInt(pasien.get("pasienId").toString())).collect(Collectors.toSet());
-		List<Map<String, Object>> ibuAnak = pasienDao.findIdByNoCmOfIbu(setIdIbu);
+		List<Map<String, Object>> ibuAnak = pasienDao.findIdByIdOfIbu(setIdIbu);
 		listData.forEach(d -> {
 			List<Integer> listIdAnak = ibuAnak.stream().filter(bn -> Integer
 					.parseInt(d.get("pasienId").toString()) == Integer.parseInt(bn.get("idIbu").toString())

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

@@ -3274,8 +3274,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 					result.put("tunjanganIstriSuami", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.TUNJANGAN_ANAK.equals(k.getIdKomponen())) {
 					result.put("tunjanganAnak", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.TUNJANGAN_PNS.equals(k.getIdKomponen())) {
+				} else if (Master.KomponenGaji.TUNJANGAN_UMUM.equals(k.getIdKomponen())) {
-					result.put("tunjanganPns", nf.format(k.getNominal()));
+					result.put("tunjanganUmum", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.TUNJANGAN_STRUKTURAL.equals(k.getIdKomponen())) {
 					result.put("tunjanganStruktural", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.TUNJANGAN_FUNGSIONAL.equals(k.getIdKomponen())) {
@@ -3284,16 +3284,34 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 					result.put("tunjanganBeras", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.TUNJANGAN_PPH.equals(k.getIdKomponen())) {
 					result.put("tunjanganPph", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.REMUNERASI.equals(k.getIdKomponen())) {
+				} else if (Master.KomponenGaji.TUNJANGAN_KOMPENSASI.equals(k.getIdKomponen())) {
-					result.put("remunerasi", nf.format(k.getNominal()));
+					result.put("tunjanganKompensasi", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.PEMBULATAN.equals(k.getIdKomponen())) {
+					result.put("pembulatan", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.REMUNERASI_KINERJA.equals(k.getIdKomponen())) {
+					result.put("remunerasiKinerja", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) {
+					result.put("feeForService", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
 					result.put("remunerasiOperasional", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.KELEBIHAN_JAM_KERJA.equals(k.getIdKomponen())) {
+					result.put("kelebihanJamKerja", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.REMUNERASI_MANAJERIAL.equals(k.getIdKomponen())) {
+					result.put("remunerasiManajerial", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_DIKLITJAR.equals(k.getIdKomponen())) {
+					result.put("remunerasiTambahanDiklitjar", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_LAIN.equals(k.getIdKomponen())) {
+					result.put("remunerasiTambahanLain", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) {
 					result.put("uangMakan", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PFK.equals(k.getIdKomponen())) {
+				} else if (Master.KomponenGaji.POTONGAN_PFK.equals(k.getIdKomponen())) {
-					result.put("pfk", nf.format(k.getNominal()));
+					result.put("potongaPfk", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.PPH.equals(k.getIdKomponen())) {
+				} else if (Master.KomponenGaji.POTONGAN_PPH.equals(k.getIdKomponen())) {
-					result.put("pph", nf.format(k.getNominal()));
+					result.put("potonganPph", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.POTONGAN_BPJSTK.equals(k.getIdKomponen())) {
+					result.put("potonganBpjsKetenagakerjaan", nf.format(k.getNominal()));
+				} else if (Master.KomponenGaji.POTONGAN_BPJSK.equals(k.getIdKomponen())) {
+					result.put("potonganBpjsKesehatan", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.SEWA_RUMAH.equals(k.getIdKomponen())) {
 					result.put("sewaRumah", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.KELEBIHAN_TUNJANGAN.equals(k.getIdKomponen())) {
@@ -3302,18 +3320,14 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 					result.put("potonganLain", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.TABUNGAN_RUMAH.equals(k.getIdKomponen())) {
 					result.put("tabunganRumah", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.POTONGAN_BPJSTK.equals(k.getIdKomponen())) {
-					result.put("potonganBpjsKetenagakerjaan", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.POTONGAN_BPJSK.equals(k.getIdKomponen())) {
-					result.put("potonganBpjsKesehatan", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.SIMPANAN_WAJIB_KOPERASI_GAJI.equals(k.getIdKomponen())) {
 					result.put("simpananWajibKoperasiGaji", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.PINJAMAN_KOPERASI_GAJI.equals(k.getIdKomponen())) {
 					result.put("pinjamanKoperasiGaji", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.POTONGAN_PPH_21_REMUNERASI.equals(k.getIdKomponen())) {
+				} else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) {
-					result.put("potonganPph21Remunerasi", nf.format(k.getNominal()));
+					result.put("potonganPphRemunerasi", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.POTONGAN_PPH_21_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
+				} else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
-					result.put("potonganPph21RemunerasiOperasional", nf.format(k.getNominal()));
+					result.put("potonganPphRemunerasiOperasional", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) {
 					result.put("potonganObat", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) {
@@ -3328,8 +3342,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 					result.put("tokoKoperasi", nf.format(k.getNominal()));
 				} else if (Master.KomponenGaji.WAKAF_DLL.equals(k.getIdKomponen())) {
 					result.put("wakafDanLainLain", nf.format(k.getNominal()));
-				} else if (Master.KomponenGaji.POTONGAN_PPH_21_UANG_MAKAN.equals(k.getIdKomponen())) {
+				} else if (Master.KomponenGaji.POTONGAN_UANG_MAKAN.equals(k.getIdKomponen())) {
-					result.put("potonganPph21UangMakan", nf.format(k.getNominal()));
+					result.put("potonganUangMakan", nf.format(k.getNominal()));
 				}
 			}
 		}
@@ -3397,6 +3411,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 			pegawaiDtoBuilder.unitKerja(CommonUtil.isNotNullOrEmpty(dto.getJabatan()) ? dto.getJabatan() : "-");
 			pegawaiDtoBuilder
 					.subUnitKerja(CommonUtil.isNotNullOrEmpty(dto.getSubUnitKerja()) ? dto.getSubUnitKerja() : "-");
+			pegawaiDtoBuilder.statusKepegawaian(
+					CommonUtil.isNotNullOrEmpty(dto.getStatusKepegawaian()) ? dto.getStatusKepegawaian() : "-");
 			SlipPenerimaanDto.SlipPenerimaanDtoBuilder penerimaanDtoBuilder = SlipPenerimaanDto.builder();
 			SlipPotonganDto.SlipPotonganDtoBuilder potonganDtoBuilder = SlipPotonganDto.builder();
 			SlipJumlahDto.SlipJumlahDtoBuilder jumlahDtoBuilder = SlipJumlahDto.builder();
@@ -3433,8 +3449,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 						penerimaanDtoBuilder.tunjanganIstriSuami(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.TUNJANGAN_ANAK.equals(k.getIdKomponen())) {
 						penerimaanDtoBuilder.tunjanganAnak(nf.format(k.getNominal()));
-					} else if (Master.KomponenGaji.TUNJANGAN_PNS.equals(k.getIdKomponen())) {
+					} else if (Master.KomponenGaji.TUNJANGAN_UMUM.equals(k.getIdKomponen())) {
-						penerimaanDtoBuilder.tunjanganPns(nf.format(k.getNominal()));
+						penerimaanDtoBuilder.tunjanganUmum(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.TUNJANGAN_STRUKTURAL.equals(k.getIdKomponen())) {
 						penerimaanDtoBuilder.tunjanganStruktural(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.TUNJANGAN_FUNGSIONAL.equals(k.getIdKomponen())) {
@@ -3443,16 +3459,34 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 						penerimaanDtoBuilder.tunjanganBeras(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.TUNJANGAN_PPH.equals(k.getIdKomponen())) {
 						penerimaanDtoBuilder.tunjanganPph(nf.format(k.getNominal()));
-					} else if (Master.KomponenGaji.REMUNERASI.equals(k.getIdKomponen())) {
+					} else if (Master.KomponenGaji.TUNJANGAN_KOMPENSASI.equals(k.getIdKomponen())) {
-						penerimaanDtoBuilder.remunerasi(nf.format(k.getNominal()));
+						penerimaanDtoBuilder.tunjanganKompensasi(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.PEMBULATAN.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.pembulatan(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.REMUNERASI_KINERJA.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.remunerasiKinerja(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.FEE_FOR_SERVICE.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.feeForService(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
 						penerimaanDtoBuilder.remunerasiOperasional(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.KELEBIHAN_JAM_KERJA.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.kelebihanJamKerja(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.REMUNERASI_MANAJERIAL.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.remunerasiManajerial(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_DIKLITJAR.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.remunerasiTambahanDiklitjar(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.REMUNERASI_TAMBAHAN_LAIN.equals(k.getIdKomponen())) {
+						penerimaanDtoBuilder.remunerasiTambahanLain(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.UANG_MAKAN.equals(k.getIdKomponen())) {
 						penerimaanDtoBuilder.uangMakan(nf.format(k.getNominal()));
-					} else if (Master.KomponenGaji.PFK.equals(k.getIdKomponen())) {
+					} else if (Master.KomponenGaji.POTONGAN_PFK.equals(k.getIdKomponen())) {
-						potonganDtoBuilder.pfk(nf.format(k.getNominal()));
+						potonganDtoBuilder.potonganPfk(nf.format(k.getNominal()));
-					} else if (Master.KomponenGaji.PPH.equals(k.getIdKomponen())) {
+					} else if (Master.KomponenGaji.POTONGAN_PPH.equals(k.getIdKomponen())) {
-						potonganDtoBuilder.pph(nf.format(k.getNominal()));
+						potonganDtoBuilder.potonganPph(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.POTONGAN_BPJSTK.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.potonganBpjsKetenagakerjaan(nf.format(k.getNominal()));
+					} else if (Master.KomponenGaji.POTONGAN_BPJSK.equals(k.getIdKomponen())) {
+						potonganDtoBuilder.potonganBpjsKesehatan(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.SEWA_RUMAH.equals(k.getIdKomponen())) {
 						potonganDtoBuilder.sewaRumah(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.KELEBIHAN_TUNJANGAN.equals(k.getIdKomponen())) {
@@ -3461,18 +3495,14 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 						potonganDtoBuilder.potonganLain(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.TABUNGAN_RUMAH.equals(k.getIdKomponen())) {
 						potonganDtoBuilder.tabunganRumah(nf.format(k.getNominal()));
-					} else if (Master.KomponenGaji.POTONGAN_BPJSTK.equals(k.getIdKomponen())) {
-						potonganDtoBuilder.potonganBpjsKetenagakerjaan(nf.format(k.getNominal()));
-					} else if (Master.KomponenGaji.POTONGAN_BPJSK.equals(k.getIdKomponen())) {
-						potonganDtoBuilder.potonganBpjsKesehatan(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.SIMPANAN_WAJIB_KOPERASI_GAJI.equals(k.getIdKomponen())) {
 						potonganDtoBuilder.simpananWajibKoperasiGaji(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.PINJAMAN_KOPERASI_GAJI.equals(k.getIdKomponen())) {
 						potonganDtoBuilder.pinjamanKoperasiGaji(nf.format(k.getNominal()));
-					} else if (Master.KomponenGaji.POTONGAN_PPH_21_REMUNERASI.equals(k.getIdKomponen())) {
+					} else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI.equals(k.getIdKomponen())) {
-						potonganDtoBuilder.potonganPph21Remunerasi(nf.format(k.getNominal()));
+						potonganDtoBuilder.potonganPphRemunerasi(nf.format(k.getNominal()));
-					} else if (Master.KomponenGaji.POTONGAN_PPH_21_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
+					} else if (Master.KomponenGaji.POTONGAN_PPH_REMUNERASI_OPERASIONAL.equals(k.getIdKomponen())) {
-						potonganDtoBuilder.potonganPph21RemunerasiOperasional(nf.format(k.getNominal()));
+						potonganDtoBuilder.potonganPphRemunerasiOperasional(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.POTONGAN_OBAT.equals(k.getIdKomponen())) {
 						potonganDtoBuilder.potonganObat(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.POTONGAN_RAWAT_INAP.equals(k.getIdKomponen())) {
@@ -3487,8 +3517,8 @@ public class ReportServiceImpl extends BaseVoServiceImpl implements ReportServic
 						potonganDtoBuilder.tokoKoperasi(nf.format(k.getNominal()));
 					} else if (Master.KomponenGaji.WAKAF_DLL.equals(k.getIdKomponen())) {
 						potonganDtoBuilder.wakafDanLainLain(nf.format(k.getNominal()));
-					} else if (Master.KomponenGaji.POTONGAN_PPH_21_UANG_MAKAN.equals(k.getIdKomponen())) {
+					} else if (Master.KomponenGaji.POTONGAN_UANG_MAKAN.equals(k.getIdKomponen())) {
-						potonganDtoBuilder.potonganPph21UangMakan(nf.format(k.getNominal()));
+						potonganDtoBuilder.potonganUangMakan(nf.format(k.getNominal()));
 					}
 				}
 			}

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

@@ -344,6 +344,7 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 				dto.nip(slipGaji.get().getPegawai().getNikIntern());
 			}
 			dto.bulan(slipGaji.get().getBulan().getTime());
+			dto.statusKepegawaian(slipGaji.get().getPegawai().getKategoryPegawai().getKategoryPegawai());
 			{
 				List<SlipGajiDetail> listDetail = slipGajiDetailDao.findBySlipGaji(slipGaji.get().getId());
 				List<String> listNamaJabatan = listDetail.stream()
@@ -456,8 +457,11 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 			}
 		}
 		HSSFWorkbook workbook = new HSSFWorkbook();
+		CellStyle defaultCellStyle = workbook.createCellStyle();
+		defaultCellStyle.setWrapText(true);
 		CellStyle unlockedCellStyle = workbook.createCellStyle();
 		unlockedCellStyle.setLocked(false);
+		unlockedCellStyle.setWrapText(true);
 		HSSFSheet sheet = workbook.createSheet(new SimpleDateFormat("MMMM yyyy", new Locale("in", "ID")).format(month));
 		sheet.protectSheet("Rsa6hk@@");
 		List<Object> row1 = new ArrayList<>();
@@ -466,10 +470,12 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		row1.add("");
 		row1.add(String.valueOf(month.getTime()));
 		row1.add("");
+		row1.add("");
 		row2.add("");
 		row2.add("ID PEGAWAI");
 		row2.add("NAMA PEGAWAI");
 		row2.add("NIP / KOMPONEN");
+		row2.add("STATUS");
 		allKomponen.forEach(k -> {
 			row1.add(k.get("id"));
 			row2.add(k.get("namaKomponen"));
@@ -484,12 +490,13 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 		data.put(i++, arrkd);
 		for (Map<String, Object> d : listAllKomponen) {
 			data.put(i++,
-					new Object[] { d.get("id"), d.get("idPegawai"), d.get("namaPegawai"), d.get("nip"), d.get("1"),
+					new Object[] { d.get("id"), d.get("idPegawai"), d.get("namaPegawai"), d.get("nip"),
-							d.get("24"), d.get("25"), d.get("26"), d.get("27"), d.get("28"), d.get("29"), d.get("30"),
+							d.get("statusKepegawaian"), d.get("1"), d.get("24"), d.get("25"), d.get("26"), d.get("27"),
-							d.get("2"), d.get("3"), d.get("6"), d.get("31"), d.get("8"), d.get("32"), d.get("40"),
+							d.get("28"), d.get("29"), d.get("30"), d.get("41"), d.get("42"), d.get("2"), d.get("4"),
-							d.get("33"), d.get("34"), d.get("21"), d.get("20"), d.get("14"), d.get("15"), d.get("36"),
+							d.get("3"), d.get("43"), d.get("44"), d.get("22"), d.get("23"), d.get("6"), d.get("31"),
-							d.get("37"), d.get("16"), d.get("17"), d.get("18"), d.get("38"), d.get("35"), d.get("19"),
+							d.get("8"), d.get("21"), d.get("20"), d.get("32"), d.get("40"), d.get("33"), d.get("34"),
-							d.get("39"), d.get("12") });
+							d.get("14"), d.get("15"), d.get("36"), d.get("37"), d.get("16"), d.get("17"), d.get("18"),
+							d.get("38"), d.get("35"), d.get("19"), d.get("39"), d.get("12") });
 		}
 		TreeMap<Integer, Object[]> sorted = new TreeMap<>(data);
 		Set<Integer> keyset = sorted.keySet();
@@ -500,6 +507,7 @@ public class SlipGajiServiceImpl implements SlipGajiService {
 			int cellnum = 0;
 			for (Object obj : objArr) {
 				Cell cell = row.createCell(cellnum++);
+				cell.setCellStyle(defaultCellStyle);
 				if (obj instanceof String)
 					cell.setCellValue((String) obj);
 				else if (obj instanceof Integer)

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipGajiDto.java

@@ -38,6 +38,9 @@ public class SlipGajiDto {
 	@Caption(value = "Subunit Kerja")
 	private String subUnitKerja;
 
+	@Caption(value = "Status Kepegawaian")
+	private String statusKepegawaian;
+
 	@Caption(value = "Grade")
 	private String grade;
 

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPegawaiDto.java

@@ -47,4 +47,8 @@ public class SlipPegawaiDto {
 	@Caption(value = "Subunit Kerja")
 	@Builder.Default
 	private String subUnitKerja = "-";
+
+	@Caption(value = "Status Kepegawaian")
+	@Builder.Default
+	private String statusKepegawaian = "-";
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPenerimaanDto.java

@@ -25,9 +25,9 @@ public class SlipPenerimaanDto {
 	@Builder.Default
 	private String tunjanganAnak = "-";
 
-	@Caption(value = "Tunjangan PNS")
+	@Caption(value = "Tunjangan Umum")
 	@Builder.Default
-	private String tunjanganPns = "-";
+	private String tunjanganUmum = "-";
 
 	@Caption(value = "Tunjangan Struktural")
 	@Builder.Default
@@ -45,21 +45,33 @@ public class SlipPenerimaanDto {
 	@Builder.Default
 	private String tunjanganPph = "-";
 
-	@Caption(value = "Remunerasi")
+	@Caption(value = "Tunjangan Kompensasi")
 	@Builder.Default
-	private String remunerasi = "-";
+	private String tunjanganKompensasi = "-";
 
-	@Caption(value = "Remunerasi Operasional")
+	@Caption(value = "Pembulatan")
 	@Builder.Default
-	private String remunerasiOperasional = "-";
+	private String pembulatan = "-";
+
+	@Caption(value = "Remunerasi Kinerja")
+	@Builder.Default
+	private String remunerasiKinerja = "-";
 
 	@Caption(value = "Fee for Service")
 	@Builder.Default
 	private String feeForService = "-";
 
-	@Caption(value = "Fee for On Site")
+	@Caption(value = "Remunerasi Operasional")
 	@Builder.Default
-	private String feeForOnSite = "-";
+	private String remunerasiOperasional = "-";
+
+	@Caption(value = "Kelebihan Jam Kerja")
+	@Builder.Default
+	private String kelebihanJamKerja = "-";
+
+	@Caption(value = "Remunerasi Manajerial")
+	@Builder.Default
+	private String remunerasiManajerial = "-";
 
 	@Caption(value = "Remunerasi Tambahan Pendidikan/Pelatihan/Pengajaran")
 	@Builder.Default
@@ -69,10 +81,6 @@ public class SlipPenerimaanDto {
 	@Builder.Default
 	private String remunerasiTambahanLain = "-";
 
-	@Caption(value = "Uang Lembur")
-	@Builder.Default
-	private String uangLembur = "-";
-
 	@Caption(value = "Uang Makan")
 	@Builder.Default
 	private String uangMakan = "-";

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/SlipPotonganDto.java

@@ -13,13 +13,21 @@ import lombok.*;
 @NoArgsConstructor
 @Builder
 public class SlipPotonganDto {
-	@Caption(value = "PFK")
+	@Caption(value = "Potongan PFK")
 	@Builder.Default
-	private String pfk = "-";
+	private String potonganPfk = "-";
 
-	@Caption(value = "PPH")
+	@Caption(value = "Potongan PPH")
 	@Builder.Default
-	private String pph = "-";
+	private String potonganPph = "-";
+
+	@Caption(value = "Potongan BPJS Ketenagakerjaan")
+	@Builder.Default
+	private String potonganBpjsKetenagakerjaan = "-";
+
+	@Caption(value = "Potongan BPJS Kesehatan")
+	@Builder.Default
+	private String potonganBpjsKesehatan = "-";
 
 	@Caption(value = "Sewa Rumah")
 	@Builder.Default
@@ -37,14 +45,6 @@ public class SlipPotonganDto {
 	@Builder.Default
 	private String tabunganRumah = "-";
 
-	@Caption(value = "Potongan BPJS Ketenagakerjaan")
-	@Builder.Default
-	private String potonganBpjsKetenagakerjaan = "-";
-
-	@Caption(value = "Potongan BPJS Kesehatan")
-	@Builder.Default
-	private String potonganBpjsKesehatan = "-";
-
 	@Caption(value = "Simpanan Wajib Koperasi (Gaji)")
 	@Builder.Default
 	private String simpananWajibKoperasiGaji = "-";
@@ -53,13 +53,13 @@ public class SlipPotonganDto {
 	@Builder.Default
 	private String pinjamanKoperasiGaji = "-";
 
-	@Caption(value = "Potongan PPH 21 Remunerasi")
+	@Caption(value = "Potongan PPH Remunerasi")
 	@Builder.Default
-	private String potonganPph21Remunerasi = "-";
+	private String potonganPphRemunerasi = "-";
 
-	@Caption(value = "Potongan PPH 21 Remunerasi Operasional")
+	@Caption(value = "Potongan PPH Remunerasi Operasional")
 	@Builder.Default
-	private String potonganPph21RemunerasiOperasional = "-";
+	private String potonganPphRemunerasiOperasional = "-";
 
 	@Caption(value = "Potongan Obat")
 	@Builder.Default
@@ -89,23 +89,7 @@ public class SlipPotonganDto {
 	@Builder.Default
 	private String wakafDanLainLain = "-";
 
-	@Caption(value = "PPH Remunerasi")
+	@Caption(value = "Potongan Uang Makan")
 	@Builder.Default
-	private String pphRemunerasi = "-";
+	private String potonganUangMakan = "-";
-
-	@Caption(value = "PPH Fee for Service")
-	@Builder.Default
-	private String pphFeeForService = "-";
-
-	@Caption(value = "PPH Fee for On Site")
-	@Builder.Default
-	private String pphFeeForOnSite = "-";
-
-	@Caption(value = "PPH Uang Lembur")
-	@Builder.Default
-	private String pphUangLembur = "-";
-
-	@Caption(value = "Potongan PPH 21 Uang Makan")
-	@Builder.Default
-	private String potonganPph21UangMakan = "-";
 }

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

@@ -1,39 +1,36 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonBackReference;
 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.FetchType.LAZY;
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class Alamat
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
-
+@Setter
+@Entity
 @Table(name = "Alamat_M")
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class Alamat extends BaseMaster {
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.alamat_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.alamat_m_id_seq")
 	@SequenceGenerator(name = "public.alamat_m_id_seq", sequenceName = "public.alamat_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	@Column(name = "AlamatEmail", nullable = true, length = 50)
+	@Column(name = "AlamatEmail", length = 50)
 	@Caption(value = "Alamat Email")
 	private String alamatEmail;
 
@@ -42,50 +39,50 @@ public class Alamat extends BaseMaster {
 	@Caption(value = "Alamat Lengkap")
 	private String alamatLengkap;
 
-	@Column(name = "BlackBerry", nullable = true, length = 10)
+	@Column(name = "BlackBerry", length = 10)
 	@Caption(value = "Black Berry")
 	private String blackBerry;
 
 	@Caption(value = "Desa Kelurahan")
 	private String namaDesaKelurahan;
 
-	@Column(name = "Facebook", nullable = true, length = 50)
+	@Column(name = "Facebook", length = 50)
 	@Caption(value = "Facebook")
 	private String facebook;
 
-	@Column(name = "Faksimile1", nullable = true, length = 15)
+	@Column(name = "Faksimile1", length = 15)
 	@Caption(value = "Faksimile1")
 	private String faksimile1;
 
-	@Column(name = "Faksimile2", nullable = true, length = 15)
+	@Column(name = "Faksimile2", length = 15)
 	@Caption(value = "Faksimile2")
 	private String faksimile2;
 
-	@Column(name = "FixedPhone1", nullable = true, length = 15)
+	@Column(name = "FixedPhone1", length = 15)
 	@Caption(value = "Fixed Phone1")
 	private String fixedPhone1;
 
-	@Column(name = "FixedPhone2", nullable = true, length = 15)
+	@Column(name = "FixedPhone2", length = 15)
 	@Caption(value = "Fixed Phone2")
 	private String fixedPhone2;
 
 	@Caption(value = "Is Billing Address")
-	@Column(name = "isBillingAddress", nullable = true)
+	@Column(name = "isBillingAddress")
 	private Byte isBillingAddress;
 
 	@Caption(value = "Is Primary Address")
-	@Column(name = "isPrimaryAddress", nullable = true)
+	@Column(name = "isPrimaryAddress")
 	private Byte isPrimaryAddress;
 
 	@Caption(value = "Is Shipping Address")
-	@Column(name = "isShippingAddress", nullable = true)
+	@Column(name = "isShippingAddress")
 	private Byte isShippingAddress;
 
 	@Caption(value = "Kode Alamat")
-	@Column(name = "KdAlamat", nullable = true)
+	@Column(name = "KdAlamat")
 	private Integer kdAlamat;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectDesaKelurahanFk")
 	@Caption(value = "Object Desa Kelurahan")
 	private DesaKelurahan desaKelurahan;
@@ -93,7 +90,7 @@ public class Alamat extends BaseMaster {
 	@Column(name = "ObjectDesaKelurahanFk", insertable = false, updatable = false)
 	private Integer desaKelurahanId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectHubunganKeluargaFk")
 	@Caption(value = "Object Hubungan Keluarga")
 	private HubunganKeluarga hubunganKeluarga;
@@ -101,7 +98,7 @@ public class Alamat extends BaseMaster {
 	@Column(name = "ObjectHubunganKeluargaFk", insertable = false, updatable = false)
 	private Integer hubunganKeluargaId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectJenisAlamatFk")
 	@Caption(value = "Object Jenis Alamat")
 	private JenisAlamat jenisAlamat;
@@ -112,12 +109,12 @@ public class Alamat extends BaseMaster {
 	@Column(name = "ObjectKecamatanFk", insertable = false, updatable = false)
 	private Integer kecamatanId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectKecamatanFk")
 	@Caption(value = "Object Kecamatan")
 	private Kecamatan kecamatan;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectKotaKabupatenFk")
 	@Caption(value = "Object Kota Kabupaten")
 	private KotaKabupaten kotaKabupaten;
@@ -125,7 +122,7 @@ public class Alamat extends BaseMaster {
 	@Column(name = "ObjectKotaKabupatenFk", insertable = false, updatable = false)
 	private Integer kotaKabupatenId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectNegaraFk")
 	@Caption(value = "Object Negara")
 	private Negara negara;
@@ -133,15 +130,15 @@ public class Alamat extends BaseMaster {
 	@Column(name = "ObjectNegaraFk", insertable = false, updatable = false)
 	private Integer negaraId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectPegawaiFk")
 	@Caption(value = "Object Pegawai")
 	private LoginUser pegawai;
 
-	@Column(name = "ObjectPegawaiFk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "ObjectPegawaiFk", insertable = false, updatable = false)
 	private Integer pegawaiId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectPropinsiFk")
 	@Caption(value = "Object Propinsi")
 	private Propinsi propinsi;
@@ -149,7 +146,7 @@ public class Alamat extends BaseMaster {
 	@Column(name = "ObjectPropinsiFk", insertable = false, updatable = false)
 	private Integer propinsiId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectRekananFk")
 	@Caption(value = "Object Rekanan")
 	private Rekanan rekanan;
@@ -158,38 +155,38 @@ public class Alamat extends BaseMaster {
 	private Integer rekananId;
 
 	@Caption(value = "Kecamatan")
-	@Column(name = "Kecamatan", nullable = true, length = 50)
+	@Column(name = "Kecamatan", length = 50)
 	private String namaKecamatan;
 
-	@Column(name = "KeteranganLainnya", nullable = true, length = 150)
+	@Column(name = "KeteranganLainnya", length = 150)
 	@Caption(value = "Keterangan Lainnya")
 	private String keteranganLainnya;
 
 	@Caption(value = "Kode Pos")
-	@Column(name = "KodePos", nullable = true, length = 10)
+	@Column(name = "KodePos", length = 10)
 	private String kodePos;
 
 	@Caption(value = "Kota Kabupaten")
-	@Column(name = "KotaKabupaten", nullable = true, length = 50)
+	@Column(name = "KotaKabupaten", length = 50)
 	private String namaKotaKabupaten;
 
-	@Column(name = "Line", nullable = true, length = 50)
+	@Column(name = "Line", length = 50)
 	@Caption(value = "Line")
 	private String line;
 
-	@Column(name = "MobilePhone1", nullable = true, length = 15)
+	@Column(name = "MobilePhone1", length = 15)
 	@Caption(value = "Mobile Phone1")
 	private String mobilePhone1;
 
-	@Column(name = "MobilePhone2", nullable = true, length = 15)
+	@Column(name = "MobilePhone2", length = 15)
 	@Caption(value = "Mobile Phone2")
 	private String mobilePhone2;
 
-	@Column(name = "NamaTempatGedung", nullable = true, length = 150)
+	@Column(name = "NamaTempatGedung", length = 150)
 	@Caption(value = "Nama Tempat Gedung")
 	private String namaTempatGedung;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "NoCMFk")
 	@Caption(value = "No C M")
 	@JsonBackReference
@@ -202,394 +199,18 @@ public class Alamat extends BaseMaster {
 	private String rtrw;
 
 	@Caption(value = "Twitter")
-	@Column(name = "Twitter", nullable = true, length = 50)
+	@Column(name = "Twitter", length = 50)
 	private String twitter;
 
-	@Column(name = "Website", nullable = true, length = 80)
+	@Column(name = "Website", length = 80)
 	@Caption(value = "Website")
 	private String website;
 
-	@Column(name = "WhatsApp", nullable = true, length = 15)
+	@Column(name = "WhatsApp", length = 15)
 	@Caption(value = "Whats App")
 	private String whatsApp;
 
-	@Column(name = "YahooMessenger", nullable = true, length = 50)
+	@Column(name = "YahooMessenger", length = 50)
 	@Caption(value = "Yahoo Messenger")
 	private String yahooMessenger;
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getAlamatEmail() {
-		return alamatEmail;
-	}
-
-	public void setAlamatEmail(String alamatEmail) {
-		this.alamatEmail = alamatEmail;
-	}
-
-	public String getAlamatLengkap() {
-		return alamatLengkap;
-	}
-
-	public void setAlamatLengkap(String alamatLengkap) {
-		this.alamatLengkap = alamatLengkap;
-	}
-
-	public String getBlackBerry() {
-		return blackBerry;
-	}
-
-	public void setBlackBerry(String blackBerry) {
-		this.blackBerry = blackBerry;
-	}
-
-	public String getNamaDesaKelurahan() {
-		return namaDesaKelurahan;
-	}
-
-	public void setNamaDesaKelurahan(String namaDesaKelurahan) {
-		this.namaDesaKelurahan = namaDesaKelurahan;
-	}
-
-	public String getFacebook() {
-		return facebook;
-	}
-
-	public void setFacebook(String facebook) {
-		this.facebook = facebook;
-	}
-
-	public String getFaksimile1() {
-		return faksimile1;
-	}
-
-	public void setFaksimile1(String faksimile1) {
-		this.faksimile1 = faksimile1;
-	}
-
-	public String getFaksimile2() {
-		return faksimile2;
-	}
-
-	public void setFaksimile2(String faksimile2) {
-		this.faksimile2 = faksimile2;
-	}
-
-	public String getFixedPhone1() {
-		return fixedPhone1;
-	}
-
-	public void setFixedPhone1(String fixedPhone1) {
-		this.fixedPhone1 = fixedPhone1;
-	}
-
-	public String getFixedPhone2() {
-		return fixedPhone2;
-	}
-
-	public void setFixedPhone2(String fixedPhone2) {
-		this.fixedPhone2 = fixedPhone2;
-	}
-
-	public Byte getIsBillingAddress() {
-		return isBillingAddress;
-	}
-
-	public void setIsBillingAddress(Byte isBillingAddress) {
-		this.isBillingAddress = isBillingAddress;
-	}
-
-	public Byte getIsPrimaryAddress() {
-		return isPrimaryAddress;
-	}
-
-	public void setIsPrimaryAddress(Byte isPrimaryAddress) {
-		this.isPrimaryAddress = isPrimaryAddress;
-	}
-
-	public Byte getIsShippingAddress() {
-		return isShippingAddress;
-	}
-
-	public void setIsShippingAddress(Byte isShippingAddress) {
-		this.isShippingAddress = isShippingAddress;
-	}
-
-	public Integer getKdAlamat() {
-		return kdAlamat;
-	}
-
-	public void setKdAlamat(Integer kdAlamat) {
-		this.kdAlamat = kdAlamat;
-	}
-
-	public DesaKelurahan getDesaKelurahan() {
-		return desaKelurahan;
-	}
-
-	public void setDesaKelurahan(DesaKelurahan desaKelurahan) {
-		this.desaKelurahan = desaKelurahan;
-	}
-
-	public Integer getDesaKelurahanId() {
-		return desaKelurahanId;
-	}
-
-	public void setDesaKelurahanId(Integer desaKelurahanId) {
-		this.desaKelurahanId = desaKelurahanId;
-	}
-
-	public HubunganKeluarga getHubunganKeluarga() {
-		return hubunganKeluarga;
-	}
-
-	public void setHubunganKeluarga(HubunganKeluarga hubunganKeluarga) {
-		this.hubunganKeluarga = hubunganKeluarga;
-	}
-
-	public Integer getHubunganKeluargaId() {
-		return hubunganKeluargaId;
-	}
-
-	public void setHubunganKeluargaId(Integer hubunganKeluargaId) {
-		this.hubunganKeluargaId = hubunganKeluargaId;
-	}
-
-	public JenisAlamat getJenisAlamat() {
-		return jenisAlamat;
-	}
-
-	public void setJenisAlamat(JenisAlamat jenisAlamat) {
-		this.jenisAlamat = jenisAlamat;
-	}
-
-	public Integer getJenisAlamatId() {
-		return jenisAlamatId;
-	}
-
-	public void setJenisAlamatId(Integer jenisAlamatId) {
-		this.jenisAlamatId = jenisAlamatId;
-	}
-
-	public Integer getKecamatanId() {
-		return kecamatanId;
-	}
-
-	public void setKecamatanId(Integer kecamatanId) {
-		this.kecamatanId = kecamatanId;
-	}
-
-	public Kecamatan getKecamatan() {
-		return kecamatan;
-	}
-
-	public void setKecamatan(Kecamatan kecamatan) {
-		this.kecamatan = kecamatan;
-	}
-
-	public KotaKabupaten getKotaKabupaten() {
-		return kotaKabupaten;
-	}
-
-	public void setKotaKabupaten(KotaKabupaten kotaKabupaten) {
-		this.kotaKabupaten = kotaKabupaten;
-	}
-
-	public Integer getKotaKabupatenId() {
-		return kotaKabupatenId;
-	}
-
-	public void setKotaKabupatenId(Integer kotaKabupatenId) {
-		this.kotaKabupatenId = kotaKabupatenId;
-	}
-
-	public Negara getNegara() {
-		return negara;
-	}
-
-	public void setNegara(Negara negara) {
-		this.negara = negara;
-	}
-
-	public Integer getNegaraId() {
-		return negaraId;
-	}
-
-	public void setNegaraId(Integer negaraId) {
-		this.negaraId = negaraId;
-	}
-
-	public LoginUser getPegawai() {
-		return pegawai;
-	}
-
-	public void setPegawai(LoginUser pegawai) {
-		this.pegawai = pegawai;
-	}
-
-	public Integer getPegawaiId() {
-		return pegawaiId;
-	}
-
-	public void setPegawaiId(Integer pegawaiId) {
-		this.pegawaiId = pegawaiId;
-	}
-
-	public Propinsi getPropinsi() {
-		return propinsi;
-	}
-
-	public void setPropinsi(Propinsi propinsi) {
-		this.propinsi = propinsi;
-	}
-
-	public Integer getPropinsiId() {
-		return propinsiId;
-	}
-
-	public void setPropinsiId(Integer propinsiId) {
-		this.propinsiId = propinsiId;
-	}
-
-	public Rekanan getRekanan() {
-		return rekanan;
-	}
-
-	public void setRekanan(Rekanan rekanan) {
-		this.rekanan = rekanan;
-	}
-
-	public Integer getRekananId() {
-		return rekananId;
-	}
-
-	public void setRekananId(Integer rekananId) {
-		this.rekananId = rekananId;
-	}
-
-	public String getNamaKecamatan() {
-		return namaKecamatan;
-	}
-
-	public void setNamaKecamatan(String namaKecamatan) {
-		this.namaKecamatan = namaKecamatan;
-	}
-
-	public String getKeteranganLainnya() {
-		return keteranganLainnya;
-	}
-
-	public void setKeteranganLainnya(String keteranganLainnya) {
-		this.keteranganLainnya = keteranganLainnya;
-	}
-
-	public String getKodePos() {
-		return kodePos;
-	}
-
-	public void setKodePos(String kodePos) {
-		this.kodePos = kodePos;
-	}
-
-	public String getNamaKotaKabupaten() {
-		return namaKotaKabupaten;
-	}
-
-	public void setNamaKotaKabupaten(String namaKotaKabupaten) {
-		this.namaKotaKabupaten = namaKotaKabupaten;
-	}
-
-	public String getLine() {
-		return line;
-	}
-
-	public void setLine(String line) {
-		this.line = line;
-	}
-
-	public String getMobilePhone1() {
-		return mobilePhone1;
-	}
-
-	public void setMobilePhone1(String mobilePhone1) {
-		this.mobilePhone1 = mobilePhone1;
-	}
-
-	public String getMobilePhone2() {
-		return mobilePhone2;
-	}
-
-	public void setMobilePhone2(String mobilePhone2) {
-		this.mobilePhone2 = mobilePhone2;
-	}
-
-	public String getNamaTempatGedung() {
-		return namaTempatGedung;
-	}
-
-	public void setNamaTempatGedung(String namaTempatGedung) {
-		this.namaTempatGedung = namaTempatGedung;
-	}
-
-	public Pasien getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(Pasien pasien) {
-		this.pasien = pasien;
-	}
-
-	public Integer getPasienId() {
-		return pasienId;
-	}
-
-	public void setPasienId(Integer pasienId) {
-		this.pasienId = pasienId;
-	}
-
-	public String getRtrw() {
-		return rtrw;
-	}
-
-	public void setRtrw(String rtrw) {
-		this.rtrw = rtrw;
-	}
-
-	public String getTwitter() {
-		return twitter;
-	}
-
-	public void setTwitter(String twitter) {
-		this.twitter = twitter;
-	}
-
-	public String getWebsite() {
-		return website;
-	}
-
-	public void setWebsite(String website) {
-		this.website = website;
-	}
-
-	public String getWhatsApp() {
-		return whatsApp;
-	}
-
-	public void setWhatsApp(String whatsApp) {
-		this.whatsApp = whatsApp;
-	}
-
-	public String getYahooMessenger() {
-		return yahooMessenger;
-	}
-
-	public void setYahooMessenger(String yahooMessenger) {
-		this.yahooMessenger = yahooMessenger;
-	}
 }

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

@@ -1,37 +1,34 @@
 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.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;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "AsuransiPasien_M")
 public class AsuransiPasien extends BaseMaster {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.asuransipasien_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.asuransipasien_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.asuransipasien_m_id_seq", sequenceName = "public.asuransipasien_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.asuransipasien_m_id_seq", sequenceName = "public.asuransipasien_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	@Column(name = "AlamatLengkap", nullable = true, length = 150)
+	@Column(name = "AlamatLengkap", length = 150)
 	@Caption(value = "Alamat Lengkap")
 	private String alamatLengkap;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectGolonganAsuransiFk")
 	@Caption(value = "Object Golongan Asuransi")
 	private GolonganAsuransi golonganAsuransi;
@@ -39,7 +36,7 @@ public class AsuransiPasien extends BaseMaster {
 	@Column(name = "ObjectGolonganAsuransiFk", insertable = false, updatable = false)
 	private Integer golonganAsuransiId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectHubunganPesertaFk")
 	@Caption(value = "Object Hubungan Peserta")
 	private HubunganPesertaAsuransi hubunganPeserta;
@@ -48,10 +45,10 @@ public class AsuransiPasien extends BaseMaster {
 	private Integer hubunganPesertaId;
 
 	@Caption(value = "Kode Institusi Asal")
-	@Column(name = "KdInstitusiAsal", nullable = true)
+	@Column(name = "KdInstitusiAsal")
-	private short kdInstitusiAsal;
+	private Integer kdInstitusiAsal;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectJenisKelaminFk")
 	@Caption(value = "Object Jenis Kelamin")
 	private JenisKelamin jenisKelamin;
@@ -59,7 +56,7 @@ public class AsuransiPasien extends BaseMaster {
 	@Column(name = "ObjectJenisKelaminFk", insertable = false, updatable = false)
 	private Integer jenisKelaminId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectKelasDiJaminFk")
 	@Caption(value = "Object Kelas Di Jamin")
 	private Kelas kelasDiJamin;
@@ -68,10 +65,10 @@ public class AsuransiPasien extends BaseMaster {
 	private Integer kelasDiJaminId;
 
 	@Caption(value = "Kode Last Unit Bagian")
-	@Column(name = "KdLastUnitBagian", nullable = true)
+	@Column(name = "KdLastUnitBagian")
-	private short kdLastUnitBagian;
+	private Integer kdLastUnitBagian;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectPegawaiFk")
 	@Caption(value = "Object Pegawai")
 	private Pegawai pegawai;
@@ -79,7 +76,7 @@ public class AsuransiPasien extends BaseMaster {
 	@Column(name = "ObjectPegawaiFk", insertable = false, updatable = false)
 	private Integer pegawaiId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "KdPenjaminPasien")
 	@Caption(value = "Object Rekanan")
 	private Rekanan rekanan;
@@ -87,7 +84,7 @@ public class AsuransiPasien extends BaseMaster {
 	@Column(name = "KdPenjaminPasien", insertable = false, updatable = false)
 	private Integer kdPenjaminPasien;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "LastUnitBagian")
 	@Caption(value = "Last Unit Bagian")
 	private Ruangan lastUnitBagian;
@@ -96,354 +93,71 @@ public class AsuransiPasien extends BaseMaster {
 	private Integer lastUnitBagianId;
 
 	@NotNull(message = "Nama Peserta tidak boleh kosong")
-	@Column(name = "NamaPeserta", nullable = true, length = 40)
+	@Column(name = "NamaPeserta", length = 40)
 	@Caption(value = "Nama Peserta")
 	private String namaPeserta;
 
 	@Caption(value = "NIK Institusi Asal")
-	@Column(name = "NikInstitusiAsal", nullable = true, length = 15)
+	@Column(name = "NikInstitusiAsal", length = 15)
 	private String nikInstitusiAsal;
 
 	@Caption(value = "NIP PNS")
-	@Column(name = "NipPns", nullable = true, length = 30)
+	@Column(name = "NipPns", length = 30)
 	private String nipPns;
 
-	@Column(name = "NoAsuransi", nullable = true, length = 30)
+	@Column(name = "NoAsuransi", length = 30)
 	@Caption(value = "No Asuransi")
 	private String noAsuransi;
 
-	@Column(name = "NoAsuransiHead", nullable = true, length = 30)
+	@Column(name = "NoAsuransiHead", length = 30)
 	@Caption(value = "No Asuransi Head")
 	private String noAsuransiHead;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "NoCMFk")
 	@Caption(value = "No C M")
 	private Pasien noCm;
 
-	@Column(name="NoCMFk", insertable=false, updatable=false)
+	@Column(name = "NoCMFk", insertable = false, updatable = false)
 	private Integer noCmId;
 
-	@Column(name = "NoIdentitas", nullable = true, length = 30)
+	@Column(name = "NoIdentitas", length = 30)
 	@Caption(value = "No Identitas")
 	private String noIdentitas;
 
-	@Column(name = "NoTelpFixed", nullable = true, length = 15)
+	@Column(name = "NoTelpFixed", length = 15)
 	@Caption(value = "No Telp Fixed")
 	private String noTelpFixed;
 
-	@Column(name = "NoTelpMobile", nullable = true, length = 15)
+	@Column(name = "NoTelpMobile", length = 15)
 	@Caption(value = "No Telp Mobile")
 	private String noTelpMobile;
 
 	@Caption(value = "QAsuransi")
-	@Column(name = "QAsuransi", nullable = true, length = 15)
+	@Column(name = "QAsuransi", length = 15)
 	private Integer qAsuransi;
 
 	@Caption(value = "Tanggal Akhir Berlaku Last")
-	@Column(name = "TglAkhirBerlakuLast", nullable = true)
+	@Column(name = "TglAkhirBerlakuLast")
 	private Date tglAkhirBerlakuLast;
 
 	@Caption(value = "Tanggal Lahir")
-	@Column(name = "TglLahir", nullable = true)
+	@Column(name = "TglLahir")
 	private Date tglLahir;
 
 	@Caption(value = "Tanggal Mulai Berlaku Last")
-	@Column(name = "TglMulaiBerlakuLast", nullable = true)
+	@Column(name = "TglMulaiBerlakuLast")
 	private Date tglMulaiBerlakuLast;
 
-	//----------------------------------------------------------
+	@Column(name = "JenisPeserta", length = 100)
-	
-	@Column(name = "JenisPeserta", nullable = true, length = 100)
 	@Caption(value = "JenisPeserta")
 	private String jenisPeserta;
 
-	@Column(name = "NmProvider", nullable = true, length = 100)
+	@Column(name = "NmProvider", length = 100)
 	@Caption(value = "NmProvider")
 	private String nmProvider;
 
-	@Column(name = "KdProvider", nullable = true, length = 100)
+	@Column(name = "KdProvider", length = 100)
 	@Caption(value = "KdProvider")
 	private String kdProvider;
-	
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id; 
-	}
-
-	public String getAlamatLengkap() {
-		return alamatLengkap;
-	}
-
-	public void setAlamatLengkap(String alamatLengkap) {
-		this.alamatLengkap = alamatLengkap;
-	}
-
-	public GolonganAsuransi getGolonganAsuransi() {
-		return golonganAsuransi;
-	}
-
-	public void setGolonganAsuransi(GolonganAsuransi golonganAsuransi) {
-		this.golonganAsuransi = golonganAsuransi;
-	}
-
-	public Integer getGolonganAsuransiId() {
-		return golonganAsuransiId;
-	}
-
-	public void setGolonganAsuransiId(Integer golonganAsuransiId) {
-		this.golonganAsuransiId = golonganAsuransiId;
-	}
-
-	public HubunganPesertaAsuransi getHubunganPeserta() {
-		return hubunganPeserta;
-	}
-
-	public void setHubunganPeserta(HubunganPesertaAsuransi hubunganPeserta) {
-		this.hubunganPeserta = hubunganPeserta;
-	}
-
-	public Integer getHubunganPesertaId() {
-		return hubunganPesertaId;
-	}
-
-	public void setHubunganPesertaId(Integer hubunganPesertaId) {
-		this.hubunganPesertaId = hubunganPesertaId;
-	}
-
-	public short getKdInstitusiAsal() {
-		return kdInstitusiAsal;
-	}
-
-	public void setKdInstitusiAsal(short kdInstitusiAsal) {
-		this.kdInstitusiAsal = kdInstitusiAsal;
-	}
-
-	public JenisKelamin getJenisKelamin() {
-		return jenisKelamin;
-	}
-
-	public void setJenisKelamin(JenisKelamin jenisKelamin) {
-		this.jenisKelamin = jenisKelamin;
-	}
-
-	public Integer getJenisKelaminId() {
-		return jenisKelaminId;
-	}
-
-	public void setJenisKelaminId(Integer jenisKelaminId) {
-		this.jenisKelaminId = jenisKelaminId;
-	}
-
-	public Kelas getKelasDiJamin() {
-		return kelasDiJamin;
-	}
-
-	public void setKelasDiJamin(Kelas kelasDiJamin) {
-		this.kelasDiJamin = kelasDiJamin;
-	}
-
-	public Integer getKelasDiJaminId() {
-		return kelasDiJaminId;
-	}
-
-	public void setKelasDiJaminId(Integer kelasDiJaminId) {
-		this.kelasDiJaminId = kelasDiJaminId;
-	}
-
-	public short getKdLastUnitBagian() {
-		return kdLastUnitBagian;
-	}
-
-	public void setKdLastUnitBagian(short kdLastUnitBagian) {
-		this.kdLastUnitBagian = kdLastUnitBagian;
-	}
-
-	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 Rekanan getRekanan() {
-		return rekanan;
-	}
-
-	public void setRekanan(Rekanan rekanan) {
-		this.rekanan = rekanan;
-	}
-
-	public Integer getKdPenjaminPasien() {
-		return kdPenjaminPasien;
-	}
-
-	public void setKdPenjaminPasien(Integer kdPenjaminPasien) {
-		this.kdPenjaminPasien = kdPenjaminPasien;
-	}
-
-	public Ruangan getLastUnitBagian() {
-		return lastUnitBagian;
-	}
-
-	public void setLastUnitBagian(Ruangan lastUnitBagian) {
-		this.lastUnitBagian = lastUnitBagian;
-	}
-
-	public Integer getLastUnitBagianId() {
-		return lastUnitBagianId;
-	}
-
-	public void setLastUnitBagianId(Integer lastUnitBagianId) {
-		this.lastUnitBagianId = lastUnitBagianId;
-	}
-
-	public String getNamaPeserta() {
-		return namaPeserta;
-	}
-
-	public void setNamaPeserta(String namaPeserta) {
-		this.namaPeserta = namaPeserta;
-	}
-
-	public String getNikInstitusiAsal() {
-		return nikInstitusiAsal;
-	}
-
-	public void setNikInstitusiAsal(String nikInstitusiAsal) {
-		this.nikInstitusiAsal = nikInstitusiAsal;
-	}
-
-	public String getNipPns() {
-		return nipPns;
-	}
-
-	public void setNipPns(String nipPns) {
-		this.nipPns = nipPns;
-	}
-
-	public String getNoAsuransi() {
-		return noAsuransi;
-	}
-
-	public void setNoAsuransi(String noAsuransi) {
-		this.noAsuransi = noAsuransi;
-	}
-
-	public String getNoAsuransiHead() {
-		return noAsuransiHead;
-	}
-
-	public void setNoAsuransiHead(String noAsuransiHead) {
-		this.noAsuransiHead = noAsuransiHead;
-	}
-
-	public Pasien getNoCm() {
-		return noCm;
-	}
-
-	public void setNoCm(Pasien noCm) {
-		this.noCm = noCm;
-	}
-
-	public Integer getNoCmId() {
-		return noCmId;
-	}
-
-	public void setNoCmId(Integer noCmId) {
-		this.noCmId = noCmId;
-	}
-
-	public String getNoIdentitas() {
-		return noIdentitas;
-	}
-
-	public void setNoIdentitas(String noIdentitas) {
-		this.noIdentitas = noIdentitas;
-	}
-
-	public String getNoTelpFixed() {
-		return noTelpFixed;
-	}
-
-	public void setNoTelpFixed(String noTelpFixed) {
-		this.noTelpFixed = noTelpFixed;
-	}
-
-	public String getNoTelpMobile() {
-		return noTelpMobile;
-	}
-
-	public void setNoTelpMobile(String noTelpMobile) {
-		this.noTelpMobile = noTelpMobile;
-	}
-
-	public Integer getqAsuransi() {
-		return qAsuransi;
-	}
-
-	public void setqAsuransi(Integer qAsuransi) {
-		this.qAsuransi = qAsuransi;
-	}
-
-	public Date getTglAkhirBerlakuLast() {
-		return tglAkhirBerlakuLast;
-	}
-
-	public void setTglAkhirBerlakuLast(Date tglAkhirBerlakuLast) {
-		this.tglAkhirBerlakuLast = tglAkhirBerlakuLast;
-	}
-
-	public Date getTglLahir() {
-		return tglLahir;
-	}
-
-	public void setTglLahir(Date tglLahir) {
-		this.tglLahir = tglLahir;
-	}
-
-	public Date getTglMulaiBerlakuLast() {
-		return tglMulaiBerlakuLast;
-	}
-
-	public void setTglMulaiBerlakuLast(Date tglMulaiBerlakuLast) {
-		this.tglMulaiBerlakuLast = tglMulaiBerlakuLast;
-	}
-
-	public String getJenisPeserta() {
-		return jenisPeserta;
-	}
-
-	public void setJenisPeserta(String jenisPeserta) {
-		this.jenisPeserta = jenisPeserta;
-	}
-
-	public String getNmProvider() {
-		return nmProvider;
-	}
-
-	public void setNmProvider(String nmProvider) {
-		this.nmProvider = nmProvider;
-	}
-
-	public String getKdProvider() {
-		return kdProvider;
-	}
-
-	public void setKdProvider(String kdProvider) {
-		this.kdProvider = kdProvider;
-	}
-
 }

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

@@ -0,0 +1,80 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.SEQUENCE;
+import static javax.persistence.TemporalType.TIMESTAMP;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 16/11/2023
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "document_vedika_tb")
+public class DokumenVedika implements Serializable {
+	@Id
+	@GeneratedValue(strategy = SEQUENCE, generator = "gen_document_vedika_tb_id_seq")
+	@SequenceGenerator(name = "gen_document_vedika_tb_id_seq", sequenceName = "public.document_vedika_tb_id_seq", allocationSize = 1)
+	@Column(name = "id", columnDefinition = "serial4 default nextval('document_vedika_tb_id_seq'::regclass)")
+	protected Integer id;
+
+	@Column(name = "statusenabled")
+	@Caption(value = "Status Enabled")
+	private Boolean statusEnabled;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "pasiendaftar_t_norec")
+	@Caption(value = "Pasien Daftar")
+	private PasienDaftar pasienDaftar;
+
+	@Column(name = "pasiendaftar_t_norec", insertable = false, updatable = false)
+	private String pasienDaftarId;
+
+	@Column(name = "nam_file", length = 500)
+	@Caption(value = "Nama File")
+	private String namaFile;
+
+	@Column(name = "url")
+	@Caption(value = "URL")
+	private String url;
+
+	@Column(name = "deskripsi")
+	@Caption(value = "Deskripsi")
+	private String deskripsi;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "jenis_berkas_id")
+	@Caption(value = "Jenis Berkas")
+	private JenisBerkas jenisBerkas;
+
+	@Column(name = "jenis_berkas_id", insertable = false, updatable = false)
+	private Integer jenisBerkasId;
+
+	@Column(name = "no_mr")
+	@Caption(value = "No Rekam Medis")
+	private String pasienNoMr;
+
+	@Column(name = "date_insert")
+	@Temporal(TIMESTAMP)
+	@Caption(value = "Tanggal Dibuat")
+	private Date tglDibuat;
+
+	@Column(name = "id_user", insertable = false, updatable = false)
+	@Caption(value = "ID User")
+	private Integer userId;
+
+	@Column(name = "log_create_at")
+	@Temporal(TIMESTAMP)
+	@Caption(value = "Tanggal Log Dibuat")
+	private Date logCreateAt;
+}

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

@@ -1,90 +1,39 @@
 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 static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class KategoryPegawai
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "KategoryPegawai_M")
 public class KategoryPegawai extends BaseMaster {
-	@NotNull(message = "Kategory Pegawai tidak boleh kosong")
-	@Column(name = "KategoryPegawai", nullable = false, length = 30)
-	@Caption(value = "Kategory Pegawai")
-	private String kategoryPegawai;
-
-	public void setKategoryPegawai(String kategoryPegawai) {
-		this.kategoryPegawai = kategoryPegawai;
-	}
-
-	public String getKategoryPegawai() {
-		return this.kategoryPegawai;
-	}
-
-	@NotNull(message = "Kd Kategory Pegawai tidak boleh kosong")
-	@Column(name = "KdKategoryPegawai", nullable = false, length = 1)
-	@Caption(value = "Kode Kategory Pegawai")
-	private String kdKategoryPegawai;
-
-	public void setKdKategoryPegawai(String kdKategoryPegawai) {
-		this.kdKategoryPegawai = kdKategoryPegawai;
-	}
-
-	public String getKdKategoryPegawai() {
-		return this.kdKategoryPegawai;
-	}
-
-	@NotNull(message = "QKategory Pegawai tidak boleh kosong")
-	@Column(name = "QKategoryPegawai", nullable = false)
-	@Caption(value = "QKategory Pegawai")
-	private Byte qKategoryPegawai;
-
-	public void setqKategoryPegawai(Byte qKategoryPegawai) {
-		this.qKategoryPegawai = qKategoryPegawai;
-	}
-
-	public Byte getqKategoryPegawai() {
-		return this.qKategoryPegawai;
-	}
-
-	/*
-	 * @JsonManagedReference
-	 * 
-	 * @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL,
-	 * mappedBy="kdkategorypegawai") private Set<DetailKategoryPegawai>
-	 * DetailKategoryPegawaiSet = new HashSet<DetailKategoryPegawai>();
-	 * 
-	 * public Set<DetailKategoryPegawai> getDetailKategoryPegawaiSet() { return
-	 * DetailKategoryPegawaiSet; }
-	 * 
-	 * public void setDetailKategoryPegawaiSet(Set<DetailKategoryPegawai>
-	 * detailKategoryPegawaiSet) { DetailKategoryPegawaiSet =
-	 * detailKategoryPegawaiSet; }
-	 */
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.kategorypegawai_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.kategorypegawai_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.kategorypegawai_m_id_seq", sequenceName = "public.kategorypegawai_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.kategorypegawai_m_id_seq", sequenceName = "public.kategorypegawai_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
+	@Column(name = "KategoryPegawai")
+	@Caption(value = "Kategory Pegawai")
+	private String kategoryPegawai;
 
-		return id;
+	@Column(name = "KdKategoryPegawai")
-	}
+	@Caption(value = "Kode Kategory Pegawai")
+	private String kdKategoryPegawai;
 
-	public void setId(Integer id) {
+	@Column(name = "QKategoryPegawai")
-		this.id = id;
+	@Caption(value = "QKategory Pegawai")
-	}
+	private Byte qKategoryPegawai;
 }

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

@@ -0,0 +1,45 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.entities.Pasien;
+import com.jasamedika.medifirst2000.etl.pasien.constant.StatusMigrasi;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+import static com.jasamedika.medifirst2000.etl.pasien.constant.StatusMigrasi.BELUM_KIRIM;
+import static javax.persistence.EnumType.STRING;
+import static javax.persistence.FetchType.LAZY;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 06/11/2023
+ */
+@Getter
+@Setter
+@Entity
+@Table(name = "migrasipasien_t", uniqueConstraints = @UniqueConstraint(columnNames = "pasienfk"))
+public class MigrasiPasien extends BaseTransaction {
+	private static final long serialVersionUID = 8936798143770665885L;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "pasienfk", nullable = false)
+	@NotNull(message = "Pasien tidak boleh kosong")
+	@Caption(value = "Pasien")
+	private Pasien pasien;
+
+	@Column(name = "pasienfk", insertable = false, updatable = false, nullable = false)
+	private Integer pasienId;
+
+	@Column(length = 30, nullable = false, columnDefinition = "varchar(30) default 'BELUM_KIRIM'")
+	@Enumerated(STRING)
+	@NotNull(message = "Status migrasi tidak boleh kosong")
+	@Size(max = 30, message = "Status migrasi maksimal {max} karakter")
+	@Caption(value = "Status Migrasi")
+	private StatusMigrasi statusMigrasi = BELUM_KIRIM;
+}

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

@@ -1,33 +1,21 @@
 package com.jasamedika.medifirst2000.entities;
 
-import static javax.persistence.FetchType.LAZY;
-import static javax.persistence.GenerationType.SEQUENCE;
-
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.validation.constraints.NotNull;
-
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
 import com.jasamedika.medifirst2000.listener.MyEventListener;
-
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.SEQUENCE;
+
 @Getter
 @Setter
 @Entity
@@ -219,4 +207,8 @@ public class Pasien extends BaseMaster {
 	@Column(name = "JamLahir")
 	@Caption(value = "JamLahir")
 	private Date jamLahir;
+
+	@Column(name = "email")
+	@Caption(value = "Email")
+	private String email;
 }

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

@@ -1,231 +1,87 @@
 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 = "PemakaianAsuransi_T")
 public class PemakaianAsuransi extends BaseTransaction {
 	private static final long serialVersionUID = 8451625158161533060L;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name = "NoRegistrasiFk", nullable = true)
+	@JoinColumn(name = "NoRegistrasiFk")
 	@Caption(value = "No Registrasi")
 	private PasienDaftar pasienDaftar;
 
-	@Column(name = "NoRegistrasiFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = true)
+	@Column(name = "NoRegistrasiFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false)
 	private String pasienDaftarId;
 
-	@Column(name = "PpkRujukan", nullable = true, length = 100)
+	@Column(name = "PpkRujukan", length = 100)
 	@Caption(value = "PpkRujukan")
 	private String ppkRujukan;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "DiagnosisFk")
 	@Caption(value = "Diagnosis")
 	private Diagnosa diagnosis;
 
-	@Column(name = "DiagnosisFk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "DiagnosisFk", insertable = false, updatable = false)
 	private Integer diagnosisId;
 
-	@Column(name = "NoKepesertaan", nullable = true, length = 100)
+	@Column(name = "NoKepesertaan", length = 100)
 	@Caption(value = "NoKepesertaan")
 	private String noKepesertaan;
 
-	@Column(name = "Lakalantas", nullable = true)
+	@Column(name = "Lakalantas")
 	@Caption(value = "Lakalantas")
 	private Integer lakalantas;
 
-	@Column(name = "TglRujukan", nullable = true)
+	@Column(name = "TglRujukan")
 	@Caption(value = "TglRujukan")
 	private Date tglRujukan;
 
-	@Column(name = "NoRujukan", nullable = true, length = 100)
+	@Column(name = "NoRujukan", length = 100)
 	@Caption(value = "NoRujukan")
 	private String noRujukan;
 
-	@Column(name = "NoSep", nullable = true, length = 100)
+	@Column(name = "NoSep", length = 100)
 	@Caption(value = "NoSep")
 	private String noSep;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectAsuransiPasienFk")
 	@Caption(value = "Object Asuransi Pasien")
 	private AsuransiPasien asuransiPasien;
 
-	@Column(name = "ObjectAsuransiPasienFk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "ObjectAsuransiPasienFk", insertable = false, updatable = false)
 	private Integer asuransiPasienId;
 
 	@Caption(value = "Tanggal Registrasi")
-	@Column(name = "TglRegistrasi", nullable = true)
+	@Column(name = "TglRegistrasi")
 	private Date tglRegistrasi;
 
 	@Caption(value = "Catatan")
-	@Column(name = "Catatan", nullable = true)
+	@Column(name = "Catatan")
 	private String catatan;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectDiagnosaFK")
 	@Caption(value = "ObjectDiagnosaFK")
 	private Diagnosa diagnosa;
 
-	@Column(name = "ObjectDiagnosaFK", insertable = false, updatable = false, nullable = true)
+	@Column(name = "ObjectDiagnosaFK", insertable = false, updatable = false)
 	private Integer diagnosaId;
 
 	@Caption(value = "TanggalSep")
-	@Column(name = "TanggalSep", nullable = true)
+	@Column(name = "TanggalSep")
 	private Date tanggalSep;
-
-	public Date getTanggalPendaftaran() {
-		return tglRegistrasi;
-	}
-
-	public void setTanggalPendaftaran(Date tanggalPendaftaran) {
-		this.tglRegistrasi = tanggalPendaftaran;
-	}
-
-	public PasienDaftar getPasienDaftar() {
-		return pasienDaftar;
-	}
-
-	public void setPasienDaftar(PasienDaftar pasienDaftar) {
-		this.pasienDaftar = pasienDaftar;
-	}
-
-	public String getPasienDaftarId() {
-		return pasienDaftarId;
-	}
-
-	public void setPasienDaftarId(String pasienDaftarId) {
-		this.pasienDaftarId = pasienDaftarId;
-	}
-
-	public String getPpkRujukan() {
-		return ppkRujukan;
-	}
-
-	public void setPpkRujukan(String ppkRujukan) {
-		this.ppkRujukan = ppkRujukan;
-	}
-
-	public Diagnosa getDiagnosis() {
-		return diagnosis;
-	}
-
-	public void setDiagnosis(Diagnosa diagnosis) {
-		this.diagnosis = diagnosis;
-	}
-
-	public Integer getDiagnosisId() {
-		return diagnosisId;
-	}
-
-	public void setDiagnosisId(Integer diagnosisId) {
-		this.diagnosisId = diagnosisId;
-	}
-
-	public String getNoKepesertaan() {
-		return noKepesertaan;
-	}
-
-	public void setNoKepesertaan(String noKepesertaan) {
-		this.noKepesertaan = noKepesertaan;
-	}
-
-	public Integer getLakalantas() {
-		return lakalantas;
-	}
-
-	public void setLakalantas(Integer lakalantas) {
-		this.lakalantas = lakalantas;
-	}
-
-	public Date getTglRujukan() {
-		return tglRujukan;
-	}
-
-	public void setTglRujukan(Date tglRujukan) {
-		this.tglRujukan = tglRujukan;
-	}
-
-	public String getNoRujukan() {
-		return noRujukan;
-	}
-
-	public void setNoRujukan(String noRujukan) {
-		this.noRujukan = noRujukan;
-	}
-
-	public String getNoSep() {
-		return noSep;
-	}
-
-	public void setNoSep(String noSep) {
-		this.noSep = noSep;
-	}
-
-	public AsuransiPasien getAsuransiPasien() {
-		return asuransiPasien;
-	}
-
-	public void setAsuransiPasien(AsuransiPasien asuransiPasien) {
-		this.asuransiPasien = asuransiPasien;
-	}
-
-	public Integer getAsuransiPasienId() {
-		return asuransiPasienId;
-	}
-
-	public void setAsuransiPasienId(Integer asuransiPasienId) {
-		this.asuransiPasienId = asuransiPasienId;
-	}
-
-	public Date getTglRegistrasi() {
-		return tglRegistrasi;
-	}
-
-	public void setTglRegistrasi(Date tglRegistrasi) {
-		this.tglRegistrasi = tglRegistrasi;
-	}
-
-	public Diagnosa getDiagnosa() {
-		return diagnosa;
-	}
-
-	public void setDiagnosa(Diagnosa diagnosa) {
-		this.diagnosa = diagnosa;
-	}
-
-	public Integer getDiagnosaId() {
-		return diagnosaId;
-	}
-
-	public void setDiagnosaId(Integer diagnosaId) {
-		this.diagnosaId = diagnosaId;
-	}
-
-	public Date getTanggalSep() {
-		return tanggalSep;
-	}
-
-	public void setTanggalSep(Date tanggalSep) {
-		this.tanggalSep = tanggalSep;
-	}
-
-	public String getCatatan() {
-		return catatan;
-	}
-
-	public void setCatatan(String catatan) {
-		this.catatan = catatan;
-	}
 }

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

@@ -1,83 +1,43 @@
 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 lombok.Getter;
-import javax.persistence.GeneratedValue;
+import lombok.Setter;
-import javax.persistence.GenerationType;
+
-import javax.persistence.Id;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class PenyebabKematian
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "PenyebabKematian_M")
 public class PenyebabKematian extends BaseMaster {
+	@Id
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.penyebabkematian_m_id_seq")
+	@SequenceGenerator(name = "public.penyebabkematian_m_id_seq", sequenceName = "public.penyebabkematian_m_id_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Integer id;
+
 	@NotNull(message = "Kd Penyebab Kematian tidak boleh kosong")
 	@Column(name = "KdPenyebabKematian", nullable = false)
 	@Caption(value = "Kode Penyebab Kematian")
 	private Byte kdPenyebabKematian;
 
-	public void setKdPenyebabKematian(Byte kdPenyebabKematian) {
-		this.kdPenyebabKematian = kdPenyebabKematian;
-	}
-
-	public Byte getKdPenyebabKematian() {
-		return this.kdPenyebabKematian;
-	}
-
 	@NotNull(message = "Penyebab Kematian tidak boleh kosong")
 	@Column(name = "PenyebabKematian", nullable = false, length = 50)
 	@Caption(value = "Penyebab Kematian")
 	private String penyebabKematian;
 
-	public void setPenyebabKematian(String penyebabKematian) {
-		this.penyebabKematian = penyebabKematian;
-	}
-
-	public String getPenyebabKematian() {
-		return this.penyebabKematian;
-	}
-
 	@NotNull(message = "QPenyebab Kematian tidak boleh kosong")
 	@Column(name = "QPenyebabKematian", nullable = false)
 	@Caption(value = "QPenyebab Kematian")
 	private Byte qPenyebabKematian;
-
-	public void setqPenyebabKematian(Byte qPenyebabKematian) {
-		this.qPenyebabKematian = qPenyebabKematian;
-	}
-
-	public Byte getqPenyebabKematian() {
-		return this.qPenyebabKematian;
-	}
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.penyebabkematian_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.penyebabkematian_m_id_seq", sequenceName = "public.penyebabkematian_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/etl/pasien/constant/Agama.java

@@ -13,9 +13,7 @@ public enum Agama {
     KATOLIK(3, "Katolik"),
     HINDU(4, "Hindu"),
     BUDHA(5, "Budha"),
-    KONGHUCU(6, "Konghucu"),
+    KONGHUCU(6, "Konghucu");
-    PENGHAYAT(7, "Penghayat"),
-    LAIN_LAIN(8, "Lain-lain");
 
     private final long id;
 

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/constant/CaraMeninggal.java

@@ -0,0 +1,46 @@
+package com.jasamedika.medifirst2000.etl.pasien.constant;
+
+import lombok.Getter;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 3 Nov 2023
+ */
+public enum CaraMeninggal {
+    BAWAH_DAN_48_JAM(1, "Meninggal <=48 Jam"),
+    ATAS_48_JAM(2, "Meninggal >48 Jam"),
+    BAWAH_DAN_8_JAM(3, "Meninggal <=8 Jam"),
+    ATAS_8_JAM(4, "Meninggal >8 Jam"),
+    DOA(5, "Meninggal pada saat kedatangan"),
+    BLUECODE(6, "Meninggal pada saat gawat darurat"),
+    LAHIR(7, "Meninggal pada saat lahir");
+
+    private final long id;
+
+    @Getter
+    private final String name;
+
+    CaraMeninggal(long id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public long id() {
+        return this.id;
+    }
+
+    @Override
+    public String toString() {
+        return Long.toString(id);
+    }
+
+    public static CaraMeninggal valueOf(long id) {
+        for (CaraMeninggal caraMeninggal : values()) {
+            if (caraMeninggal.id == id) {
+                return caraMeninggal;
+            }
+        }
+        throw new IllegalArgumentException("No matching constant for [" + id + "]");
+    }
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/constant/JenisIdentitas.java

@@ -9,8 +9,8 @@ import lombok.Getter;
  */
 public enum JenisIdentitas {
     KTP(1, "KTP"),
-    KK(2, "KK"),
+    KK(2, "SIM"),
-    SIM(3, "SIM"),
+    SIM(3, "KK"),
     PASPOR(4, "Paspor"),
     KITAS(5, "KITAS"),
     AKTA_LAHIR(6, "Akta Lahir");

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/constant/Negara.java

@@ -8,18 +8,18 @@ import lombok.Getter;
  * @since 19/10/2023
  */
 public enum Negara {
-    INDONESIA(1, "Indonesia", 62),
+    INDONESIA(0, "Indonesia", 62),
-    MALAYSIA(2, "Malaysia", 60),
+    THAILAND(1, "Thailand", 66),
+    FILIPINA(2, "Filipina", 63),
     SINGAPURA(3, "Singapura", 65),
     BRUNEI_DARUSSALAM(4, "Brunei Darussalam", 673),
     VIETNAM(5, "Vietnam", 84),
-    KAMBOJA(6, "Kamboja", 855),
+    LAOS(6, "Laos", 856),
-    THAILAND(7, "Thailand", 66),
+    MYANMAR(7, "Myanmar", 95),
-    FILIPINA(8, "Filipina", 63),
+    KAMBOJA(8, "Kamboja", 855),
-    MYANMAR(9, "Myanmar", 95),
+    MALAYSIA(9, "Malaysia", 60),
-    LAOS(10, "Laos", 856),
+    TIMOR_LESTE(10, "Timor Leste", 670),
-    TIMOR_LESTE(11, "Timor Leste", 670),
+    PAPUA_NUGINI(11, "Papua Nugini", 675);
-    PAPUA_NUGINI(12, "Papua Nugini", 675);
 
     private final long id;
 

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/constant/Sapaan.java

@@ -8,11 +8,11 @@ import lombok.Getter;
  * @since 19/10/2023
  */
 public enum Sapaan {
-    BAYI(1, "Bayi", 1, 2),
+    TUAN(1, "Tuan", 17, 50),
-    ANAK(2, "Anak", 4, 10),
+    NYONYA(2, "Nyonya", 17, 50),
-    NONA(3, "Nona", 11, 21),
+    ANAK(3, "Anak", 4, 10),
-    TUAN(4, "Tuan", 17, 50),
+    BAYI(4, "Bayi", 1, 2),
-    NYONYA(5, "Nyonya", 17, 50);
+    NONA(5, "Nona", 11, 21);
 
     private final long id;
 

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/constant/StatusMigrasi.java

@@ -0,0 +1,10 @@
+package com.jasamedika.medifirst2000.etl.pasien.constant;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 3 Nov 2023
+ */
+public enum StatusMigrasi {
+	TERKIRIM, PEMBAHARUAN, BELUM_KIRIM
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/constant/Suku.java

@@ -8,8 +8,24 @@ import lombok.Getter;
  * @since 19/10/2023
  */
 public enum Suku {
-    SUNDA(1, "Sunda"),
+    JAWA(1, "Jawa"),
-    JAWA(2, "Jawa");
+    SUNDA(2, "Sunda"),
+    MADURA(3, "Madura"),
+    MANADO(4, "Manado"),
+    BALI(5, "Bali"),
+    DAYAK(6, "Dayak"),
+    BETAWI(7, "Betawi"),
+    TAPANULI(8, "Tapanuli"),
+    PAPUA(9, "Papua"),
+    AMBON(10, "Ambon"),
+    PADANG(11, "Padang"),
+    ACEH(12, "Aceh"),
+    BUGIS(13, "Bugis"),
+    MAKASSAR(14, "Makassar"),
+    MELAYU(15, "Melayu"),
+    CINA(16, "Cina"),
+    ARAB(17, "Arab"),
+    KAILI(18, "Kaili");
 
     private final long id;
 

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/AlamatDto.java

@@ -1,5 +1,10 @@
 package com.jasamedika.medifirst2000.etl.pasien.dto;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import java.util.UUID;
 
 /**
@@ -7,22 +12,17 @@ import java.util.UUID;
  * @version 1.0.0
  * @since 19/10/2023
  */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class AlamatDto {
 	private UUID id;
-
 	private JenisAlamatDto jenisAlamat;
-
 	private String alamat;
-
-    private String alamatEnkripsi;
-
 	private Integer rt;
-
 	private Integer rw;
-
 	private KelurahanDesaDto kelurahanDesa;
-
 	private Integer kodePos;
-
 	private NegaraDto negara;
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/AsuransiDto.java

@@ -17,4 +17,10 @@ import lombok.NoArgsConstructor;
 public class AsuransiDto {
 	private Long id;
 	private String asuransi;
+	private String url;
+	private String alamat;
+	private String surel;
+	private String narahubung;
+	private Integer noTelepon;
+	private Integer faksimili;
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/CaraMeninggalDto.java

@@ -8,13 +8,13 @@ import lombok.NoArgsConstructor;
 /**
  * @author salmanoe
  * @version 1.0.0
- * @since 19/10/2023
+ * @since 08/11/2023
  */
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class StatusPasienDto {
+public class CaraMeninggalDto {
 	private Long id;
-    private String statusPasien;
+	private String caraMeninggal;
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/GawaiDto.java

@@ -18,5 +18,5 @@ import java.util.UUID;
 @NoArgsConstructor
 public class GawaiDto {
 	private UUID id;
-    private Integer noGawai;
+	private Long noGawai;
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/GolonganResusDto.java

@@ -0,0 +1,21 @@
+package com.jasamedika.medifirst2000.etl.pasien.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 08/11/2023
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class GolonganResusDto {
+	private Long id;
+	private String golonganResus;
+	private Character kodeResus;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/JenisBerkasDto.java

@@ -17,4 +17,5 @@ import lombok.NoArgsConstructor;
 public class JenisBerkasDto {
 	private Long id;
 	private String jenisBerkas;
+	private KategoriBerkasDto kategoriBerkas;
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/KategoriBerkasDto.java

@@ -0,0 +1,20 @@
+package com.jasamedika.medifirst2000.etl.pasien.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 08/11/2023
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class KategoriBerkasDto {
+	private Long id;
+	private String kategoriBerkas;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/KeluargaDto.java

@@ -21,7 +21,5 @@ public class KeluargaDto {
 	private String namaPanggilan;
 	private String gelarBelakang;
 	private String surel;
-    private String kodeNegaraGawai;
+	private Long noGawai;
-    private Integer noGawai;
-    private PasienDto pasien;
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/PasienDto.java

@@ -20,15 +20,17 @@ public class PasienDto {
 	private String noRekamMedis;
 	private String gelarDepan;
 	private String namaLengkap;
-    private String namaLengkapEnkripsi;
 	private String namaPanggilan;
 	private String gelarBelakang;
+	private SapaanDto sapaan;
 	private Set<IdentitasDto> identitas;
 	private String tempatLahir;
 	private LocalDateTime tanggalLahir;
 	private JenisKelaminDto jenisKelamin;
 	private GolonganDarahDto golonganDarah;
+	private GolonganResusDto golonganResus;
 	private CaraLahirDto caraLahir;
+	private CaraMeninggalDto caraMeninggal;
 	private SukuDto suku;
 	private BahasaDto bahasa;
 	private KewarganegaraanDto kewarganegaraan;
@@ -37,7 +39,6 @@ public class PasienDto {
 	private PendidikanDto pendidikan;
 	private Set<AlamatDto> alamat;
 	private String surel;
-    private String surelEnkripsi;
 	private Set<GawaiDto> gawai;
 	private PekerjaanDto pekerjaan;
 	private LingkunganKerjaDto lingkunganKerja;
@@ -45,5 +46,4 @@ public class PasienDto {
 	private Set<BerkasDto> berkas;
 	private Set<KeluargaDto> keluarga;
 	private Set<JaminanDto> jaminan;
-    private StatusPasienDto statusPasien;
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/etl/pasien/dto/SapaanDto.java

@@ -0,0 +1,22 @@
+package com.jasamedika.medifirst2000.etl.pasien.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 08/11/2023
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class SapaanDto {
+	private Long id;
+	private String sapaan;
+	private Integer usiaMinimal;
+	private Integer usiaMaksimal;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AlamatVO.java

@@ -2,510 +2,142 @@ package com.jasamedika.medifirst2000.vo;
 
 import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * class Alamat
  * 
  * @author Generator
  */
+@Getter
+@Setter
 public class AlamatVO extends BaseMasterVO {
-
+	@Caption(value = "AlamatVO Email")
-	private static final long serialVersionUID = 3125504058977184317L;
-
-	@Caption(value="AlamatVO Email")
 	private String alamatEmail;
 
-	@Caption(value="AlamatVO Lengkap")
+	@Caption(value = "AlamatVO Lengkap")
 	private String alamatLengkap;
 
-	@Caption(value="Black Berry")
+	@Caption(value = "Black Berry")
 	private String blackBerry;
 
-	@Caption(value="Desa Kelurahan")
+	@Caption(value = "Desa Kelurahan")
 	private String namaDesaKelurahan;
 
-	@Caption(value="Facebook")
+	@Caption(value = "Facebook")
 	private String facebook;
 
-	@Caption(value="Faksimile1")
+	@Caption(value = "Faksimile1")
 	private String faksimile1;
 
-	@Caption(value="Faksimile2")
+	@Caption(value = "Faksimile2")
 	private String faksimile2;
 
-	@Caption(value="Fixed Phone1")
+	@Caption(value = "Fixed Phone1")
 	private String fixedPhone1;
 
-	@Caption(value="Fixed Phone2")
+	@Caption(value = "Fixed Phone2")
 	private String fixedPhone2;
 
-	@Caption(value="Is Billing Address")
+	@Caption(value = "Is Billing Address")
 	private Byte isBillingAddress;
 
-	@Caption(value="Is Primary Address")
+	@Caption(value = "Is Primary Address")
 	private Byte isPrimaryAddress;
 
-	@Caption(value="Is Shipping Address")
+	@Caption(value = "Is Shipping Address")
 	private Byte isShippingAddress;
 
-	@Caption(value="Kode Alamat")
+	@Caption(value = "Kode Alamat")
 	private Integer kdAlamat;
 
-	@Caption(value="Object Desa Kelurahan")
+	@Caption(value = "Object Desa Kelurahan")
 	private DesaKelurahanVO desaKelurahan;
 
 	private Integer desaKelurahanId;
 
-	@Caption(value="Object Hubungan Keluarga")
+	@Caption(value = "Object Hubungan Keluarga")
 	private HubunganKeluargaVO hubunganKeluarga;
 
 	private Integer hubunganKeluargaId;
 
-	@Caption(value="Object Jenis Alamat")
+	@Caption(value = "Object Jenis Alamat")
 	private JenisAlamatVO jenisAlamat;
 
 	private Integer jenisAlamatId;
 
-	@Caption(value="Object Kecamatan")
+	@Caption(value = "Object Kecamatan")
 	private KecamatanVO kecamatan;
 
 	private Integer kecamatanId;
 
-	@Caption(value="Object Kota Kabupaten")
+	@Caption(value = "Object Kota Kabupaten")
 	private KotaKabupatenVO kotaKabupaten;
 
 	private Integer kotaKabupatenId;
 
-	@Caption(value="Object Negara")
+	@Caption(value = "Object Negara")
 	private NegaraVO negara;
 
 	private Integer negaraId;
 
-	@Caption(value="Object Pegawai")
+	@Caption(value = "Object Pegawai")
 	private LoginUserVO pegawai;
 
 	private Integer pegawaiId;
 
-	@Caption(value="Object Propinsi")
+	@Caption(value = "Object Propinsi")
 	private PropinsiVO propinsi;
 
 	private Integer propinsiId;
 
-	@Caption(value="Object Rekanan")
+	@Caption(value = "Object Rekanan")
 	private RekananVO rekanan;
 
 	private Integer rekananId;
 
-	@Caption(value="Kecamatan")
+	@Caption(value = "Kecamatan")
 	private String namaKecamatan;
 
-	@Caption(value="Keterangan Lainnya")
+	@Caption(value = "Keterangan Lainnya")
 	private String keteranganLainnya;
 
-	@Caption(value="Kode Pos")
+	@Caption(value = "Kode Pos")
 	private String kodePos;
 
-	@Caption(value="Kota Kabupaten")
+	@Caption(value = "Kota Kabupaten")
 	private String namaKotaKabupaten;
 
-	@Caption(value="Line")
+	@Caption(value = "Line")
 	private String line;
 
-	@Caption(value="Mobile Phone1")
+	@Caption(value = "Mobile Phone1")
 	private String mobilePhone1;
 
-	@Caption(value="Mobile Phone2")
+	@Caption(value = "Mobile Phone2")
 	private String mobilePhone2;
 
-	@Caption(value="Nama Tempat Gedung")
+	@Caption(value = "Nama Tempat Gedung")
 	private String namaTempatGedung;
 
-	@Caption(value="No C M")
+	@Caption(value = "No C M")
 	private PasienVO pasien;
 
 	private Integer pasienId;
 
-	@Caption(value="RT R W")
+	@Caption(value = "RT R W")
 	private String rtrw;
 
-	@Caption(value="Twitter")
+	@Caption(value = "Twitter")
 	private String twitter;
 
-	@Caption(value="Website")
+	@Caption(value = "Website")
 	private String website;
 
-	@Caption(value="Whats App")
+	@Caption(value = "Whats App")
 	private String whatsApp;
 
-	@Caption(value="Yahoo Messenger")
+	@Caption(value = "Yahoo Messenger")
 	private String yahooMessenger;
-
-	public String getAlamatEmail() {
-		return alamatEmail;
-	}
-
-	public void setAlamatEmail(String alamatEmail) {
-		this.alamatEmail = alamatEmail;
-	}
-
-	public String getAlamatLengkap() {
-		return alamatLengkap;
-	}
-
-	public void setAlamatLengkap(String alamatLengkap) {
-		this.alamatLengkap = alamatLengkap;
-	}
-
-	public String getBlackBerry() {
-		return blackBerry;
-	}
-
-	public void setBlackBerry(String blackBerry) {
-		this.blackBerry = blackBerry;
-	}
-
-	public String getNamaDesaKelurahan() {
-		return namaDesaKelurahan;
-	}
-
-	public void setNamaDesaKelurahan(String namaDesaKelurahan) {
-		this.namaDesaKelurahan = namaDesaKelurahan;
-	}
-
-	public String getFacebook() {
-		return facebook;
-	}
-
-	public void setFacebook(String facebook) {
-		this.facebook = facebook;
-	}
-
-	public String getFaksimile1() {
-		return faksimile1;
-	}
-
-	public void setFaksimile1(String faksimile1) {
-		this.faksimile1 = faksimile1;
-	}
-
-	public String getFaksimile2() {
-		return faksimile2;
-	}
-
-	public void setFaksimile2(String faksimile2) {
-		this.faksimile2 = faksimile2;
-	}
-
-	public String getFixedPhone1() {
-		return fixedPhone1;
-	}
-
-	public void setFixedPhone1(String fixedPhone1) {
-		this.fixedPhone1 = fixedPhone1;
-	}
-
-	public String getFixedPhone2() {
-		return fixedPhone2;
-	}
-
-	public void setFixedPhone2(String fixedPhone2) {
-		this.fixedPhone2 = fixedPhone2;
-	}
-
-	public Byte getIsBillingAddress() {
-		return isBillingAddress;
-	}
-
-	public void setIsBillingAddress(Byte isBillingAddress) {
-		this.isBillingAddress = isBillingAddress;
-	}
-
-	public Byte getIsPrimaryAddress() {
-		return isPrimaryAddress;
-	}
-
-	public void setIsPrimaryAddress(Byte isPrimaryAddress) {
-		this.isPrimaryAddress = isPrimaryAddress;
-	}
-
-	public Byte getIsShippingAddress() {
-		return isShippingAddress;
-	}
-
-	public void setIsShippingAddress(Byte isShippingAddress) {
-		this.isShippingAddress = isShippingAddress;
-	}
-
-	public Integer getKdAlamat() {
-		return kdAlamat;
-	}
-
-	public void setKdAlamat(Integer kdAlamat) {
-		this.kdAlamat = kdAlamat;
-	}
-
-	public DesaKelurahanVO getDesaKelurahan() {
-		return desaKelurahan;
-	}
-
-	public void setDesaKelurahan(DesaKelurahanVO desaKelurahan) {
-		this.desaKelurahan = desaKelurahan;
-	}
-
-	public Integer getDesaKelurahanId() {
-		return desaKelurahanId;
-	}
-
-	public void setDesaKelurahanId(Integer desaKelurahanId) {
-		this.desaKelurahanId = desaKelurahanId;
-	}
-
-	public HubunganKeluargaVO getHubunganKeluarga() {
-		return hubunganKeluarga;
-	}
-
-	public void setHubunganKeluarga(HubunganKeluargaVO hubunganKeluarga) {
-		this.hubunganKeluarga = hubunganKeluarga;
-	}
-
-	public Integer getHubunganKeluargaId() {
-		return hubunganKeluargaId;
-	}
-
-	public void setHubunganKeluargaId(Integer hubunganKeluargaId) {
-		this.hubunganKeluargaId = hubunganKeluargaId;
-	}
-
-	public JenisAlamatVO getJenisAlamat() {
-		return jenisAlamat;
-	}
-
-	public void setJenisAlamat(JenisAlamatVO jenisAlamat) {
-		this.jenisAlamat = jenisAlamat;
-	}
-
-	public Integer getJenisAlamatId() {
-		return jenisAlamatId;
-	}
-
-	public void setJenisAlamatId(Integer jenisAlamatId) {
-		this.jenisAlamatId = jenisAlamatId;
-	}
-
-	public KecamatanVO getKecamatan() {
-		return kecamatan;
-	}
-
-	public void setKecamatan(KecamatanVO kecamatan) {
-		this.kecamatan = kecamatan;
-	}
-
-	public Integer getKecamatanId() {
-		return kecamatanId;
-	}
-
-	public void setKecamatanId(Integer kecamatanId) {
-		this.kecamatanId = kecamatanId;
-	}
-
-	public KotaKabupatenVO getKotaKabupaten() {
-		return kotaKabupaten;
-	}
-
-	public void setKotaKabupaten(KotaKabupatenVO kotaKabupaten) {
-		this.kotaKabupaten = kotaKabupaten;
-	}
-
-	public Integer getKotaKabupatenId() {
-		return kotaKabupatenId;
-	}
-
-	public void setKotaKabupatenId(Integer kotaKabupatenId) {
-		this.kotaKabupatenId = kotaKabupatenId;
-	}
-
-	public NegaraVO getNegara() {
-		return negara;
-	}
-
-	public void setNegara(NegaraVO negara) {
-		this.negara = negara;
-	}
-
-	public Integer getNegaraId() {
-		return negaraId;
-	}
-
-	public void setNegaraId(Integer negaraId) {
-		this.negaraId = negaraId;
-	}
-
-	public LoginUserVO getPegawai() {
-		return pegawai;
-	}
-
-	public void setPegawai(LoginUserVO pegawai) {
-		this.pegawai = pegawai;
-	}
-
-	public Integer getPegawaiId() {
-		return pegawaiId;
-	}
-
-	public void setPegawaiId(Integer pegawaiId) {
-		this.pegawaiId = pegawaiId;
-	}
-
-	public PropinsiVO getPropinsi() {
-		return propinsi;
-	}
-
-	public void setPropinsi(PropinsiVO propinsi) {
-		this.propinsi = propinsi;
-	}
-
-	public Integer getPropinsiId() {
-		return propinsiId;
-	}
-
-	public void setPropinsiId(Integer propinsiId) {
-		this.propinsiId = propinsiId;
-	}
-
-	public RekananVO getRekanan() {
-		return rekanan;
-	}
-
-	public void setRekanan(RekananVO rekanan) {
-		this.rekanan = rekanan;
-	}
-
-	public Integer getRekananId() {
-		return rekananId;
-	}
-
-	public void setRekananId(Integer rekananId) {
-		this.rekananId = rekananId;
-	}
-
-	public String getNamaKecamatan() {
-		return namaKecamatan;
-	}
-
-	public void setNamaKecamatan(String namaKecamatan) {
-		this.namaKecamatan = namaKecamatan;
-	}
-
-	public String getKeteranganLainnya() {
-		return keteranganLainnya;
-	}
-
-	public void setKeteranganLainnya(String keteranganLainnya) {
-		this.keteranganLainnya = keteranganLainnya;
-	}
-
-	public String getKodePos() {
-		return kodePos;
-	}
-
-	public void setKodePos(String kodePos) {
-		this.kodePos = kodePos;
-	}
-
-	public String getNamaKotaKabupaten() {
-		return namaKotaKabupaten;
-	}
-
-	public void setNamaKotaKabupaten(String namaKotaKabupaten) {
-		this.namaKotaKabupaten = namaKotaKabupaten;
-	}
-
-	public String getLine() {
-		return line;
-	}
-
-	public void setLine(String line) {
-		this.line = line;
-	}
-
-	public String getMobilePhone1() {
-		return mobilePhone1;
-	}
-
-	public void setMobilePhone1(String mobilePhone1) {
-		this.mobilePhone1 = mobilePhone1;
-	}
-
-	public String getMobilePhone2() {
-		return mobilePhone2;
-	}
-
-	public void setMobilePhone2(String mobilePhone2) {
-		this.mobilePhone2 = mobilePhone2;
-	}
-
-	public String getNamaTempatGedung() {
-		return namaTempatGedung;
-	}
-
-	public void setNamaTempatGedung(String namaTempatGedung) {
-		this.namaTempatGedung = namaTempatGedung;
-	}
-
-	public PasienVO getPasien() {
-		return pasien;
-	}
-
-	public void setPasien(PasienVO pasien) {
-		this.pasien = pasien;
-	}
-
-	public Integer getPasienId() {
-		return pasienId;
-	}
-
-	public void setPasienId(Integer pasienId) {
-		this.pasienId = pasienId;
-	}
-
-	public String getRtrw() {
-		return rtrw;
-	}
-
-	public void setRtrw(String rtrw) {
-		this.rtrw = rtrw;
-	}
-
-	public String getTwitter() {
-		return twitter;
-	}
-
-	public void setTwitter(String twitter) {
-		this.twitter = twitter;
-	}
-
-	public String getWebsite() {
-		return website;
-	}
-
-	public void setWebsite(String website) {
-		this.website = website;
-	}
-
-	public String getWhatsApp() {
-		return whatsApp;
-	}
-
-	public void setWhatsApp(String whatsApp) {
-		this.whatsApp = whatsApp;
-	}
-
-	public String getYahooMessenger() {
-		return yahooMessenger;
-	}
-
-	public void setYahooMessenger(String yahooMessenger) {
-		this.yahooMessenger = yahooMessenger;
-	}
 }
-

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AsuransiPasienVO.java

@@ -1,41 +1,23 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.io.Serializable;
-import javax.persistence.*;
-import java.util.Date;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
-import com.jasamedika.medifirst2000.entities.AsuransiPasien;
-import com.jasamedika.medifirst2000.entities.DataAsuransi;
-import com.jasamedika.medifirst2000.entities.Diagnosa;
-import com.jasamedika.medifirst2000.entities.GolonganAsuransi;
-import com.jasamedika.medifirst2000.entities.HubunganPesertaAsuransi;
-import com.jasamedika.medifirst2000.entities.JenisKelamin;
-import com.jasamedika.medifirst2000.entities.Kelas;
-import com.jasamedika.medifirst2000.entities.Pasien;
-import com.jasamedika.medifirst2000.entities.Pegawai;
-import com.jasamedika.medifirst2000.entities.Rekanan;
-import com.jasamedika.medifirst2000.entities.Ruangan;
-
-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.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Getter
+@Setter
 public class AsuransiPasienVO extends BaseMasterVO {
 
 	@Caption(value = "Alamat Lengkap")
 	private String alamatLengkap;
 
-	@ManyToOne(fetch = FetchType.LAZY)
 	@Caption(value = "Object Golongan Asuransi")
 	private GolonganAsuransiVO golonganAsuransi;
 
-	@ManyToOne(fetch = FetchType.LAZY)
 	@NotNull(message = "Kd Hubungan Peserta tidak boleh kosong")
 	@Caption(value = "Object Hubungan Peserta")
 	private HubunganPesertaAsuransiVO hubunganPeserta;
@@ -43,12 +25,10 @@ public class AsuransiPasienVO extends BaseMasterVO {
 	@Caption(value = "Kode Institusi Asal")
 	private Integer kdInstitusiAsal;
 
-	@ManyToOne(fetch = FetchType.LAZY)
 	@NotNull(message = "Kd Jenis Kelamin tidak boleh kosong")
 	@Caption(value = "Object Jenis Kelamin")
 	private JenisKelaminVO jenisKelamin;
 
-	@ManyToOne(fetch = FetchType.LAZY)
 	@NotNull(message = "Kd Kelas Di Jamin tidak boleh kosong")
 	@Caption(value = "Object Kelas Di Jamin")
 	private KelasVO kelasDiJamin;
@@ -56,15 +36,12 @@ public class AsuransiPasienVO extends BaseMasterVO {
 	@Caption(value = "Kode Last Unit Bagian")
 	private Integer kdLastUnitBagian;
 
-	@ManyToOne(fetch = FetchType.LAZY)
 	@Caption(value = "Object Pegawai")
 	private PegawaiVO pegawai;
 
-	@ManyToOne(fetch = FetchType.LAZY)
 	@Caption(value = "Object Rekanan")
 	private RekananVO rekanan;
 
-	@ManyToOne(fetch = FetchType.LAZY)
 	@Caption(value = "Last Unit Bagian")
 	private RuanganVO lastUnitBagian;
 
@@ -85,7 +62,6 @@ public class AsuransiPasienVO extends BaseMasterVO {
 	@Caption(value = "No Asuransi Head")
 	private String noAsuransiHead;
 
-	@ManyToOne(fetch = FetchType.LAZY)
 	@Caption(value = "No C M")
 	private PasienVO noCm;
 
@@ -120,8 +96,6 @@ public class AsuransiPasienVO extends BaseMasterVO {
 	@Caption(value = "KdProvider")
 	private String kdProvider;
 
-	//----------------------------------------------Pemakaian Asuransi-----------------------------------------------------
-	
 	@Caption(value = "PpkRujukan")
 	private String ppkRujukan;
 
@@ -146,295 +120,7 @@ public class AsuransiPasienVO extends BaseMasterVO {
 	@Caption(value = "ObjectDiagnosaFK")
 	private DiagnosaVO diagnosa;
 
-	@Column(name = "TanggalSep", nullable = true )
 	private Date tanggalSep;
 
 	private String catatan;
-	
-	public String getCatatan() {
-		return catatan;
-	}
-	public void setCatatan(String catatan) {
-		this.catatan = catatan;
-	}
-	
-	public String getAlamatLengkap() {
-		return alamatLengkap;
-	}
-
-	public void setAlamatLengkap(String alamatLengkap) {
-		this.alamatLengkap = alamatLengkap;
-	}
-
-	public GolonganAsuransiVO getGolonganAsuransi() {
-		return golonganAsuransi;
-	}
-
-	public void setGolonganAsuransi(GolonganAsuransiVO golonganAsuransi) {
-		this.golonganAsuransi = golonganAsuransi;
-	}
-
-	public HubunganPesertaAsuransiVO getHubunganPeserta() {
-		return hubunganPeserta;
-	}
-
-	public void setHubunganPeserta(HubunganPesertaAsuransiVO hubunganPeserta) {
-		this.hubunganPeserta = hubunganPeserta;
-	}
-
-	public Integer getKdInstitusiAsal() {
-		return kdInstitusiAsal;
-	}
-
-	public void setKdInstitusiAsal(Integer kdInstitusiAsal) {
-		this.kdInstitusiAsal = kdInstitusiAsal;
-	}
-
-	public JenisKelaminVO getJenisKelamin() {
-		return jenisKelamin;
-	}
-
-	public void setJenisKelamin(JenisKelaminVO jenisKelamin) {
-		this.jenisKelamin = jenisKelamin;
-	}
-
-	public KelasVO getKelasDiJamin() {
-		return kelasDiJamin;
-	}
-
-	public void setKelasDiJamin(KelasVO kelasDiJamin) {
-		this.kelasDiJamin = kelasDiJamin;
-	}
-
-	public Integer getKdLastUnitBagian() {
-		return kdLastUnitBagian;
-	}
-
-	public void setKdLastUnitBagian(Integer kdLastUnitBagian) {
-		this.kdLastUnitBagian = kdLastUnitBagian;
-	}
-
-	public PegawaiVO getPegawai() {
-		return pegawai;
-	}
-
-	public void setPegawai(PegawaiVO pegawai) {
-		this.pegawai = pegawai;
-	}
-
-	public RekananVO getRekanan() {
-		return rekanan;
-	}
-
-	public void setRekanan(RekananVO rekanan) {
-		this.rekanan = rekanan;
-	}
-
-	public RuanganVO getLastUnitBagian() {
-		return lastUnitBagian;
-	}
-
-	public void setLastUnitBagian(RuanganVO lastUnitBagian) {
-		this.lastUnitBagian = lastUnitBagian;
-	}
-
-	public String getNamaPeserta() {
-		return namaPeserta;
-	}
-
-	public void setNamaPeserta(String namaPeserta) {
-		this.namaPeserta = namaPeserta;
-	}
-
-	public String getNikInstitusiAsal() {
-		return nikInstitusiAsal;
-	}
-
-	public void setNikInstitusiAsal(String nikInstitusiAsal) {
-		this.nikInstitusiAsal = nikInstitusiAsal;
-	}
-
-	public String getNipPns() {
-		return nipPns;
-	}
-
-	public void setNipPns(String nipPns) {
-		this.nipPns = nipPns;
-	}
-
-	public String getNoAsuransi() {
-		return noAsuransi;
-	}
-
-	public void setNoAsuransi(String noAsuransi) {
-		this.noAsuransi = noAsuransi;
-	}
-
-	public String getNoAsuransiHead() {
-		return noAsuransiHead;
-	}
-
-	public void setNoAsuransiHead(String noAsuransiHead) {
-		this.noAsuransiHead = noAsuransiHead;
-	}
-
-	public PasienVO getNoCm() {
-		return noCm;
-	}
-
-	public void setNoCm(PasienVO noCm) {
-		this.noCm = noCm;
-	}
-
-	public String getNoIdentitas() {
-		return noIdentitas;
-	}
-
-	public void setNoIdentitas(String noIdentitas) {
-		this.noIdentitas = noIdentitas;
-	}
-
-	public String getNoTelpFixed() {
-		return noTelpFixed;
-	}
-
-	public void setNoTelpFixed(String noTelpFixed) {
-		this.noTelpFixed = noTelpFixed;
-	}
-
-	public String getNoTelpMobile() {
-		return noTelpMobile;
-	}
-
-	public void setNoTelpMobile(String noTelpMobile) {
-		this.noTelpMobile = noTelpMobile;
-	}
-
-	public Integer getqAsuransi() {
-		return qAsuransi;
-	}
-
-	public void setqAsuransi(Integer qAsuransi) {
-		this.qAsuransi = qAsuransi;
-	}
-
-	public Date getTglAkhirBerlakuLast() {
-		return tglAkhirBerlakuLast;
-	}
-
-	public void setTglAkhirBerlakuLast(Date tglAkhirBerlakuLast) {
-		this.tglAkhirBerlakuLast = tglAkhirBerlakuLast;
-	}
-
-	public Date getTglLahir() {
-		return tglLahir;
-	}
-
-	public void setTglLahir(Date tglLahir) {
-		this.tglLahir = tglLahir;
-	}
-
-	public Date getTglMulaiBerlakuLast() {
-		return tglMulaiBerlakuLast;
-	}
-
-	public void setTglMulaiBerlakuLast(Date tglMulaiBerlakuLast) {
-		this.tglMulaiBerlakuLast = tglMulaiBerlakuLast;
-	}
-
-	public String getPpkRujukan() {
-		return ppkRujukan;
-	}
-
-	public void setPpkRujukan(String ppkRujukan) {
-		this.ppkRujukan = ppkRujukan;
-	}
-
-	public DiagnosaVO getDiagnosis() {
-		return diagnosis;
-	}
-
-	public void setDiagnosis(DiagnosaVO diagnosis) {
-		this.diagnosis = diagnosis;
-	}
-
-	public String getNoKepesertaan() {
-		return noKepesertaan;
-	}
-
-	public void setNoKepesertaan(String noKepesertaan) {
-		this.noKepesertaan = noKepesertaan;
-	}
-
-	public Integer getLakalantas() {
-		return lakalantas;
-	}
-
-	public void setLakalantas(Integer lakalantas) {
-		this.lakalantas = lakalantas;
-	}
-
-	public Date getTglRujukan() {
-		return tglRujukan;
-	}
-
-	public void setTglRujukan(Date tglRujukan) {
-		this.tglRujukan = tglRujukan;
-	}
-
-	public String getNoRujukan() {
-		return noRujukan;
-	}
-
-	public void setNoRujukan(String noRujukan) {
-		this.noRujukan = noRujukan;
-	}
-
-	public String getNoSep() {
-		return noSep;
-	}
-
-	public void setNoSep(String noSep) {
-		this.noSep = noSep;
-	}
-
-	public String getJenisPeserta() {
-		return jenisPeserta;
-	}
-
-	public void setJenisPeserta(String jenisPeserta) {
-		this.jenisPeserta = jenisPeserta;
-	}
-
-	public String getNmProvider() {
-		return nmProvider;
-	}
-
-	public void setNmProvider(String nmProvider) {
-		this.nmProvider = nmProvider;
-	}
-
-	public String getKdProvider() {
-		return kdProvider;
-	}
-
-	public void setKdProvider(String kdProvider) {
-		this.kdProvider = kdProvider;
-	}
-
-	public DiagnosaVO getDiagnosa() {
-		return diagnosa;
-	}
-
-	public void setDiagnosa(DiagnosaVO diagnosa) {
-		this.diagnosa = diagnosa;
-	}
-
-	public Date getTanggalSep() {
-		return tanggalSep;
-	}
-
-	public void setTanggalSep(Date tanggalSep) {
-		this.tanggalSep = tanggalSep;
-	}
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/KategoryPegawaiVO.java

@@ -1,77 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.*;
-import java.util.Date;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
-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.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * class KategoryPegawai
  * 
  * @author Generator
  */
-//@Entity
+@Getter
-//@Table(name = "KategoryPegawai_M")
+@Setter
 public class KategoryPegawaiVO extends BaseMasterVO {
-	@Caption(value="Kategory Pegawai")
+	@Caption(value = "Kategory Pegawai")
 	private String kategoryPegawai;
 
-	public void setKategoryPegawai(String kategoryPegawai) {
+	@Caption(value = "Kode Kategory Pegawai")
-		this.kategoryPegawai = kategoryPegawai;
-	}
-
-	@Column(name = "KategoryPegawai", nullable = false , length = 30)
-	public String getKategoryPegawai(){
-		return this.kategoryPegawai;
-	}
-
-	@Caption(value="Kode Kategory Pegawai")
 	private String kdKategoryPegawai;
 
-	public void setKdKategoryPegawai(String kdKategoryPegawai) {
+	@Caption(value = "QKategory Pegawai")
-		this.kdKategoryPegawai = kdKategoryPegawai;
-	}
-
-	@Column(name = "KdKategoryPegawai", nullable = false , length = 1)
-	public String getKdKategoryPegawai(){
-		return this.kdKategoryPegawai;
-	}
-
-	@Caption(value="QKategory Pegawai")
 	private Byte qKategoryPegawai;
-
-	public void setqKategoryPegawai(Byte qKategoryPegawai) {
-		this.qKategoryPegawai = qKategoryPegawai;
-	}
-
-	@Column(name = "QKategoryPegawai", nullable = false )
-	public Byte getqKategoryPegawai(){
-		return this.qKategoryPegawai;
-	}
-	
-/*	//
-	@OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="kdkategorypegawai")
-	private Set<DetailKategoryPegawai> DetailKategoryPegawaiSet = new HashSet<DetailKategoryPegawai>();
-
-	public Set<DetailKategoryPegawai> getDetailKategoryPegawaiSet() {
-		return DetailKategoryPegawaiSet;
-	}
-
-	public void setDetailKategoryPegawaiSet(Set<DetailKategoryPegawai> detailKategoryPegawaiSet) {
-		DetailKategoryPegawaiSet = detailKategoryPegawaiSet;
-	}*/
-
 }
-

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MigrasiPasienVO.java

@@ -0,0 +1,28 @@
+package com.jasamedika.medifirst2000.vo;
+
+import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+import com.jasamedika.medifirst2000.etl.pasien.constant.StatusMigrasi;
+import com.jasamedika.medifirst2000.helper.Caption;
+import com.jasamedika.medifirst2000.vo.PasienVO;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 06/11/2023
+ */
+@Getter
+@Setter
+public class MigrasiPasienVO extends BaseTransactionVO {
+	@NotNull(message = "Pasien tidak boleh kosong")
+	@Caption(value = "Pasien")
+	private PasienVO pasien;
+
+	private Integer pasienId;
+
+	@Caption(value = "Status Migrasi")
+	private StatusMigrasi statusMigrasi;
+}

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PasienVO.java

@@ -137,4 +137,7 @@ public class PasienVO extends BaseMasterVO {
 
 	@Caption(value = "propinsi")
 	private PropinsiVO propinsi;
+
+	@Caption(value = "Email")
+	private String email;
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemakaianAsuransiVO.java

@@ -1,10 +1,14 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.util.Date;
-
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import java.util.Date;
+
+@Getter
+@Setter
 public class PemakaianAsuransiVO extends BaseTransactionVO {
 	@Caption(value = "No Registrasi")
 	private PasienDaftarVO pasienDaftar;
@@ -41,101 +45,4 @@ public class PemakaianAsuransiVO extends BaseTransactionVO {
 
 	@Caption(value = "tanggalPendaftaran")
 	private String tanggalPendaftaran;
-
-	public PasienDaftarVO getPasienDaftar() {
-		return pasienDaftar;
-	}
-
-	public void setPasienDaftar(PasienDaftarVO pasienDaftar) {
-		this.pasienDaftar = pasienDaftar;
-	}
-
-	public DataAsuransiVO getAsuransi() {
-		return asuransi;
-	}
-
-	public void setAsuransi(DataAsuransiVO asuransi) {
-		this.asuransi = asuransi;
-	}
-
-	public String getPpkRujukan() {
-		return ppkRujukan;
-	}
-
-	public void setPpkRujukan(String ppkRujukan) {
-		this.ppkRujukan = ppkRujukan;
-	}
-
-	public DiagnosaVO getDiagnosis() {
-		return diagnosis;
-	}
-
-	public void setDiagnosis(DiagnosaVO diagnosis) {
-		this.diagnosis = diagnosis;
-	}
-
-	public String getNoKepesertaan() {
-		return noKepesertaan;
-	}
-
-	public void setNoKepesertaan(String noKepesertaan) {
-		this.noKepesertaan = noKepesertaan;
-	}
-
-	public Integer getLakalantas() {
-		return lakalantas;
-	}
-
-	public void setLakalantas(Integer lakalantas) {
-		this.lakalantas = lakalantas;
-	}
-
-	public Date getTglRujukan() {
-		return tglRujukan;
-	}
-
-	public void setTglRujukan(Date tglRujukan) {
-		this.tglRujukan = tglRujukan;
-	}
-
-	public String getNoRujukan() {
-		return noRujukan;
-	}
-
-	public void setNoRujukan(String noRujukan) {
-		this.noRujukan = noRujukan;
-	}
-
-	public String getNoSep() {
-		return noSep;
-	}
-
-	public void setNoSep(String noSep) {
-		this.noSep = noSep;
-	}
-
-	public AsuransiPasienVO getAsuransiPasien() {
-		return asuransiPasien;
-	}
-
-	public void setAsuransiPasien(AsuransiPasienVO asuransiPasien) {
-		this.asuransiPasien = asuransiPasien;
-	}
-
-	public Date getTglRegistrasi() {
-		return tglRegistrasi;
-	}
-
-	public void setTglRegistrasi(Date tglRegistrasi) {
-		this.tglRegistrasi = tglRegistrasi;
-	}
-
-	public String getTanggalPendaftaran() {
-		return tanggalPendaftaran;
-	}
-
-	public void setTanggalPendaftaran(String tanggalPendaftaran) {
-		this.tanggalPendaftaran = tanggalPendaftaran;
-	}
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PenyebabKematianVO.java

@@ -1,63 +1,24 @@
 package com.jasamedika.medifirst2000.vo;
 
-import java.io.Serializable;
-import javax.persistence.*;
-import java.util.Date;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
-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.vo.BaseMasterVO;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * class PenyebabKematian
  * 
  * @author Generator
  */
-//@Entity
+@Getter
-//@Table(name = "PenyebabKematian_M")
+@Setter
 public class PenyebabKematianVO extends BaseMasterVO {
-	@Caption(value="Kode Penyebab Kematian")
+	@Caption(value = "Kode Penyebab Kematian")
 	private Byte kdPenyebabKematian;
 
-	public void setKdPenyebabKematian(Byte kdPenyebabKematian) {
+	@Caption(value = "Penyebab Kematian")
-		this.kdPenyebabKematian = kdPenyebabKematian;
-	}
-
-	@Column(name = "KdPenyebabKematian", nullable = false )
-	public Byte getKdPenyebabKematian(){
-		return this.kdPenyebabKematian;
-	}
-
-	@Caption(value="Penyebab Kematian")
 	private String penyebabKematian;
 
-	public void setPenyebabKematian(String penyebabKematian) {
+	@Caption(value = "QPenyebab Kematian")
-		this.penyebabKematian = penyebabKematian;
-	}
-
-	@Column(name = "PenyebabKematian", nullable = false , length = 50)
-	public String getPenyebabKematian(){
-		return this.penyebabKematian;
-	}
-
-	@Caption(value="QPenyebab Kematian")
 	private Byte qPenyebabKematian;
-
-	public void setqPenyebabKematian(Byte qPenyebabKematian) {
-		this.qPenyebabKematian = qPenyebabKematian;
-	}
-
-	@Column(name = "QPenyebabKematian", nullable = false )
-	public Byte getqPenyebabKematian(){
-		return this.qPenyebabKematian;
-	}
-
-
 }
-

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

@@ -884,5 +884,8 @@
 		<mapping class="com.jasamedika.medifirst2000.entities.JumlahDosis" />
 		<mapping class="com.jasamedika.medifirst2000.entities.KeteranganPakaiObat" />
 		<mapping class="com.jasamedika.medifirst2000.entities.SatuanDosis" />
+
+		<mapping class="com.jasamedika.medifirst2000.entities.MigrasiPasien" />
+		<mapping class="com.jasamedika.medifirst2000.entities.DokumenVedika" />
 	</session-factory>
 </hibernate-configuration>