diff --git a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java
index 6c51f35e..28979070 100644
--- a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java
+++ b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingDaftarOnlineController.java
@@ -242,8 +242,8 @@ public class BridgingDaftarOnlineController {
bridge.setHari(map.get("namaHari").toString());
bridge.setIddokter(map.get("idPegawai").toString());
bridge.setIdKlinik(map.get("idRuangan").toString());
- bridge.setJamMulaiPraktek(map.get("waktumulai").toString());
- bridge.setJamTutupPraktek(map.get("waktuselesai").toString());
+ bridge.setJamMulaiPraktek(map.get("waktuMulai").toString());
+ bridge.setJamTutupPraktek(map.get("waktuSelesai").toString());
bridge.setKuota(map.get("quota").toString());
bridge.setNamadokter(map.get("namaLengkap").toString());
bridge.setUpdate(dateFormat.format(cal.getTime()));
diff --git a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingSiranapController.java b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingSiranapController.java
index bfb3560c..71715c2f 100644
--- a/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingSiranapController.java
+++ b/jasamedika-bridging/src/main/java/com/jasamedika/medifirst2000/controller/BridgingSiranapController.java
@@ -1,20 +1,5 @@
package com.jasamedika.medifirst2000.controller;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
import com.jasamedika.medifirst2000.dao.BridgingDao;
import com.jasamedika.medifirst2000.dao.LogSiranapDao;
import com.jasamedika.medifirst2000.entities.LogSiranap;
@@ -24,6 +9,15 @@ import com.jasamedika.medifirst2000.vo.custom.BridgeSiranapKamarVO;
import com.jasamedika.medifirst2000.vo.custom.BridgeSiranapListVO;
import com.jasamedika.medifirst2000.vo.custom.BridgeSiranapRuanganVO;
import com.jasamedika.medifirst2000.vo.custom.BridgeSiranapVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
@RestController
@RequestMapping("/siranap")
@@ -237,7 +231,7 @@ public class BridgingSiranapController {
log.setTerpakaiMale(voTempatTidur.getTerpakaiMale()+"");
log.setTglUpdate(voTempatTidur.getTglUpdate());
log.setTipePasien(voTempatTidur.getTipePasien());
- log.setTotal_TT(voTempatTidur.getTotalTT()+"");
+ log.setTotalTempatTidur(voTempatTidur.getTotalTT()+"");
log.setWaiting(voTempatTidur.getWaiting()+"");
log.setTglAccess(new Date());
if(CommonUtil.isNotNullOrEmpty(log))
diff --git a/jasamedika-bridging/src/main/resources/hibernate.cfg.xml b/jasamedika-bridging/src/main/resources/hibernate.cfg.xml
index 3ef2c10c..ac958520 100644
--- a/jasamedika-bridging/src/main/resources/hibernate.cfg.xml
+++ b/jasamedika-bridging/src/main/resources/hibernate.cfg.xml
@@ -2,306 +2,2137 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AntrianPasienDiPeriksaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AntrianPasienDiPeriksaDao.java
index 6cbbce2f..2681aeb9 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AntrianPasienDiPeriksaDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/AntrianPasienDiPeriksaDao.java
@@ -1,9 +1,7 @@
package com.jasamedika.medifirst2000.dao;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
+import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.Query;
@@ -11,8 +9,9 @@ import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
-import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* Repository class for Pasien
@@ -76,7 +75,7 @@ public interface AntrianPasienDiPeriksaDao extends PagingAndSortingRepository findDiagnosaPasien(@Param("noCm") String noCm, @Param("tglRegistrasi") String tglRegistrasi);
@Query("select NEW Map (" + "a.noRec as noRec, " + "a.ruanganId as ruangan, " + "c.id as kelasId) "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/BridgingDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/BridgingDao.java
index f0f4deff..05c10fb1 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/BridgingDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/BridgingDao.java
@@ -1,16 +1,15 @@
package com.jasamedika.medifirst2000.dao;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.DetailDiagnosaPasien;
+import com.jasamedika.medifirst2000.entities.Profile;
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.DetailDiagnosaPasien;
-import com.jasamedika.medifirst2000.entities.Profile;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
@Repository("BridgingDao")
public interface BridgingDao extends PagingAndSortingRepository {
@@ -38,7 +37,7 @@ public interface BridgingDao extends PagingAndSortingRepository kunjunganIgd(@Param("dateNow") Date dateNow);
- @Query("select new map(jadwalPraktek.jamPraktek as jamPraktek,jadwalPraktek.waktumulai as jamBuka, jadwalPraktek.waktuselesai as jamTutup"
+ @Query("select new map(jadwalPraktek.jamPraktek as jamPraktek,jadwalPraktek.waktuMulai as jamBuka, jadwalPraktek.waktuSelesai as jamTutup"
+ ",hari.namaHari as hari, ruangan.namaRuangan as namaRuangan, ruangan.id as id)"
+ " from JadwalPraktikDokter model " + " left join model.hari hari "
+ " left join model.jadwalPraktek jadwalPraktek " + " left join model.ruangan ruangan "
@@ -48,7 +47,7 @@ public interface BridgingDao extends PagingAndSortingRepository {
// custom query
- @Query("select model from DiagnosaPasien model where model.pasienDaftar.pasienDaftar.pasien.noCm=:noCm and model.tanggalPendaftaran=:tanggalPendaftaran")
+ @Query("select model from DiagnosaPasien model where model.pasienDaftar.pasienDaftar.pasien.noCm=:noCm and model.tglRegistrasi=:tanggalPendaftaran")
public List findDiagnosaPasienByNoCmAndTglInput(@Param("noCm") String noCm,@Param("tanggalPendaftaran") Date tanggalPendaftaran);
@Query("select model from DiagnosaPasien model where model.pasienDaftar.pasienDaftar.pasien.id=:pasienId")
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JadwalDpjpRawatInapDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JadwalDpjpRawatInapDao.java
index 039eb206..4d9d3970 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JadwalDpjpRawatInapDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JadwalDpjpRawatInapDao.java
@@ -16,7 +16,7 @@ public interface JadwalDpjpRawatInapDao extends PagingAndSortingRepository> getJadwalDpjpDokterPelayanan(
@Param("id") Integer id,
@Param("dateNow") Date dateNow);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JadwalPraktikDokterDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JadwalPraktikDokterDao.java
index a18131ab..3969712c 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JadwalPraktikDokterDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/JadwalPraktikDokterDao.java
@@ -19,7 +19,7 @@ public interface JadwalPraktikDokterDao extends CrudRepository findByPegawaiId(@Param("pegawaiId") Integer idPegawai);
+
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KesanPsikologis_DiagnosisDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KesanPsikologis_DiagnosisDao.java
index b703b16a..b60694c4 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KesanPsikologis_DiagnosisDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/KesanPsikologis_DiagnosisDao.java
@@ -7,12 +7,12 @@ import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
-import com.jasamedika.medifirst2000.entities.KesanPsikologis_Diagnosis;
+import com.jasamedika.medifirst2000.entities.KesanPsikologisDiagnosis;
@Repository("KesanPsikologis_DiagnosisDao")
-public interface KesanPsikologis_DiagnosisDao extends PagingAndSortingRepository {
-
- @Query("select model from KesanPsikologis_Diagnosis model where model.pengkajianAwalPsikologi.noRec=:noRec")
- public List findByNoRec(@Param("noRec") String noRec);
+public interface KesanPsikologis_DiagnosisDao extends PagingAndSortingRepository {
+
+ @Query("select model from KesanPsikologisDiagnosis model where model.pengkajianAwalPsikologi.noRec=:noRec")
+ public List findByNoRec(@Param("noRec") String noRec);
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java
index 19bbc315..9f58ab2d 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/MapPegawaiJabatanToUnitKerjaDao.java
@@ -197,19 +197,6 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends JpaRepository getMapJabatanUtamaByPegawai(@Param("idPegawai") Integer idPegawai);
- @Query("select new Map(mapp.id, mapp.pegawaiId, mapp.isCanCreateJadwal, mapp.isMonitoring, mapp.isPrimary, jab.levelJabatan) "
- + "from MapPegawaiJabatanToUnitKerja mapp " + "left join mapp.jabatan jab "
- + "where mapp.statusEnabled is true and jab.statusEnabled is true and jab.levelJabatan is not null "
- + "and mapp.jabatanId = :idJabatan and mapp.subUnitKerjaPegawaiId = :idSubunitKerja and mapp.unitKerjaPegawaiId = :idUnitKerja")
- Map getMappByDetail(@Param("idJabatan") Integer idJabatan,
- @Param("idSubunitKerja") Integer idSubunitKerja, @Param("idUnitKerja") Integer idUnitKerja);
-
- @Query("select distinct mapp.pegawaiId " + "from MapPegawaiJabatanToUnitKerja mapp "
- + "inner join mapp.jabatan jab " + "where mapp.statusEnabled is true " + "and jab.statusEnabled is true "
- + "and jab.levelJabatan > :levelJabatan " + "and mapp.subUnitKerjaPegawaiId = :idSubunitKerja")
- List getPegawaiBySubunitKerja(@Param("idSubunitKerja") Integer idSubunitKerja,
- @Param("levelJabatan") Integer levelJabatan);
-
@Query("select mapp.jabatanId from MapPegawaiJabatanToUnitKerja mapp " + "left join mapp.jabatan jb "
+ "where mapp.statusEnabled is true " + "and mapp.pegawaiId=:idPegawai "
+ "and mapp.unitKerjaPegawaiId=:idUnitKerja " + "order by jb.levelJabatan desc")
@@ -315,24 +302,6 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends JpaRepository getAll();
- @Query("select new Map(mapp.id as idMapping, mapp.pegawaiId as idPegawai, mapp.atasanLangsungId as idAtasan, mapp.pejabatPenilaiId as idPenilai) "
- + "from MapPegawaiJabatanToUnitKerja mapp "
- + "where mapp.statusEnabled is true and mapp.jabatanId is not null and mapp.unitKerjaPegawaiId is not null and mapp.subUnitKerjaPegawaiId is not null "
- + "and (mapp.pegawaiId in (:listAtasan) or mapp.pegawaiId in (:listPenilai)) and mapp.jabatanId = :jabatanId "
- + "and mapp.unitKerjaPegawaiId = :unitId and mapp.subUnitKerjaPegawaiId = :subId")
- List> getMappingJabatanDanAtasan(@Param("listAtasan") List listAtasan,
- @Param("listPenilai") List listPenilai, @Param("jabatanId") Integer jabatanId,
- @Param("unitId") Integer unitId, @Param("subId") Integer subId);
-
- @Query("select distinct mapp.atasanLangsungId from MapPegawaiJabatanToUnitKerja mapp where mapp.statusEnabled is true and mapp.atasanLangsungId is not null")
- List listAtasanLangsung();
-
- @Query("select distinct mapp.pejabatPenilaiId from MapPegawaiJabatanToUnitKerja mapp where mapp.statusEnabled is true and mapp.pejabatPenilaiId is not null")
- List listPejabatPenilai();
-
- @Query("select mapp.id from MapPegawaiJabatanToUnitKerja mapp where mapp.statusEnabled is true and mapp.pegawaiId = :pegawaiId")
- List getMappingIdByPegawai(@Param("pegawaiId") Integer pegawaiId);
-
@Query("select new Map(jab.id as idJabatan, jab.namaJabatan as namaJabatan, "
+ "peg.id as idPegawai, peg.namaLengkap as namaLengkap, coalesce(peg.nipPns,peg.nip,peg.nikIntern) as nipPns, "
+ "uk.id as idUnitKerja, uk.name as namaUnitKerja, "
@@ -527,4 +496,5 @@ public interface MapPegawaiJabatanToUnitKerjaDao extends JpaRepository findDokterByUnitKerja(@Param("listUnitKerjaId") List listIdUnitKerja);
+
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java
index 6ee3ef62..8f5ba451 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PegawaiDao.java
@@ -786,14 +786,6 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific
+ "and mj.unitKerjaPegawaiId = :idUnitKerja " + "and (jb.levelJabatan in (3,4,5))")
List getPegawaiSDMforCred(@Param("idUnitKerja") Integer idUnitKerja);
- @Query("select pg.id from MapPegawaiJabatanToUnitKerja mj " + "inner join mj.pegawai pg "
- + "inner join mj.jabatan jb " + "where mj.unitKerjaPegawaiId = jb.unitKerjaId "
- + "and mj.statusEnabled is true and pg.statusEnabled is true and jb.statusEnabled is true "
- + "and mj.unitKerjaPegawaiId = :idUnitKerja " + "and (jb.levelJabatan in (3,4) "
- + "or (mj.subUnitKerjaPegawaiId = :idSubUnitKerja and jb.levelJabatan = 5))")
- List getPegawaiSDMforCred(@Param("idUnitKerja") Integer idUnitKerja,
- @Param("idSubUnitKerja") Integer idSubUnitKerja);
-
@Query("select pegawai.id " + "from MapPegawaiJabatanToUnitKerja mapPegawai "
+ "inner join mapPegawai.pegawai pegawai " + "where mapPegawai.isPrimary is true "
+ "and mapPegawai.statusEnabled is true " + "and pegawai.statusEnabled is true "
@@ -849,12 +841,6 @@ public interface PegawaiDao extends JpaRepository, JpaSpecific
@Query("select pg.shiftKerjaId from Pegawai pg where pg.statusEnabled is true and pg.id = :idPegawai")
Integer getKelompokShiftByIdPegawai(@Param("idPegawai") Integer idPegawai);
- @Query("select p.id " + "from Pegawai p," + "JenisPegawai j," + "SettingDataFixed s "
- + "where p.statusEnabled is true " + "and p.jenisPegawaiId = j.id "
- + "and p.jenisPegawaiId = cast(s.nilaiField as int) " + "and j.id = cast(s.nilaiField as int) "
- + "and s.namaField='KdJenisPegawaiDokter' " + "and p.statusPegawai.id = 2")
- List getPegawaiKedokteran();
-
@Query("select new Map(pegawai.alamat as alamat, " + "pegawai.agamaId as agamaId, "
+ "pegawai.bankRekeningAtasNama as bankRekeningAtasNama, "
+ "pegawai.bankRekeningNama as bankRekeningNama, " + "pegawai.bankRekeningNomor as bankRekeningNomor, "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananLaboratoriumDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananLaboratoriumDao.java
index 5d7e4cf8..0c6d41e3 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananLaboratoriumDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananLaboratoriumDao.java
@@ -1,14 +1,13 @@
package com.jasamedika.medifirst2000.dao;
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.LisOrderSysmex;
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.LisOrderSysmex;
+import java.util.List;
+import java.util.Map;
@Repository("PelayananLaboratoriumDao")
public interface PelayananLaboratoriumDao extends PagingAndSortingRepository{
@@ -54,6 +53,6 @@ public interface PelayananLaboratoriumDao extends PagingAndSortingRepository> chekOrder(@Param("noLab") String noLab);
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananLaboratoriumTempDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananLaboratoriumTempDao.java
index ebb68116..d7884432 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananLaboratoriumTempDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananLaboratoriumTempDao.java
@@ -1,13 +1,13 @@
package com.jasamedika.medifirst2000.dao;
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.entities.LisOrderTmpSysmex;
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.LisOrderTmpSysmex;
+
+import java.util.List;
+import java.util.Map;
@Repository("PelayananLaboratoriumTempDao")
public interface PelayananLaboratoriumTempDao extends PagingAndSortingRepository {
@@ -15,8 +15,8 @@ public interface PelayananLaboratoriumTempDao extends PagingAndSortingRepository
@Query("SELECT so.noOrderIntern FROM StrukOrder so where so.noOrder = :noOrder")
String getNolab(@Param("noOrder") String noOrder);
- @Query("select NEW MAP(lis.ono as noLab, lis.orderTestID as ordertestid, lis.pid as rm , lis.requestDt as dt) FROM "
- + " LisOrderTmpSysmex lis where lis.ono = :noOrder ")
+ @Query("select NEW MAP(lis.orderNumber as noLab, lis.orderTestId as ordertestid, lis.patientId as rm , lis.requestData as dt) FROM "
+ + " LisOrderTmpSysmex lis where lis.orderNumber = :noOrder ")
Map getOrderFromLisOrderTmp(@Param("noOrder") String noOrder);
@Query("select NEW MAP(lis.ono as noLab, lis.requestDt as tglRequest) FROM "
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MapPegawaiJabatanToUnitKerjaService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MapPegawaiJabatanToUnitKerjaService.java
index 1c1dd9a3..0892aa4d 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MapPegawaiJabatanToUnitKerjaService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/MapPegawaiJabatanToUnitKerjaService.java
@@ -1,5 +1,6 @@
package com.jasamedika.medifirst2000.service;
+import com.jasamedika.medifirst2000.dto.PegawaiJabatanDto;
import com.jasamedika.medifirst2000.dto.superapp.request.EmailDto;
import com.jasamedika.medifirst2000.dto.superapp.response.AuthorizationDto;
import com.jasamedika.medifirst2000.entities.MapPegawaiJabatanToUnitKerja;
@@ -16,8 +17,6 @@ public interface MapPegawaiJabatanToUnitKerjaService {
Map saveHistory(List listVo);
- Map saveHistory(MapPegawaiJabatanToUnitKerja mapp);
-
Map findAllByPegawai(Integer idPegawai);
Map findAllMap();
@@ -36,8 +35,6 @@ public interface MapPegawaiJabatanToUnitKerjaService {
List> findSubUnitByUnitJadwal(Integer idPegawai, Integer idUnit);
- Map checkAtasan(MapPegawaiJabatanToUnitKerjaVO vo);
-
void saveHistoryPegawai(MapPegawaiJabatanToUnitKerja model, String perubahan);
Map getMapJabatanForMonitoringAbsensiByPegawai(Integer idPegawai);
@@ -52,8 +49,6 @@ public interface MapPegawaiJabatanToUnitKerjaService {
Map findAtasanDanUnitKerja(Integer idPegawai, Integer idJabatan);
- Map autoMappingAtasan(Integer idPegawai, Integer idJabatan, Integer idUnit, Integer idSub);
-
List> findFormasiJabatan();
List> getJabatanPegawai();
@@ -69,4 +64,6 @@ public interface MapPegawaiJabatanToUnitKerjaService {
AuthorizationDto get(EmailDto dto);
String getJenisLogbook(Integer idPegawai);
+
+ PegawaiJabatanDto getDataJabatan(Integer idPegawai);
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PermohonanStatusPegawaiService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PermohonanStatusPegawaiService.java
index 3d9861bd..8983c7cf 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PermohonanStatusPegawaiService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/PermohonanStatusPegawaiService.java
@@ -1,6 +1,7 @@
package com.jasamedika.medifirst2000.service;
import com.jasamedika.medifirst2000.dto.DataCutiDto;
+import com.jasamedika.medifirst2000.dto.MonitoringJatahCutiDto;
import com.jasamedika.medifirst2000.entities.PegawaiHistoriRekapIndex;
import com.jasamedika.medifirst2000.vo.JatahCutiDanIzinVO;
import com.jasamedika.medifirst2000.vo.KelompokShiftKerjaCustomVO;
@@ -82,6 +83,8 @@ public interface PermohonanStatusPegawaiService {
List> getAllDataCuti();
+ List findByPegawai(Integer idPegawai);
+
List> getAllDataCuti(Integer idPegawai);
Map updatePlanningPegawaiStatus(PlanningPegawaiStatusVO vo);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AdvokasiHukumMedicolegalServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AdvokasiHukumMedicolegalServiceImpl.java
index a43e16a9..8af4add8 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AdvokasiHukumMedicolegalServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AdvokasiHukumMedicolegalServiceImpl.java
@@ -267,7 +267,7 @@ private static String SETTING_DATA_FIXED_JENIS="AdvokasiHukumHukor";
writeByteArraysToFile(targetFile+File.separator+fileName, decodedBytes);
dokumen.setPathFile(targetFile+File.separator+fileName);
dokumen.setNamaJudulDokumen(fileName);
- dokumen.setqDokumen(0);
+ dokumen.setQDokumen(0);
dokumen.setStatusEnabled(true);
dokumenDao.save(dokumen);
return dokumen;
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AnamnesisServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AnamnesisServiceImpl.java
index dabf18dd..4e0b9490 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AnamnesisServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AnamnesisServiceImpl.java
@@ -8,27 +8,17 @@ import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.jasamedika.medifirst2000.converter.AnamnesisConverter;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
-import com.jasamedika.medifirst2000.converter.PasienConverter;
-import com.jasamedika.medifirst2000.converter.RiwayatPenyakitPengobatanConverter;
-import com.jasamedika.medifirst2000.dao.AnamnesisDao;
import com.jasamedika.medifirst2000.dao.AnamnesisDao;
import com.jasamedika.medifirst2000.entities.Anamnesis;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.Anamnesis;
-import com.jasamedika.medifirst2000.entities.PapAnamesis;
-import com.jasamedika.medifirst2000.entities.Pasien;
import com.jasamedika.medifirst2000.entities.Pegawai;
-import com.jasamedika.medifirst2000.entities.RiwayatPenyakitPengobatan;
import com.jasamedika.medifirst2000.entities.Ruangan;
import com.jasamedika.medifirst2000.service.AnamnesisService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.AnamnesisVO;
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
-import com.jasamedika.medifirst2000.vo.AnamnesisVO;
import com.jasamedika.medifirst2000.vo.PegawaiVO;
-import com.jasamedika.medifirst2000.vo.RiwayatPenyakitPengobatanVO;
import com.jasamedika.medifirst2000.vo.RuanganVO;
@@ -75,7 +65,7 @@ public class AnamnesisServiceImpl extends BaseVoServiceImpl implements Anamnesis
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar()))
{
- anamnesis.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ anamnesis.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
if(CommonUtil.isNotNullOrEmpty(anamnesis))
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AsesmenGiziAwalServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AsesmenGiziAwalServiceImpl.java
index 7a8a7288..e773770c 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AsesmenGiziAwalServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AsesmenGiziAwalServiceImpl.java
@@ -1,31 +1,20 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.jasamedika.medifirst2000.converter.AntrianPasienDiPeriksaConverter;
-import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
-import com.jasamedika.medifirst2000.converter.JenisDietConverter;
-import com.jasamedika.medifirst2000.converter.PasienConverter;
-import com.jasamedika.medifirst2000.converter.PreskripsiDietConverter;
-import com.jasamedika.medifirst2000.converter.TindakLanjutGiziConverter;
+import com.jasamedika.medifirst2000.converter.*;
import com.jasamedika.medifirst2000.dao.AsesmenGiziAwalDao;
import com.jasamedika.medifirst2000.dao.PreskripsiDietDao;
import com.jasamedika.medifirst2000.dao.TindakLanjutGiziDao;
-import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.AsesmenGiziAwal;
-import com.jasamedika.medifirst2000.entities.JenisDiet;
-import com.jasamedika.medifirst2000.entities.Pasien;
-import com.jasamedika.medifirst2000.entities.PreskripsiDiet;
-import com.jasamedika.medifirst2000.entities.TindakLanjutGizi;
+import com.jasamedika.medifirst2000.entities.*;
import com.jasamedika.medifirst2000.service.AsesmenGiziAwalService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.AsesmenGiziAwalVO;
import com.jasamedika.medifirst2000.vo.PreskripsiDietVO;
import com.jasamedika.medifirst2000.vo.TindakLanjutGiziVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
@@ -69,7 +58,7 @@ public class AsesmenGiziAwalServiceImpl extends BaseVoServiceImpl implements Ase
asesmentConverter.setUseGson(true);
asesmenGiziAwal = asesmentConverter.transferVOToModel(vo, asesmenGiziAwal);
if(CommonUtil.isNotNullOrEmpty(vo.getPasien())){
- asesmenGiziAwal.setPasien(pasienConverter.transferVOToModel(vo.getPasien(), new AntrianPasienDiPeriksa()));
+ asesmenGiziAwal.setPasienDaftar(pasienConverter.transferVOToModel(vo.getPasien(), new AntrianPasienDiPeriksa()));
}
asesmenGiziAwal.setTanggalPendaftaran(vo.getTanggalPendaftaran());
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AsesmenGiziLanjutServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AsesmenGiziLanjutServiceImpl.java
index 7bc364af..9bc420e3 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AsesmenGiziLanjutServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/AsesmenGiziLanjutServiceImpl.java
@@ -1,6 +1,5 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -13,8 +12,6 @@ import com.jasamedika.medifirst2000.converter.RuanganConverter;
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
import com.jasamedika.medifirst2000.dao.AsesmenGiziLanjutDao;
import com.jasamedika.medifirst2000.entities.AsesmenGiziLanjut;
-import com.jasamedika.medifirst2000.entities.KasusPenyakit;
-import com.jasamedika.medifirst2000.entities.Ruangan;
import com.jasamedika.medifirst2000.service.AsesmenGiziLanjutService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.AsesmenGiziLanjutVO;
@@ -39,7 +36,7 @@ public class AsesmenGiziLanjutServiceImpl extends BaseVoServiceImpl implements A
public Map saveAsesmenGiziLanjut(AsesmenGiziLanjutVO vo) {
AsesmenGiziLanjut asesmenGiziLanjut = asesmenGiziLanjutConverter.transferVOToModel(vo, new AsesmenGiziLanjut());
- asesmenGiziLanjut.setPasien(antrianPasienDiPeriksaDao.findByNoRec(vo.getPasien().getNoRec()));
+ asesmenGiziLanjut.setPasienDaftar(antrianPasienDiPeriksaDao.findByNoRec(vo.getPasien().getNoRec()));
AsesmenGiziLanjut resultAsesmenGiziLanjut = asesmenGiziLanjutDao.save(asesmenGiziLanjut);
Map result = new HashMap();
@@ -69,10 +66,10 @@ public class AsesmenGiziLanjutServiceImpl extends BaseVoServiceImpl implements A
AsesmenGiziLanjut resultModel = asesmenGiziLanjutDao.findAsesmenGiziLanjutByNoRegistrasi(noRegistrasi);
if (CommonUtil.isNotNullOrEmpty(resultModel)) {
result.put("noRec", resultModel.getNoRec());
- result.put("pasien", resultModel.getPasien());
+ result.put("pasien", resultModel.getPasienDaftar());
result.put("dataFound", true);
- if (CommonUtil.isNotNullOrEmpty(resultModel.getPasien().getPasienDaftar().getPasienId())) {
- result.put("pasien.noRegistrasi", resultModel.getPasien().getPasienDaftar().getNoRegistrasi());
+ if (CommonUtil.isNotNullOrEmpty(resultModel.getPasienDaftar().getPasienDaftar().getPasienId())) {
+ result.put("pasien.noRegistrasi", resultModel.getPasienDaftar().getPasienDaftar().getNoRegistrasi());
}
} else {
result.put("dataFound", false);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganServiceImpl.java
index a10808d4..9a38cb8b 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CatatanPerkembanganServiceImpl.java
@@ -65,7 +65,7 @@ public class CatatanPerkembanganServiceImpl implements CatatanPerkembanganServic
public Map saveCatatanPerkembangan(CatatanPerkembanganVO vo) {
Map result=new HashMap();
CatatanPerkembangan model = catatanPerkembanganConverter.transferVOToModel(vo, new CatatanPerkembangan());
- model.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
+ model.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
CatatanPerkembangan resultModel = catatanPerkembanganDao.save(model);
if(CommonUtil.isNotNullOrEmpty(resultModel)){
result.put("id", resultModel.getNoRec());
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CetakPengantarSuratServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CetakPengantarSuratServiceImpl.java
index 85bae431..d0f8e458 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CetakPengantarSuratServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CetakPengantarSuratServiceImpl.java
@@ -70,7 +70,7 @@ public class CetakPengantarSuratServiceImpl implements CetakPengantarSuratServic
dokumen.setNamaJudulDokumen(vo.getPerihalSurat());
dokumen.setNamaPegawaiPembuat(loginUserService.getLoginUser().getPegawai().getNamaLengkap());
dokumen.setTglDokumen(vo.getTanggalSuratDiserahkan());
- dokumen.setqDokumen(0);
+ dokumen.setQDokumen(0);
Dokumen resultDokumen = new Dokumen();
if(CommonUtil.isNotNullOrEmpty(dokumen)){
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CheckInServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CheckInServiceImpl.java
index 348fe768..c689e8ce 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CheckInServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/CheckInServiceImpl.java
@@ -112,7 +112,7 @@ public class CheckInServiceImpl implements CheckInService {
Map result=new HashMap();
CheckIn model = checkInConverter.transferVOToModel(vo, new CheckIn());
AntrianPasienDiPeriksa p = antrianPasienDiPeriksaDao.findByNoRec(vo.getPasien().getNoRec());
- model.setPasien(p);
+ model.setPasienDaftar(p);
model.setNoRec(vo.getNoRec());
@@ -124,7 +124,7 @@ public class CheckInServiceImpl implements CheckInService {
model.setN(vo.getN());
model.setTd(vo.getTd());
model.setRr(vo.getRr());
- model.setTanggalPendaftaran(p.getTglRegistrasi());
+ model.setTglRegistrasi(p.getTglRegistrasi());
model.setStatusEnabled(vo.getStatusEnabled());
if(CommonUtil.isNotNullOrEmpty(vo.getJenisOperasi())) {
model.setJenisOperasi(jenisOperasiConverter.transferVOToModel(vo.getJenisOperasi(), new JenisOperasi()));
@@ -204,7 +204,7 @@ public class CheckInServiceImpl implements CheckInService {
List listalat=new ArrayList();
AntrianPasienDiPeriksa pasien = antrianPasienDiPeriksaDao.findByNoRec(vo.getPasien().getNoRec());
- modelCheckIn.setPasien(pasien);
+ modelCheckIn.setPasienDaftar(pasien);
modelCheckIn.getPengobatanKhusus().clear();
modelCheckIn.getAlatTerpasang().clear();
CheckIn resultModel = checkInDao.save(modelCheckIn);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DaftarStrukPenjualanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DaftarStrukPenjualanServiceImpl.java
index 8a0a4ee2..1066369d 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DaftarStrukPenjualanServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DaftarStrukPenjualanServiceImpl.java
@@ -156,8 +156,8 @@ public class DaftarStrukPenjualanServiceImpl implements DaftarStrukPenjualanServ
if (CommonUtil.isNotNullOrEmpty(pelayananPasienModel)) {
PelayananPasien pelayananPasien = new PelayananPasien();
- if (CommonUtil.isNotNullOrEmpty(pelayananPasienModel.getPasien())) {
- pelayananPasien.setPasien(pelayananPasienModel.getPasien());
+ if (CommonUtil.isNotNullOrEmpty(pelayananPasienModel.getPasienDaftar())) {
+ pelayananPasien.setPasienDaftar(pelayananPasienModel.getPasienDaftar());
}
if (CommonUtil.isNotNullOrEmpty(pelayananPasienModel.getNoRec())) {
pelayananPasien.setNoRecTriger(pelayananPasienModel.getNoRec());
@@ -282,8 +282,8 @@ public class DaftarStrukPenjualanServiceImpl implements DaftarStrukPenjualanServ
for (PelayananPasienDetail pelayananPasienDetailModel : pelayananPasienDetailSet) {
PelayananPasienDetail pelayananPasienDetail = new PelayananPasienDetail();
- if (CommonUtil.isNotNullOrEmpty(pelayananPasienDetailModel.getPasien())) {
- pelayananPasienDetail.setPasien(pelayananPasienDetailModel.getPasien());
+ if (CommonUtil.isNotNullOrEmpty(pelayananPasienDetailModel.getPasienDaftar())) {
+ pelayananPasienDetail.setPasienDaftar(pelayananPasienDetailModel.getPasienDaftar());
}
if (CommonUtil.isNotNullOrEmpty(pelayananPasienDetailModel.getNoRec())) {
pelayananPasienDetail.setNoRecTriger(pelayananPasienDetailModel.getNoRec());
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaKeperawatanTransaksiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaKeperawatanTransaksiServiceImpl.java
index a532eb5c..26497f19 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaKeperawatanTransaksiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaKeperawatanTransaksiServiceImpl.java
@@ -75,7 +75,7 @@ public class DiagnosaKeperawatanTransaksiServiceImpl implements DiagnosaKeperawa
diagnosaKeperawatanTransaksi.setDiagnosaKeperawatan(diagnosaKeperawatanConverter.transferVOToModel(vo.getDiagnosaKeperawatan(), new DiagnosaKeperawatan()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
- diagnosaKeperawatanTransaksi.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ diagnosaKeperawatanTransaksi.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getRuangan())){
diagnosaKeperawatanTransaksi.setRuangan(ruanganConverter.transferVOToModel(vo.getRuangan(), new Ruangan()));
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaPasienServiceImpl.java
index dc256d85..3645edb6 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaPasienServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaPasienServiceImpl.java
@@ -1,13 +1,6 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -18,7 +11,6 @@ import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.google.gson.Gson;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
import com.jasamedika.medifirst2000.dao.DiagnosaPasienDao;
@@ -27,24 +19,18 @@ import com.jasamedika.medifirst2000.dao.PelayananPasienDao;
import com.jasamedika.medifirst2000.dao.PemakaianAsuransiDao;
import com.jasamedika.medifirst2000.dao.PostingJurnalTransaksiDao;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.ChartOfAccount;
import com.jasamedika.medifirst2000.entities.DetailDiagnosaPasien;
import com.jasamedika.medifirst2000.entities.Diagnosa;
import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
import com.jasamedika.medifirst2000.entities.JenisDiagnosa;
-import com.jasamedika.medifirst2000.entities.JenisJurnal;
import com.jasamedika.medifirst2000.entities.MapDiagnosaToProduk;
import com.jasamedika.medifirst2000.entities.PelayananPasien;
-import com.jasamedika.medifirst2000.entities.PemakaianAsuransi;
-import com.jasamedika.medifirst2000.entities.PostingJurnalTransaksi;
-import com.jasamedika.medifirst2000.entities.PostingJurnalTransaksiD;
import com.jasamedika.medifirst2000.entities.Produk;
import com.jasamedika.medifirst2000.enums.StatusAntrianEnum;
import com.jasamedika.medifirst2000.enums.StatusPenyakitEnum;
import com.jasamedika.medifirst2000.service.DiagnosaPasienService;
import com.jasamedika.medifirst2000.service.ProdukService;
import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.util.DateUtil;
import com.jasamedika.medifirst2000.util.JsonUtil;
import com.jasamedika.medifirst2000.vo.DetailDiagnosaPasienVO;
import com.jasamedika.medifirst2000.vo.DiagnosaPasienVO;
@@ -126,8 +112,8 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag
if (CommonUtil.isNotNullOrEmpty(detailDiagnosaPasienVO.getJenisDiagnosa())) {
detailDiagnosaPasien.setJenisDiagnosa(jenisDiagnosaConverter.transferVOToModel(detailDiagnosaPasienVO.getJenisDiagnosa(), new JenisDiagnosa()));
}
- if (CommonUtil.isNotNullOrEmpty(diagnosaPasien.getPasien())) {
- detailDiagnosaPasien.setPasien(diagnosaPasien.getPasien());
+ if (CommonUtil.isNotNullOrEmpty(diagnosaPasien.getPasienDaftar())) {
+ detailDiagnosaPasien.setPasienDaftar(diagnosaPasien.getPasienDaftar());
}
if (CommonUtil.isNullOrEmpty(detailDiagnosaPasienVO.getNoRec())) {
List listProduk = mapDiagnosisToProdukDao.findProdukByDiagnosa(detailDiagnosaPasien.getDiagnosa().getKdDiagnosa());
@@ -136,11 +122,11 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag
Produk produk = listProduk.get(0).getProduk();
if (CommonUtil.isNotNullOrEmpty(produk)) {
- List abc = pelayananPasienDao.findPelayananPasien(diagnosaPasien.getPasien().getNoRec(),
+ List abc = pelayananPasienDao.findPelayananPasien(diagnosaPasien.getPasienDaftar().getNoRec(),
produk.getId(), format.format(new Date()));
if ((abc.isEmpty())) {
- produkService.postDiagnosa(detailDiagnosaPasien.getDiagnosa().getId().toString(), diagnosaPasien.getPasien());
+ produkService.postDiagnosa(detailDiagnosaPasien.getDiagnosa().getId().toString(), diagnosaPasien.getPasienDaftar());
}
}
}
@@ -156,8 +142,8 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag
if(CommonUtil.isNotNullOrEmpty(diagnosaPasien)) {
DiagnosaPasien resultPasien = diagnosaPasienDao.save(diagnosaPasien);
result.put("noRec", resultPasien.noRec);
- result.put("namaPasien", resultPasien.getPasien().getPasienDaftar().getPasien().getNamaPasien());
- result.put("noCm", resultPasien.getPasien().getPasienDaftar().getPasien().getNoCm());
+ result.put("namaPasien", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNamaPasien());
+ result.put("noCm", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
}
}else {
DiagnosaPasien diagnosaPasien = new DiagnosaPasien();
@@ -168,11 +154,11 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag
if (CommonUtil.isNotNullOrEmpty(vo)) {
diagnosaPasien = diagnosaPasienConverter.transferVOToModel(vo, new DiagnosaPasien());
pasienDaftar = antrianPasienDiPeriksaDao.findByNoRec(vo.getNoRecPasienDaftar());
- diagnosaPasien.setTanggalPendaftaran(vo.getTanggalPendaftaran());
+ diagnosaPasien.setTglRegistrasi(vo.getTanggalPendaftaran());
}
if (CommonUtil.isNotNullOrEmpty(pasienDaftar)) {
- diagnosaPasien.setPasien(pasienDaftar);
+ diagnosaPasien.setPasienDaftar(pasienDaftar);
}
if (CommonUtil.isNotNullOrEmpty(vo.getDiagnosis())) {
@@ -194,7 +180,7 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag
detailDiagnosaPasien.setJenisDiagnosa(jenisDiagnosaConverter.transferVOToModel(detailDiagnosaPasienVO.getJenisDiagnosa(), new JenisDiagnosa()));
}
if (CommonUtil.isNotNullOrEmpty(pasienDaftar)) {
- detailDiagnosaPasien.setPasien(pasienDaftar);
+ detailDiagnosaPasien.setPasienDaftar(pasienDaftar);
}
if (CommonUtil.isNullOrEmpty(detailDiagnosaPasienVO.getNoRec())) {
List listProduk = mapDiagnosisToProdukDao.findProdukByDiagnosa(detailDiagnosaPasien.getDiagnosa().getKdDiagnosa());
@@ -236,8 +222,8 @@ public class DiagnosaPasienServiceImpl extends BaseVoServiceImpl implements Diag
if (CommonUtil.isNotNullOrEmpty(diagnosaPasien)) {
DiagnosaPasien resultPasien = diagnosaPasienDao.save(diagnosaPasien);
result.put("noRec", resultPasien.noRec);
- result.put("namaPasien", resultPasien.getPasien().getPasienDaftar().getPasien().getNamaPasien());
- result.put("noCm", resultPasien.getPasien().getPasienDaftar().getPasien().getNoCm());
+ result.put("namaPasien", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNamaPasien());
+ result.put("noCm", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
}
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaTindakanPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaTindakanPasienServiceImpl.java
index 43ea53d6..a93c9f02 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaTindakanPasienServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DiagnosaTindakanPasienServiceImpl.java
@@ -87,10 +87,10 @@ public class DiagnosaTindakanPasienServiceImpl extends BaseVoServiceImpl impleme
if(CommonUtil.isNotNullOrEmpty(vo.getPasien())&& pasienDaftar == null){
pasienDaftar =antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(),
vo.getTanggalPendaftaran());
- diagnosaTindakanPasien.setPasien(pasienDaftar);
+ diagnosaTindakanPasien.setPasienDaftar(pasienDaftar);
}
else
- diagnosaTindakanPasien.setPasien(pasienDaftar);
+ diagnosaTindakanPasien.setPasienDaftar(pasienDaftar);
diagnosaTindakanPasienDao.delete(diagnosaTindakanPasienDao.findByPasienDaftarNoRec(pasienDaftar.getNoRec()));
diagnosaTindakanPasien.setTanggalPendaftaran(vo.getTanggalPendaftaran());
diagnosaTindakanPasien.getDiagnosisTindakan().clear();
@@ -185,8 +185,8 @@ public class DiagnosaTindakanPasienServiceImpl extends BaseVoServiceImpl impleme
Map resultDiagnosaTindakanPasien=new HashMap();
resultDiagnosaTindakanPasien.put("noRec", resultPasien.getNoRec());
- resultDiagnosaTindakanPasien.put("namaPasien", resultPasien.getPasien().getPasienDaftar().getPasien().getNamaPasien());
- resultDiagnosaTindakanPasien.put("noCm", resultPasien.getPasien().getPasienDaftar().getPasien().getNoCm());
+ resultDiagnosaTindakanPasien.put("namaPasien", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNamaPasien());
+ resultDiagnosaTindakanPasien.put("noCm", resultPasien.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
return resultDiagnosaTindakanPasien;
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DisposisiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DisposisiServiceImpl.java
index 8e603a44..a741f6b8 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DisposisiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DisposisiServiceImpl.java
@@ -94,7 +94,7 @@ public class DisposisiServiceImpl extends BaseVoServiceImpl implements Disposisi
}
- dokumen.setqDokumen(0);
+ dokumen.setQDokumen(0);
dokumen.setQtyLampiran((short) 1);
dokumen.setTglDokumen(new Date());
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DokumenKeluarServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DokumenKeluarServiceImpl.java
index 3c063866..d5b873ea 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DokumenKeluarServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DokumenKeluarServiceImpl.java
@@ -309,7 +309,7 @@ public class DokumenKeluarServiceImpl extends BaseVoServiceImpl implements Dokum
if(CommonUtil.isNotNullOrEmpty(vo.getPathFile())){
dokumen.setPathFile(vo.getPathFile());
}
- dokumen.setqDokumen(0);
+ dokumen.setQDokumen(0);
if(CommonUtil.isNotNullOrEmpty(vo.getLampiran())){
dokumen.setQtyLampiran(vo.getLampiran());
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DraftSuratServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DraftSuratServiceImpl.java
index 5d9ca6a8..16c855d6 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DraftSuratServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/DraftSuratServiceImpl.java
@@ -103,7 +103,7 @@ public class DraftSuratServiceImpl extends BaseAngaranServiceImpl implements Dra
dokumen.setNamaJudulDokumen(vo.getJudul());
}
- dokumen.setqDokumen(0);
+ dokumen.setQDokumen(0);
dokumen.setQtyLampiran((short) 1);
dokumen.setTglDokumen(new Date());
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/EdukasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/EdukasiServiceImpl.java
index 686fc6bf..a1a65731 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/EdukasiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/EdukasiServiceImpl.java
@@ -9,7 +9,6 @@ import org.springframework.stereotype.Service;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.EdukasiDao;
-import com.jasamedika.medifirst2000.dao.EdukasiDao;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
import com.jasamedika.medifirst2000.entities.Edukasi;
import com.jasamedika.medifirst2000.entities.Pegawai;
@@ -56,7 +55,7 @@ public class EdukasiServiceImpl extends BaseVoServiceImpl implements EdukasiServ
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar()))
{
- edukasi.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ edukasi.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
if(CommonUtil.isNotNullOrEmpty(edukasi))
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/HasilPemeriksaanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/HasilPemeriksaanServiceImpl.java
index 78b6bad2..d3770dd4 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/HasilPemeriksaanServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/HasilPemeriksaanServiceImpl.java
@@ -1,39 +1,30 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.jasamedika.medifirst2000.vo.ProdukDetailLaboratoriumVO;
-
-import com.jasamedika.medifirst2000.entities.ProdukDetailLaboratorium;
-import com.jasamedika.medifirst2000.entities.StrukHasilPemeriksaan;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.HasilPemeriksaanService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.entities.HasilPemeriksaan;
-import com.jasamedika.medifirst2000.entities.OrderPelayanan;
-import com.jasamedika.medifirst2000.vo.HasilPemeriksaanVO;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.HasilPemeriksaanDao;
import com.jasamedika.medifirst2000.dao.OrderPelayananDao;
import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
import com.jasamedika.medifirst2000.dao.StrukHasilPemeriksaanDao;
+import com.jasamedika.medifirst2000.entities.HasilPemeriksaan;
+import com.jasamedika.medifirst2000.entities.OrderPelayanan;
+import com.jasamedika.medifirst2000.entities.ProdukDetailLaboratorium;
+import com.jasamedika.medifirst2000.entities.StrukHasilPemeriksaan;
+import com.jasamedika.medifirst2000.service.HasilPemeriksaanService;
+import com.jasamedika.medifirst2000.util.CommonUtil;
+import com.jasamedika.medifirst2000.vo.HasilPemeriksaanVO;
+import com.jasamedika.medifirst2000.vo.ProdukDetailLaboratoriumVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* Implement class for HasilPemeriksaanService
*
* @author Generator
- * @param
*/
@Service("hasilPemeriksaanService")
public class HasilPemeriksaanServiceImpl extends BaseVoServiceImpl implements HasilPemeriksaanService {
@@ -99,7 +90,7 @@ public class HasilPemeriksaanServiceImpl extends BaseVoServiceImpl implements Ha
public StrukHasilPemeriksaan getStruk(HasilPemeriksaan strukHasilPemeriksaan) {
if(hasilPemeriksaanDao.findOne(strukHasilPemeriksaan.getNoRec())==null)
return null;
- return hasilPemeriksaanDao.findOne(strukHasilPemeriksaan.getNoRec()).getstrukHasilPemeriksaan();
+ return hasilPemeriksaanDao.findOne(strukHasilPemeriksaan.getNoRec()).getStrukHasilPemeriksaan();
}
@Override
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InputKantongDarahServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InputKantongDarahServiceImpl.java
index 2f3e6bbd..1f277140 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InputKantongDarahServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InputKantongDarahServiceImpl.java
@@ -9,50 +9,29 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
-import com.jasamedika.medifirst2000.converter.RuanganConverter;
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
-import com.jasamedika.medifirst2000.dao.AntrianPasienRegistrasiDao;
import com.jasamedika.medifirst2000.dao.OrderPelayananDao;
-import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
-import com.jasamedika.medifirst2000.dao.PasienDao;
import com.jasamedika.medifirst2000.dao.PelayananPasienDao;
import com.jasamedika.medifirst2000.dao.ProdukDao;
import com.jasamedika.medifirst2000.dao.StrukPelayananDNoBatchDao;
import com.jasamedika.medifirst2000.dao.StrukPelayananDao;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.AntrianPasienRegistrasi;
import com.jasamedika.medifirst2000.entities.KelompokTransaksi;
import com.jasamedika.medifirst2000.entities.OrderPelayanan;
-import com.jasamedika.medifirst2000.entities.Pasien;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
import com.jasamedika.medifirst2000.entities.PelayananPasien;
import com.jasamedika.medifirst2000.entities.Produk;
-import com.jasamedika.medifirst2000.entities.RegistrasiGawatDaruratDetail;
-import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien;
-import com.jasamedika.medifirst2000.entities.StrukKirim;
import com.jasamedika.medifirst2000.entities.StrukPelayanan;
import com.jasamedika.medifirst2000.entities.StrukPelayananDNoBatch;
-import com.jasamedika.medifirst2000.enums.TipePasienEnum;
-import com.jasamedika.medifirst2000.service.AntrianPasienRegistrasiService;
import com.jasamedika.medifirst2000.service.InputKantongDarahService;
-import com.jasamedika.medifirst2000.service.PasienDaftarService;
-import com.jasamedika.medifirst2000.service.PasienService;
import com.jasamedika.medifirst2000.service.ProdukService;
-import com.jasamedika.medifirst2000.service.RegistrasiGawatDaruratDetailService;
-import com.jasamedika.medifirst2000.service.RegistrasiPasienGawatDaruratService;
-import com.jasamedika.medifirst2000.service.RegistrasiPasienGawatDaruratService;
-import com.jasamedika.medifirst2000.service.RegistrasiPelayananPasienService;
import com.jasamedika.medifirst2000.service.StrukPelayananDNoBatchService;
import com.jasamedika.medifirst2000.service.StrukPelayananService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.vo.AntrianPasienRegistrasiVO;
import com.jasamedika.medifirst2000.vo.GolonganDarahVO;
import com.jasamedika.medifirst2000.vo.InputKantongDarahVO;
import com.jasamedika.medifirst2000.vo.KelompokTransaksiVO;
import com.jasamedika.medifirst2000.vo.KirimProdukRuanganVO;
import com.jasamedika.medifirst2000.vo.OrderPelayananVO;
import com.jasamedika.medifirst2000.vo.ProdukVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPasienGawatDaruratVO;
import com.jasamedika.medifirst2000.vo.RhesusVO;
import com.jasamedika.medifirst2000.vo.StrukPelayananDNoBatchVO;
import com.jasamedika.medifirst2000.vo.StrukPelayananVO;
@@ -155,7 +134,7 @@ private BaseConverterImpl orderPelayananConver
newsubModel.setAturanPakai("-");
//newsubModel.setKeteranganPakai();
newsubModel.setKeteranganPakai2("-");
- newsubModel.setPasien(antrianPasienDiPeriksa);
+ newsubModel.setPasienDaftar(antrianPasienDiPeriksa);
newsubModel.setProduk(data.getProduk());
KelompokTransaksi kelompokTransaksi= new KelompokTransaksi();
kelompokTransaksi.setId(Integer.parseInt(GetSettingDataFixed("KelompokTransaksiBankDarah")));
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InseminasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InseminasiServiceImpl.java
index 0accab23..770f3cea 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InseminasiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InseminasiServiceImpl.java
@@ -72,7 +72,7 @@ public class InseminasiServiceImpl implements InseminasiService {
public Map saveInseminasi(InseminasiVO vo) {
Map result=new HashMap();
Inseminasi model = inseminasiConverter.transferVOToModel(vo, new Inseminasi());
- model.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
+ model.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
Inseminasi resultModel = inseminasiDao.save(model);
if(CommonUtil.isNotNullOrEmpty(resultModel)){
result.put("id", resultModel.getNoRec());
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InstruksiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InstruksiServiceImpl.java
index 6e027c21..61841682 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InstruksiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/InstruksiServiceImpl.java
@@ -59,7 +59,7 @@ public class InstruksiServiceImpl extends BaseVoServiceImpl implements Instruksi
}
if(CommonUtil.isNotNullOrEmpty(voTemp.getPasienDaftar()))
{
- instruksi.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(voTemp.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ instruksi.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(voTemp.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
if(CommonUtil.isNotNullOrEmpty(instruksi))
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JenisWaktuServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JenisWaktuServiceImpl.java
index fe4da7ff..3c7825dc 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JenisWaktuServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/JenisWaktuServiceImpl.java
@@ -1,9 +1,15 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.jasamedika.medifirst2000.converter.base.BaseVoConverter;
+import com.jasamedika.medifirst2000.dao.JenisWaktuDao;
+import com.jasamedika.medifirst2000.entities.Departemen;
+import com.jasamedika.medifirst2000.entities.JenisWaktu;
+import com.jasamedika.medifirst2000.entities.KelompokProduk;
+import com.jasamedika.medifirst2000.exception.ServiceVOException;
+import com.jasamedika.medifirst2000.service.JenisWaktuService;
+import com.jasamedika.medifirst2000.vo.DepartemenVO;
+import com.jasamedika.medifirst2000.vo.JenisWaktuVO;
+import com.jasamedika.medifirst2000.vo.KelompokProdukVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
@@ -14,34 +20,25 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.stereotype.Service;
-import com.jasamedika.medifirst2000.converter.base.BaseVoConverter;
-import com.jasamedika.medifirst2000.dao.JenisWaktuDao;
-import com.jasamedika.medifirst2000.entities.Departemen;
-import com.jasamedika.medifirst2000.entities.JenisWaktu;
-import com.jasamedika.medifirst2000.entities.KelompokProduk;
-import com.jasamedika.medifirst2000.entities.KelompokUser;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.JenisWaktuService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.vo.DepartemenVO;
-import com.jasamedika.medifirst2000.vo.JenisWaktuVO;
-import com.jasamedika.medifirst2000.vo.KelompokProdukVO;
-import com.jasamedika.medifirst2000.vo.KelompokUserVO;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Service("JenisWaktuService")
-public class JenisWaktuServiceImpl extends BaseVoServiceImpl implements JenisWaktuService{
+public class JenisWaktuServiceImpl extends BaseVoServiceImpl implements JenisWaktuService {
@Autowired
private JenisWaktuDao jenisWaktuDao;
-
+
@Autowired
private BaseVoConverter jenisWaktuConverter;
-
+
@Autowired
private BaseVoConverter departementConverter;
-
- @Autowired BaseVoConverter kelompokProdukConverter;
-
+
+ @Autowired
+ BaseVoConverter kelompokProdukConverter;
+
@Override
public JenisWaktuVO add(JenisWaktuVO vo) throws JpaSystemException, ServiceVOException {
return null;
@@ -76,14 +73,14 @@ public class JenisWaktuServiceImpl extends BaseVoServiceImpl implements JenisWak
@Override
public Map findAll(Integer page, Integer take, String sort, String dir,
Specification spec) {
- Direction direction=null;
-
- if(dir.equalsIgnoreCase("asc")){
- direction=Sort.Direction.ASC;
- }else{
- direction=Sort.Direction.DESC;
+ Direction direction = null;
+
+ if (dir.equalsIgnoreCase("asc")) {
+ direction = Sort.Direction.ASC;
+ } else {
+ direction = Sort.Direction.DESC;
}
-
+
Pageable pageable = new PageRequest(page, take, direction, sort);
Page resultPage = jenisWaktuDao.findAll(spec, pageable);
List resultData = resultPage.getContent();
@@ -92,23 +89,24 @@ public class JenisWaktuServiceImpl extends BaseVoServiceImpl implements JenisWak
@Override
public Map save(JenisWaktuVO vo) {
- Map result = new HashMap();
+ Map result = new HashMap();
JenisWaktu model = jenisWaktuConverter.transferVOToModel(vo, new JenisWaktu());
Byte no = this.jenisWaktuDao.getNo().byteValue();
model.setKdJenisWaktu(no);
model.setNoUrut(no);
- model.setqJenisWaktu(no);
-
+ model.setQJenisWaktu(no);
+
model.setDepartemen(departementConverter.transferVOToModel(vo.getDepartemen(), new Departemen()));
- model.setKelompokProduk(kelompokProdukConverter.transferVOToModel(vo.getKelompokProduk(), new KelompokProduk()));
+ model.setKelompokProduk(
+ kelompokProdukConverter.transferVOToModel(vo.getKelompokProduk(), new KelompokProduk()));
JenisWaktu jenisWaktuResult = this.jenisWaktuDao.save(model);
-
- if(jenisWaktuResult.getId() != null){
+
+ if (jenisWaktuResult.getId() != null) {
result.put("data", jenisWaktuResult.getId());
}
-
+
return result;
}
@@ -118,7 +116,5 @@ public class JenisWaktuServiceImpl extends BaseVoServiceImpl implements JenisWak
result.put("data", this.jenisWaktuDao.getJenisWaktu());
return result;
}
-
-
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KegiatanAnggaranServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KegiatanAnggaranServiceImpl.java
index a6f5ede6..9bab980e 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KegiatanAnggaranServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KegiatanAnggaranServiceImpl.java
@@ -15,40 +15,37 @@ import org.springframework.stereotype.Service;
import com.jasamedika.medifirst2000.dao.KegiatanAnggaranDao;
import com.jasamedika.medifirst2000.entities.KegiatanAnggaran;
-import com.jasamedika.medifirst2000.entities.Ruangan;
-import com.jasamedika.medifirst2000.entities.kesulitanMenyusui;
import com.jasamedika.medifirst2000.service.KegiatanAnggaranService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.GridDetailAnggaran;
@Service("kegiatanAnggaranService")
-public class KegiatanAnggaranServiceImpl extends BaseVoServiceImpl implements KegiatanAnggaranService{
-
+public class KegiatanAnggaranServiceImpl extends BaseVoServiceImpl implements KegiatanAnggaranService {
+
@Autowired
private KegiatanAnggaranDao kegiatanAnggaranDao;
@Override
- public Map kegiatanAnggaranList(Integer page, Integer limit, String sort, String dir,Specification spec) {
-
- Direction direction=null;
-
- if(sort.equalsIgnoreCase("asc")){
- direction=Sort.Direction.ASC;
- }else{
- direction=Sort.Direction.DESC;
+ public Map kegiatanAnggaranList(Integer page, Integer limit, String sort, String dir,
+ Specification spec) {
+
+ Direction direction = null;
+
+ if (sort.equalsIgnoreCase("asc")) {
+ direction = Sort.Direction.ASC;
+ } else {
+ direction = Sort.Direction.DESC;
}
-
+
Pageable pageable = new PageRequest(page, limit, direction, sort);
Page resultPage = kegiatanAnggaranDao.findAll(spec, pageable);
List kegiatanAnggaranList = resultPage.getContent();
- ListlistGridKegiatan=new ArrayList();
- for(KegiatanAnggaran model:kegiatanAnggaranList){
-
+ List listGridKegiatan = new ArrayList();
+ for (KegiatanAnggaran model : kegiatanAnggaranList) {
+
}
-
+
return constructMapReturn(listGridKegiatan, resultPage.getTotalElements(), resultPage.getTotalPages());
-
+
}
-
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KelahiranServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KelahiranServiceImpl.java
index 0a6dbfa4..8a945baf 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KelahiranServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KelahiranServiceImpl.java
@@ -11,14 +11,12 @@ import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
import com.jasamedika.medifirst2000.dao.KelahiranDao;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
import com.jasamedika.medifirst2000.entities.Kelahiran;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
import com.jasamedika.medifirst2000.entities.ProsesKelahiran;
import com.jasamedika.medifirst2000.entities.StatusYaTidak;
import com.jasamedika.medifirst2000.service.KelahiranService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
import com.jasamedika.medifirst2000.vo.KelahiranVO;
-import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
import com.jasamedika.medifirst2000.vo.ProsesKelahiranVO;
import com.jasamedika.medifirst2000.vo.StatusYaTidakVO;
@@ -60,7 +58,7 @@ public class KelahiranServiceImpl implements KelahiranService{
kelahiran.setProsesKelahiran(prosesKelahiranConverter.transferVOToModel(vo.getProsesKelahiran(), new ProsesKelahiran()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
- kelahiran.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ kelahiran.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
Kelahiran kelahiranResult=kelahiranDao.save(kelahiran);
@@ -91,7 +89,7 @@ public class KelahiranServiceImpl implements KelahiranService{
kelahiran.setProsesKelahiran(prosesKelahiranConverter.transferVOToModel(vo.getProsesKelahiran(), new ProsesKelahiran()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
- kelahiran.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ kelahiran.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
Kelahiran kelahiranResult=kelahiranDao.save(kelahiran);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KomponenEvaluasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KomponenEvaluasiServiceImpl.java
index 130dcd4f..fa6633ab 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KomponenEvaluasiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/KomponenEvaluasiServiceImpl.java
@@ -1,16 +1,6 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.jasamedika.medifirst2000.converter.DepartemenConverter;
-import com.jasamedika.medifirst2000.converter.JabatanConverter;
-import com.jasamedika.medifirst2000.converter.KelompokEvaluasiConverter;
-import com.jasamedika.medifirst2000.converter.KomponenEvaluasiConverter;
-import com.jasamedika.medifirst2000.converter.SatuanHasilConverter;
+import com.jasamedika.medifirst2000.converter.*;
import com.jasamedika.medifirst2000.dao.KomponenEvaluasiDao;
import com.jasamedika.medifirst2000.entities.Departemen;
import com.jasamedika.medifirst2000.entities.KelompokEvaluasi;
@@ -19,6 +9,11 @@ import com.jasamedika.medifirst2000.entities.SatuanHasil;
import com.jasamedika.medifirst2000.service.KomponenEvaluasiService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.KomponenEvaluasiVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
@Service("KomponenEvaluasiService")
@@ -68,7 +63,7 @@ public class KomponenEvaluasiServiceImpl extends BaseVoServiceImpl implements Ko
Integer count =komponenEvaluasiDao.countKomponenEvaluasi();
count++;
komponenEvaluasi.setNoUrut(count);
- komponenEvaluasi.setqKomponenEvaluasi(count);
+ komponenEvaluasi.setQKomponenEvaluasi(count);
}
komponenEvaluasiDao.save(komponenEvaluasi);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LayananServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LayananServiceImpl.java
index 4f85e939..4de56772 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LayananServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LayananServiceImpl.java
@@ -1,6 +1,5 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -65,7 +64,7 @@ public class LayananServiceImpl implements LayananService{
{
Layanan layanan = layananConverter.transferVOToModel(layananVO, new Layanan());
layanan.setLayananDetail(layananDetailConverter.transferVOToModel(layananVO.getLayananDetail(), new LayananDetail()));
- layanan.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(layananVO.getPasien().getId(), layananVO.getTglRegistrasi()));
+ layanan.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(layananVO.getPasien().getId(), layananVO.getTglRegistrasi()));
Layanan resultModel = layananDao.save(layanan);
if(CommonUtil.isNotNullOrEmpty(resultModel)){
result.put("idLayanan", resultModel.getNoRec());
@@ -75,7 +74,7 @@ public class LayananServiceImpl implements LayananService{
for(TindakanLainVO tindakanLainVO : vo.getTindakanLain())
{
TindakanLain tindakanLain = tindakanLainConverter.transferVOToModel(tindakanLainVO, new TindakanLain());
- tindakanLain.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(tindakanLainVO.getPasien().getId(), tindakanLainVO.getTglRegistrasi()));
+ tindakanLain.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(tindakanLainVO.getPasien().getId(), tindakanLainVO.getTglRegistrasi()));
TindakanLain resultModel = tindakanLainDao.save(tindakanLain);
if(CommonUtil.isNotNullOrEmpty(resultModel)){
result.put("idTindakanLain", resultModel.getNoRec());
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LevelTingkatServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LevelTingkatServiceImpl.java
index d19fda0d..79fe6d92 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LevelTingkatServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LevelTingkatServiceImpl.java
@@ -1,13 +1,5 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
import com.jasamedika.medifirst2000.dao.DepartemenDao;
import com.jasamedika.medifirst2000.dao.LevelTingkatDao;
import com.jasamedika.medifirst2000.dto.LevelTingkatDto;
@@ -15,6 +7,13 @@ import com.jasamedika.medifirst2000.entities.LevelTingkat;
import com.jasamedika.medifirst2000.service.LevelTingkatService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.util.JsonUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Service("LevelTingkatService")
public class LevelTingkatServiceImpl extends BaseVoServiceImpl implements LevelTingkatService
@@ -38,7 +37,7 @@ public class LevelTingkatServiceImpl extends BaseVoServiceImpl implements LevelT
lt.setReportDisplay(vo.getReportDisplay());
lt.setKdLevelTingkatHead(vo.getKdLevelTingkatHead());
lt.setDepartemen(departemenDao.findOne(vo.getDepartemenId()));
- lt.setqLevelTingkat(vo.getQlevelTingkat());
+ lt.setQLevelTingkat(vo.getQlevelTingkat());
lt.setKodeExternal(vo.getKodeExternal());
lt.setNamaExternal(vo.getNamaExternal());
lt.setStatusEnabled(vo.getStatusEnabled());
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
index 4f755fa6..467854f4 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapPegawaiJabatanToUnitKerjaServiceImpl.java
@@ -4,12 +4,12 @@ import com.google.gson.Gson;
import com.jasamedika.medifirst2000.constants.Master;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.*;
+import com.jasamedika.medifirst2000.dto.PegawaiJabatanDto;
import com.jasamedika.medifirst2000.dto.superapp.request.EmailDto;
import com.jasamedika.medifirst2000.dto.superapp.response.AuthorizationDto;
import com.jasamedika.medifirst2000.entities.*;
import com.jasamedika.medifirst2000.service.LoginUserService;
import com.jasamedika.medifirst2000.service.MapPegawaiJabatanToUnitKerjaService;
-import com.jasamedika.medifirst2000.service.MappingPegawaiToAtasanService;
import com.jasamedika.medifirst2000.service.RiwayatJabatanService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.*;
@@ -26,9 +26,6 @@ import static com.jasamedika.medifirst2000.constants.Master.KelompokJabatan.PENU
public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
implements MapPegawaiJabatanToUnitKerjaService {
- @Autowired
- private MappingPegawaiToAtasanService mappingPegawaiToAtasanService;
-
@Autowired
private LoginUserService loginUserService;
@@ -868,88 +865,6 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
return result;
}
- @Override
- @Transactional
- public Map saveHistory(MapPegawaiJabatanToUnitKerja mapp) {
- Map result = new HashMap<>();
- MapPegawaiJabatanToUnitKerjaHistori map = new MapPegawaiJabatanToUnitKerjaHistori();
-
- LoginUser loginUser = loginUserService.getLoginUser();
-
- // exceptional dynamic data entry
- if (CommonUtil.isNotNullOrEmpty(mapp.getJabatan())) {
- if (mapp.getJabatan().getId().equals(Master.EMPTY_DATA)) {
- mapp.setJabatan(null);
- }
- }
- if (CommonUtil.isNotNullOrEmpty(mapp.getUnitKerjaPegawai())) {
- if (mapp.getUnitKerjaPegawai().getId().equals(Master.EMPTY_DATA)) {
- mapp.setUnitKerjaPegawai(null);
- }
- }
- if (CommonUtil.isNotNullOrEmpty(mapp.getSubUnitKerjaPegawai())) {
- if (mapp.getSubUnitKerjaPegawai().getId().equals(Master.EMPTY_DATA)) {
- mapp.setSubUnitKerjaPegawai(null);
- }
- }
- if (CommonUtil.isNotNullOrEmpty(mapp.getAtasanLangsung())) {
- if (mapp.getAtasanLangsung().getId().equals(Master.EMPTY_DATA)) {
- mapp.setAtasanLangsung(null);
- }
- }
- if (CommonUtil.isNotNullOrEmpty(mapp.getPejabatPenilai())) {
- if (mapp.getPejabatPenilai().getId().equals(Master.EMPTY_DATA)) {
- mapp.setPejabatPenilai(null);
- }
- }
-
- map.setKdProfile(Master.KODE_PROFILE);
- map.setStatusEnabled(Master.STATUS_ENABLE_TRUE);
-
- if (CommonUtil.isNotNullOrEmpty(mapp.getPegawai())) {
- map.setPegawai(mapp.getPegawai());
- }
-
- if (CommonUtil.isNotNullOrEmpty(mapp.getJabatan())) {
- map.setJabatan(mapp.getJabatan());
- }
-
- if (CommonUtil.isNotNullOrEmpty(mapp.getUnitKerjaPegawai())) {
- map.setUnitKerjaPegawai(mapp.getUnitKerjaPegawai());
- }
-
- if (CommonUtil.isNotNullOrEmpty(mapp.getSubUnitKerjaPegawai())) {
- map.setSubUnitKerjaPegawai(mapp.getSubUnitKerjaPegawai());
- }
-
- if (CommonUtil.isNotNullOrEmpty(mapp.getAtasanLangsung())) {
- map.setAtasanLangsung(mapp.getAtasanLangsung());
- }
-
- if (CommonUtil.isNotNullOrEmpty(mapp.getAtasanLangsungDireksi())) {
- map.setAtasanLangsungDireksi(mapp.getAtasanLangsungDireksi());
- }
-
- if (CommonUtil.isNotNullOrEmpty(mapp.getPejabatPenilai())) {
- map.setPejabatPenilai(mapp.getPejabatPenilai());
- }
-
- if (CommonUtil.isNotNullOrEmpty(mapp.getPejabatPenilaiDireksi())) {
- map.setPejabatPenilaiDireksi(mapp.getPejabatPenilaiDireksi());
- }
-
- if (CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) {
- map.setMappingId(mapp.getId());
- map.setPegawaiInput(loginUser.getPegawai());
- map.setTglInput(new Date());
- }
- map = mapPegawaiJabatanToUnitKerjaHistoriDao.save(map);
-
- result.put("norec", map.getNoRec());
-
- return result;
- }
-
@Transactional
public void disableIsprimary(Integer idPegawai, Integer id) {
mapPegawaiJabatanToUnitKerjaDao.changeIsNotPrimary(idPegawai, id);
@@ -1297,67 +1212,6 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
return lis;
}
- @Override
- public Map checkAtasan(MapPegawaiJabatanToUnitKerjaVO vo) {
- Map result = new HashMap<>();
- List mappVos = new ArrayList<>();
- MapPegawaiJabatanToUnitKerjaVO mappVo = new MapPegawaiJabatanToUnitKerjaVO();
-
- Map currentDataMappByDetail = mapPegawaiJabatanToUnitKerjaDao.getMappByDetail(
- vo.getJabatan().getId(), vo.getSubUnitKerjaPegawai().getId(), vo.getUnitKerjaPegawai().getId());
-
- if (CommonUtil.isNotNullOrEmpty(vo.getJabatan().getLevelJabatan())) {
- // hanya jabatan yang memiliki bawahan
- if (CommonUtil.isNotNullOrEmpty(currentDataMappByDetail)) {
- // data mapping existing sudah ada
- if (!currentDataMappByDetail.get("id").equals(vo.getId())) {
- // ubah atau buat baru jabatan untuk menggantikan pegawai
- // dengan jabatan yang sama sebelumnya
-
- // delete data pejabat lama
- mappVo.setId((Integer) currentDataMappByDetail.get("id"));
- mappVo.setStatusEnabled(false);
- mappVos.add(mappVo);
- save(mappVos);
-
- // dapatkan pegawai bawahan
- List listPegawai = mapPegawaiJabatanToUnitKerjaDao.getPegawaiBySubunitKerja(
- vo.getSubUnitKerjaPegawai().getId(),
- Integer.valueOf(currentDataMappByDetail.get("levelJabatan").toString()));
-
- // set atasan di pegawai bawahan
- for (Integer idPeg : listPegawai) {
- List vosMappAtasan = getMappingPegawaiToAtasanVo(vo, idPeg);
-
- mappingPegawaiToAtasanService.saveMappingPegawaiToAtasan(vosMappAtasan);
- }
-
- }
- }
- }
-
- return result;
- }
-
- private static List getMappingPegawaiToAtasanVo(MapPegawaiJabatanToUnitKerjaVO vo,
- Integer idPeg) {
- List vosMappAtasan = new ArrayList<>();
- MappingPegawaiToAtasanVO voMappAtasan = new MappingPegawaiToAtasanVO();
- PegawaiVO voPegawai = new PegawaiVO();
- PegawaiVO voAtasan = new PegawaiVO();
- PegawaiVO voPenilai = new PegawaiVO();
-
- voPegawai.setId(idPeg);
- voAtasan.setId(vo.getPegawai().getId());
- voPenilai.setId(vo.getPegawai().getId());
-
- voMappAtasan.setPegawai(voPegawai);
- voMappAtasan.setAtasanLangsung(voAtasan);
- voMappAtasan.setAtasanPejabatPenilai(voPenilai);
- vosMappAtasan.add(voMappAtasan);
- return vosMappAtasan;
- }
-
@Override
public void saveHistoryPegawai(MapPegawaiJabatanToUnitKerja model, String perubahan) {
HistoryDataPegawai historyDataPegawai = new HistoryDataPegawai();
@@ -1561,76 +1415,6 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
return result;
}
- @Override
- @Transactional
- public Map autoMappingAtasan(Integer idPegawai, Integer idJabatan, Integer idUnit, Integer idSub) {
- Map result = new HashMap<>();
-
- List listPegawaiAtasanHistori;
- List listPegawaiPenilaiHistori;
-
- List listAtasan = mapPegawaiJabatanToUnitKerjaDao.listAtasanLangsung();
- List listPenilai = mapPegawaiJabatanToUnitKerjaDao.listPejabatPenilai();
- List> mappingBaru = mapPegawaiJabatanToUnitKerjaDao.getMappingJabatanDanAtasan(listAtasan,
- listPenilai, idJabatan, idUnit, idSub);
- if (CommonUtil.isNotNullOrEmpty(mappingBaru)) {
- List listAtasanHist = mapPegawaiJabatanToUnitKerjaHistoriDao.getHistoriAtasan(idJabatan, idUnit,
- idSub);
- if (CommonUtil.isNotNullOrEmpty(listAtasanHist)) {
- for (Integer idAtasan : listAtasanHist) {
- listPegawaiAtasanHistori = mapPegawaiJabatanToUnitKerjaHistoriDao.getHistoriBawahanAtasan(idAtasan);
- listPegawaiPenilaiHistori = mapPegawaiJabatanToUnitKerjaHistoriDao
- .getHistoriBawahanPenilai(idAtasan);
-
- List listMappingChanged = new ArrayList<>();
- if (CommonUtil.isNotNullOrEmpty(listPegawaiAtasanHistori)) {
- for (Integer idPegawaiHistori : listPegawaiAtasanHistori) {
- List listMapping = mapPegawaiJabatanToUnitKerjaDao
- .getMappingIdByPegawai(idPegawaiHistori);
-
- Pegawai pegawaiAtasan = new Pegawai();
- pegawaiAtasan.setId(idPegawai);
- for (Integer idMapping : listMapping) {
- MapPegawaiJabatanToUnitKerja mapping = mapPegawaiJabatanToUnitKerjaDao
- .findOne(idMapping);
- if (CommonUtil.isNotNullOrEmpty(mapping)) {
- mapping.setAtasanLangsung(pegawaiAtasan);
- mapPegawaiJabatanToUnitKerjaDao.save(mapping);
-
- listMappingChanged.add(idMapping);
- }
- }
- }
- }
-
- if (CommonUtil.isNotNullOrEmpty(listPegawaiPenilaiHistori)) {
- for (Integer idPegawaiHistori : listPegawaiPenilaiHistori) {
- List listMapping = mapPegawaiJabatanToUnitKerjaDao
- .getMappingIdByPegawai(idPegawaiHistori);
-
- Pegawai pegawaiAtasan = new Pegawai();
- pegawaiAtasan.setId(idPegawai);
- for (Integer idMapping : listMapping) {
- MapPegawaiJabatanToUnitKerja mapping = mapPegawaiJabatanToUnitKerjaDao
- .findOne(idMapping);
- if (CommonUtil.isNotNullOrEmpty(mapping)) {
- mapping.setAtasanLangsung(pegawaiAtasan);
- mapPegawaiJabatanToUnitKerjaDao.save(mapping);
-
- listMappingChanged.add(idMapping);
- }
- }
- }
- }
-
- result.put("data", listMappingChanged);
- }
- }
- }
-
- return result;
- }
-
@Override
public List> findFormasiJabatan() {
List> result = new ArrayList<>();
@@ -1771,4 +1555,25 @@ public class MapPegawaiJabatanToUnitKerjaServiceImpl extends BaseVoServiceImpl
return "Logbook Tarif";
}
}
+
+ @Override
+ public PegawaiJabatanDto getDataJabatan(Integer idPegawai) {
+ PegawaiJabatanDto.PegawaiJabatanDtoBuilder builder = PegawaiJabatanDto.builder();
+ Pegawai pegawai = pegawaiDao.getPegawaiById(idPegawai);
+ if (CommonUtil.isNotNullOrEmpty(pegawai)) {
+ if (CommonUtil.isNotNullOrEmpty(pegawai.getNipPns())) {
+ builder.noKepegawaian(pegawai.getNipPns());
+ } else if (CommonUtil.isNotNullOrEmpty(pegawai.getNikIntern())) {
+ builder.noKepegawaian(pegawai.getNikIntern());
+ } else if (CommonUtil.isNotNullOrEmpty(pegawai.getNim())) {
+ builder.noKepegawaian(pegawai.getNim());
+ }
+ }
+ List listMap = mapPegawaiJabatanToUnitKerjaDao.findByPegawaiId(idPegawai);
+ List jabatan = listMap.stream().map(map -> map.getJabatan().getNamaJabatan() + " - "
+ + map.getUnitKerjaPegawai().getName() + " - " + map.getSubUnitKerjaPegawai().getName()).distinct()
+ .collect(Collectors.toList());
+ builder.jabatan(jabatan);
+ return builder.build();
+ }
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MappingAlatToBundleServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MappingAlatToBundleServiceImpl.java
index a3e05452..133fa0f1 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MappingAlatToBundleServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MappingAlatToBundleServiceImpl.java
@@ -1,27 +1,24 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.stereotype.Service;
-
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.MappingAlatToBundleDao;
import com.jasamedika.medifirst2000.entities.Alat;
import com.jasamedika.medifirst2000.entities.BundleSetAlat;
import com.jasamedika.medifirst2000.entities.MappingAlatToBundle;
-import com.jasamedika.medifirst2000.entities.Produk;
import com.jasamedika.medifirst2000.exception.ServiceVOException;
import com.jasamedika.medifirst2000.service.MappingAlatToBundleService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.AlatVO;
import com.jasamedika.medifirst2000.vo.BundleSetAlatVO;
import com.jasamedika.medifirst2000.vo.MappingAlatToBundleVO;
-import com.jasamedika.medifirst2000.vo.ProdukVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.jpa.JpaSystemException;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Service("MappingAlatToBundleService")
public class MappingAlatToBundleServiceImpl extends BaseVoServiceImpl implements MappingAlatToBundleService {
@@ -91,7 +88,7 @@ public class MappingAlatToBundleServiceImpl extends BaseVoServiceImpl implements
if(CommonUtil.isNotNullOrEmpty(resultModel)){
result.put("id", resultModel.getId());
- result.put("Bundle", resultModel.getBundleSetAlat().getName());
+ result.put("Bundle", resultModel.getBundleSetAlat().getNama());
result.put("Produk", resultModel.getAlat().getNamaAlat());
}
@@ -118,7 +115,7 @@ public class MappingAlatToBundleServiceImpl extends BaseVoServiceImpl implements
if(CommonUtil.isNotNullOrEmpty(resultModel)){
result.put("id", resultModel.getId());
- result.put("Bundle", resultModel.getBundleSetAlat().getName());
+ result.put("Bundle", resultModel.getBundleSetAlat().getNama());
result.put("Produk", resultModel.getAlat().getNamaAlat());
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MasalahKeperawatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MasalahKeperawatanServiceImpl.java
index 98e99434..c2fc7c7f 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MasalahKeperawatanServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MasalahKeperawatanServiceImpl.java
@@ -9,31 +9,17 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.stereotype.Service;
-import com.jasamedika.medifirst2000.converter.DetailHasilTriaseConverter;
-import com.jasamedika.medifirst2000.converter.DetailTriaseConverter;
-import com.jasamedika.medifirst2000.converter.HasilTriaseConverter;
import com.jasamedika.medifirst2000.converter.MasalahKeperawatanConverter;
import com.jasamedika.medifirst2000.converter.MasalahKeperawatanDetailConverter;
-import com.jasamedika.medifirst2000.converter.PemeriksaanTriageConverter;
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
-import com.jasamedika.medifirst2000.dao.HasilTriaseDao;
import com.jasamedika.medifirst2000.dao.MasalahKeperawatanDao;
import com.jasamedika.medifirst2000.dao.MasalahKeperawatanDetailDao;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.DetailHasilTriase;
-import com.jasamedika.medifirst2000.entities.DetailTriase;
-import com.jasamedika.medifirst2000.entities.HasilTriase;
import com.jasamedika.medifirst2000.entities.MasalahKeperawatan;
import com.jasamedika.medifirst2000.entities.MasalahKeperawatanDetail;
-import com.jasamedika.medifirst2000.entities.PemeriksaanTriage;
-import com.jasamedika.medifirst2000.entities.PernahDirawatDetail;
import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.HasilTriaseService;
import com.jasamedika.medifirst2000.service.MasalahKeperawatanService;
import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.vo.DetailHasilTriaseVO;
-import com.jasamedika.medifirst2000.vo.DetailTriaseVO;
-import com.jasamedika.medifirst2000.vo.HasilTriaseVO;
import com.jasamedika.medifirst2000.vo.MasalahKeperawatanDetailVO;
import com.jasamedika.medifirst2000.vo.MasalahKeperawatanVO;
@@ -96,7 +82,7 @@ public class MasalahKeperawatanServiceImpl implements MasalahKeperawatanService{
masalahKeperawatan = masalahKeperawatanConverter.transferVOToModel(vo, masalahKeperawatan);
masalahKeperawatan.setTglInput(vo.getTglInput());
AntrianPasienDiPeriksa pasienDaftar = antrianPasienDiPeriksaDao.findByNoRec(vo.getPasienDaftar().getNoRec());
- masalahKeperawatan.setPasien(pasienDaftar);
+ masalahKeperawatan.setPasienDaftar(pasienDaftar);
masalahKeperawatan.setNoRec(vo.getNoRec());
masalahKeperawatan.getMasalahKeperawatanDetail().clear();
@@ -110,7 +96,7 @@ public class MasalahKeperawatanServiceImpl implements MasalahKeperawatanService{
MasalahKeperawatanDetail masalahKeperawatanDetail = masalahKeperawatanDetailConverter.transferVOToModel(masalahKeperawatanDetailVO, new MasalahKeperawatanDetail());
//detailHasilTriase.setHasilTriase(hasilTriase);
masalahKeperawatanDetail.setMasalahKeperawatan(masalahKeperawatan);
- masalahKeperawatanDetail.setPasien(pasienDaftar);
+ masalahKeperawatanDetail.setPasienDaftar(pasienDaftar);
masalahKeperawatanDetailDao.save(masalahKeperawatanDetail);
// if(CommonUtil.isNotNullOrEmpty(masalahKeperawatanDetail.getMasalahKeperawatan())){
// masalahKeperawatan.getMasalahKeperawatanDetail().add(masalahKeperawatanDetail);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ObservasiIGDServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ObservasiIGDServiceImpl.java
index ee76fd81..653d383a 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ObservasiIGDServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ObservasiIGDServiceImpl.java
@@ -15,8 +15,6 @@ import com.jasamedika.medifirst2000.dao.ObservasiIGDDao;
import com.jasamedika.medifirst2000.entities.CaraPemberianObat;
import com.jasamedika.medifirst2000.entities.Obat;
import com.jasamedika.medifirst2000.entities.ObservasiIGD;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
-import com.jasamedika.medifirst2000.entities.PengobatanKhusus;
import com.jasamedika.medifirst2000.exception.ServiceVOException;
import com.jasamedika.medifirst2000.service.ObservasiIGDService;
import com.jasamedika.medifirst2000.service.PasienDaftarService;
@@ -25,7 +23,6 @@ import com.jasamedika.medifirst2000.vo.CaraPemberianObatVO;
import com.jasamedika.medifirst2000.vo.ObatVO;
import com.jasamedika.medifirst2000.vo.ObservasiIGDVO;
import com.jasamedika.medifirst2000.vo.ObservasiIGDVOCustom;
-import com.jasamedika.medifirst2000.vo.PengobatanKhususVO;
@Service("observasiIGDService")
public class ObservasiIGDServiceImpl implements ObservasiIGDService {
@@ -50,7 +47,7 @@ public class ObservasiIGDServiceImpl implements ObservasiIGDService {
model.setCaraPemberianObat(
caraPemberianObatConverter.transferVOToModel(vos.getCaraPemberianObat(), new CaraPemberianObat()));
model.setObat(obatConverter.transferVOToModel(vos.getObat(), new Obat()));
- model.setPasien(
+ model.setPasienDaftar(
antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vos.getPasien().getId(), vos.getTglRegistrasi()));
ObservasiIGD resultModel = observasiIGDDao.save(model);
@@ -71,7 +68,7 @@ public class ObservasiIGDServiceImpl implements ObservasiIGDService {
model = observasiIGDConverter.transferVOToModel(vo, new ObservasiIGD());
model.setCaraPemberianObat(caraPemberianObatConverter.transferVOToModel(vo.getCaraPemberianObat(), new CaraPemberianObat()));
model.setObat(obatConverter.transferVOToModel(vo.getObat(), new Obat()));
- model.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
+ model.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
ObservasiIGD resultModel = observasiIGDDao.save(model);
if (CommonUtil.isNotNullOrEmpty(resultModel)) {
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderProdukServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderProdukServiceImpl.java
index 6a51df19..fbca4e8a 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderProdukServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/OrderProdukServiceImpl.java
@@ -53,7 +53,6 @@ import com.jasamedika.medifirst2000.dao.StrukHistoriDao;
import com.jasamedika.medifirst2000.dao.StrukKirimDao;
import com.jasamedika.medifirst2000.dao.StrukOrderDao;
import com.jasamedika.medifirst2000.dao.custom.OrderProdukDaoCustom;
-import com.jasamedika.medifirst2000.dto.CekStokProdukRuanganDto;
import com.jasamedika.medifirst2000.dto.OrderPelayananGiziDto;
import com.jasamedika.medifirst2000.dto.PiutangRekananProfileTemp;
//import com.jasamedika.medifirst2000.vo.UploadVO;
@@ -72,7 +71,6 @@ import com.jasamedika.medifirst2000.entities.JenisWaktu;
import com.jasamedika.medifirst2000.entities.Kelas;
import com.jasamedika.medifirst2000.entities.LisOrder;
import com.jasamedika.medifirst2000.entities.LogAcc;
-import com.jasamedika.medifirst2000.entities.MapProdukMenuToBahan;
import com.jasamedika.medifirst2000.entities.MapRuanganToProduk;
import com.jasamedika.medifirst2000.entities.OrderPelayanan;
import com.jasamedika.medifirst2000.entities.OrderProduk;
@@ -260,7 +258,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
// );
// pasienDaftar=pasienDaftarDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"),
// vo.getPasien().getId(),format+",000",format+",999");
- model.setPasien(antrianPasienDiPeriksaBefore);
+ model.setPasienDaftar(antrianPasienDiPeriksaBefore);
Map listRuangan = new HashMap<>();
@@ -347,8 +345,8 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
//System.out.println(new SimpleDateFormat("dd-MM-yyyy").format(vo.getStrukOrder().getTglOrder()) + "test ya");
strukOrder.setIsDelivered((byte) 1);
strukOrder.setQtyJenisProduk(1.0);
- strukOrder.setNoCm(model.getPasien().getPasienDaftar().getPasien());
- strukOrder.setNoRegistrasi(model.getPasien().getPasienDaftar());
+ strukOrder.setNoCm(model.getPasienDaftar().getPasienDaftar().getPasien());
+ strukOrder.setNoRegistrasi(model.getPasienDaftar().getPasienDaftar());
strukOrder.setQtyProduk(1.0);
strukOrder.setTotalBeaMaterai(0.0);
strukOrder.setTotalBiayaKirim(0.0);
@@ -366,7 +364,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
strukOrder.setRuanganTujuan(antrianPasienDiPeriksa.getRuangan());
}
- strukOrder.setRuangan(model.getPasien().getRuangan());
+ strukOrder.setRuangan(model.getPasienDaftar().getRuangan());
strukOrder.setKeteranganOrder(vo.getKeteranganOrder());
strukOrder.setNoOrderIntern(noOrderIntern);
@@ -381,7 +379,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
antrianPasienDiPeriksa.setTglRegistrasi(strukOrder.getTglOrder());
antrianPasienDiPeriksa.setStatusPasien((byte) 1);
- antrianPasienDiPeriksa.setPasienDaftar(model.getPasien().getPasienDaftar());
+ antrianPasienDiPeriksa.setPasienDaftar(model.getPasienDaftar().getPasienDaftar());
antrianPasienDiPeriksa.setNoAntrian(antrianPasienDiPeriksaService.getFormatNumberByMonthYearRuangan(
vo.getStrukOrder().getTglOrder(), antrianPasienDiPeriksa.getRuangan().getId()));
antrianPasienDiPeriksa.setStatusAntrian(StatusAntrianEnum.MENUNGGU.getVal());
@@ -419,7 +417,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
orderTindakanLabConverter.setUseGson(true);
DetailOrderTindakan newsubModel = orderTindakanLabConverter.transferVOToModel(subModel,
new DetailOrderTindakan());
- newsubModel.setPasien(model.getPasien());
+ newsubModel.setPasienDaftar(model.getPasienDaftar());
newsubModel.setOrderProduk(model);
OrderPelayanan orderPelayanan = new OrderPelayanan();
orderPelayanan.setStrukOrder(strukOrder);
@@ -451,7 +449,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
}
//
orderPelayanan.setRuanganTujuan(antrianPasienDiPeriksa.getRuangan());
- orderPelayanan.setRuangan(model.getPasien().getRuangan());
+ orderPelayanan.setRuangan(model.getPasienDaftar().getRuangan());
orderPelayanan.setProduk(newsubModel.getProduk());
orderPelayanan.setNoOrder(strukOrder);
orderPelayanan.setIsCito((byte)cito);
@@ -483,7 +481,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
detailRadiologi = detailRadiologiConverter.transferVOToModel(vo.getDetailRadiologi(),
new DetailRadiologi());
detailRadiologi.setOrderProduk(resultDomain);
- detailRadiologi.setPasien(model.getPasien());
+ detailRadiologi.setPasienDaftar(model.getPasienDaftar());
detailRadiologiDao.save(detailRadiologi);
}
}
@@ -642,7 +640,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
}
//--------------------------------------------------------------------------------------
if(CommonUtil.isNotNullOrEmpty(antrian)) {
- pelayanan.setPasien(antrian);
+ pelayanan.setPasienDaftar(antrian);
antrian.setStatusAntrian(StatusAntrianEnum.SELESAI_DIPERIKSA.getVal());
antrianPasienDiPeriksaDao.save(antrian);
}
@@ -696,7 +694,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
pelayananPasienDetail.setProduk(hargaNetto.getProduk());
}
if(CommonUtil.isNotNullOrEmpty(antrian)){
- pelayananPasienDetail.setPasien(antrian);
+ pelayananPasienDetail.setPasienDaftar(antrian);
}
if(CommonUtil.isNotNullOrEmpty(orderPelayanan.getStrukOrder().getStatusOrder())){
pelayananPasienDetail.setStatusOrder(orderPelayanan.getStrukOrder().getStatusOrder());
@@ -1080,17 +1078,17 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
}
List list = (List) query.getResultList();
for (LisOrder lisOrder : list) {
- List listPasien = pasienDao.findByNoCm(lisOrder.getPid());
+ List listPasien = pasienDao.findByNoCm(lisOrder.getPatientId());
Pasien pasien;
if (listPasien.size() > 0) {
pasien = listPasien.get(listPasien.size() - 1);
} else {
RegistrasiPasienVO registrasiPasienVo = new RegistrasiPasienVO();
PasienVO pasienVo = new PasienVO();
- pasienVo.setNoCm(lisOrder.getPid());
- pasienVo.setNamaPasien(lisOrder.getPname());
+ pasienVo.setNoCm(lisOrder.getPatientId());
+ pasienVo.setNamaPasien(lisOrder.getPatientName());
- pasienVo.setTglLahir(DateUtil.toDate(lisOrder.getBirth_dt()));
+ pasienVo.setTglLahir(DateUtil.toDate(lisOrder.getBirthData()));
JenisKelaminVO jenisKelamin = new JenisKelaminVO();
jenisKelamin.setId(Integer.parseInt(lisOrder.getSex()));
pasienVo.setJenisKelamin(jenisKelamin);
@@ -1777,7 +1775,7 @@ public class OrderProdukServiceImpl extends BaseVoServiceImpl implements OrderPr
pelayanan.setProduk(orderPelayanan.getProduk());
pelayanan.setJumlah(orderPelayanan.getJumlah());
pelayanan.setTglPelayanan(orderPelayanan.getTglPelayanan());
- pelayanan.setPasien(antrian.get(0));
+ pelayanan.setPasienDaftar(antrian.get(0));
Map map = pelayananPiutangRekananService.getHargaPiutangRekananProfile(
pasienDaftar.getNoRec(), orderPelayanan.getProduk(), orderPelayanan.getJumlah(), 0);
List listPiutangRekananProfileTemp = (List) map
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapInformasiIbuServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapInformasiIbuServiceImpl.java
index 469cc1ab..18220749 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapInformasiIbuServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapInformasiIbuServiceImpl.java
@@ -1,22 +1,15 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import com.jasamedika.medifirst2000.vo.PasienVO;
import com.jasamedika.medifirst2000.vo.RuanganVO;
import com.jasamedika.medifirst2000.entities.Pasien;
import com.jasamedika.medifirst2000.entities.Ruangan;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
import com.jasamedika.medifirst2000.service.PapInformasiIbuService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
@@ -28,7 +21,6 @@ import com.jasamedika.medifirst2000.vo.PapInformasiIbuVO;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
import com.jasamedika.medifirst2000.dao.PapInformasiIbuDao;
-import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
/**
* Implement class for PapInformasiIbuService
@@ -73,7 +65,7 @@ public class PapInformasiIbuServiceImpl extends BaseVoServiceImpl implements Pap
model.setRuangan(ruanganConverter.transferVOToModel(vo.getRuangan(), new Ruangan()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
- model.setPasien(antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ model.setPasienDaftar(antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getKebangsaan())){
model.setKebangsaan(kebangsaanConverter.transferVOToModel(vo.getKebangsaan(), new Kebangsaan()));
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapMataServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapMataServiceImpl.java
index 2d07539a..4df134d5 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapMataServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapMataServiceImpl.java
@@ -100,7 +100,7 @@ public class PapMataServiceImpl implements PapMataService {
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar()))
{
- papMata.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ papMata.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
papMata.getKategoriKlinikMataSet().clear();
papMata.getDataKacamataSet().clear();
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapObstetriServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapObstetriServiceImpl.java
index aed55fc6..9e15f451 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapObstetriServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapObstetriServiceImpl.java
@@ -17,9 +17,7 @@ import com.jasamedika.medifirst2000.dao.PasienDao;
import com.jasamedika.medifirst2000.dao.RiwayatKehamilanObstetriDao;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
import com.jasamedika.medifirst2000.entities.DetailRiwayatObstetri;
-import com.jasamedika.medifirst2000.entities.KeadaanUmumObstetri;
import com.jasamedika.medifirst2000.entities.KeadaanUmumObstetriDetail;
-import com.jasamedika.medifirst2000.entities.KeteranganLainLainDetail;
import com.jasamedika.medifirst2000.entities.PapObstetri;
import com.jasamedika.medifirst2000.entities.RiwayatKehamilanObstetri;
import com.jasamedika.medifirst2000.service.PapObstetriService;
@@ -59,7 +57,7 @@ public class PapObstetriServiceImpl implements PapObstetriService {
Map result=new HashMap();
PapObstetri model=papObstetriConverter.transferVOToModel(vo, new PapObstetri());
AntrianPasienDiPeriksa pasienDaftar = antrianPasienDiPeriksaDao.findByNoRec(vo.getNoRec());
- model.setPasien(pasienDaftar);
+ model.setPasienDaftar(pasienDaftar);
for(RiwayatKehamilanObstetri voLocal:riwayatKehamilanObstetriDao.findByRiwayatKehamilan(model.getNoRec())){
riwayatKehamilanObstetriDao.delete(voLocal);
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapPengambilanSpesimenServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapPengambilanSpesimenServiceImpl.java
index 104e97a5..819f28f1 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapPengambilanSpesimenServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapPengambilanSpesimenServiceImpl.java
@@ -18,15 +18,7 @@ import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
import com.jasamedika.medifirst2000.dao.PelayananPasienDao;
import com.jasamedika.medifirst2000.dto.PiutangRekananProfileTemp;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.AsalProduk;
-import com.jasamedika.medifirst2000.entities.GolonganAsuransi;
-import com.jasamedika.medifirst2000.entities.HubunganKeluarga;
-import com.jasamedika.medifirst2000.entities.JenisTarif;
-import com.jasamedika.medifirst2000.entities.Kelas;
-import com.jasamedika.medifirst2000.entities.KomponenHarga;
-import com.jasamedika.medifirst2000.entities.ObservasiIGD;
import com.jasamedika.medifirst2000.entities.OrderPelayanan;
-import com.jasamedika.medifirst2000.entities.Paket;
import com.jasamedika.medifirst2000.entities.PapPengambilanSpesimen;
import com.jasamedika.medifirst2000.entities.PasienDaftar;
import com.jasamedika.medifirst2000.entities.PelayananPasien;
@@ -92,7 +84,7 @@ public class PapPengambilanSpesimenServiceImpl implements PapPengambilanSpesimen
PapPengambilanSpesimen resultModel=papPengambilanSpesimenDao.finByNoOrderAndTglOrder(noOrder, tglOrder);
if(CommonUtil.isNotNullOrEmpty(resultModel)){
result.put("Jumlah", resultModel.getJumlah());
- result.put("pasien", resultModel.getPasien());
+ result.put("pasien", resultModel.getPasienDaftar());
result.put("dataFound", true);
if(CommonUtil.isNotNullOrEmpty(resultModel.getStrukOrder().getNoOrder())){
result.put("StrukOrder.noOrder", resultModel.getStrukOrder().getNoOrder());
@@ -124,10 +116,10 @@ public class PapPengambilanSpesimenServiceImpl implements PapPengambilanSpesimen
//modelSpesimen.setBahanSample(model.getBahanSample());
modelSpesimen.setStrukOrder(model.getStrukOrder());
if(vo.getNoRec()==null)
- modelSpesimen.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vos.getPasien().getId(), vo.getTglRegistrasi()));
+ modelSpesimen.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vos.getPasien().getId(), vo.getTglRegistrasi()));
else
- modelSpesimen.setPasien(antrianPasienDiPeriksaDao.findOne(vo.getNoRec()));
- modelSpesimen.setStrukOrder(modelSpesimen.getPasien().getStrukOrder());
+ modelSpesimen.setPasienDaftar(antrianPasienDiPeriksaDao.findOne(vo.getNoRec()));
+ modelSpesimen.setStrukOrder(modelSpesimen.getPasienDaftar().getStrukOrder());
PapPengambilanSpesimen modelResult = papPengambilanSpesimenDao.save(modelSpesimen);
if(CommonUtil.isNotNullOrEmpty(modelResult))
{
@@ -156,7 +148,7 @@ public class PapPengambilanSpesimenServiceImpl implements PapPengambilanSpesimen
modelSpesimen.setTglAmbilSpesimen(papPengambilanSpesimenConverter.transferVOToModel(vos, new PapPengambilanSpesimen()).getTglAmbilSpesimen());
modelSpesimen.setBahanSample(papPengambilanSpesimenConverter.transferVOToModel(vos, new PapPengambilanSpesimen()).getBahanSample());
modelSpesimen.setStrukOrder(papPengambilanSpesimenConverter.transferVOToModel(vos, new PapPengambilanSpesimen()).getStrukOrder());
- modelSpesimen.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vos.getPasien().getId(), vos.getTglRegistrasi()));
+ modelSpesimen.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vos.getPasien().getId(), vos.getTglRegistrasi()));
PapPengambilanSpesimen modelResult = papPengambilanSpesimenDao.save(modelSpesimen);
if(CommonUtil.isNotNullOrEmpty(modelResult))
{
@@ -194,7 +186,7 @@ public class PapPengambilanSpesimenServiceImpl implements PapPengambilanSpesimen
pelayanan.setProduk(hasil.getProduk());
pelayanan.setJumlah(1.0);
pelayanan.setTglPelayanan(hasil.getTglPelayanan());
- pelayanan.setPasien(antrian);
+ pelayanan.setPasienDaftar(antrian);
Map map=pelayananPiutangRekananService.getHargaPiutangRekananProfile(antrian.getNoRec(),
hasil.getProduk(), hasil.getJumlah(), 0);
List listPiutangRekananProfileTemp=(List) map.get("list");
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapRencanaKonsultasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapRencanaKonsultasiServiceImpl.java
index 4054d511..91acde72 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapRencanaKonsultasiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PapRencanaKonsultasiServiceImpl.java
@@ -1,6 +1,5 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -48,7 +47,7 @@ public class PapRencanaKonsultasiServiceImpl implements PapRencanaKonsultasiServ
Map result = new HashMap();
PapRencanaKonsultasi model = papRencanaKonsultasiConverter.transferVOToModel(vo, new PapRencanaKonsultasi());
- model.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(),
+ model.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(),
vo.getTglRegistrasi()));
AntrianPasienDiPeriksa antrianPasienDiPeriksa = new AntrianPasienDiPeriksa();
if (vo.getNoRec()==null) {
@@ -63,7 +62,7 @@ public class PapRencanaKonsultasiServiceImpl implements PapRencanaKonsultasiServ
} else {
antrianPasienDiPeriksa.setStatusKunjungan(StatusKunjunganEnum.BARU.getVal());
}
- antrianPasienDiPeriksaService.saveAntrianPasienDiperiksaFromMasukKamar(model.getPasien().getPasienDaftar(),antrianPasienDiPeriksa);
+ antrianPasienDiPeriksaService.saveAntrianPasienDiperiksaFromMasukKamar(model.getPasienDaftar().getPasienDaftar(),antrianPasienDiPeriksa);
}
@@ -74,8 +73,8 @@ public class PapRencanaKonsultasiServiceImpl implements PapRencanaKonsultasiServ
{
result.put("noRec", resultModel.getNoRec());
result.put("tglInput", resultModel.getTglInput());
- if (CommonUtil.isNotNullOrEmpty(resultModel.getPasien().getPasienDaftar().getPasien().getId())) {
- result.put("pasien.noCm", resultModel.getPasien().getPasienDaftar().getPasien().getNoCm());
+ if (CommonUtil.isNotNullOrEmpty(resultModel.getPasienDaftar().getPasienDaftar().getPasien().getId())) {
+ result.put("pasien.noCm", resultModel.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
}
} return result;
@@ -90,8 +89,8 @@ public class PapRencanaKonsultasiServiceImpl implements PapRencanaKonsultasiServ
result.put("noRec", resultModel.getNoRec());
result.put("tglInput", resultModel.getTglInput());
result.put("datafound", true);
- if(CommonUtil.isNotNullOrEmpty(resultModel.getPasien().getPasienDaftar().getPasien().getId())){
- result.put("pasien.noCm", resultModel.getPasien().getPasienDaftar().getPasien().getNoCm());
+ if(CommonUtil.isNotNullOrEmpty(resultModel.getPasienDaftar().getPasienDaftar().getPasien().getId())){
+ result.put("pasien.noCm", resultModel.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
}
}else{
result.put("datafound", false);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananAdmixtureServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananAdmixtureServiceImpl.java
index b4e062b5..f4b4c5ba 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananAdmixtureServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananAdmixtureServiceImpl.java
@@ -12,7 +12,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
-import com.jasamedika.medifirst2000.dao.AlatYangTerpasangDao;
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
import com.jasamedika.medifirst2000.dao.PelayananAdmixtureDao;
import com.jasamedika.medifirst2000.dao.ProduksiDetailDao;
@@ -29,8 +28,6 @@ import com.jasamedika.medifirst2000.util.StringUtil;
import com.jasamedika.medifirst2000.vo.ProduksiDetailVO;
import com.jasamedika.medifirst2000.vo.StorageVO;
import com.jasamedika.medifirst2000.vo.PelayananProduksiVO;
-import com.jasamedika.medifirst2000.vo.PengobatanKhususDetailVO;
-import com.jasamedika.medifirst2000.vo.PengobatanKhususVO;
@Service("pelayananAdmixtureService")
public class PelayananAdmixtureServiceImpl implements PelayananAdmixtureService{
@@ -117,7 +114,7 @@ public class PelayananAdmixtureServiceImpl implements PelayananAdmixtureService{
pelayananProduksi.getPelayananAdmixture().clear();
}
pelayananProduksi.setNoProduksi(StringUtil.formatNumber(String.valueOf(pelayananAdmixtureDao.getCountByMonthAndYear(new Date()) + 1), 10));
- pelayananProduksi.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
+ pelayananProduksi.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
pelayananProduksi.getPelayananAdmixture().addAll(listProduksiDetail);
pelayananProduksi.setStorage(storageConverter.transferVOToModel(vo.getStorage(), new Storage()));
PelayananProduksi resultModel = pelayananAdmixtureDao.save(pelayananProduksi);
@@ -149,7 +146,7 @@ public class PelayananAdmixtureServiceImpl implements PelayananAdmixtureService{
pelayananProduksi.getPelayananAdmixture().clear();
}
pelayananProduksi.setNoProduksi(StringUtil.formatNumber(String.valueOf(pelayananAdmixtureDao.getCountByMonthAndYear(new Date()) + 1), 10));
- pelayananProduksi.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
+ pelayananProduksi.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
pelayananProduksi.getPelayananAdmixture().addAll(listProduksiDetail);
pelayananProduksi.setStorage(storageConverter.transferVOToModel(vo.getStorage(), new Storage()));
PelayananProduksi resultModel = pelayananAdmixtureDao.save(pelayananProduksi);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananCytotoxicServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananCytotoxicServiceImpl.java
index c935dd56..bc67f30b 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananCytotoxicServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananCytotoxicServiceImpl.java
@@ -114,7 +114,7 @@ public class PelayananCytotoxicServiceImpl implements PelayananCytotoxicService
}
pelayananProduksi.setNoProduksi(StringUtil
.formatNumber(String.valueOf(pelayananCytotoxicDao.getCountByMonthAndYear(new Date()) + 1), 10));
- pelayananProduksi.setPasien(
+ pelayananProduksi.setPasienDaftar(
antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
pelayananProduksi.getPelayananCytotoxic().addAll(listProduksiDetail);
pelayananProduksi.setStorage(storageConverter.transferVOToModel(vo.getStorage(), new Storage()));
@@ -146,7 +146,7 @@ public class PelayananCytotoxicServiceImpl implements PelayananCytotoxicService
}
pelayananProduksi.setNoProduksi(StringUtil
.formatNumber(String.valueOf(pelayananCytotoxicDao.getCountByMonthAndYear(new Date()) + 1), 10));
- pelayananProduksi.setPasien(
+ pelayananProduksi.setPasienDaftar(
antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
pelayananProduksi.getPelayananCytotoxic().addAll(listProduksiDetail);
pelayananProduksi.setStorage(storageConverter.transferVOToModel(vo.getStorage(), new Storage()));
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananLaboratoriumServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananLaboratoriumServiceImpl.java
index e4ddebee..9a3f3fd8 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananLaboratoriumServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananLaboratoriumServiceImpl.java
@@ -64,19 +64,19 @@ public class PelayananLaboratoriumServiceImpl implements PelayananLaboratoriumSe
// lisOrderSysmex.setAddress1(orderLab.get("alamatLengkap").toString());
- lisOrderSysmex.setBirthDt(formatDate(orderLab.get("tglLahir").toString()));
+ lisOrderSysmex.setBirthData(formatDate(orderLab.get("tglLahir").toString()));
lisOrderSysmex.setClinican(orderLab.get("pegawaiId").toString() + '^' + orderLab.get("namaLengkap").toString());
lisOrderSysmex.setComment("");
lisOrderSysmex.setFlag(0);
- lisOrderSysmex.setMessageDt(formatDate(orderLab.get("tglPelayanan").toString()));
- lisOrderSysmex.setOno(orderLab.get("noOrderIntern").toString());
+ lisOrderSysmex.setMessageData(formatDate(orderLab.get("tglPelayanan").toString()));
+ lisOrderSysmex.setOrderNumber(orderLab.get("noOrderIntern").toString());
/*
* NW : Transaksi baru RP : Update transaksi CA : Batal Transaksi
*/
lisOrderSysmex.setOrderControl("NW");
- lisOrderSysmex.setOrderTestID(kdPeriksa);
- lisOrderSysmex.setPid(orderLab.get("noCm").toString());
- lisOrderSysmex.setpName(orderLab.get("namaPasien").toString());
+ lisOrderSysmex.setOrderTestId(kdPeriksa);
+ lisOrderSysmex.setPatientId(orderLab.get("noCm").toString());
+ lisOrderSysmex.setPatientName(orderLab.get("namaPasien").toString());
/*- R : Rutin
- U : Cito */
if (orderLab.get("cito").toString().equals("1")) {
@@ -88,13 +88,13 @@ public class PelayananLaboratoriumServiceImpl implements PelayananLaboratoriumSe
* - IN : Rawat inap - OP : Rawat jalan
*/
if (orderLab.get("idDep").toString().equals("16")) {
- lisOrderSysmex.setpType("IN");
+ lisOrderSysmex.setPatientType("IN");
} else {
- lisOrderSysmex.setpType("OP");
+ lisOrderSysmex.setPatientType("OP");
}
- lisOrderSysmex.setRequestDt(formatDate(orderLab.get("tglPelayanan").toString()));
- lisOrderSysmex.setRoomNo("");
+ lisOrderSysmex.setRequestData(formatDate(orderLab.get("tglPelayanan").toString()));
+ lisOrderSysmex.setRoomNumber("");
/*
* - 1 : Laki-laki - 2 : Perempuan - 0 : Tidak diketahui
*/
@@ -108,7 +108,7 @@ public class PelayananLaboratoriumServiceImpl implements PelayananLaboratoriumSe
lisOrderSysmex.setSex("0");
}
lisOrderSysmex.setSource(orderLab.get("ruanganId").toString() + '^' + orderLab.get("namaRuangan").toString());
- lisOrderSysmex.setVisitNo(orderLab.get("noRegis").toString());
+ lisOrderSysmex.setVisitNumber(orderLab.get("noRegis").toString());
LisOrderTmpSysmex lisOrderTmpSysmex = new LisOrderTmpSysmex();
lisOrderTmpSysmex = transferVOToModel(lisOrderSysmex, lisOrderTmpSysmex);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananObatServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananObatServiceImpl.java
index 27d08f43..72200fec 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananObatServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananObatServiceImpl.java
@@ -85,7 +85,6 @@ import com.jasamedika.medifirst2000.entities.PemakaianAsuransi;
import com.jasamedika.medifirst2000.entities.Pendidikan;
import com.jasamedika.medifirst2000.entities.Produk;
import com.jasamedika.medifirst2000.entities.RacikanDetail;
-import com.jasamedika.medifirst2000.entities.Rekanan;
import com.jasamedika.medifirst2000.entities.ResepRacikanOrder;
import com.jasamedika.medifirst2000.entities.ResepRacikanOrderDetail;
import com.jasamedika.medifirst2000.entities.RouteFarmasi;
@@ -131,7 +130,6 @@ import com.jasamedika.medifirst2000.vo.PelayananPasienVO;
import com.jasamedika.medifirst2000.vo.PendidikanVO;
import com.jasamedika.medifirst2000.vo.ProdukVO;
import com.jasamedika.medifirst2000.vo.RacikanDetailVO;
-import com.jasamedika.medifirst2000.vo.ReturSupplierVO;
import com.jasamedika.medifirst2000.vo.RuanganVO;
import com.jasamedika.medifirst2000.vo.StatusPerkawinanVO;
import com.jasamedika.medifirst2000.vo.StrukOrderVO;
@@ -340,7 +338,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
entities.setHargaJual(0.0);
entities.setStock(1.0);
entities=pelayananPasienDao.save(entities);
- entities.setPasien(antrianPasienDiPeriksaDao.findByNoRec(entities.getPasien().getNoRec()));
+ entities.setPasienDaftar(antrianPasienDiPeriksaDao.findByNoRec(entities.getPasienDaftar().getNoRec()));
list.add(entities);
List hargas = mapDiagnosaToProdukDao.getHargaDetail(entities.getProduk().getId(),
entities.getKelas().getId());
@@ -351,7 +349,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
newsubModelDetail.setHargaJual(harga.getHargaNetto1());
newsubModelDetail.setTglPelayanan(entities.getTglPelayanan());
newsubModelDetail.setJumlah(1.0);
- newsubModelDetail.setPasien(entities.getPasien());
+ newsubModelDetail.setPasienDaftar(entities.getPasienDaftar());
newsubModelDetail.setKeteranganLain("-");
newsubModelDetail.setAturanPakai("-");
// newsubModelDetail.setKeteranganPakai("-");
@@ -370,7 +368,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
PelayananPasienPetugas model = pelayananPetugasConverter.transferVOToModel(petugas,
new PelayananPasienPetugas());
model.setPelayananPasien(entities);
- model.setNomasuk(entities.getPasien());
+ model.setNomasuk(entities.getPasienDaftar());
pelayananPasienPetugasDao.save(model);
}
@@ -396,9 +394,9 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
{
PemakaianAsuransi pemakaianAsuransi =
- pemakaianAsuransiDao.findByPasienDaftar (pelayananPasien.getPasien().getPasienDaftar().getNoRec());
+ pemakaianAsuransiDao.findByPasienDaftar (pelayananPasien.getPasienDaftar().getPasienDaftar().getNoRec());
List antrianDiperiksas =
- antrianPasienDiPeriksaDao.findByNoRegisterNonRawatInap(pelayananPasien.getPasien().getPasienDaftar().getNoRegistrasi());
+ antrianPasienDiPeriksaDao.findByNoRegisterNonRawatInap(pelayananPasien.getPasienDaftar().getPasienDaftar().getNoRegistrasi());
if(antrianDiperiksas.size()!=0)
{
@@ -414,12 +412,12 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
}
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- urlParameters+= "{\"kdDepartemen\":\""+ kdInstalasi+ "\",\"kdRekanan\":\""+ kdRekanan+ "\",\"jenisPelayanan\":\""+ pelayananPasien.getPasien().getPasienDaftar().getJenisPelayanan() +"\",\"noAntrianDiperiksa\":\""+ pelayananPasien.getPasien().getNoRec() +"\",\"noIdPelayanan\":\""+ pelayananPasien.getNoRec() +"\", \"idProduk\":\""+pelayananPasien.getProduk().getId()+"\",\"harga\":\""+ pelayananPasien.getHargaJual() +"\",\"tglInput\":\""+format.format( pelayananPasien.getTglPelayanan()) +"\",\"keterangan\":\"Pelayanan Tindakan\"}";
+ urlParameters+= "{\"kdDepartemen\":\""+ kdInstalasi+ "\",\"kdRekanan\":\""+ kdRekanan+ "\",\"jenisPelayanan\":\""+ pelayananPasien.getPasienDaftar().getPasienDaftar().getJenisPelayanan() +"\",\"noAntrianDiperiksa\":\""+ pelayananPasien.getPasienDaftar().getNoRec() +"\",\"noIdPelayanan\":\""+ pelayananPasien.getNoRec() +"\", \"idProduk\":\""+pelayananPasien.getProduk().getId()+"\",\"harga\":\""+ pelayananPasien.getHargaJual() +"\",\"tglInput\":\""+format.format( pelayananPasien.getTglPelayanan()) +"\",\"keterangan\":\"Pelayanan Tindakan\"}";
}
else
{
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
- urlParameters+= ",{\"kdDepartemen\":\""+ kdInstalasi+ "\",\"kdRekanan\":\""+ kdRekanan+ "\",\"jenisPelayanan\":\""+ pelayananPasien.getPasien().getPasienDaftar().getJenisPelayanan() +"\",\"noAntrianDiperiksa\":\""+ pelayananPasien.getPasien().getNoRec() +"\",\"noIdPelayanan\":\""+ pelayananPasien.getNoRec() +"\", \"idProduk\":\""+pelayananPasien.getProduk().getId()+"\",\"harga\":\""+ pelayananPasien.getHargaJual() +"\",\"tglInput\":\""+ format.format( pelayananPasien.getTglPelayanan()) +"\",\"keterangan\":\"Pelayanan Tindakan\"}";
+ urlParameters+= ",{\"kdDepartemen\":\""+ kdInstalasi+ "\",\"kdRekanan\":\""+ kdRekanan+ "\",\"jenisPelayanan\":\""+ pelayananPasien.getPasienDaftar().getPasienDaftar().getJenisPelayanan() +"\",\"noAntrianDiperiksa\":\""+ pelayananPasien.getPasienDaftar().getNoRec() +"\",\"noIdPelayanan\":\""+ pelayananPasien.getNoRec() +"\", \"idProduk\":\""+pelayananPasien.getProduk().getId()+"\",\"harga\":\""+ pelayananPasien.getHargaJual() +"\",\"tglInput\":\""+ format.format( pelayananPasien.getTglPelayanan()) +"\",\"keterangan\":\"Pelayanan Tindakan\"}";
}
}
@@ -589,7 +587,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
newsubModel.setKeteranganPakai(BaseConverterImpl
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
newsubModel.setTglPelayanan(strukResep.getTglResep());
- newsubModel.setPasien(pasienDaftar);
+ newsubModel.setPasienDaftar(pasienDaftar);
newsubModel
.setProduk(produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
JenisObat jenisObat = new JenisObat();
@@ -658,7 +656,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
newsubModelDetail.setKeteranganPakai(BaseConverterImpl
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
newsubModelDetail.setKeteranganPakai2("-");
- newsubModelDetail.setPasien(pasienDaftar);
+ newsubModelDetail.setPasienDaftar(pasienDaftar);
newsubModelDetail.setProduk(
produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
@@ -811,7 +809,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
newsubModel.setKeteranganPakai(BaseConverterImpl
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
newsubModel.setTglPelayanan(strukResep.getTglResep());
- newsubModel.setPasien(pasienDaftar);
+ newsubModel.setPasienDaftar(pasienDaftar);
newsubModel
.setProduk(produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
JenisObat jenisObat = new JenisObat();
@@ -880,7 +878,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
newsubModelDetail.setKeteranganPakai(BaseConverterImpl
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
newsubModelDetail.setKeteranganPakai2("-");
- newsubModelDetail.setPasien(pasienDaftar);
+ newsubModelDetail.setPasienDaftar(pasienDaftar);
newsubModelDetail.setProduk(
produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
@@ -1062,7 +1060,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
kartuStok.setRuangan(pelayananpasien.getStrukOrder().getRuanganTujuan());
kartuStok.setJumlah(Double.parseDouble(pelayananpasien.getJumlah().toString()));
kartuStok.setKeterangan(
- "Penjulan Kepada pasien " + pelayananpasien.getPasien().getPasienDaftar().getPasien().getNamaPasien());
+ "Penjulan Kepada pasien " + pelayananpasien.getPasienDaftar().getPasienDaftar().getPasien().getNamaPasien());
kartuStok.setStatus(true);
kartuStok.setTglKejadian(pelayananpasien.getStrukOrder().getTglOrder());
kartuStok.setTglInput(new Date());
@@ -1224,12 +1222,12 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
entities.setJumlah(pelayananPasienVO.getQty());
}
if(CommonUtil.isNotNullOrEmpty(antrianPasienDiPeriksa)) {
- entities.setPasien(antrianPasienDiPeriksa);
+ entities.setPasienDaftar(antrianPasienDiPeriksa);
//added by susy 2017-09-18
PasienDaftar pasienDaftar = pasienDaftarDao.findByNoRec(antrianPasienDiPeriksa.getPasienDaftarId());
if(CommonUtil.isNotNullOrEmpty(pasienDaftar))
{
- entities.setTanggalPendaftaran(pasienDaftar.getTglRegistrasi());
+ entities.setTglRegistrasi(pasienDaftar.getTglRegistrasi());
}
}
@@ -1299,8 +1297,8 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
if(CommonUtil.isNotNullOrEmpty(hargaNettoProdukByKelasD.getKomponenHarga())) {
newsubModelDetail.setKomponenHarga(hargaNettoProdukByKelasD.getKomponenHarga());
}
- if(CommonUtil.isNotNullOrEmpty(pelayananPaseinResult.getPasien())) {
- newsubModelDetail.setPasien(pelayananPaseinResult.getPasien());
+ if(CommonUtil.isNotNullOrEmpty(pelayananPaseinResult.getPasienDaftar())) {
+ newsubModelDetail.setPasienDaftar(pelayananPaseinResult.getPasienDaftar());
}
if(CommonUtil.isNotNullOrEmpty(pelayananPaseinResult.getProduk())) {
newsubModelDetail.setProduk(pelayananPaseinResult.getProduk());
@@ -1324,7 +1322,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
}
if(CommonUtil.isNotNullOrEmpty(pelayananPasienPetugasVO)){
pelayananPasienPetugas.setPelayananPasien(pelayananPaseinResult);
- pelayananPasienPetugas.setNomasuk(pelayananPaseinResult.getPasien());
+ pelayananPasienPetugas.setNomasuk(pelayananPaseinResult.getPasienDaftar());
}
if(CommonUtil.isNotNullOrEmpty(pelayananPasienPetugasVO.getKdpegawai())){
pelayananPasienPetugas.setKdproduk(produkConverter.transferVOToModel(pelayananPasienPetugasVO.getKdproduk(), new Produk()));
@@ -1497,7 +1495,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
newsubModel.setKeteranganPakai(BaseConverterImpl
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
newsubModel.setTglPelayanan(strukResep.getTglResep());
- newsubModel.setPasien(pasienDaftar);
+ newsubModel.setPasienDaftar(pasienDaftar);
newsubModel
.setProduk(produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
JenisObat jenisObat = new JenisObat();
@@ -1587,7 +1585,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
newsubModelDetail.setKeteranganPakai(BaseConverterImpl
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
newsubModelDetail.setKeteranganPakai2("-");
- newsubModelDetail.setPasien(pasienDaftar);
+ newsubModelDetail.setPasienDaftar(pasienDaftar);
newsubModelDetail.setProduk(
produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
@@ -1767,7 +1765,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
newsubModel.setKeteranganPakai(BaseConverterImpl
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
newsubModel.setTglPelayanan(strukResep.getTglResep());
- newsubModel.setPasien(pasienDaftar);
+ newsubModel.setPasienDaftar(pasienDaftar);
newsubModel
.setProduk(produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
JenisObat jenisObat = new JenisObat();
@@ -1857,7 +1855,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
newsubModelDetail.setKeteranganPakai(BaseConverterImpl
.transferVOToModelData(subModel.getKeteranganPakai(), new Stigma()));
newsubModelDetail.setKeteranganPakai2("-");
- newsubModelDetail.setPasien(pasienDaftar);
+ newsubModelDetail.setPasienDaftar(pasienDaftar);
newsubModelDetail.setProduk(
produkConverter.transferVOToModel(subModel.getProduk(), new Produk()));
@@ -1904,7 +1902,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
strukOrder = strukOrderDao.findByNoRec(pelayananPasienDetailVO.getStrukOrder().getNoRec());
detail.setStrukOrder(strukOrder);
Produk produk=produkConverter.transferVOToModel(pelayananPasienDetailVO.getProduk(), new Produk());
- AntrianPasienDiPeriksa pasienDaftar=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasien().getNoRec());
+ AntrianPasienDiPeriksa pasienDaftar=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasienDaftar().getNoRec());
Map map=pelayananPiutangRekananService.getHargaPiutangRekananProfile(pasienDaftar.getPasienDaftar().getNoRegistrasi(),
produk, pelayananPasienDetailVO.getJumlahPembulatan(), 0);
@@ -1939,7 +1937,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
RacikanDetail racikanDetail = new RacikanDetail();
racikanDetail = BaseConverterImpl.transferVOToModelData(racikan, new RacikanDetail());
Produk produk1=produkConverter.transferVOToModel(pelayananPasienDetailVO.getProduk(), new Produk());
- AntrianPasienDiPeriksa pasienDaftar1=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasien().getNoRec());
+ AntrianPasienDiPeriksa pasienDaftar1=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasienDaftar().getNoRec());
Map map2=pelayananPiutangRekananService.getHargaPiutangRekananProfile(pasienDaftar1.getPasienDaftar().getNoRegistrasi(),
produk1, pelayananPasienDetailVO.getJumlahPembulatan(), 0);
@@ -2507,7 +2505,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
PelayananPasien detail = BaseConverterImpl.transferVOToModelData(pelayananPasienDetailVO, new PelayananPasien());
Double totalHarga = 0.0;
- AntrianPasienDiPeriksa pasienDaftar=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasien().getNoRec());
+ AntrianPasienDiPeriksa pasienDaftar=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasienDaftar().getNoRec());
Map map=pelayananPiutangRekananService.getHargaPiutangRekananProfile(pasienDaftar.getNoRec(),
produk, pelayananPasienDetailVO.getJumlahPembulatan(), 0);
@@ -2527,7 +2525,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
RacikanDetail racikanDetail = new RacikanDetail();
racikanDetail = BaseConverterImpl.transferVOToModelData(racikan, new RacikanDetail());
Produk produk1=racikanDetail.getProduk();
- AntrianPasienDiPeriksa pasienDaftar1=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasien().getNoRec());
+ AntrianPasienDiPeriksa pasienDaftar1=antrianPasienDiPeriksaDao.findByNoRec(detail.getPasienDaftar().getNoRec());
Map map2=pelayananPiutangRekananService.getHargaPiutangRekananProfile(pasienDaftar1.getNoRec(),
produk1, pelayananPasienDetailVO.getJumlahPembulatan(), 0);
@@ -2646,7 +2644,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
pelayananPasien.setProduk(abc.getProduk());
pelayananPasien.setProdukId(abc.getProduk().getId());
pelayananPasien.setJumlah(abc.getJumlah());
- pelayananPasien.setPasien(antrian.get(0));
+ pelayananPasien.setPasienDaftar(antrian.get(0));
pelayananPasien.setTglPelayanan(abc.getTglPelayanan());
pelayananPasien.setKeteranganPakai(abc.getKeteranganPakai());
pelayananPasien.setGenerik(abc.getGenerik());
@@ -3158,7 +3156,7 @@ public class PelayananObatServiceImpl extends BaseVoServiceImpl implements Pelay
pelayananPasien.setProduk(abc.getProduk());
pelayananPasien.setProdukId(abc.getProduk().getId());
pelayananPasien.setJumlah(abc.getJumlah());
- pelayananPasien.setPasien(antrian.get(0));
+ pelayananPasien.setPasienDaftar(antrian.get(0));
pelayananPasien.setTglPelayanan(abc.getTglPelayanan());
pelayananPasien.setKeteranganPakai(abc.getKeteranganPakai());
pelayananPasien.setGenerik(abc.getGenerik());
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
index 8dfbf03c..eaf393b5 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPasienServiceImpl.java
@@ -160,7 +160,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
Map result = new HashMap<>();
PelayananPasien model = new PelayananPasien();
model = pelayananPasienConverter.transferVOToModel(vo, model);
- model.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi((short) 0, vo.getPasien().getId(),
+ model.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi((short) 0, vo.getPasien().getId(),
vo.getTglRegistrasi()));
if (CommonUtil.isNotNullOrEmpty(vo.getJenisObat())) {
model.setJenisObat(jenisObatConverter.transferVOToModel(vo.getJenisObat(), new JenisObat()));
@@ -3673,7 +3673,7 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
.collect(Collectors.toList());
List byNorecPelayanan = pelayananPasienDao.findAll(norecPelayanan);
{
- Optional pendaftaran = byNorecPelayanan.stream().map(p -> p.getPasien().getPasienDaftar())
+ Optional pendaftaran = byNorecPelayanan.stream().map(p -> p.getPasienDaftar().getPasienDaftar())
.findFirst();
pendaftaran.ifPresent(p -> {
Integer pasienId = p.getPasien().getId();
@@ -4002,9 +4002,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
throw new ServiceVOException(e.getMessage());
}
{
- AntrianPasienDiPeriksa antrian = originPelayanan.getPasien();
+ AntrianPasienDiPeriksa antrian = originPelayanan.getPasienDaftar();
if (CommonUtil.isNotNullOrEmpty(antrian))
- duplicatePelayanan.setPasien(antrian);
+ duplicatePelayanan.setPasienDaftar(antrian);
}
{
JenisKemasan jenisKemasan = originPelayanan.getJenisKemasan();
@@ -4097,9 +4097,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
throw new ServiceVOException(e.getMessage());
}
{
- AntrianPasienDiPeriksa pasien = origin.getPasien();
+ AntrianPasienDiPeriksa pasien = origin.getPasienDaftar();
if (CommonUtil.isNotNullOrEmpty(pasien))
- duplicate.setPasien(pasien);
+ duplicate.setPasienDaftar(pasien);
}
{
KomponenHarga komponenHarga = origin.getKomponenHarga();
@@ -4201,9 +4201,9 @@ public class PelayananPasienServiceImpl extends BaseVoServiceImpl implements Pel
throw new ServiceVOException(e.getMessage());
}
{
- AntrianPasienDiPeriksa antrian = origin.getPasien();
+ AntrianPasienDiPeriksa antrian = origin.getPasienDaftar();
if (CommonUtil.isNotNullOrEmpty(antrian))
- duplicate.setPasien(antrian);
+ duplicate.setPasienDaftar(antrian);
}
{
JenisKemasan jenisKemasan = origin.getJenisKemasan();
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPiutangRekananServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPiutangRekananServiceImpl.java
index e0b94561..2d5f9e57 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPiutangRekananServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananPiutangRekananServiceImpl.java
@@ -1,46 +1,17 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
+import com.jasamedika.medifirst2000.dao.*;
+import com.jasamedika.medifirst2000.dto.HargaNettoProdukByTerimaTemp;
+import com.jasamedika.medifirst2000.dto.PiutangRekananProfileTemp;
+import com.jasamedika.medifirst2000.entities.*;
+import com.jasamedika.medifirst2000.service.PelayananHargaStokDiskonService;
+import com.jasamedika.medifirst2000.service.PelayananPiutangRekananService;
+import com.jasamedika.medifirst2000.util.CommonUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
-import com.jasamedika.medifirst2000.dao.HargaNettoProdukByKelasDao;
-import com.jasamedika.medifirst2000.dao.HargaPaketPenjaminDao;
-import com.jasamedika.medifirst2000.dao.HargaPaketPenjaminLuarPaketDao;
-import com.jasamedika.medifirst2000.dao.MapRuanganToProdukDao;
-import com.jasamedika.medifirst2000.dao.PersenTanggunganPenjaminDao;
-import com.jasamedika.medifirst2000.dao.ProdukTidakDiTanggungDao;
-import com.jasamedika.medifirst2000.dao.RuanganDao;
-import com.jasamedika.medifirst2000.dto.HargaNettoProdukByTerimaTemp;
-import com.jasamedika.medifirst2000.dto.PiutangRekananProfileTemp;
-import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.AsalProduk;
-import com.jasamedika.medifirst2000.entities.GolonganAsuransi;
-import com.jasamedika.medifirst2000.entities.HargaNettoProdukByKelas;
-import com.jasamedika.medifirst2000.entities.HargaPaketPenjamin;
-import com.jasamedika.medifirst2000.entities.HargaPaketPenjaminLuarPaket;
-import com.jasamedika.medifirst2000.entities.HubunganKeluarga;
-import com.jasamedika.medifirst2000.entities.JenisTarif;
-import com.jasamedika.medifirst2000.entities.Kelas;
-import com.jasamedika.medifirst2000.entities.KelompokPasien;
-import com.jasamedika.medifirst2000.entities.KomponenHarga;
-import com.jasamedika.medifirst2000.entities.Paket;
-import com.jasamedika.medifirst2000.entities.PersenTanggunganPenjamin;
-import com.jasamedika.medifirst2000.entities.Produk;
-import com.jasamedika.medifirst2000.entities.ProdukTidakDiTanggung;
-import com.jasamedika.medifirst2000.entities.Rekanan;
-import com.jasamedika.medifirst2000.entities.Ruangan;
-import com.jasamedika.medifirst2000.service.PelayananHargaStokDiskonService;
-import com.jasamedika.medifirst2000.service.PelayananPiutangRekananService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
+import java.util.*;
@Service("PelayananPiutangRekananService")
public class PelayananPiutangRekananServiceImpl implements PelayananPiutangRekananService {
@@ -236,7 +207,7 @@ public class PelayananPiutangRekananServiceImpl implements PelayananPiutangRekan
maxTPenjamin = String.valueOf(hargaPaketPenjaminLuarPaket.getMaxTPenjamin());
persenTPenjaminSelisih = String.valueOf(hargaPaketPenjaminLuarPaket.getPersenTPenjamindrSelisih());
persenTProfileSelisih = String.valueOf(hargaPaketPenjaminLuarPaket.getPersenTProfiledrSelisih());
- qtyMaxKunjungan = String.valueOf(hargaPaketPenjaminLuarPaket.getqtyMaxProduk());
+ qtyMaxKunjungan = String.valueOf(hargaPaketPenjaminLuarPaket.getQtyMaxProduk());
}
}
if (listHargaPaketPenjamin != null) {
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananTpnServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananTpnServiceImpl.java
index 495f5e09..213bbb4d 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananTpnServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PelayananTpnServiceImpl.java
@@ -12,30 +12,19 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.jasamedika.medifirst2000.converter.PelayananTpnConverter;
-import com.jasamedika.medifirst2000.converter.PapRiwayatPenyakitPengobatanConverter;
import com.jasamedika.medifirst2000.converter.PelayananProduksiConverter;
import com.jasamedika.medifirst2000.dao.PelayananTpnDao;
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
-import com.jasamedika.medifirst2000.dao.PasienDao;
import com.jasamedika.medifirst2000.dao.PelayananProduksiDao;
-import com.jasamedika.medifirst2000.dao.RegistrasiPelayananPasienDao;
import com.jasamedika.medifirst2000.dao.RunningNumberDao;
-import com.jasamedika.medifirst2000.entities.PapKeluhanTambahan;
-import com.jasamedika.medifirst2000.entities.PapLaboratorium;
-import com.jasamedika.medifirst2000.entities.PapRiwayatPenyakitPengobatan;
import com.jasamedika.medifirst2000.entities.PelayananTpn;
-import com.jasamedika.medifirst2000.entities.Pasien;
import com.jasamedika.medifirst2000.entities.PelayananProduksi;
-import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien;
import com.jasamedika.medifirst2000.entities.RunningNumber;
import com.jasamedika.medifirst2000.exception.ServiceVOException;
import com.jasamedika.medifirst2000.service.PelayananTpnService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.util.StringUtil;
-import com.jasamedika.medifirst2000.vo.PapKeluhanTambahanVO;
-import com.jasamedika.medifirst2000.vo.PapLaboratoriumVO;
-import com.jasamedika.medifirst2000.vo.PapRiwayatPenyakitPengobatanVO;
import com.jasamedika.medifirst2000.vo.PelayananProduksiVO;
import com.jasamedika.medifirst2000.vo.PelayananTpnVO;
@@ -78,7 +67,7 @@ public class PelayananTpnServiceImpl implements PelayananTpnService {
String noProduksi = StringUtil.formatNumber(number.toString(), 10);
model.setNoProduksi(noProduksi);
- model.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(), vo.getTglRegistrasi()));
+ model.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(), vo.getTglRegistrasi()));
model.getPelayananTpnSet().clear();
PelayananProduksi resultModel=pelayananProduksiDao.save(model);
List detail=new ArrayList();
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemeriksaanUmumServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemeriksaanUmumServiceImpl.java
index 36ebb5ee..1469ebdd 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemeriksaanUmumServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemeriksaanUmumServiceImpl.java
@@ -18,7 +18,6 @@ import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
import com.jasamedika.medifirst2000.vo.PemeriksaanUmumVO;
import com.jasamedika.medifirst2000.vo.PegawaiVO;
-import com.jasamedika.medifirst2000.vo.PemeriksaanUmumVO;
import com.jasamedika.medifirst2000.vo.RuanganVO;
@Service("PemeriksaanUmumService")
@@ -55,7 +54,7 @@ public class PemeriksaanUmumServiceImpl extends BaseVoServiceImpl implements Pem
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar()))
{
- pemeriksaanUmum.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ pemeriksaanUmum.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
if(CommonUtil.isNotNullOrEmpty(pemeriksaanUmum))
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemindahanEmbrioServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemindahanEmbrioServiceImpl.java
index 55f79d3d..46a9a101 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemindahanEmbrioServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PemindahanEmbrioServiceImpl.java
@@ -84,7 +84,7 @@ public class PemindahanEmbrioServiceImpl implements PemindahanEmbrioService {
public Map savePemindahanEmbrio(PemindahanEmbrioVO vo) {
Map result = new HashMap();
PemindahanEmbrio model = pemindahanEmbrioConverter.transferVOToModel(vo, new PemindahanEmbrio());
- model.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
+ model.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
PemindahanEmbrio resultModel = pemindahanEmbrioDao.save(model);
if(CommonUtil.isNotNullOrEmpty(resultModel))
{
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengambilanOvumServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengambilanOvumServiceImpl.java
index 16e2bdec..4317c25d 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengambilanOvumServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengambilanOvumServiceImpl.java
@@ -12,7 +12,6 @@ import com.jasamedika.medifirst2000.entities.PengambilanOvum;
import com.jasamedika.medifirst2000.exception.ServiceVOException;
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
import com.jasamedika.medifirst2000.dao.PengambilanOvumDao;
-import com.jasamedika.medifirst2000.service.BaseVoService;
import com.jasamedika.medifirst2000.service.PasienDaftarService;
import com.jasamedika.medifirst2000.vo.PengambilanOvumVO;
import com.jasamedika.medifirst2000.converter.PengambilanOvumConverter;
@@ -84,7 +83,7 @@ public class PengambilanOvumServiceImpl implements PengambilanOvumService {
public Map savePengambilanOvum(PengambilanOvumVO vo) {
Map result=new HashMap();
PengambilanOvum model = pengambilanOvumConverter.transferVOToModel(vo, new PengambilanOvum());
- model.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
+ model.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
PengambilanOvum resultModel = pengambilanOvumDao.save(model);
if(CommonUtil.isNotNullOrEmpty(resultModel)){
result.put("id", resultModel.getNoRec());
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianAwalPsikologiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianAwalPsikologiServiceImpl.java
index b5deb504..735911db 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianAwalPsikologiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PengkajianAwalPsikologiServiceImpl.java
@@ -1,64 +1,23 @@
package com.jasamedika.medifirst2000.service.impl;
+import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
+import com.jasamedika.medifirst2000.converter.PendidikanConverter;
+import com.jasamedika.medifirst2000.dao.*;
+import com.jasamedika.medifirst2000.entities.*;
+import com.jasamedika.medifirst2000.exception.ServiceVOException;
+import com.jasamedika.medifirst2000.service.PasienDaftarService;
+import com.jasamedika.medifirst2000.service.PengkajianAwalPsikologiService;
+import com.jasamedika.medifirst2000.util.CommonUtil;
+import com.jasamedika.medifirst2000.vo.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.jpa.JpaSystemException;
+import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.stereotype.Service;
-
-import com.jasamedika.medifirst2000.converter.AlatTerpasangDetailConverter;
-import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
-import com.jasamedika.medifirst2000.converter.PendidikanConverter;
-import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
-import com.jasamedika.medifirst2000.dao.AsesmenPsikologisDao;
-import com.jasamedika.medifirst2000.dao.KesanPsikologis_DiagnosisDao;
-import com.jasamedika.medifirst2000.dao.PengalamanOrganisasiDao;
-import com.jasamedika.medifirst2000.dao.PengkajianAwalPsikologiDao;
-import com.jasamedika.medifirst2000.dao.ProfilSensoriDao;
-import com.jasamedika.medifirst2000.dao.RiwayatPendidikanFormalDao;
-import com.jasamedika.medifirst2000.dao.RiwayatPendidikanNonFormalDao;
-import com.jasamedika.medifirst2000.dao.RiwayatPerkembanganDao;
-import com.jasamedika.medifirst2000.dao.TesPsikologiDao;
-import com.jasamedika.medifirst2000.entities.AlatTerpasangDetail;
-import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.AsesmenPsikologis;
-import com.jasamedika.medifirst2000.entities.AsesmenPsikologisDetail;
-import com.jasamedika.medifirst2000.entities.CheckIn;
-import com.jasamedika.medifirst2000.entities.KesanPsikologis_Diagnosis;
-import com.jasamedika.medifirst2000.entities.KesanPsikologis_DiagnosisDetail;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
-import com.jasamedika.medifirst2000.entities.Pendidikan;
-import com.jasamedika.medifirst2000.entities.PengalamanOrganisasi;
-import com.jasamedika.medifirst2000.entities.PengkajianAwalPsikologi;
-import com.jasamedika.medifirst2000.entities.PengobatanKhususDetail;
-import com.jasamedika.medifirst2000.entities.ProfilSensori;
-import com.jasamedika.medifirst2000.entities.RiwayatPendidikanFormal;
-import com.jasamedika.medifirst2000.entities.RiwayatPendidikanNonFormal;
-import com.jasamedika.medifirst2000.entities.RiwayatPerkembangan;
-import com.jasamedika.medifirst2000.entities.RiwayatPerkembanganDetail;
-import com.jasamedika.medifirst2000.entities.SistemProfilSensori;
-import com.jasamedika.medifirst2000.entities.TesPsikologi;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.PasienDaftarService;
-import com.jasamedika.medifirst2000.service.PengkajianAwalPsikologiService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.vo.AsesmenPsikologisDetailVO;
-import com.jasamedika.medifirst2000.vo.AsesmenPsikologisVO;
-import com.jasamedika.medifirst2000.vo.KesanPsikologis_DiagnosisDetailVO;
-import com.jasamedika.medifirst2000.vo.KesanPsikologis_DiagnosisVO;
-import com.jasamedika.medifirst2000.vo.PengalamanOrganisasiVO;
-import com.jasamedika.medifirst2000.vo.PengkajianAwalPsikologiVO;
-import com.jasamedika.medifirst2000.vo.ProfilSensoriVO;
-import com.jasamedika.medifirst2000.vo.RiwayatPendidikanFormalVO;
-import com.jasamedika.medifirst2000.vo.RiwayatPendidikanNonFormalVO;
-import com.jasamedika.medifirst2000.vo.RiwayatPerkembanganDetailVO;
-import com.jasamedika.medifirst2000.vo.RiwayatPerkembanganVO;
-import com.jasamedika.medifirst2000.vo.SistemProfilSensoriVO;
-import com.jasamedika.medifirst2000.vo.TesPsikologiVO;
-
@Service("pengkajianAwalPsikologiService")
public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikologiService {
@@ -70,28 +29,28 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
@Autowired
private PengkajianAwalPsikologiDao pengkajianAwalPsikologiDao;
-
+
@Autowired
private RiwayatPerkembanganDao riwayatPerkembanganDao;
-
+
@Autowired
private PengalamanOrganisasiDao pengalamanOrganisasiDao;
-
+
@Autowired
private RiwayatPendidikanFormalDao riwayatPendidikanFormalDao;
-
+
@Autowired
private RiwayatPendidikanNonFormalDao riwayatPendidikanNonFormalDao;
-
+
@Autowired
private AsesmenPsikologisDao asesmenPsikologisDao;
-
+
@Autowired
private ProfilSensoriDao profilSensoriDao;
-
+
@Autowired
private KesanPsikologis_DiagnosisDao kesanPsikologis_DiagnosisDao;
-
+
@Autowired
private TesPsikologiDao tesPsikologiDao;
@@ -109,28 +68,28 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
@Autowired
private BaseConverterImpl riwayatPerkembanganDetailConverter;
-
+
@Autowired
private BaseConverterImpl asesmenPsikologisConverter;
-
+
@Autowired
private BaseConverterImpl profilSensoriConverter;
-
+
@Autowired
private BaseConverterImpl sistemProfilSensoriConverter;
@Autowired
private BaseConverterImpl asesmenPsikologisDetailConverter;
-
+
@Autowired
- private BaseConverterImpl kesanPsikologis_DiagnosisConverter;
-
+ private BaseConverterImpl kesanPsikologis_DiagnosisConverter;
+
@Autowired
- private BaseConverterImpl kesanPsikologis_DiagnosisDetailConverter;
-
+ private BaseConverterImpl kesanPsikologis_DiagnosisDetailConverter;
+
@Autowired
private BaseConverterImpl tesPsikologiConverter;
-
+
@Autowired
private PasienDaftarService pasienDaftarService;
@@ -165,12 +124,15 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
String sort, String dir) {
return null;
}
+
@Autowired
private AntrianPasienDiPeriksaDao antrianPasienDiPeriksaDao;
+
@Override
public Map addPengkajianAwal(PengkajianAwalPsikologiVO vo) {
Map result = new HashMap();
- PengkajianAwalPsikologi model = pengkajianAwalPsikologiConverter.transferVOToModel(vo,new PengkajianAwalPsikologi());
+ PengkajianAwalPsikologi model = pengkajianAwalPsikologiConverter.transferVOToModel(vo,
+ new PengkajianAwalPsikologi());
AntrianPasienDiPeriksa pasien = antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(),
vo.getTglRegistrasi());
List listRiwayatPerkembangan = new ArrayList();
@@ -178,9 +140,9 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
List listPengalamanOrganisasi = new ArrayList();
List listRiwayatPendidikanNonFormal = new ArrayList();
List listAsesmenPsikologis = new ArrayList();
- List listProfilSensori= new ArrayList();
- List listKesanPsikologis_Diagnosis= new ArrayList();
- List listTesPsikologi= new ArrayList();
+ List listProfilSensori = new ArrayList();
+ List listKesanPsikologisDiagnosis = new ArrayList();
+ List listTesPsikologi = new ArrayList();
for (RiwayatPerkembanganVO riwayat : vo.getRiwayatPerkembangan()) {
RiwayatPerkembangan riwayatPerkembangan = riwayatPerkembanganConverter.transferVOToModel(riwayat,
@@ -213,31 +175,34 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
pengalamanOrganisasi.setPengkajianAwalPsikologi(model);
listPengalamanOrganisasi.add(pengalamanOrganisasi);
}
-
+
for (AsesmenPsikologisVO asesmen : vo.getAsesmenPsikologis()) {
- AsesmenPsikologis asesmenPsikologis = asesmenPsikologisConverter.transferVOToModel(asesmen,new AsesmenPsikologis());
- asesmenPsikologis.setAsesmenPsikologisDetail(asesmenPsikologisDetailConverter.transferVOToModel(asesmen.getAsesmenPsikologisDetail(), new AsesmenPsikologisDetail()));
+ AsesmenPsikologis asesmenPsikologis = asesmenPsikologisConverter.transferVOToModel(asesmen,
+ new AsesmenPsikologis());
+ asesmenPsikologis.setAsesmenPsikologisDetail(asesmenPsikologisDetailConverter
+ .transferVOToModel(asesmen.getAsesmenPsikologisDetail(), new AsesmenPsikologisDetail()));
asesmenPsikologis.setPengkajianAwalPsikologi(model);
listAsesmenPsikologis.add(asesmenPsikologis);
}
-
+
for (ProfilSensoriVO profil : vo.getProfilSensori()) {
- ProfilSensori profilSensori = profilSensoriConverter.transferVOToModel(profil,new ProfilSensori());
- profilSensori.setSistemProfilSensori(sistemProfilSensoriConverter.transferVOToModel(profil.getSistemProfilSensori(), new SistemProfilSensori()));
+ ProfilSensori profilSensori = profilSensoriConverter.transferVOToModel(profil, new ProfilSensori());
+ profilSensori.setSistemProfilSensori(sistemProfilSensoriConverter
+ .transferVOToModel(profil.getSistemProfilSensori(), new SistemProfilSensori()));
profilSensori.setPengkajianAwalPsikologi(model);
listProfilSensori.add(profilSensori);
}
-
- for(KesanPsikologis_DiagnosisVO psikologis : vo.getKesanPsikologis())
- {
- KesanPsikologis_Diagnosis kesanPsikologis = kesanPsikologis_DiagnosisConverter.transferVOToModel(psikologis, new KesanPsikologis_Diagnosis());
- kesanPsikologis.setKesanPsikologis(kesanPsikologis_DiagnosisDetailConverter.transferVOToModel(psikologis.getKesanPsikologis(), new KesanPsikologis_DiagnosisDetail()));
+
+ for (KesanPsikologis_DiagnosisVO psikologis : vo.getKesanPsikologis()) {
+ KesanPsikologisDiagnosis kesanPsikologis = kesanPsikologis_DiagnosisConverter.transferVOToModel(psikologis,
+ new KesanPsikologisDiagnosis());
+ kesanPsikologis.setKesanPsikologis(kesanPsikologis_DiagnosisDetailConverter
+ .transferVOToModel(psikologis.getKesanPsikologis(), new KesanPsikologisDiagnosisDetail()));
kesanPsikologis.setPengkajianAwalPsikologi(model);
- listKesanPsikologis_Diagnosis.add(kesanPsikologis);
+ listKesanPsikologisDiagnosis.add(kesanPsikologis);
}
-
- for(TesPsikologiVO tes : vo.getTesPsikologi())
- {
+
+ for (TesPsikologiVO tes : vo.getTesPsikologi()) {
TesPsikologi tesPsikologi = tesPsikologiConverter.transferVOToModel(tes, new TesPsikologi());
tesPsikologi.setPengkajianAwalPsikologi(model);
listTesPsikologi.add(tesPsikologi);
@@ -274,15 +239,15 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
if (CommonUtil.isNotNullOrEmpty(model.getTesPsikologi())) {
model.getTesPsikologi().clear();
- }
- model.setPasien(pasien);
+ }
+ model.setPasienDaftar(pasien);
model.getRiwayatPerkembangan().addAll(listRiwayatPerkembangan);
model.getRiwayatPendidikanFormal().addAll(listRiwayatPendidikanFormal);
model.getRiwayatPendidikanNonFormal().addAll(listRiwayatPendidikanNonFormal);
model.getPengalamanOrganisasi().addAll(listPengalamanOrganisasi);
model.getAsesmenPsikologis().addAll(listAsesmenPsikologis);
model.getProfilSensori().addAll(listProfilSensori);
- model.getKesanPsikologis().addAll(listKesanPsikologis_Diagnosis);
+ model.getKesanPsikologis().addAll(listKesanPsikologisDiagnosis);
model.getTesPsikologi().addAll(listTesPsikologi);
PengkajianAwalPsikologi resultModel = pengkajianAwalPsikologiDao.save(model);
if (CommonUtil.isNotNullOrEmpty(resultModel)) {
@@ -290,21 +255,24 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
}
return result;
}
-
-
+
@Override
public Map updatePengkajianAwal(PengkajianAwalPsikologiVO vo) {
Map result = new HashMap();
- PengkajianAwalPsikologi pengkajianAwalPsikologi = pengkajianAwalPsikologiConverter.transferVOToModel(vo, new PengkajianAwalPsikologi());
- List modelRiwayatPerkembangan =riwayatPerkembanganDao.findByNoRec(vo.getNoRec());
- List modelRiwayatPendidikanFormal = riwayatPendidikanFormalDao.findByNoRec(vo.getNoRec());
+ PengkajianAwalPsikologi pengkajianAwalPsikologi = pengkajianAwalPsikologiConverter.transferVOToModel(vo,
+ new PengkajianAwalPsikologi());
+ List modelRiwayatPerkembangan = riwayatPerkembanganDao.findByNoRec(vo.getNoRec());
+ List modelRiwayatPendidikanFormal = riwayatPendidikanFormalDao
+ .findByNoRec(vo.getNoRec());
List modelPengalamanOrganisasi = pengalamanOrganisasiDao.findByNoRec(vo.getNoRec());
- List modelRiwayatPendidikanNonFormal = riwayatPendidikanNonFormalDao.findByNoRec(vo.getNoRec());
+ List modelRiwayatPendidikanNonFormal = riwayatPendidikanNonFormalDao
+ .findByNoRec(vo.getNoRec());
List modelAsesmenPsikologis = asesmenPsikologisDao.findByNoRec(vo.getNoRec());
List modelProfilSensori = profilSensoriDao.findByNoRec(vo.getNoRec());
- List modelKesanPsikologis_Diagnosis = kesanPsikologis_DiagnosisDao.findByNoRec(vo.getNoRec());
+ List modelKesanPsikologis_Diagnosis = kesanPsikologis_DiagnosisDao
+ .findByNoRec(vo.getNoRec());
List modelTesPsikologi = tesPsikologiDao.findByNoRec(vo.getNoRec());
-
+
if (CommonUtil.isNotNullOrEmpty(modelRiwayatPerkembangan)) {
riwayatPerkembanganDao.delete(modelRiwayatPerkembangan);
}
@@ -312,15 +280,15 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
if (CommonUtil.isNotNullOrEmpty(modelRiwayatPendidikanFormal)) {
riwayatPendidikanFormalDao.delete(modelRiwayatPendidikanFormal);
}
-
+
if (CommonUtil.isNotNullOrEmpty(modelPengalamanOrganisasi)) {
pengalamanOrganisasiDao.delete(modelPengalamanOrganisasi);
}
-
+
if (CommonUtil.isNotNullOrEmpty(modelRiwayatPendidikanNonFormal)) {
riwayatPendidikanNonFormalDao.delete(modelRiwayatPendidikanNonFormal);
- }
-
+ }
+
if (CommonUtil.isNotNullOrEmpty(modelAsesmenPsikologis)) {
asesmenPsikologisDao.delete(modelAsesmenPsikologis);
}
@@ -328,15 +296,15 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
if (CommonUtil.isNotNullOrEmpty(modelProfilSensori)) {
profilSensoriDao.delete(modelProfilSensori);
}
-
+
if (CommonUtil.isNotNullOrEmpty(modelKesanPsikologis_Diagnosis)) {
kesanPsikologis_DiagnosisDao.delete(modelKesanPsikologis_Diagnosis);
}
-
+
if (CommonUtil.isNotNullOrEmpty(modelTesPsikologi)) {
tesPsikologiDao.delete(modelTesPsikologi);
- }
-
+ }
+
AntrianPasienDiPeriksa pasien = antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(),
vo.getTglRegistrasi());
List listRiwayatPerkembangan = new ArrayList();
@@ -344,9 +312,9 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
List listPengalamanOrganisasi = new ArrayList();
List listRiwayatPendidikanNonFormal = new ArrayList();
List listAsesmenPsikologis = new ArrayList();
- List listProfilSensori= new ArrayList();
- List listKesanPsikologis_Diagnosis= new ArrayList();
- List listTesPsikologi= new ArrayList();
+ List listProfilSensori = new ArrayList();
+ List listKesanPsikologis_Diagnosis = new ArrayList();
+ List listTesPsikologi = new ArrayList();
for (RiwayatPerkembanganVO riwayat : vo.getRiwayatPerkembangan()) {
RiwayatPerkembangan riwayatPerkembangan = riwayatPerkembanganConverter.transferVOToModel(riwayat,
@@ -379,31 +347,34 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
pengalamanOrganisasi.setPengkajianAwalPsikologi(pengkajianAwalPsikologi);
listPengalamanOrganisasi.add(pengalamanOrganisasi);
}
-
+
for (AsesmenPsikologisVO asesmen : vo.getAsesmenPsikologis()) {
- AsesmenPsikologis asesmenPsikologis = asesmenPsikologisConverter.transferVOToModel(asesmen,new AsesmenPsikologis());
- asesmenPsikologis.setAsesmenPsikologisDetail(asesmenPsikologisDetailConverter.transferVOToModel(asesmen.getAsesmenPsikologisDetail(), new AsesmenPsikologisDetail()));
+ AsesmenPsikologis asesmenPsikologis = asesmenPsikologisConverter.transferVOToModel(asesmen,
+ new AsesmenPsikologis());
+ asesmenPsikologis.setAsesmenPsikologisDetail(asesmenPsikologisDetailConverter
+ .transferVOToModel(asesmen.getAsesmenPsikologisDetail(), new AsesmenPsikologisDetail()));
asesmenPsikologis.setPengkajianAwalPsikologi(pengkajianAwalPsikologi);
listAsesmenPsikologis.add(asesmenPsikologis);
}
-
+
for (ProfilSensoriVO profil : vo.getProfilSensori()) {
- ProfilSensori profilSensori = profilSensoriConverter.transferVOToModel(profil,new ProfilSensori());
- profilSensori.setSistemProfilSensori(sistemProfilSensoriConverter.transferVOToModel(profil.getSistemProfilSensori(), new SistemProfilSensori()));
+ ProfilSensori profilSensori = profilSensoriConverter.transferVOToModel(profil, new ProfilSensori());
+ profilSensori.setSistemProfilSensori(sistemProfilSensoriConverter
+ .transferVOToModel(profil.getSistemProfilSensori(), new SistemProfilSensori()));
profilSensori.setPengkajianAwalPsikologi(pengkajianAwalPsikologi);
listProfilSensori.add(profilSensori);
}
-
- for(KesanPsikologis_DiagnosisVO psikologis : vo.getKesanPsikologis())
- {
- KesanPsikologis_Diagnosis kesanPsikologis = kesanPsikologis_DiagnosisConverter.transferVOToModel(psikologis, new KesanPsikologis_Diagnosis());
- kesanPsikologis.setKesanPsikologis(kesanPsikologis_DiagnosisDetailConverter.transferVOToModel(psikologis.getKesanPsikologis(), new KesanPsikologis_DiagnosisDetail()));
+
+ for (KesanPsikologis_DiagnosisVO psikologis : vo.getKesanPsikologis()) {
+ KesanPsikologisDiagnosis kesanPsikologis = kesanPsikologis_DiagnosisConverter.transferVOToModel(psikologis,
+ new KesanPsikologisDiagnosis());
+ kesanPsikologis.setKesanPsikologis(kesanPsikologis_DiagnosisDetailConverter
+ .transferVOToModel(psikologis.getKesanPsikologis(), new KesanPsikologisDiagnosisDetail()));
kesanPsikologis.setPengkajianAwalPsikologi(pengkajianAwalPsikologi);
listKesanPsikologis_Diagnosis.add(kesanPsikologis);
}
-
- for(TesPsikologiVO tes : vo.getTesPsikologi())
- {
+
+ for (TesPsikologiVO tes : vo.getTesPsikologi()) {
TesPsikologi tesPsikologi = tesPsikologiConverter.transferVOToModel(tes, new TesPsikologi());
tesPsikologi.setPengkajianAwalPsikologi(pengkajianAwalPsikologi);
listTesPsikologi.add(tesPsikologi);
@@ -440,8 +411,8 @@ public class PengkajianAwalPsikologiServiceImpl implements PengkajianAwalPsikolo
if (CommonUtil.isNotNullOrEmpty(pengkajianAwalPsikologi.getTesPsikologi())) {
pengkajianAwalPsikologi.getTesPsikologi().clear();
- }
- pengkajianAwalPsikologi.setPasien(pasien);
+ }
+ pengkajianAwalPsikologi.setPasienDaftar(pasien);
pengkajianAwalPsikologi.getRiwayatPerkembangan().addAll(listRiwayatPerkembangan);
pengkajianAwalPsikologi.getRiwayatPendidikanFormal().addAll(listRiwayatPendidikanFormal);
pengkajianAwalPsikologi.getRiwayatPendidikanNonFormal().addAll(listRiwayatPendidikanNonFormal);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java
index b7ec02c0..c496815e 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PermohonanStatusPegawaiImpl.java
@@ -5,6 +5,7 @@ import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.*;
import com.jasamedika.medifirst2000.dao.custom.PlanningPegawaiStatusDaoCustom;
import com.jasamedika.medifirst2000.dto.DataCutiDto;
+import com.jasamedika.medifirst2000.dto.MonitoringJatahCutiDto;
import com.jasamedika.medifirst2000.entities.*;
import com.jasamedika.medifirst2000.exception.ServiceVOException;
import com.jasamedika.medifirst2000.service.JatahCutiDanIzinService;
@@ -2160,6 +2161,11 @@ public class PermohonanStatusPegawaiImpl implements PermohonanStatusPegawaiServi
return jatahCutiDanIzinDao.getAllJatahCuti(Integer.valueOf(komponen));
}
+ @Override
+ public List findByPegawai(Integer idPegawai) {
+ return jatahCutiDanIzinDao.findByPegawaiId(idPegawai);
+ }
+
@Override
public List> getAllDataCuti(Integer idPegawai) {
LocalDateTime now = LocalDateTime.now();
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PersetujuanUmumServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PersetujuanUmumServiceImpl.java
index 5b7d8ca1..054af1ef 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PersetujuanUmumServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PersetujuanUmumServiceImpl.java
@@ -20,9 +20,7 @@ import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
import com.jasamedika.medifirst2000.entities.Kelas;
import com.jasamedika.medifirst2000.entities.KelompokPasien;
import com.jasamedika.medifirst2000.entities.OrderPelayananDiet;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
import com.jasamedika.medifirst2000.entities.PersetujuanUmum;
-import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien;
import com.jasamedika.medifirst2000.entities.Ruangan;
import com.jasamedika.medifirst2000.service.PersetujuanUmumService;
import com.jasamedika.medifirst2000.util.CommonUtil;
@@ -79,7 +77,7 @@ public class PersetujuanUmumServiceImpl extends BaseVoServiceImpl implements Per
if (CommonUtil.isNotNullOrEmpty(list)){
listPasien = list.get(0);
}
- model.setPasien(listPasien);
+ model.setPasienDaftar(listPasien);
//Shakato 05082016
if (CommonUtil.isNotNullOrEmpty(vo.getRuanganTujuan())) {
model.setRuanganTujuan(ruanganConverter.transferVOToModel(vo.getRuanganTujuan(), new Ruangan()));
@@ -87,7 +85,7 @@ public class PersetujuanUmumServiceImpl extends BaseVoServiceImpl implements Per
else
{
- model.setRuanganTujuan(model.getPasien().getRuangan());
+ model.setRuanganTujuan(model.getPasienDaftar().getRuangan());
if(model.getRuanganTujuan()==null)
{
model.setRuanganTujuan( ruanganDao.findById(Integer.parseInt(GetSettingDataFixed("KdRuanganLaboratorium"))));
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PraAnestesiDokterServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PraAnestesiDokterServiceImpl.java
index 9b1596c0..8d2db623 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PraAnestesiDokterServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PraAnestesiDokterServiceImpl.java
@@ -10,11 +10,9 @@ import org.springframework.stereotype.Service;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
-import com.jasamedika.medifirst2000.dao.KajianSistemDao;
import com.jasamedika.medifirst2000.dao.PraAnestesiDokterDao;
import com.jasamedika.medifirst2000.entities.KajianSistem;
import com.jasamedika.medifirst2000.entities.PraAnestesiDokter;
-import com.jasamedika.medifirst2000.entities.StatusYaTidak;
import com.jasamedika.medifirst2000.exception.ServiceVOException;
import com.jasamedika.medifirst2000.service.KajianSistemService;
import com.jasamedika.medifirst2000.service.PasienDaftarService;
@@ -22,7 +20,6 @@ import com.jasamedika.medifirst2000.service.PraAnestesiDokterService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.KajianSistemVO;
import com.jasamedika.medifirst2000.vo.PraAnestesiDokterVO;
-import com.jasamedika.medifirst2000.vo.StatusYaTidakVO;
@Service("praAnestesiDokterService")
public class PraAnestesiDokterServiceImpl implements PraAnestesiDokterService{
@@ -89,11 +86,11 @@ public class PraAnestesiDokterServiceImpl implements PraAnestesiDokterService{
PraAnestesiDokter praAnestesiDokter = praAnestesiDokterConverter.transferVOToModel(vo, new PraAnestesiDokter());
if(CommonUtil.isNotNullOrEmpty(praAnestesiDokter))
{
- praAnestesiDokter.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
+ praAnestesiDokter.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
PraAnestesiDokter resultModel = praAnestesiDokterDao.save(praAnestesiDokter);
if(CommonUtil.isNotNullOrEmpty(resultModel)){
result.put("id", resultModel.getNoRec());
- result.put("Nama Pasien", resultModel.getPasien().getPasienDaftar().getPasien().getNamaPasien());
+ result.put("Nama Pasien", resultModel.getPasienDaftar().getPasienDaftar().getPasien().getNamaPasien());
}
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PraAnestesiPasienServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PraAnestesiPasienServiceImpl.java
index 1244b97c..0ca479b6 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PraAnestesiPasienServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/PraAnestesiPasienServiceImpl.java
@@ -14,7 +14,6 @@ import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
import com.jasamedika.medifirst2000.dao.PraAnestesiPasienDao;
import com.jasamedika.medifirst2000.dao.PraAnestesiPasienDetailDao;
import com.jasamedika.medifirst2000.entities.KategoriPraAnestesi;
-import com.jasamedika.medifirst2000.entities.PenyulitAnestesi;
import com.jasamedika.medifirst2000.entities.PraAnestesiPasien;
import com.jasamedika.medifirst2000.entities.PraAnestesiPasienDetail;
import com.jasamedika.medifirst2000.entities.StatusYaTidak;
@@ -100,7 +99,7 @@ public class PraAnestesiPasienServiceImpl implements PraAnestesiPasienService{
praAnestesiPasien.getPraAnestesiPasienDetail().clear();
}
- praAnestesiPasien.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
+ praAnestesiPasien.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
praAnestesiPasien.getPraAnestesiPasienDetail().addAll(listPraAnestesiPasienDetail);
praAnestesiPasien.setRiwayatPembedahan(statusYaTidakConverter.transferVOToModel(vo.getRiwayatPembedahan(), new StatusYaTidak()));
PraAnestesiPasien resultModel = praAnestesiPasienDao.save(praAnestesiPasien);
@@ -134,7 +133,7 @@ public class PraAnestesiPasienServiceImpl implements PraAnestesiPasienService{
praAnestesiPasien.getPraAnestesiPasienDetail().clear();
}
- praAnestesiPasien.setPasien(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
+ praAnestesiPasien.setPasienDaftar(antrianPasienDiPeriksaDao.findbyNoCmAndTglRegistrasi(vo.getPasien().getId(), vo.getTglRegistrasi()));
praAnestesiPasien.setRiwayatPembedahan(statusYaTidakConverter.transferVOToModel(vo.getRiwayatPembedahan(), new StatusYaTidak()));
praAnestesiPasien.getPraAnestesiPasienDetail().addAll(listPraAnestesiPasienDetail);
PraAnestesiPasien resultModel = praAnestesiPasienDao.save(praAnestesiPasien);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukServiceImpl.java
index 1c94147e..6e3e3238 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ProdukServiceImpl.java
@@ -409,7 +409,7 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS
newsubModel.setNilaiNormal((byte) 1);
// newsubModel.setKeteranganPakai();
newsubModel.setKeteranganPakai2("-");
- newsubModel.setPasien(pasienDaftar);
+ newsubModel.setPasienDaftar(pasienDaftar);
newsubModel.setProduk(produk);
newsubModel.setStock(1.0);
newsubModel.setJumlah(1.0);
@@ -441,7 +441,7 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS
//
newsubModelDetail.setTglPelayanan(d1);
newsubModelDetail.setJumlah(1.0);
- newsubModelDetail.setPasien(pasienDaftar);
+ newsubModelDetail.setPasienDaftar(pasienDaftar);
newsubModelDetail.setKeteranganLain("-");
newsubModelDetail.setAturanPakai("-");
// newsubModelDetail.setKeteranganPakai("-");
@@ -472,7 +472,7 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS
model.setKdjenispetugaspe(kdjenispetugaspe);
model.setKdpegawai(LoginUserService.getLoginUser().getPegawai());
model.setPelayananPasien(newsubModel);
- model.setNomasuk(newsubModel.getPasien());
+ model.setNomasuk(newsubModel.getPasienDaftar());
pelayananPasienPetugasDao.save(model);
}
@@ -896,7 +896,7 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS
newsubModel.setAturanPakai("-");
// newsubModel.setKeteranganPakai();
newsubModel.setKeteranganPakai2("-");
- newsubModel.setPasien(pasienDaftar);
+ newsubModel.setPasienDaftar(pasienDaftar);
newsubModel.setProduk(produk);
newsubModel.setStock(1.0);
newsubModel.setJumlah(1.0);
@@ -906,7 +906,7 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS
newsubModelDetail.setHargaJual(deposite);
newsubModelDetail.setTglPelayanan(d1);
newsubModelDetail.setJumlah(1.0);
- newsubModelDetail.setPasien(pasienDaftar);
+ newsubModelDetail.setPasienDaftar(pasienDaftar);
newsubModelDetail.setKeteranganLain("-");
newsubModelDetail.setAturanPakai("-");
// newsubModelDetail.setKeteranganPakai("-");
@@ -937,7 +937,7 @@ public class ProdukServiceImpl extends BaseAngaranServiceImpl implements ProdukS
model.setKdjenispetugaspe(kdjenispetugaspe);
model.setKdpegawai(LoginUserService.getLoginUser().getPegawai());
model.setPelayananPasien(newsubModel);
- model.setNomasuk(newsubModel.getPasien());
+ model.setNomasuk(newsubModel.getPasienDaftar());
pelayananPasienPetugasDao.save(model);
Map data = new HashMap<>();
data.put("message", "Data berhasil di simpan");
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RadiologiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RadiologiServiceImpl.java
index ed09e01a..2499f49d 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RadiologiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RadiologiServiceImpl.java
@@ -255,7 +255,7 @@ public class RadiologiServiceImpl implements RadiologiService{
pelayananPasien.setKelas(orderPelayanan.getKelas().getKelas());
}
if(CommonUtil.isNotNullOrEmpty(antrian)) {
- pelayananPasien.setPasien(antrian);
+ pelayananPasien.setPasienDaftar(antrian);
}
if(CommonUtil.isNotNullOrEmpty(produk)) {
pelayananPasien.setProduk(produk);
@@ -297,7 +297,7 @@ public class RadiologiServiceImpl implements RadiologiService{
pelayananPasienDetail.setProduk(hargaNetto.getProduk());
}
if(CommonUtil.isNotNullOrEmpty(antrian)){
- pelayananPasienDetail.setPasien(antrian);
+ pelayananPasienDetail.setPasienDaftar(antrian);
}
if(CommonUtil.isNotNullOrEmpty(orderPelayanan.getStrukOrder().getStatusOrder())){
pelayananPasienDetail.setStatusOrder(orderPelayanan.getStrukOrder().getStatusOrder());
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananServiceImpl.java
index ed6689d2..725b3904 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RegistrasiPelayananServiceImpl.java
@@ -1,6 +1,5 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -83,7 +82,6 @@ import com.jasamedika.medifirst2000.entities.AsalRujukan;
import com.jasamedika.medifirst2000.entities.AsuransiPasien;
import com.jasamedika.medifirst2000.entities.DesaKelurahan;
import com.jasamedika.medifirst2000.entities.DetailDiagnosaPasien;
-import com.jasamedika.medifirst2000.entities.DetailKamar;
import com.jasamedika.medifirst2000.entities.DetailSep;
import com.jasamedika.medifirst2000.entities.Diagnosa;
import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
@@ -104,19 +102,14 @@ import com.jasamedika.medifirst2000.entities.Kelas;
import com.jasamedika.medifirst2000.entities.KelompokPasien;
import com.jasamedika.medifirst2000.entities.KelompokTransaksi;
import com.jasamedika.medifirst2000.entities.KendaliDokumenRekamMedis;
-import com.jasamedika.medifirst2000.entities.Konsultasi;
import com.jasamedika.medifirst2000.entities.KotaKabupaten;
import com.jasamedika.medifirst2000.entities.MappingPasienPacs;
import com.jasamedika.medifirst2000.entities.Negara;
import com.jasamedika.medifirst2000.entities.OrderPelayanan;
import com.jasamedika.medifirst2000.entities.OrderProduk;
-import com.jasamedika.medifirst2000.entities.PapDataTandaVital;
-import com.jasamedika.medifirst2000.entities.PapKeluhanUtama;
-import com.jasamedika.medifirst2000.entities.PapTandaVital;
import com.jasamedika.medifirst2000.entities.Pasien;
import com.jasamedika.medifirst2000.entities.PasienDaftar;
import com.jasamedika.medifirst2000.entities.PasienDiRujukKeIntExt;
-import com.jasamedika.medifirst2000.entities.PasienInstruksiPerjanjian;
import com.jasamedika.medifirst2000.entities.PasienInstruksiPerjanjianT;
import com.jasamedika.medifirst2000.entities.Pegawai;
import com.jasamedika.medifirst2000.entities.Pekerjaan;
@@ -152,7 +145,6 @@ import com.jasamedika.medifirst2000.service.AntrianPasienDiPeriksaService;
import com.jasamedika.medifirst2000.service.BridgingBpjs;
import com.jasamedika.medifirst2000.service.DiagnosaPasienService;
import com.jasamedika.medifirst2000.service.DokumenRekamMedisService;
-import com.jasamedika.medifirst2000.service.KendaliDokumenRekamMedisService;
import com.jasamedika.medifirst2000.service.LoginUserService;
import com.jasamedika.medifirst2000.service.MasukKamarService;
import com.jasamedika.medifirst2000.service.PasienDaftarService;
@@ -160,7 +152,6 @@ import com.jasamedika.medifirst2000.service.RegistrasiPasienService;
import com.jasamedika.medifirst2000.service.RegistrasiPelayananService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.util.DateUtil;
-import com.jasamedika.medifirst2000.util.HibernateInitialize;
import com.jasamedika.medifirst2000.util.JsonUtil;
import com.jasamedika.medifirst2000.util.StringUtil;
import com.jasamedika.medifirst2000.vo.AdmisiRencanaPindahRuanganVO;
@@ -169,7 +160,6 @@ import com.jasamedika.medifirst2000.vo.AsalRujukanVO;
import com.jasamedika.medifirst2000.vo.AsuransiPasienVO;
import com.jasamedika.medifirst2000.vo.AsuransiRegistrasiPasienVO;
import com.jasamedika.medifirst2000.vo.DesaKelurahanVO;
-import com.jasamedika.medifirst2000.vo.DetailKamarVO;
import com.jasamedika.medifirst2000.vo.DiagnosaVO;
import com.jasamedika.medifirst2000.vo.DokumenRekamMedisVO;
import com.jasamedika.medifirst2000.vo.DokumenVO;
@@ -185,16 +175,13 @@ import com.jasamedika.medifirst2000.vo.KelasVO;
import com.jasamedika.medifirst2000.vo.KelompokPasienVO;
import com.jasamedika.medifirst2000.vo.KonsultasiVO;
import com.jasamedika.medifirst2000.vo.KotaKabupatenVO;
-import com.jasamedika.medifirst2000.vo.MasukKamarVO;
import com.jasamedika.medifirst2000.vo.NegaraVO;
import com.jasamedika.medifirst2000.vo.OrderProdukVO;
import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
import com.jasamedika.medifirst2000.vo.PasienVO;
-import com.jasamedika.medifirst2000.vo.PegawaiVO;
import com.jasamedika.medifirst2000.vo.PekerjaanVO;
import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO;
import com.jasamedika.medifirst2000.vo.PendidikanVO;
-import com.jasamedika.medifirst2000.vo.ProdukVO;
import com.jasamedika.medifirst2000.vo.PropinsiVO;
import com.jasamedika.medifirst2000.vo.RegistrasiPasienPenunjangVO;
import com.jasamedika.medifirst2000.vo.RegistrasiPasienVO;
@@ -213,7 +200,6 @@ import com.jasamedika.medifirst2000.vo.TempatTidurVO;
* Implement class for RegistrasiPasienService
*
* @author Askur
- * @param
*/
@Service("registrasiPelayananService")
public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
@@ -453,7 +439,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
MappingPasienPacs mapping = mappingPasienPacsDao
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
if (mapping != null) {
- gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
+ gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
}
}
@@ -1283,8 +1269,8 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
if (CommonUtil.isNullOrEmpty(dokumen.getTglDokumen())) {
dokumen.setTglDokumen(new Date());
}
- if (CommonUtil.isNullOrEmpty(dokumen.getqDokumen())) {
- dokumen.setqDokumen(0);
+ if (CommonUtil.isNullOrEmpty(dokumen.getQDokumen())) {
+ dokumen.setQDokumen(0);
}
if (CommonUtil.isNullOrEmpty(dokumen.getJenisDokumen())) {
JenisDokumen jenisDokumen = new JenisDokumen();
@@ -1818,7 +1804,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
MappingPasienPacs mappingPasienPacs = mappingPasienPacsDao
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
if (CommonUtil.isNotNullOrEmpty(mappingPasienPacs)) {
- result.put("studyId", mappingPasienPacs.getStudyInstanceUID());
+ result.put("studyId", mappingPasienPacs.getStudyInstanceUid());
result.put("noMrPacs", mappingPasienPacs.getNoMr());
}
}
@@ -2068,7 +2054,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
}
} else {
- maps.put("header", hasilTindakan.get(0).getstrukHasilPemeriksaan().ToMap());
+ maps.put("header", hasilTindakan.get(0).getStrukHasilPemeriksaan().ToMap());
for (HasilPemeriksaan map : hasilTindakan) {
Map mapData = new HashMap<>();
Map produkMap = map.ToMap();
@@ -2206,12 +2192,12 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
List> list = new ArrayList>();
for (SuratPermintaanMasuk item : temp) {
Map data = new HashMap();
- data.put("tglRegistrasi", item.getPasien().getTglRegistrasi());
- data.put("noRec", item.getPasien().getPasienDaftar().getNoRec());
- AntrianPasienDiPeriksa antrian = item.getPasien();
+ data.put("tglRegistrasi", item.getPasienDaftar().getTglRegistrasi());
+ data.put("noRec", item.getPasienDaftar().getPasienDaftar().getNoRec());
+ AntrianPasienDiPeriksa antrian = item.getPasienDaftar();
// data.put("tanggal",
// item.getPasien().getPasienDaftar().getTglRegistrasi());
- data.put("tanggal", item.getPasien().getTglRegistrasi());
+ data.put("tanggal", item.getPasienDaftar().getTglRegistrasi());
try {
data.put("diagnosa",
JsonUtil.ToMaps(diagnosaPasienDao.findDiagnosaPasienByNoCmAndTglInput(
@@ -2237,7 +2223,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
// edit by askur 28112016
// data.put("display", new SimpleDateFormat("dd
// MMM").format(item.getPasien().getPasienDaftar().getTglRegistrasi()));
- data.put("display", new SimpleDateFormat("dd MMM").format(item.getPasien().getTglRegistrasi()));
+ data.put("display", new SimpleDateFormat("dd MMM").format(item.getPasienDaftar().getTglRegistrasi()));
//
PasienDaftar pasienDaftar = antrian.getPasienDaftar();
@@ -2248,7 +2234,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
// data.put("diagnosa",
// item.getPasien().getPasienDaftar().getNoRec());
- data.put("noCm", item.getPasien().getPasienDaftar().getPasien().getNoCm());
+ data.put("noCm", item.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
list.add(data);
}
return list;
@@ -2390,7 +2376,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
}
MappingPasienPacs mapping = mappingPasienPacsDao.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
if (mapping != null) {
- gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
+ gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
}
if (CommonUtil.isNotNullOrEmpty(antrianPasienDiPeriksa.getRuangan())) {
@@ -2547,7 +2533,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
MappingPasienPacs mapping = mappingPasienPacsDao
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
if (mapping != null) {
- gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
+ gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
}
}
@@ -2830,7 +2816,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
MappingPasienPacs mapping = mappingPasienPacsDao
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
if (mapping != null) {
- gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
+ gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
}
}
@@ -3021,7 +3007,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
MappingPasienPacs mapping = mappingPasienPacsDao
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
if (mapping != null) {
- gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
+ gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
}
}
@@ -3202,7 +3188,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
MappingPasienPacs mapping = mappingPasienPacsDao
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
if (mapping != null) {
- gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
+ gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
}
}
@@ -3382,7 +3368,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
MappingPasienPacs mapping = mappingPasienPacsDao
.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
if (mapping != null) {
- gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
+ gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
}
}
@@ -3793,7 +3779,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
realData.put("tglInput",
new SimpleDateFormat("dd-MM-yyyy HH.mm").format(detailDiagnosaPasien.getTglInputDiagnosa()));
Diagnosa diagnosa = detailDiagnosaPasien.getDiagnosa();
- AntrianPasienDiPeriksa antrianPasienDiPeriksa = detailDiagnosaPasien.getPasien();
+ AntrianPasienDiPeriksa antrianPasienDiPeriksa = detailDiagnosaPasien.getPasienDaftar();
Pegawai pegawai = antrianPasienDiPeriksa.getPegawai();
Ruangan ruangan = antrianPasienDiPeriksa.getRuangan();
realData.put("diagnosa", diagnosa.getNamaDiagnosa());
@@ -3880,7 +3866,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
}
MappingPasienPacs mapping = mappingPasienPacsDao.findByPasienDaftarNoRec(antrianPasienDiPeriksa.getNoRec());
if (mapping != null) {
- gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUID());
+ gridAntrianPasienDiPeriksaVO.setStudyId(mapping.getStudyInstanceUid());
gridAntrianPasienDiPeriksaVO.setNoMrPacs(mapping.getNoMr());
}
if (CommonUtil.isNotNullOrEmpty(antrianPasienDiPeriksa.getRuangan())) {
@@ -5265,7 +5251,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
pelayanan.setTglPelayanan(antrian.getTglRegistrasi());
}
pelayanan.setKelas(antrian.getKelas());
- pelayanan.setPasien(antrian);// antrian
+ pelayanan.setPasienDaftar(antrian);// antrian
Map mappingproduk = hargaNettoProdukByKelasDao.getProdukByKelas(antrian.getKelas().getId(),
produk.getId());
if (CommonUtil.isNotNullOrEmpty(mappingproduk)) {
@@ -5289,7 +5275,7 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
pelayananPasienDetail.setProduk(hargaNetto.getProduk());
}
if (CommonUtil.isNotNullOrEmpty(antrian)) {
- pelayananPasienDetail.setPasien(antrian);
+ pelayananPasienDetail.setPasienDaftar(antrian);
}
if (CommonUtil.isNotNullOrEmpty(hargaNetto.getKomponenHarga())) {
pelayananPasienDetail.setKomponenHarga(hargaNetto.getKomponenHarga());
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RehabilitasiAsesmenServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RehabilitasiAsesmenServiceImpl.java
index f468bc2a..192b8a3d 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RehabilitasiAsesmenServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RehabilitasiAsesmenServiceImpl.java
@@ -38,7 +38,7 @@ public class RehabilitasiAsesmenServiceImpl implements RehabilitasiAsesmenServic
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar()))
{
AntrianPasienDiPeriksa antrianPasienDiPeriksa = antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa());
- rehabilitasiAsesmen.setPasien(antrianPasienDiPeriksa);
+ rehabilitasiAsesmen.setPasienDaftar(antrianPasienDiPeriksa);
}
if(CommonUtil.isNotNullOrEmpty(vo.getNoRec()))
{
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RehabilitasiFormulirKlaimServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RehabilitasiFormulirKlaimServiceImpl.java
index a9486e0e..07bcc051 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RehabilitasiFormulirKlaimServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RehabilitasiFormulirKlaimServiceImpl.java
@@ -15,14 +15,12 @@ import com.jasamedika.medifirst2000.dao.RehabilitasiFormulirKlaimDao;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
import com.jasamedika.medifirst2000.entities.DiagnosaTindakan;
import com.jasamedika.medifirst2000.entities.DiagnosaTindakans;
-import com.jasamedika.medifirst2000.entities.RehabilitasiAsesmen;
import com.jasamedika.medifirst2000.entities.RehabilitasiFormulirKlaim;
import com.jasamedika.medifirst2000.service.RehabilitasiKlaimFormulirService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
import com.jasamedika.medifirst2000.vo.DiagnosaTindakanVO;
import com.jasamedika.medifirst2000.vo.DiagnosaTindakansVO;
-import com.jasamedika.medifirst2000.vo.RehabilitasiAsesmenVO;
import com.jasamedika.medifirst2000.vo.RehabilitasiFormulirKlaimVO;
@Service("RehabilitasiKlaimFormulirService")
@@ -79,7 +77,7 @@ public class RehabilitasiFormulirKlaimServiceImpl implements RehabilitasiKlaimFo
rehabilitasiFormulirKlaim.setDiagnosaMedis(diagnosaTindakanSet);
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar()))
{
- rehabilitasiFormulirKlaim.setPasien(antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ rehabilitasiFormulirKlaim.setPasienDaftar(antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getNoRec()))
{
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekrutmenServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekrutmenServiceImpl.java
index 39b30490..958fb670 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekrutmenServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RekrutmenServiceImpl.java
@@ -288,7 +288,7 @@ public class RekrutmenServiceImpl extends BaseVoServiceImpl implements Rekrutmen
for(DokumenLamaranDto model:dto.getSetDokumenLamaran()){
Dokumen dokumen=new Dokumen();
dokumen.setNamaJudulDokumen("CV");
- dokumen.setqDokumen(0);
+ dokumen.setQDokumen(0);
Lokasi lokasi=new Lokasi();
lokasi.setId(1);
dokumen.setLokasi(lokasi);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RencanaServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RencanaServiceImpl.java
index ef0da6f5..d0383e1e 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RencanaServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RencanaServiceImpl.java
@@ -1,10 +1,8 @@
package com.jasamedika.medifirst2000.service.impl;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -60,7 +58,7 @@ public class RencanaServiceImpl extends BaseVoServiceImpl implements RencanaSer
}
if(CommonUtil.isNotNullOrEmpty(voTemp.getPasienDaftar()))
{
- rencana.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(voTemp.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ rencana.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(voTemp.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
if(CommonUtil.isNotNullOrEmpty(rencana))
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResumeMedisServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResumeMedisServiceImpl.java
index 4a5292ca..ea2ae8bd 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResumeMedisServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ResumeMedisServiceImpl.java
@@ -54,7 +54,7 @@ public class ResumeMedisServiceImpl extends BaseVoServiceImpl implements ResumeM
if(CommonUtil.isNotNullOrEmpty(vo))
{
ResumeMedis resumeMedis = resumeMedisConverter.transferVOToModel(vo, new ResumeMedis());
- resumeMedis.setPasien(antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ resumeMedis.setPasienDaftar(antrianPasienDiPeriksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
resumeMedis.setKondisiWaktuKeluar(statusPulangConverter.transferVOToModel(vo.getKondisiWaktuKeluar(), new StatusPulang()));
resumeMedis.setPengobatanDilanjutkan(lanjutanPengobatanConverter.transferVOToModel(vo.getPengobatanDilanjutkan(), new LanjutanPengobatan()));
Set detailTerapiPulangSet = new HashSet();
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatAsupanMakanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatAsupanMakanServiceImpl.java
index fd5cceaa..efef4165 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatAsupanMakanServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatAsupanMakanServiceImpl.java
@@ -11,7 +11,6 @@ import com.jasamedika.medifirst2000.dao.RiwayatAsupanMakanDao;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
import com.jasamedika.medifirst2000.entities.CaraPemberianSusuBayi;
import com.jasamedika.medifirst2000.entities.JenisIsapanAsi;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
//import com.jasamedika.medifirst2000.dao.RiwayatPascaLahirDao;
import com.jasamedika.medifirst2000.entities.RiwayatAsupanMakan;
//import com.jasamedika.medifirst2000.entities.RiwayatPascaLahir;
@@ -21,7 +20,6 @@ import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
import com.jasamedika.medifirst2000.vo.CaraPemberianSusuBayiVO;
import com.jasamedika.medifirst2000.vo.JenisIsapanAsiVO;
-import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
import com.jasamedika.medifirst2000.vo.RiwayatAsupanMakanVO;
//import com.jasamedika.medifirst2000.vo.RiwayatPascaLahirVO;
import com.jasamedika.medifirst2000.vo.StatusYaTidakVO;
@@ -75,7 +73,7 @@ public class RiwayatAsupanMakanServiceImpl implements RiwayatAsupanMakanService
riwayatAsupanMakan.setNasiBiasa(statusYaTidakConverter.transferVOToModel(vo.getNasiBiasa(), new StatusYaTidak()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
- riwayatAsupanMakan.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
+ riwayatAsupanMakan.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
}
RiwayatAsupanMakan resultModel = riwayatAsupanMakanDao.save(riwayatAsupanMakan);
@@ -117,7 +115,7 @@ public class RiwayatAsupanMakanServiceImpl implements RiwayatAsupanMakanService
riwayatAsupanMakan.setNasiBiasa(statusYaTidakConverter.transferVOToModel(vo.getNasiBiasa(), new StatusYaTidak()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
- riwayatAsupanMakan.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
+ riwayatAsupanMakan.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
}
RiwayatAsupanMakan resultModel = riwayatAsupanMakanDao.save(riwayatAsupanMakan);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatKesehatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatKesehatanServiceImpl.java
index 2c2dcba4..23d4cda4 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatKesehatanServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatKesehatanServiceImpl.java
@@ -18,7 +18,6 @@ import com.jasamedika.medifirst2000.dao.PernahDiPeriksaDetailDao;
import com.jasamedika.medifirst2000.dao.RiwayatKesehatanDao;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
import com.jasamedika.medifirst2000.entities.Diagnosa;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
import com.jasamedika.medifirst2000.entities.PernahDirawatDetail;
import com.jasamedika.medifirst2000.entities.RiwayatKesehatan;
import com.jasamedika.medifirst2000.exception.ServiceVOException;
@@ -100,7 +99,7 @@ public class RiwayatKesehatanServiceImpl implements RiwayatKesehatanService{
pernahDiPeriksaDetailDao.delete(pernahDirawatDetailVO);
}
- riwayatKesehatan.setPasien(pasienDaftar);
+ riwayatKesehatan.setPasienDaftar(pasienDaftar);
for(PernahDirawatDetailVO pernahDirawatDetailVO:vo.getPernahDirawatDetail()){
PernahDirawatDetail pernahDirawatDetail = pernahDirawatDetailConverter.transferVOToModel(pernahDirawatDetailVO, new PernahDirawatDetail());
pernahDirawatDetail.setRiwayatKesehatan(riwayatKesehatan);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatMasaKehamilanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatMasaKehamilanServiceImpl.java
index 585eea93..4ed854ec 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatMasaKehamilanServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatMasaKehamilanServiceImpl.java
@@ -10,10 +10,8 @@ import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.RiwayatMasaKehamilanDao;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
import com.jasamedika.medifirst2000.entities.KbSebelumHamil;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
import com.jasamedika.medifirst2000.entities.PemeriksaanKehamilan;
import com.jasamedika.medifirst2000.entities.PenyakitIbuHamil;
-import com.jasamedika.medifirst2000.entities.RiwayatAsupanMakan;
import com.jasamedika.medifirst2000.entities.RiwayatMasaKehamilan;
import com.jasamedika.medifirst2000.entities.SifatKehamilan;
import com.jasamedika.medifirst2000.entities.StatusTeraturTidak;
@@ -21,10 +19,8 @@ import com.jasamedika.medifirst2000.service.RiwayatMasaKehamilanService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
import com.jasamedika.medifirst2000.vo.KbSebelumHamilVO;
-import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
import com.jasamedika.medifirst2000.vo.PemeriksaanKehamilanVO;
import com.jasamedika.medifirst2000.vo.PenyakitIbuHamilVO;
-import com.jasamedika.medifirst2000.vo.RiwayatAsupanMakanVO;
import com.jasamedika.medifirst2000.vo.RiwayatMasaKehamilanVO;
import com.jasamedika.medifirst2000.vo.SifatKehamilanVO;
import com.jasamedika.medifirst2000.vo.StatusTeraturTidakVO;
@@ -78,7 +74,7 @@ public class RiwayatMasaKehamilanServiceImpl implements RiwayatMasaKehamilanServ
riwayatMasaKehamilan.setKbSebelumHamil(kbSebelumHamilConverter.transferVOToModel(vo.getKbSebelumHamil(), new KbSebelumHamil()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
- riwayatMasaKehamilan.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ riwayatMasaKehamilan.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
RiwayatMasaKehamilan model = riwayatMasaKehamilanDao.save(riwayatMasaKehamilan);
@@ -111,7 +107,7 @@ public class RiwayatMasaKehamilanServiceImpl implements RiwayatMasaKehamilanServ
riwayatMasaKehamilan.setKbSebelumHamil(kbSebelumHamilConverter.transferVOToModel(vo.getKbSebelumHamil(), new KbSebelumHamil()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
- riwayatMasaKehamilan.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ riwayatMasaKehamilan.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
RiwayatMasaKehamilan model = riwayatMasaKehamilanDao.save(riwayatMasaKehamilan);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPascaLahirServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPascaLahirServiceImpl.java
index 564a7556..fa52d3b6 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPascaLahirServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPascaLahirServiceImpl.java
@@ -10,13 +10,11 @@ import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
import com.jasamedika.medifirst2000.dao.RiwayatPascaLahirDao;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
import com.jasamedika.medifirst2000.entities.RiwayatPascaLahir;
import com.jasamedika.medifirst2000.entities.StatusYaTidak;
import com.jasamedika.medifirst2000.service.RiwayatPascaLahirService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
-import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
import com.jasamedika.medifirst2000.vo.RiwayatPascaLahirVO;
import com.jasamedika.medifirst2000.vo.StatusYaTidakVO;
@@ -60,7 +58,7 @@ public class RiwayatPascaLahirServiceImpl implements RiwayatPascaLahirService {
// riwayatPascaLahir.setPasien(pasienDaftarDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(), vo.getTglRegistrasi()));
// }
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
- riwayatPascaLahir.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
+ riwayatPascaLahir.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
}
RiwayatPascaLahir resultModel = riwayatPascaLahirDao.save(riwayatPascaLahir);
@@ -91,7 +89,7 @@ public class RiwayatPascaLahirServiceImpl implements RiwayatPascaLahirService {
riwayatPascaLahir.setIsLetakKejangSeluruhTubuh(statusYaTidakConverter.transferVOToModel(vo.getIsLetakKejangSeluruhTubuh(), new StatusYaTidak()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
- riwayatPascaLahir.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
+ riwayatPascaLahir.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(),new AntrianPasienDiPeriksa()));
}
RiwayatPascaLahir resultModel = riwayatPascaLahirDao.save(riwayatPascaLahir);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPenyakitPengobatanServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPenyakitPengobatanServiceImpl.java
index 664ce8fe..3be770ba 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPenyakitPengobatanServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPenyakitPengobatanServiceImpl.java
@@ -54,7 +54,7 @@ public class RiwayatPenyakitPengobatanServiceImpl implements RiwayatPenyakitPeng
.setPetugas(pegawaiConverter.transferVOToModel(vo.getPetugas(), new Pegawai()));
}
if (CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())) {
- riwayatPenyakitPengobatan.setPasien(antrianPasienDiperiksaConverter
+ riwayatPenyakitPengobatan.setPasienDaftar(antrianPasienDiperiksaConverter
.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPerkembanganPsikomotorServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPerkembanganPsikomotorServiceImpl.java
index 9330e5d8..96b0deb1 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPerkembanganPsikomotorServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RiwayatPerkembanganPsikomotorServiceImpl.java
@@ -9,16 +9,10 @@ import org.springframework.stereotype.Service;
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.RiwayatPerkembanganPsikomotorDao;
import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.Kelahiran;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
-import com.jasamedika.medifirst2000.entities.ProsesKelahiran;
import com.jasamedika.medifirst2000.entities.RiwayatPerkembanganPsikomotor;
-import com.jasamedika.medifirst2000.entities.StatusYaTidak;
import com.jasamedika.medifirst2000.service.RiwayatPerkembanganPsikomotorService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
-import com.jasamedika.medifirst2000.vo.KelahiranVO;
-import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
import com.jasamedika.medifirst2000.vo.RiwayatPerkembanganPsikomotorVO;
/**
@@ -46,7 +40,7 @@ public class RiwayatPerkembanganPsikomotorServiceImpl implements RiwayatPerkemba
riwayatPerkembanganPsikomotor=riwayatPerkembanganPsikomotorConverter.transferVOToModel(vo, new RiwayatPerkembanganPsikomotor());
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
- riwayatPerkembanganPsikomotor.setPasien(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ riwayatPerkembanganPsikomotor.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
RiwayatPerkembanganPsikomotor riwayatPerkembanganPsikomotorResult=riwayatPerkembanganPsikomotorDao.save(riwayatPerkembanganPsikomotor);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SignInOperationServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SignInOperationServiceImpl.java
index 3d6288e0..dc27f39e 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SignInOperationServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SignInOperationServiceImpl.java
@@ -77,9 +77,9 @@ public class SignInOperationServiceImpl implements SignInOperationService{
try {
AntrianPasienDiPeriksa p = antrianPasienDiPeriksaDao.findByNoRec(vo.getPasien().getNoRec());
- model.setPasien(p);
+ model.setPasienDaftar(p);
model.setNoRec(vo.getNoRec());
- model.setTanggalPendaftaran(p.getTglRegistrasi());
+ model.setTglRegistrasi(p.getTglRegistrasi());
model.setStatusEnabled(vo.getStatusEnabled());
//set SignIn Operation Detail Quisioner
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StatusKemandirianServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StatusKemandirianServiceImpl.java
index fec25dfb..717519e4 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StatusKemandirianServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/StatusKemandirianServiceImpl.java
@@ -1,22 +1,15 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import com.jasamedika.medifirst2000.vo.StatusMandiriVO;
import com.jasamedika.medifirst2000.entities.StatusMandiri;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
import com.jasamedika.medifirst2000.service.StatusKemandirianService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.entities.StatusKemandirian;
@@ -52,7 +45,7 @@ public class StatusKemandirianServiceImpl extends BaseVoServiceImpl implements S
Map result = new HashMap();
StatusKemandirian model = new StatusKemandirian();
model = statusKemandirianConverter.transferVOToModel(vo,model);
- model.setPasien(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(), vo.getTglRegistrasi()));
+ model.setPasienDaftar(antrianPasienDiPeriksaDao.finByNoIdAndTglRegistrasi(Short.parseShort("0"), vo.getPasien().getId(), vo.getTglRegistrasi()));
if (CommonUtil.isNotNullOrEmpty(vo.getEkstremitasAtas()))
{
model.setEkstremitasAtas(statusMandiriConverter.transferVOToModel(vo.getEkstremitasAtas(), new StatusMandiri()));
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SuratMasukServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SuratMasukServiceImpl.java
index 0b0f6642..3d040c56 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SuratMasukServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SuratMasukServiceImpl.java
@@ -356,7 +356,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas
dokumen.setPegawaiPembuat(pegawaiPembuat);
dokumen.setNamaPegawaiPembuat(loginUserService.getLoginUser().getPegawai().getNamaLengkap());
- dokumen.setqDokumen(0);
+ dokumen.setQDokumen(0);
dokumen.setQtyLampiran((short) 1);
dokumen.setTglDokumen(DateUtil.getShortDate());
dokumen.setNoDokumen(GenerateNoDokumen());
@@ -816,7 +816,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas
dokumen.setPegawaiPembuat(pegawaiPembuat);
dokumen.setNamaPegawaiPembuat(loginUserService.getLoginUser().getPegawai().getNamaLengkap());
- dokumen.setqDokumen(0);
+ dokumen.setQDokumen(0);
dokumen.setQtyLampiran((short) 1);
dokumen.setTglDokumen(DateUtil.getShortDate());
dokumen.setNoDokumen(GenerateNoDokumen());
@@ -1032,7 +1032,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas
dokumen.setPegawaiPembuat(loginUserService.getLoginUser().getPegawai());
dokumen.setRuangan(loginUserService.getLoginUser().getPegawai().getRuangan());
dokumen.setTglDokumen(dokumenTemplateVO.getTanggal());
- dokumen.setqDokumen(0);
+ dokumen.setQDokumen(0);
dokumen.setQtyLampiran((short) 1);
dokumen.setNoDokumen(dokumenTemplateVO.getKdDokumen().toString());
daoDokumen.save(dokumen);
@@ -1211,7 +1211,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas
dokumen.setTglDokumen(suratMasukDariExternalVO.getTglSurat());
dokumen.setIsDokumenInOutInt((byte) 0);//Masuk 0, keluar 1, Buat Penomoran = 2
dokumen.setRuangan(loginUser.getPegawai().getRuangan());
- dokumen.setqDokumen(0);
+ dokumen.setQDokumen(0);
dokumen.setQtyLampiran((short) 0);
daoDokumen.save(dokumen);
@@ -1507,7 +1507,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas
dokumen.setTglDokumen(suratMasukInternalEksternalVO.getTglDokumen());
dokumen.setIsDokumenInOutInt((byte) 2);//Masuk 0, keluar 1, Buat Penomoran = 2
dokumen.setRuangan(loginUser.getPegawai().getRuangan());
- dokumen.setqDokumen(0);
+ dokumen.setQDokumen(0);
dokumen.setQtyLampiran((short) 0);
dokumen.setDeskripsiDokumen(suratMasukInternalEksternalVO.getLampiran());
daoDokumen.save(dokumen);//Buat dokumen baru
@@ -1758,7 +1758,7 @@ public class SuratMasukServiceImpl extends BaseVoServiceImpl implements SuratMas
dokumen.setTglDokumen(new Date());
dokumen.setIsDokumenInOutInt((byte) 0);//Masuk 0, keluar 1, Buat Penomoran = 2
dokumen.setRuangan(loginUser.getPegawai().getRuangan());
- dokumen.setqDokumen(0);
+ dokumen.setQDokumen(0);
dokumen.setQtyLampiran((short) 0);
daoDokumen.save(dokumen);
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SuratPermintaanMasukServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SuratPermintaanMasukServiceImpl.java
index 73f80b2f..b0bfbeec 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SuratPermintaanMasukServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SuratPermintaanMasukServiceImpl.java
@@ -1,26 +1,18 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.orm.jpa.JpaSystemException;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import com.jasamedika.medifirst2000.vo.PegawaiVO;
import com.jasamedika.medifirst2000.entities.Pegawai;
-import com.jasamedika.medifirst2000.entities.PersetujuanUmum;
import com.jasamedika.medifirst2000.vo.CaraMasukVO;
import com.jasamedika.medifirst2000.entities.CaraMasuk;
import com.jasamedika.medifirst2000.vo.RuanganVO;
import com.jasamedika.medifirst2000.entities.Ruangan;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
import com.jasamedika.medifirst2000.service.SuratPermintaanMasukService;
import com.jasamedika.medifirst2000.util.CommonUtil;
import com.jasamedika.medifirst2000.entities.SuratPermintaanMasuk;
@@ -63,7 +55,7 @@ public class SuratPermintaanMasukServiceImpl extends BaseVoServiceImpl implement
SuratPermintaanMasuk model = new SuratPermintaanMasuk();
suratPermintaanMasukConverter.setUseGson(true);
model = suratPermintaanMasukConverter.transferVOToModel(vo, model);
- model.setPasien(antrianPasienDiPeriksaDao.findByNoRec(vo.getPasienDaftar().getNoRec()));
+ model.setPasienDaftar(antrianPasienDiPeriksaDao.findByNoRec(vo.getPasienDaftar().getNoRec()));
if (CommonUtil.isNotNullOrEmpty(vo.getPetugas())) {
model.setPetugas(pegawaiConverter.transferVOToModel(vo.getPetugas(), new Pegawai()));
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/TransferPasienInternalServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/TransferPasienInternalServiceImpl.java
index c51ab5d9..458ec17a 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/TransferPasienInternalServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/TransferPasienInternalServiceImpl.java
@@ -24,9 +24,7 @@ import com.jasamedika.medifirst2000.entities.HubunganKeluarga;
import com.jasamedika.medifirst2000.entities.InformasiMedis;
import com.jasamedika.medifirst2000.entities.JenisNyeri;
import com.jasamedika.medifirst2000.entities.KeadaanPasien;
-import com.jasamedika.medifirst2000.entities.Obat;
import com.jasamedika.medifirst2000.entities.PapTandaVital;
-import com.jasamedika.medifirst2000.entities.Pasien;
import com.jasamedika.medifirst2000.entities.PasienDaftar;
import com.jasamedika.medifirst2000.entities.Pegawai;
import com.jasamedika.medifirst2000.entities.Peralatan;
@@ -56,10 +54,8 @@ import com.jasamedika.medifirst2000.vo.HubunganKeluargaVO;
import com.jasamedika.medifirst2000.vo.InformasiMedisVO;
import com.jasamedika.medifirst2000.vo.JenisNyeriVO;
import com.jasamedika.medifirst2000.vo.KeadaanPasienVO;
-import com.jasamedika.medifirst2000.vo.ObatVO;
import com.jasamedika.medifirst2000.vo.PapTandaVitalVO;
import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
import com.jasamedika.medifirst2000.vo.PegawaiVO;
import com.jasamedika.medifirst2000.vo.PeralatanDetailVO;
import com.jasamedika.medifirst2000.vo.PeralatanVO;
@@ -208,7 +204,7 @@ public class TransferPasienInternalServiceImpl extends BaseVoServiceImpl impleme
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
antrianPasienDiPeriksa = antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa());
//antrianPasienDiPeriksa.setPasienDaftar(pasienDaftarConverter.transferVOToModel(vo.getPasienDaftar().getPasienDaftar(), new PasienDaftar()));
- transferPasienInternal.setPasien(antrianPasienDiPeriksa);
+ transferPasienInternal.setPasienDaftar(antrianPasienDiPeriksa);
}
if(CommonUtil.isNotNullOrEmpty(vo.getDokterJaga())){
@@ -291,7 +287,7 @@ public class TransferPasienInternalServiceImpl extends BaseVoServiceImpl impleme
if(CommonUtil.isNotNullOrEmpty(antrianPasienDiPeriksa))
{
- model.setPasien(antrianPasienDiPeriksa);
+ model.setPasienDaftar(antrianPasienDiPeriksa);
}
if (CommonUtil.isNotNullOrEmpty(statusKemandirianVO.getEkstremitasAtas()))
@@ -451,7 +447,7 @@ public class TransferPasienInternalServiceImpl extends BaseVoServiceImpl impleme
}
if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())){
- transferPasienExsternal.setPasien(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
+ transferPasienExsternal.setPasienDaftar(antrianPasienDiperiksaConverter.transferVOToModel(vo.getPasienDaftar(), new AntrianPasienDiPeriksa()));
}
if(CommonUtil.isNotNullOrEmpty(vo.getDokterJaga())){
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/MonitoringJatahCutiDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/MonitoringJatahCutiDto.java
new file mode 100644
index 00000000..3e99f02d
--- /dev/null
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/MonitoringJatahCutiDto.java
@@ -0,0 +1,33 @@
+package com.jasamedika.medifirst2000.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 2/5/2025
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MonitoringJatahCutiDto {
+
+ private String noRec;
+
+ private String komponenCuti;
+
+ private Integer tahun;
+
+ private Integer jatahCuti;
+
+ private Integer cutiTerpakai;
+
+ private Integer sisaCuti;
+
+ private String statusPenangguhan;
+
+}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/PegawaiJabatanDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/PegawaiJabatanDto.java
new file mode 100644
index 00000000..60dc3814
--- /dev/null
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/PegawaiJabatanDto.java
@@ -0,0 +1,25 @@
+package com.jasamedika.medifirst2000.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author salmanoe
+ * @version 1.0.0
+ * @since 06/02/2025
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PegawaiJabatanDto {
+
+ private String noKepegawaian;
+
+ private List jabatan;
+
+}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ANC.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ANC.java
index ed81ef4d..538956a4 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ANC.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ANC.java
@@ -1,50 +1,35 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class ANC
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "RM_ANC_M")
public class ANC extends BaseMaster {
+
@NotNull(message = "Name tidak boleh kosong")
@Column(name = "Name", nullable = false, length = 100)
@Caption(value = "Name")
private String name;
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return this.name;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_ANC_M_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.RM_ANC_M_id_seq", sequenceName = "public.RM_ANC_M_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.RM_ANC_M_id_seq")
+ @SequenceGenerator(name = "public.RM_ANC_M_id_seq", sequenceName = "public.RM_ANC_M_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AbsensiPegawai.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AbsensiPegawai.java
index e80253b7..66b07b53 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AbsensiPegawai.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AbsensiPegawai.java
@@ -1,39 +1,31 @@
package com.jasamedika.medifirst2000.entities;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.*;
-import com.jasamedika.medifirst2000.entities.Pegawai;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
import com.jasamedika.medifirst2000.base.BaseTransaction;
-
-import javax.validation.constraints.NotNull;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
/**
* class AbsensiPegawai
*
* @author Generator
*/
+@Getter
+@Setter
@Entity
@Table(name = "sdm_AbsensiPegawai_T")
public class AbsensiPegawai extends BaseTransaction {
+
@ManyToOne
@JoinColumn(name = "PegawaiFk")
@NotNull(message = "Pegawai Harus Diisi")
@Caption(value = "Pegawai")
private Pegawai pegawai;
- public Pegawai getPegawai() {
- return pegawai;
- }
-
- public void setPegawai(Pegawai pegawai) {
- this.pegawai = pegawai;
- }
-
@Column(name = "PegawaiFk", insertable = false, updatable = false)
private Integer pegawaiId;
@@ -41,24 +33,8 @@ public class AbsensiPegawai extends BaseTransaction {
@Caption(value = "JamMasuk")
private Date jamMasuk;
- public Date getJamMasuk() {
- return jamMasuk;
- }
-
- public void setJamMasuk(Date jamMasuk) {
- this.jamMasuk = jamMasuk;
- }
-
- @Column(name = "JamKeluar", nullable = true, length = 100)
+ @Column(name = "JamKeluar", length = 100)
@Caption(value = "JamKeluar")
private Date jamKeluar;
- public Date getJamKeluar() {
- return jamKeluar;
- }
-
- public void setJamKeluar(Date jamKeluar) {
- this.jamKeluar = jamKeluar;
- }
-
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityLog.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityLog.java
index cf85c11b..165534c0 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityLog.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityLog.java
@@ -1,48 +1,26 @@
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 lombok.Getter;
+import lombok.Setter;
-@Table(name="activity_log")
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.AUTO;
+
+@Getter
+@Setter
@Entity
+@Table(name = "activity_log")
public class ActivityLog {
-
+
@Id
- @GeneratedValue(strategy = GenerationType.AUTO)
+ @GeneratedValue(strategy = AUTO)
private Long id;
-
+
@Column(name = "action")
private String action;
-
- @Column(name = "detail", columnDefinition ="TEXT")
+
+ @Column(name = "detail", columnDefinition = "TEXT")
private String detail;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getAction() {
- return action;
- }
-
- public void setAction(String action) {
- this.action = action;
- }
-
- public String getDetail() {
- return detail;
- }
-
- public void setDetail(String detail) {
- this.detail = detail;
- }
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityPegawai.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityPegawai.java
index c94c1d8d..1927fc9c 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityPegawai.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ActivityPegawai.java
@@ -15,6 +15,7 @@ import static javax.persistence.FetchType.LAZY;
@Entity
@Table(name = "ActivityPegawai_H")
public class ActivityPegawai extends BaseTransaction {
+
private static final long serialVersionUID = 3739050768690435138L;
@Caption(value = "keterangan")
@@ -36,4 +37,5 @@ public class ActivityPegawai extends BaseTransaction {
@Caption(value = "group")
@Column(name = "GroupData", length = 250)
private String group;
+
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdmisiRencanaPindahRuangan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdmisiRencanaPindahRuangan.java
index 80706b88..52a18d08 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdmisiRencanaPindahRuangan.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdmisiRencanaPindahRuangan.java
@@ -1,249 +1,97 @@
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.fasterxml.jackson.annotation.JsonIgnoreProperties;
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="AdmisiRencanaPindahRuangan_T")
+@Table(name = "AdmisiRencanaPindahRuangan_T")
@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
-public class AdmisiRencanaPindahRuangan extends BaseTransaction{
-
- @ManyToOne(fetch=FetchType.LAZY)
+public class AdmisiRencanaPindahRuangan extends BaseTransaction {
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectRegistrasiPelayananPasienFk")
- @Caption(value="Registrasi Pelayanan Pasien")
+ @Caption(value = "Registrasi Pelayanan Pasien")
private AntrianPasienDiPeriksa registrasiPelayananPasien;
-
- @Column(name = "ObjectRegistrasiPelayananPasienFk", insertable=false, updatable=false, nullable = true )
+
+ @Column(name = "ObjectRegistrasiPelayananPasienFk", insertable = false, updatable = false)
private String registrasiPelayananPasienId;
- @Caption(value="Tanggal Keluar Rencana")
- @Column(name = "TglKeluarRencana", nullable = true )
- private Date tglKeluarRencana ;
-
- @ManyToOne(fetch=FetchType.LAZY)
+ @Caption(value = "Tanggal Keluar Rencana")
+ @Column(name = "TglKeluarRencana")
+ private Date tglKeluarRencana;
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectStatusKeluarRencanaFk")
- @Caption(value="Status Keluar Rencana")
+ @Caption(value = "Status Keluar Rencana")
private StatusKeluar statusKeluarRencana;
-
- @Column(name = "ObjectStatusKeluarRencanaFk", insertable=false, updatable=false, nullable = true )
+
+ @Column(name = "ObjectStatusKeluarRencanaFk", insertable = false, updatable = false)
private Integer statusKeluarRencanaId;
- @ManyToOne(fetch=FetchType.LAZY)
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectKelasRencanaFk")
- @Caption(value="Kelas Rencana")
+ @Caption(value = "Kelas Rencana")
private Kelas kelasRencana;
-
- @Column(name = "ObjectKelasRencanaFk", insertable=false, updatable=false, nullable = true )
+
+ @Column(name = "ObjectKelasRencanaFk", insertable = false, updatable = false)
private Integer kelasRencanaId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectRuanganRencanaFk")
- @Caption(value="Ruangan Rencana")
+ @Caption(value = "Ruangan Rencana")
private Ruangan ruanganRencana;
-
- @Column(name = "ObjectRuanganRencanaFk", insertable=false, updatable=false, nullable = true )
+
+ @Column(name = "ObjectRuanganRencanaFk", insertable = false, updatable = false)
private Integer ruanganRencanaId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectKelasKamarRencanaFk")
- @Caption(value="Kelas Kamar Rencana")
+ @Caption(value = "Kelas Kamar Rencana")
private Kamar kelasKamarRencana;
-
- @Column(name = "ObjectKelasKamarRencanaFk", insertable=false, updatable=false, nullable = true )
+
+ @Column(name = "ObjectKelasKamarRencanaFk", insertable = false, updatable = false)
private Integer kelasKamarRencanaId;
-
- @Caption(value="No Bed")
- @Column(name = "NoBedRencana", nullable = true)
+
+ @Caption(value = "No Bed")
+ @Column(name = "NoBedRencana")
private Integer noBedRencana;
-
- @Caption(value="Keterangan Lainya")
- @Column(name = "KeteranganLainya", nullable = true , length = 100)
+
+ @Caption(value = "Keterangan Lainya")
+ @Column(name = "KeteranganLainya", length = 100)
private String keteranganLainya;
-
- //-----------------------------------------------------------------------------------------------
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectKelasAwalFk")
- @Caption(value="Kelas Awal")
+ @Caption(value = "Kelas Awal")
private Kelas kelasAwal;
-
- @Column(name = "ObjectKelasAwalFk", insertable=false, updatable=false, nullable = true )
+
+ @Column(name = "ObjectKelasAwalFk", insertable = false, updatable = false)
private Integer kelasAwalId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectRuanganAwalFk")
- @Caption(value="Ruangan Awal")
+ @Caption(value = "Ruangan Awal")
private Ruangan ruanganAwal;
-
- @Column(name = "ObjectRuanganAwalFk", insertable=false, updatable=false, nullable = true )
+
+ @Column(name = "ObjectRuanganAwalFk", insertable = false, updatable = false)
private Integer ruanganAwalId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectKelasKamarAwalFk")
- @Caption(value="Kelas Kamar Awal")
+ @Caption(value = "Kelas Kamar Awal")
private Kamar kelasKamarAwal;
-
- @Column(name = "ObjectKelasKamarAwalFk", insertable=false, updatable=false, nullable = true )
+
+ @Column(name = "ObjectKelasKamarAwalFk", insertable = false, updatable = false)
private Integer kelasKamarAwalId;
- public AntrianPasienDiPeriksa getRegistrasiPelayananPasien() {
- return registrasiPelayananPasien;
- }
-
- public void setRegistrasiPelayananPasien(AntrianPasienDiPeriksa registrasiPelayananPasien) {
- this.registrasiPelayananPasien = registrasiPelayananPasien;
- }
-
- public String getRegistrasiPelayananPasienId() {
- return registrasiPelayananPasienId;
- }
-
- public void setRegistrasiPelayananPasienId(String registrasiPelayananPasienId) {
- this.registrasiPelayananPasienId = registrasiPelayananPasienId;
- }
-
- public Date getTglKeluarRencana() {
- return tglKeluarRencana;
- }
-
- public void setTglKeluarRencana(Date tglKeluarRencana) {
- this.tglKeluarRencana = tglKeluarRencana;
- }
-
- public Integer getStatusKeluarRencanaId() {
- return statusKeluarRencanaId;
- }
-
- public void setStatusKeluarRencanaId(Integer statusKeluarRencanaId) {
- this.statusKeluarRencanaId = statusKeluarRencanaId;
- }
-
- public Kelas getKelasRencana() {
- return kelasRencana;
- }
-
- public void setKelasRencana(Kelas kelasRencana) {
- this.kelasRencana = kelasRencana;
- }
-
- public Integer getKelasRencanaId() {
- return kelasRencanaId;
- }
-
- public void setKelasRencanaId(Integer kelasRencanaId) {
- this.kelasRencanaId = kelasRencanaId;
- }
-
- public Ruangan getRuanganRencana() {
- return ruanganRencana;
- }
-
- public void setRuanganRencana(Ruangan ruanganRencana) {
- this.ruanganRencana = ruanganRencana;
- }
-
- public Integer getRuanganRencanaId() {
- return ruanganRencanaId;
- }
-
- public void setRuanganRencanaId(Integer ruanganRencanaId) {
- this.ruanganRencanaId = ruanganRencanaId;
- }
-
- public Kamar getKelasKamarRencana() {
- return kelasKamarRencana;
- }
-
- public void setKelasKamarRencana(Kamar kelasKamarRencana) {
- this.kelasKamarRencana = kelasKamarRencana;
- }
-
- public Integer getKelasKamarRencanaId() {
- return kelasKamarRencanaId;
- }
-
- public void setKelasKamarRencanaId(Integer kelasKamarRencanaId) {
- this.kelasKamarRencanaId = kelasKamarRencanaId;
- }
-
- public Integer getNoBedRencana() {
- return noBedRencana;
- }
-
- public void setNoBedRencana(Integer noBedRencana) {
- this.noBedRencana = noBedRencana;
- }
-
- public String getKeteranganLainya() {
- return keteranganLainya;
- }
-
- public void setKeteranganLainya(String keteranganLainya) {
- this.keteranganLainya = keteranganLainya;
- }
-
- public Kelas getKelasAwal() {
- return kelasAwal;
- }
-
- public void setKelasAwal(Kelas kelasAwal) {
- this.kelasAwal = kelasAwal;
- }
-
- public Integer getKelasAwalId() {
- return kelasAwalId;
- }
-
- public void setKelasAwalId(Integer kelasAwalId) {
- this.kelasAwalId = kelasAwalId;
- }
-
- public Ruangan getRuanganAwal() {
- return ruanganAwal;
- }
-
- public void setRuanganAwal(Ruangan ruanganAwal) {
- this.ruanganAwal = ruanganAwal;
- }
-
- public Integer getRuanganAwalId() {
- return ruanganAwalId;
- }
-
- public void setRuanganAwalId(Integer ruanganAwalId) {
- this.ruanganAwalId = ruanganAwalId;
- }
-
- public Kamar getKelasKamarAwal() {
- return kelasKamarAwal;
- }
-
- public void setKelasKamarAwal(Kamar kelasKamarAwal) {
- this.kelasKamarAwal = kelasKamarAwal;
- }
-
- public Integer getKelasKamarAwalId() {
- return kelasKamarAwalId;
- }
-
- public void setKelasKamarAwalId(Integer kelasKamarAwalId) {
- this.kelasKamarAwalId = kelasKamarAwalId;
- }
-
- public StatusKeluar getStatusKeluarRencana() {
- return statusKeluarRencana;
- }
-
- public void setStatusKeluarRencana(StatusKeluar statusKeluarRencana) {
- this.statusKeluarRencana = statusKeluarRencana;
- }
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdvokasiHukumMedicolegal.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdvokasiHukumMedicolegal.java
index a18caa45..768ddf1d 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdvokasiHukumMedicolegal.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AdvokasiHukumMedicolegal.java
@@ -1,20 +1,18 @@
package com.jasamedika.medifirst2000.entities;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
@Entity
@Table(name = "AdvokasiHukumMedicolegal_M")
public class AdvokasiHukumMedicolegal extends BaseMaster {
@@ -70,114 +68,10 @@ public class AdvokasiHukumMedicolegal extends BaseMaster {
@Caption(value = "Status Kasus")
private String statusKasus;
- public String getNoKasus() {
- return noKasus;
- }
-
- public void setNoKasus(String noKasus) {
- this.noKasus = noKasus;
- }
-
- public Date getTglKasus() {
- return tglKasus;
- }
-
- public void setTglKasus(Date tglKasus) {
- this.tglKasus = tglKasus;
- }
-
- public Pegawai getUser() {
- return user;
- }
-
- public void setUser(Pegawai user) {
- this.user = user;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public JenisKasusMedicolegal getJenisKasus() {
- return jenisKasus;
- }
-
- public void setJenisKasus(JenisKasusMedicolegal jenisKasus) {
- this.jenisKasus = jenisKasus;
- }
-
- public Integer getJenisKasusId() {
- return jenisKasusId;
- }
-
- public void setJenisKasusId(Integer jenisKasusId) {
- this.jenisKasusId = jenisKasusId;
- }
-
- public String getAnalisaKajian() {
- return analisaKajian;
- }
-
- public void setAnalisaKajian(String analisaKajian) {
- this.analisaKajian = analisaKajian;
- }
-
- public String getHasilKeputusan() {
- return hasilKeputusan;
- }
-
- public void setHasilKeputusan(String hasilKeputusan) {
- this.hasilKeputusan = hasilKeputusan;
- }
-
- public String getStatusKasus() {
- return statusKasus;
- }
-
- public void setStatusKasus(String statusKasus) {
- this.statusKasus = statusKasus;
- }
-
- public String getDeskripsiKasus() {
- return deskripsiKasus;
- }
-
- public void setDeskripsiKasus(String deskripsiKasus) {
- this.deskripsiKasus = deskripsiKasus;
- }
-
- public Pegawai getPenanggungJawab() {
- return penanggungJawab;
- }
-
- public void setPenanggungJawab(Pegawai penanggungJawab) {
- this.penanggungJawab = penanggungJawab;
- }
-
- public Integer getPenanggungJawabId() {
- return penanggungJawabId;
- }
-
- public void setPenanggungJawabId(Integer penanggungJawabId) {
- this.penanggungJawabId = penanggungJawabId;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.advokasihukummedicolegal_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.advokasihukummedicolegal_m_id_seq", sequenceName = "public.advokasihukummedicolegal_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.advokasihukummedicolegal_m_id_seq")
+ @SequenceGenerator(name = "public.advokasihukummedicolegal_m_id_seq", sequenceName = "public.advokasihukummedicolegal_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Agama.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Agama.java
index 508012c8..a7ccb881 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Agama.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Agama.java
@@ -1,25 +1,23 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.envers.Audited;
-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
@Entity
@Table(name = "Agama_M")
@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
public class Agama extends BaseMaster {
-
+
@NotNull(message = "Agama tidak boleh kosong")
@Column(name = "Agama", nullable = false, length = 100)
@Caption(value = "Agama")
@@ -36,41 +34,9 @@ public class Agama extends BaseMaster {
private short qAgama;
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.agama_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.agama_m_id_seq", sequenceName = "public.agama_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.agama_m_id_seq")
+ @SequenceGenerator(name = "public.agama_m_id_seq", sequenceName = "public.agama_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public String getAgama() {
- return agama;
- }
-
- public void setAgama(String agama) {
- this.agama = agama;
- }
-
- public Byte getKdAgama() {
- return kdAgama;
- }
-
- public void setKdAgama(Byte kdAgama) {
- this.kdAgama = kdAgama;
- }
-
- public short getqAgama() {
- return qAgama;
- }
-
- public void setqAgama(short qAgama) {
- this.qAgama = qAgama;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaM.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaM.java
index ab6df1c6..37b0244a 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaM.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaM.java
@@ -1,23 +1,18 @@
package com.jasamedika.medifirst2000.entities;
-// Generated Apr 27, 2016 3:58:51 PM by Hibernate Tools 3.4.0.CR1
+import lombok.Getter;
+import lombok.Setter;
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import org.hibernate.envers.Audited;
-
-
-
-
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
@Table(name = "Agama_M_SAMPLE")
-public class AgamaM {
+public class AgamaM {
+
@Id
protected String idString;
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaMId.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaMId.java
index ab1f60bb..a690dea3 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaMId.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgamaMId.java
@@ -1,47 +1,29 @@
package com.jasamedika.medifirst2000.entities;
-// Generated Apr 27, 2016 3:58:51 PM by Hibernate Tools 3.4.0.CR1
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.validation.constraints.NotNull;
+import java.util.Objects;
-
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
@Embeddable
public class AgamaMId implements java.io.Serializable {
- private short kdProfile;
- private byte kdAgama;
-
- public AgamaMId() {
- }
-
- public AgamaMId(short kdProfile, byte kdAgama) {
- this.kdProfile = kdProfile;
- this.kdAgama = kdAgama;
- }
-
- @NotNull(message="Kd Profile tidak boleh kosong")
+ @NotNull(message = "Kd Profile tidak boleh kosong")
@Column(name = "KdProfile", nullable = false)
- public short getKdProfile() {
- return this.kdProfile;
- }
+ private Short kdProfile;
- public void setKdProfile(short kdProfile) {
- this.kdProfile = kdProfile;
- }
-
- @NotNull(message="Kd Agama tidak boleh kosong")
+ @NotNull(message = "Kd Agama tidak boleh kosong")
@Column(name = "KdAgama", nullable = false)
- public byte getKdAgama() {
- return this.kdAgama;
- }
-
- public void setKdAgama(byte kdAgama) {
- this.kdAgama = kdAgama;
- }
-
-
+ private Byte kdAgama;
@Override
public boolean equals(Object obj) {
@@ -52,11 +34,9 @@ public class AgamaMId implements java.io.Serializable {
if (getClass() != obj.getClass())
return false;
AgamaMId other = (AgamaMId) obj;
- if (kdAgama != other.kdAgama)
+ if (!Objects.equals(kdAgama, other.kdAgama))
return false;
- if (kdProfile != other.kdProfile)
- return false;
- return true;
+ return Objects.equals(kdProfile, other.kdProfile);
}
@Override
@@ -67,6 +47,5 @@ public class AgamaMId implements java.io.Serializable {
result = prime * result + kdProfile;
return result;
}
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgingPeriod.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgingPeriod.java
index a7958513..f019c79b 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgingPeriod.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AgingPeriod.java
@@ -22,6 +22,7 @@ import static javax.persistence.GenerationType.SEQUENCE;
@Entity
@Table(name = "aging_period_m", schema = "mkko")
public class AgingPeriod extends BaseActive implements Serializable {
+
@Id
@GeneratedValue(strategy = SEQUENCE, generator = "sg_aging_period_m")
@SequenceGenerator(name = "sg_aging_period_m", schema = "mkko", sequenceName = "mkko.aging_period_m_seq", allocationSize = 1)
@@ -33,4 +34,5 @@ public class AgingPeriod extends BaseActive implements Serializable {
@NotBlank(message = "Period tidak boleh kosong")
@Caption("Period")
private String period;
+
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkibatHaid.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkibatHaid.java
index bfc1a4e9..d7a44aaf 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkibatHaid.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkibatHaid.java
@@ -1,49 +1,35 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AkibatHaid
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "RM_AkibatHaid_M")
public class AkibatHaid extends BaseMaster {
+
@NotNull(message = "Name tidak boleh kosong")
@Column(name = "Name", nullable = false, length = 100)
@Caption(value = "Name")
private String name;
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return this.name;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.AkibatHaid_M_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.AkibatHaid_M_id_seq", sequenceName = "public.AkibatHaid_M_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.AkibatHaid_M_id_seq")
+ @SequenceGenerator(name = "public.AkibatHaid_M_id_seq", sequenceName = "public.AkibatHaid_M_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkreditasiPelatihan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkreditasiPelatihan.java
index 5d3c8208..d6f2c1f4 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkreditasiPelatihan.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AkreditasiPelatihan.java
@@ -1,43 +1,28 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
@Entity
@Table(name = "AkreditasiPelatihan_M")
-public class AkreditasiPelatihan extends BaseMaster{
-
- @Column(name = "AkreditasiPelatihan", nullable = false , length = 100)
+public class AkreditasiPelatihan extends BaseMaster {
+
+ @Column(name = "AkreditasiPelatihan", nullable = false, length = 100)
@Caption(value = "AkreditasiPelatihan")
- private String akreditasiPelatihan ;
+ private String akreditasiPelatihan;
- public String getAkreditasiPelatihan() {
- return akreditasiPelatihan;
- }
-
- public void setAkreditasiPelatihan(String akreditasiPelatihan) {
- this.akreditasiPelatihan = akreditasiPelatihan;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.AkreditasiPelatihan_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.AkreditasiPelatihan_m_id_seq", sequenceName = "public.AkreditasiPelatihan_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.AkreditasiPelatihan_m_id_seq")
+ @SequenceGenerator(name = "public.AkreditasiPelatihan_m_id_seq", sequenceName = "public.AkreditasiPelatihan_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AktivitasKemandirian.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AktivitasKemandirian.java
index 01160f68..17931c7d 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AktivitasKemandirian.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AktivitasKemandirian.java
@@ -1,17 +1,17 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
import javax.validation.constraints.NotNull;
-import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "RM_AktivitasKemandirian_M")
public class AktivitasKemandirian extends BaseKeyValueMaster {
@@ -20,26 +20,10 @@ public class AktivitasKemandirian extends BaseKeyValueMaster {
@Caption(value = "kategori")
private String kategori;
- public String getKategori() {
- return kategori;
- }
-
- public void setKategori(String kategori) {
- this.kategori = kategori;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.AktivitasKemandirian_M_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.AktivitasKemandirian_M_id_seq", sequenceName = "public.AktivitasKemandirian_M_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.AktivitasKemandirian_M_id_seq")
+ @SequenceGenerator(name = "public.AktivitasKemandirian_M_id_seq", sequenceName = "public.AktivitasKemandirian_M_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Akun.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Akun.java
index 3d93ade2..75897425 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Akun.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Akun.java
@@ -1,16 +1,17 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
@Entity
@Table(name = "Akun_M")
public class Akun extends BaseMaster {
@@ -22,50 +23,18 @@ public class Akun extends BaseMaster {
@NotNull(message = "Kode Akun tidak boleh kosong")
@Caption(value = "Kode Akun")
- @Column(name = "KodeAkun", nullable = true, length = 50)
+ @Column(name = "KodeAkun", length = 50)
private String kodeAkun;
@NotNull(message = "Keterangan tidak boleh kosong")
@Caption(value = "Keterangan")
- @Column(name = "Keterangan", nullable = true, length = 200)
+ @Column(name = "Keterangan", length = 200)
private String ketAkun;
- public String getNamaAkun() {
- return namaAkun;
- }
-
- public void setNamaAkun(String namaAkun) {
- this.namaAkun = namaAkun;
- }
-
- public String getKodeAkun() {
- return kodeAkun;
- }
-
- public void setKodeAkun(String kodeAkun) {
- this.kodeAkun = kodeAkun;
- }
-
- public String getKetAkun() {
- return ketAkun;
- }
-
- public void setKetAkun(String ketAkun) {
- this.ketAkun = ketAkun;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.akun_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.akun_m_id_seq", sequenceName = "public.akun_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.akun_m_id_seq")
+ @SequenceGenerator(name = "public.akun_m_id_seq", sequenceName = "public.akun_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alamat.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alamat.java
index 2824de1e..874807b7 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alamat.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alamat.java
@@ -24,6 +24,7 @@ import static javax.persistence.GenerationType.SEQUENCE;
@Table(name = "Alamat_M")
@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
public class Alamat extends BaseMaster {
+
@Id
@GeneratedValue(strategy = SEQUENCE, generator = "public.alamat_m_id_seq")
@SequenceGenerator(name = "public.alamat_m_id_seq", sequenceName = "public.alamat_m_id_seq", allocationSize = 1)
@@ -213,4 +214,5 @@ public class Alamat extends BaseMaster {
@Column(name = "YahooMessenger", length = 50)
@Caption(value = "Yahoo Messenger")
private String yahooMessenger;
+
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlasanPemindahanPasien.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlasanPemindahanPasien.java
index 051fcb56..a02b3933 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlasanPemindahanPasien.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlasanPemindahanPasien.java
@@ -1,27 +1,23 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
import javax.validation.constraints.NotNull;
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class Agama
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AlasanPemindahanPasien_M")
public class AlasanPemindahanPasien extends BaseMaster {
@@ -30,26 +26,10 @@ public class AlasanPemindahanPasien extends BaseMaster {
@Caption(value = "Name")
private String name;
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.alasanpemindahanpasien_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.alasanpemindahanpasien_m_id_seq", sequenceName = "public.alasanpemindahanpasien_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.alasanpemindahanpasien_m_id_seq")
+ @SequenceGenerator(name = "public.alasanpemindahanpasien_m_id_seq", sequenceName = "public.alasanpemindahanpasien_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alat.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alat.java
index 44c9d69c..beeef3cf 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alat.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alat.java
@@ -1,18 +1,17 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
@Entity
@Table(name = "Alat_M")
public class Alat extends BaseMaster {
@@ -75,131 +74,10 @@ public class Alat extends BaseMaster {
@Column(name = "satuanStandarFk", insertable = false, updatable = false)
private Integer satuanStandarId;
- public String getNamaAlat() {
- return namaAlat;
- }
-
- public void setNamaAlat(String namaAlat) {
- this.namaAlat = namaAlat;
- }
-
- public String getKdAlat() {
- return kdAlat;
- }
-
- public void setKdAlat(String kdAlat) {
- this.kdAlat = kdAlat;
- }
-
- public String getNomorAlamatAlat() {
- return nomorAlamatAlat;
- }
-
- public void setNomorAlamatAlat(String nomorAlamatAlat) {
- this.nomorAlamatAlat = nomorAlamatAlat;
- }
-
- public Alat getAlatHead() {
- return alatHead;
- }
-
- public void setAlatHead(Alat alatHead) {
- this.alatHead = alatHead;
- }
-
- public Integer getAlatHeadId() {
- return alatHeadId;
- }
-
- public void setAlatHeadId(Integer alatHeadId) {
- this.alatHeadId = alatHeadId;
- }
-
- public Departemen getDepartemen() {
- return departemen;
- }
-
- public void setDepartemen(Departemen departemen) {
- this.departemen = departemen;
- }
-
- public Integer getDepartemenId() {
- return departemenId;
- }
-
- public void setDepartemenId(Integer departemenId) {
- this.departemenId = departemenId;
- }
-
- public Produk getProdukAset() {
- return produkAset;
- }
-
- public void setProdukAset(Produk produkAset) {
- this.produkAset = produkAset;
- }
-
- public Integer getProdukAsetId() {
- return produkAsetId;
- }
-
- public void setProdukAsetId(Integer produkAsetId) {
- this.produkAsetId = produkAsetId;
- }
-
- public RegistrasiAset getRegistrasiAset() {
- return registrasiAset;
- }
-
- public void setRegistrasiAset(RegistrasiAset registrasiAset) {
- this.registrasiAset = registrasiAset;
- }
-
- public String getRegistrasiAsetId() {
- return registrasiAsetId;
- }
-
- public void setRegistrasiAsetId(String registrasiAsetId) {
- this.registrasiAsetId = registrasiAsetId;
- }
-
- public Integer getKapasitasAlat() {
- return kapasitasAlat;
- }
-
- public void setKapasitasAlat(Integer kapasitasAlat) {
- this.kapasitasAlat = kapasitasAlat;
- }
-
- public SatuanStandar getSatuanStandar() {
- return satuanStandar;
- }
-
- public void setSatuanStandar(SatuanStandar satuanStandar) {
- this.satuanStandar = satuanStandar;
- }
-
- public Integer getSatuanStandarId() {
- return satuanStandarId;
- }
-
- public void setSatuanStandarId(Integer satuanStandarId) {
- this.satuanStandarId = satuanStandarId;
- }
-
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.alat_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.alat_m_id_seq", sequenceName = "public.alat_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.alat_m_id_seq")
+ @SequenceGenerator(name = "public.alat_m_id_seq", sequenceName = "public.alat_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatCssd.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatCssd.java
index 1541c952..93b84e48 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatCssd.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatCssd.java
@@ -1,15 +1,16 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
@Entity
@Table(name = "AlatCssd_M")
public class AlatCssd extends BaseMaster {
@@ -22,34 +23,10 @@ public class AlatCssd extends BaseMaster {
@Caption(value = "Nama Alat")
private String namaAlat;
- public String getKodeBarang() {
- return kodeBarang;
- }
-
- public void setKodeBarang(String kodeBarang) {
- this.kodeBarang = kodeBarang;
- }
-
- public String getNamaAlat() {
- return namaAlat;
- }
-
- public void setNamaAlat(String namaAlat) {
- this.namaAlat = namaAlat;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.alatcssd_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.alatcssd_m_id_seq", sequenceName = "public.alatcssd_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.alatcssd_m_id_seq")
+ @SequenceGenerator(name = "public.alatcssd_m_id_seq", sequenceName = "public.alatcssd_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatKesehatan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatKesehatan.java
index c723ebd8..4fd1a2e6 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatKesehatan.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatKesehatan.java
@@ -1,44 +1,30 @@
package com.jasamedika.medifirst2000.entities;
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AlatKesehatan
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AlatKesehatan_M")
public class AlatKesehatan extends BaseMaster {
- @Caption(value = "Kode Alkes")
- private Byte kdAlkes;
@NotNull(message = "Kd Alkes tidak boleh kosong")
@Column(name = "KdAlkes", nullable = false)
- public Byte getKdAlkes() {
- return this.kdAlkes;
- }
-
- public void setKdAlkes(Byte kdAlkes) {
- this.kdAlkes = kdAlkes;
- }
+ @Caption(value = "Kode Alkes")
+ private Byte kdAlkes;
@ManyToOne
@JoinColumn(name = "ObjectDepartemenFk")
@@ -49,14 +35,6 @@ public class AlatKesehatan extends BaseMaster {
@Column(name = "ObjectDepartemenFk", insertable = false, updatable = false)
private Integer departemenId;
- public Integer getDepartemenId() {
- return departemenId;
- }
-
- public void setDepartemenId(Integer departemenId) {
- this.departemenId = departemenId;
- }
-
@ManyToOne
@JoinColumn(name = "ObjectJenisAlkesFk")
@NotNull(message = "Object Jenis Alkes Harus Diisi")
@@ -66,71 +44,19 @@ public class AlatKesehatan extends BaseMaster {
@Column(name = "ObjectJenisAlkesFk", insertable = false, updatable = false, nullable = false)
private Integer jenisAlkesId;
- public Integer getJenisAlkesId() {
- return jenisAlkesId;
- }
-
- public void setJenisAlkesId(Integer jenisAlkesId) {
- this.jenisAlkesId = jenisAlkesId;
- }
-
+ @NotNull(message = "Nama Alkes tidak boleh kosong")
+ @Column(name = "NamaAlkes", nullable = false, length = 100)
@Caption(value = "Nama Alkes")
private String namaAlkes;
+ @Column(name = "NomorAlamatAlkes", length = 20)
@Caption(value = "Nomor Alamat Alkes")
private String nomorAlamatAlkes;
- @NotNull(message = "Kd Departemen tidak boleh kosong")
- @Column(name = "KdDepartemen", nullable = false, length = 1)
- public Departemen getDepartemen() {
- return this.departemen;
- }
-
- @NotNull(message = "Kd Jenis Alkes tidak boleh kosong")
- @Column(name = "KdJenisAlkes", nullable = false)
- public JenisAlatKesehatan getJenisAlkes() {
- return this.jenisAlkes;
- }
-
- @NotNull(message = "Nama Alkes tidak boleh kosong")
- @Column(name = "NamaAlkes", nullable = false, length = 100)
- public String getNamaAlkes() {
- return this.namaAlkes;
- }
-
- @Column(name = "NomorAlamatAlkes", nullable = true, length = 20)
- public String getNomorAlamatAlkes() {
- return this.nomorAlamatAlkes;
- }
-
- public void setDepartemen(Departemen departemen) {
- this.departemen = departemen;
- }
-
- public void setJenisAlkes(JenisAlatKesehatan jenisAlkes) {
- this.jenisAlkes = jenisAlkes;
- }
-
- public void setNamaAlkes(String namaAlkes) {
- this.namaAlkes = namaAlkes;
- }
-
- public void setNomorAlamatAlkes(String nomorAlamatAlkes) {
- this.nomorAlamatAlkes = nomorAlamatAlkes;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.alatkesehatan_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.alatkesehatan_m_id_seq", sequenceName = "public.alatkesehatan_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.alatkesehatan_m_id_seq")
+ @SequenceGenerator(name = "public.alatkesehatan_m_id_seq", sequenceName = "public.alatkesehatan_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatKhusus.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatKhusus.java
index 0561d9da..85d2dd1b 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatKhusus.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatKhusus.java
@@ -1,78 +1,38 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
import javax.validation.constraints.NotNull;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
-
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AlatKhusus_T")
-public class AlatKhusus extends BaseTransaction{
-
+public class AlatKhusus extends BaseTransaction {
+
@ManyToOne
@JoinColumn(name = "PerencanaanAnestesiFk")
@NotNull(message = "Perencanaan Anestesi tidak boleh kosong")
private PerencanaanAnestesi perencanaanAnestesi;
-
- @Column(name = "PerencanaanAnestesiFk", insertable=false,updatable=false)
+
+ @Column(name = "PerencanaanAnestesiFk", insertable = false, updatable = false)
private String perencanaanAnestesiId;
-
+
@ManyToOne
@JoinColumn(name = "AlatKhususDetailFk")
@NotNull(message = "Alat Khusus Detail tidak boleh kosong")
private AlatKhususDetail alatKhususDetail;
-
- @Column(name = "AlatKhususDetailFk", insertable=false,updatable=false)
+
+ @Column(name = "AlatKhususDetailFk", insertable = false, updatable = false)
private Integer alatKhususDetailId;
-
+
@NotNull(message = "Is Nilai tidak boleh kosong")
@Column(name = "isNilai")
@Caption(value = "Is Nilai")
private Boolean isNilai;
-
- public Boolean getIsNilai() {
- return isNilai;
- }
-
- public void setIsNilai(Boolean isNilai) {
- this.isNilai = isNilai;
- }
-
- public PerencanaanAnestesi getPerencanaanAnestesi() {
- return perencanaanAnestesi;
- }
-
- public void setPerencanaanAnestesi(PerencanaanAnestesi perencanaanAnestesi) {
- this.perencanaanAnestesi = perencanaanAnestesi;
- }
-
- public String getPerencanaanAnestesiId() {
- return perencanaanAnestesiId;
- }
-
- public void setPerencanaanAnestesiId(String perencanaanAnestesiId) {
- this.perencanaanAnestesiId = perencanaanAnestesiId;
- }
-
- public AlatKhususDetail getAlatKhususDetail() {
- return alatKhususDetail;
- }
-
- public void setAlatKhususDetail(AlatKhususDetail alatKhususDetail) {
- this.alatKhususDetail = alatKhususDetail;
- }
-
- public Integer getAlatKhususDetailId() {
- return alatKhususDetailId;
- }
-
- public void setAlatKhususDetailId(Integer alatKhususDetailId) {
- this.alatKhususDetailId = alatKhususDetailId;
- }
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatKhususDetail.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatKhususDetail.java
index 5402c8a6..7b4f2247 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatKhususDetail.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatKhususDetail.java
@@ -1,18 +1,18 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import lombok.Getter;
+import lombok.Setter;
-@Entity // @Audited
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
+@Entity
@Table(name = "RM_AlatKhusus_M")
public class AlatKhususDetail extends BaseMaster {
@@ -21,25 +21,10 @@ public class AlatKhususDetail extends BaseMaster {
@Caption(value = "Name")
private String name;
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return this.name;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.AlatKhusus_M_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.AlatKhusus_M_id_seq", sequenceName = "public.AlatKhusus_M_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.AlatKhusus_M_id_seq")
+ @SequenceGenerator(name = "public.AlatKhusus_M_id_seq", sequenceName = "public.AlatKhusus_M_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatTerpasang.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatTerpasang.java
index d485be9e..dbf56f4e 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatTerpasang.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatTerpasang.java
@@ -1,50 +1,35 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AlatYangTerpasangCheckIn
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "RM_AlatTerpasang_M")
public class AlatTerpasang extends BaseMaster {
+
@NotNull(message = "Name tidak boleh kosong")
@Column(name = "Name", nullable = false, length = 100)
@Caption(value = "Name")
private String name;
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return this.name;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.AlatTerpasang_M_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.AlatTerpasang_M_id_seq", sequenceName = "public.AlatTerpasang_M_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.AlatTerpasang_M_id_seq")
+ @SequenceGenerator(name = "public.AlatTerpasang_M_id_seq", sequenceName = "public.AlatTerpasang_M_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatTerpasangDetail.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatTerpasangDetail.java
index 2e18fc2e..1d413eb9 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatTerpasangDetail.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatTerpasangDetail.java
@@ -1,50 +1,29 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
import javax.validation.constraints.NotNull;
-import org.hibernate.envers.Audited;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AlatTerpasang_T")
public class AlatTerpasangDetail extends BaseTransaction {
-
+
@ManyToOne
@JoinColumn(name = "AlatYangTerpasangFk")
@NotNull(message = "Alat Yang Terpasang tidak boleh kosong")
private AlatYangTerpasangCheckIn alatTerpasang;
-
- @Column(name = "AlatYangTerpasangFk", insertable=false,updatable=false)
+
+ @Column(name = "AlatYangTerpasangFk", insertable = false, updatable = false)
private Integer alatTerpasangId;
+
@ManyToOne
@JoinColumn(name = "CheckInFk")
@NotNull(message = "CheckIn tidak boleh kosong")
private CheckIn checkIn;
- public AlatYangTerpasangCheckIn getAlatTerpasang() {
- return alatTerpasang;
- }
-
- public void setAlatTerpasang(AlatYangTerpasangCheckIn alatTerpasang) {
- this.alatTerpasang = alatTerpasang;
- }
-
- public CheckIn getCheckIn() {
- return checkIn;
- }
-
- public void setCheckIn(CheckIn checkIn) {
- this.checkIn = checkIn;
- }
-
-
-
-
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatYangTerpasangCheckIn.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatYangTerpasangCheckIn.java
index 139f553c..eaffb3e1 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatYangTerpasangCheckIn.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AlatYangTerpasangCheckIn.java
@@ -1,49 +1,35 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
import javax.validation.constraints.NotNull;
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
/**
- * class AlatYangTerpasangCheckIn
+ * class AlatYangTerpasangCheckIn
*
* @author Generator
*/
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
@Table(name = "RM_AlatYangTerpasangCheckIn_M")
public class AlatYangTerpasangCheckIn extends BaseMaster {
- @NotNull(message="Name tidak boleh kosong")
+
+ @NotNull(message = "Name tidak boleh kosong")
@Column(name = "Name", nullable = false, length = 100)
@Caption(value = "Name")
private String name;
- public void setName(String name)
- {
- this.name = name;
- }
- public String getName()
- {
- return this.name;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.rm_alatyangterpasangcheckIn_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.rm_alatyangterpasangcheckIn_m_id_seq", sequenceName = "public.rm_alatyangterpasangcheckIn_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.rm_alatyangterpasangcheckIn_m_id_seq")
+ @SequenceGenerator(name = "public.rm_alatyangterpasangcheckIn_m_id_seq", sequenceName = "public.rm_alatyangterpasangcheckIn_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alergi.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alergi.java
index 8c02f3fa..70159d84 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alergi.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Alergi.java
@@ -1,83 +1,45 @@
package com.jasamedika.medifirst2000.entities;
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class Alergi
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "Alergi_M")
public class Alergi extends BaseMaster {
+
@NotNull(message = "Kd Alergi tidak boleh kosong")
@Column(name = "KdAlergi", nullable = false)
@Caption(value = "Kode Alergi")
private short kdAlergi;
- public void setKodeAlergi(short kdAlergi) {
- this.kdAlergi = kdAlergi;
- }
-
- public short getKodeAlergi() {
- return this.kdAlergi;
- }
-
@Caption(value = "Nama Alergi")
@NotNull(message = "Nama Alergi tidak boleh kosong")
@Column(name = "NamaAlergi", nullable = false, length = 25)
private String namaAlergi;
- public void setNamaAlergi(String namaAlergi) {
- this.namaAlergi = namaAlergi;
- }
-
- public String getNamaAlergi() {
- return this.namaAlergi;
- }
-
@NotNull(message = "QAlergi tidak boleh kosong")
@Column(name = "QAlergi", nullable = false)
@Caption(value = "QAlergi")
private short qAlergi;
- public void setQAlergi(short qAlergi) {
- this.qAlergi = qAlergi;
- }
-
- public short getQAlergi() {
- return this.qAlergi;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.alergi_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.alergi_m_id_seq", sequenceName = "public.alergi_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.alergi_m_id_seq")
+ @SequenceGenerator(name = "public.alergi_m_id_seq", sequenceName = "public.alergi_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AnakAktif.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AnakAktif.java
index 05ae099f..591b9b6d 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AnakAktif.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AnakAktif.java
@@ -1,42 +1,30 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
@Entity
@Table(name = "rm_AnakAktif_M")
public class AnakAktif extends BaseMaster {
+
@NotNull(message = "Name tidak boleh kosong")
@Column(name = "Name", nullable = false, length = 100)
@Caption(value = "Name")
private String name;
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return this.name;
- }
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.rm_AnakAktif_M_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.rm_AnakAktif_M_id_seq", sequenceName = "public.agama_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.rm_AnakAktif_M_id_seq")
+ @SequenceGenerator(name = "public.rm_AnakAktif_M_id_seq", sequenceName = "public.agama_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AnakLelah.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AnakLelah.java
index 85ed003a..04004aca 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AnakLelah.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AnakLelah.java
@@ -1,43 +1,30 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
@Entity
@Table(name = "rm_AnakLelah_M")
public class AnakLelah extends BaseMaster {
+
@NotNull(message = "Name tidak boleh kosong")
@Column(name = "Name", nullable = false, length = 100)
@Caption(value = "Name")
private String name;
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return this.name;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.rm_AnakLelah_M_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.rm_AnakLelah_M_id_seq", sequenceName = "public.rm_AnakLelah_M_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.rm_AnakLelah_M_id_seq")
+ @SequenceGenerator(name = "public.rm_AnakLelah_M_id_seq", sequenceName = "public.rm_AnakLelah_M_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Anamnesis.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Anamnesis.java
index ac2c682a..33134fdb 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Anamnesis.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Anamnesis.java
@@ -1,117 +1,52 @@
package com.jasamedika.medifirst2000.entities;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import javax.persistence.*;
import javax.validation.constraints.NotNull;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import java.util.Date;
/**
*
* @author Adik
*/
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
@Table(name = "Anamnesis_T")
public class Anamnesis extends MedicalRecordTransaction {
-
+
@ManyToOne
@JoinColumn(name = "PegawaiFK")
- @NotNull(message="Pegawai Harus Diisi")
- @Caption(value="Pegawai")
+ @NotNull(message = "Pegawai Harus Diisi")
+ @Caption(value = "Pegawai")
private Pegawai petugas;
- @Column(name = "PegawaiFK", insertable=false,updatable=false,nullable = false)
+ @Column(name = "PegawaiFK", insertable = false, updatable = false, nullable = false)
private Integer petugasId;
-
- @Column(name = "AnamnesisSuster", nullable = true)
- @Caption(value="AnamnesisSuster ")
+
+ @Column(name = "AnamnesisSuster")
+ @Caption(value = "AnamnesisSuster ")
private String anamnesisSuster;
-
- @Column(name = "anamnesisDokter", nullable = true)
- @Caption(value="Anamnesis Dokter")
+
+ @Column(name = "anamnesisDokter")
+ @Caption(value = "Anamnesis Dokter")
private String anamnesisDokter;
-
- @NotNull(message="tglInput Tidak Boleh Kosong")
- @Column(name = "tglInput", nullable = false )
- @Caption(value="Tanggal Input")
+
+ @NotNull(message = "tglInput Tidak Boleh Kosong")
+ @Column(name = "tglInput", nullable = false)
+ @Caption(value = "Tanggal Input")
private Date tanggalInput;
-
+
@ManyToOne
@JoinColumn(name = "RuanganFK")
- @NotNull(message="Ruangan Harus Diisi")
- @Caption(value="Ruangan")
+ @NotNull(message = "Ruangan Harus Diisi")
+ @Caption(value = "Ruangan")
private Ruangan ruangan;
- @Column(name = "RuanganFK", insertable=false,updatable=false,nullable = false)
- private Integer ruanganId;
+ @Column(name = "RuanganFK", insertable = false, updatable = false, nullable = false)
+ private Integer ruanganId;
- public Pegawai getPetugas() {
- return petugas;
- }
-
- public void setPetugas(Pegawai petugas) {
- this.petugas = petugas;
- }
-
- public Integer getPetugasId() {
- return petugasId;
- }
-
- public void setPetugasId(Integer petugasId) {
- this.petugasId = petugasId;
- }
-
- public String getAnamnesisSuster() {
- return anamnesisSuster;
- }
-
- public void setAnamnesisSuster(String anamnesisSuster) {
- this.anamnesisSuster = anamnesisSuster;
- }
-
- public String getAnamnesisDokter() {
- return anamnesisDokter;
- }
-
- public void setAnamnesisDokter(String anamnesisDokter) {
- this.anamnesisDokter = anamnesisDokter;
- }
-
- public Date getTanggalInput() {
- return tanggalInput;
- }
-
- public void setTanggalInput(Date tanggalInput) {
- this.tanggalInput = tanggalInput;
- }
-
- public Ruangan getRuangan() {
- return ruangan;
- }
-
- public void setRuangan(Ruangan ruangan) {
- this.ruangan = ruangan;
- }
-
- public Integer getRuanganId() {
- return ruanganId;
- }
-
- public void setRuanganId(Integer ruanganId) {
- this.ruanganId = ruanganId;
- }
-
}
-
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AnggaranRemunerasi.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AnggaranRemunerasi.java
index 8eeb5b14..93ade0f8 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AnggaranRemunerasi.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AnggaranRemunerasi.java
@@ -1,19 +1,16 @@
package com.jasamedika.medifirst2000.entities;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Getter
+@Setter
@Entity
@Table(name = "sdm_anggaranremunerasi_t")
public class AnggaranRemunerasi extends BaseTransaction {
@@ -69,100 +66,4 @@ public class AnggaranRemunerasi extends BaseTransaction {
@Temporal(TemporalType.TIMESTAMP)
private Date tanggalPembaharuanData;
- public Date getTahun() {
- return tahun;
- }
-
- public void setTahun(Date tahun) {
- this.tahun = tahun;
- }
-
- public Long getTotalNilaiJabatan() {
- return totalNilaiJabatan;
- }
-
- public void setTotalNilaiJabatan(Long totalNilaiJabatan) {
- this.totalNilaiJabatan = totalNilaiJabatan;
- }
-
- public Double getAnggaranRemunTahun() {
- return anggaranRemunTahun;
- }
-
- public void setAnggaranRemunTahun(Double anggaranRemunTahun) {
- this.anggaranRemunTahun = anggaranRemunTahun;
- }
-
- public Double getAnggaranRemunBulan() {
- return anggaranRemunBulan;
- }
-
- public void setAnggaranRemunBulan(Double anggaranRemunBulan) {
- this.anggaranRemunBulan = anggaranRemunBulan;
- }
-
- public Double getPoinIndeksRupiah() {
- return poinIndeksRupiah;
- }
-
- public void setPoinIndeksRupiah(Double poinIndeksRupiah) {
- this.poinIndeksRupiah = poinIndeksRupiah;
- }
-
- public GradeRemunerasi getGrade() {
- return grade;
- }
-
- public void setGrade(GradeRemunerasi grade) {
- this.grade = grade;
- }
-
- public Integer getGradeId() {
- return gradeId;
- }
-
- public void setGradeId(Integer gradeId) {
- this.gradeId = gradeId;
- }
-
- public Double getGajiHonorarium() {
- return gajiHonorarium;
- }
-
- public void setGajiHonorarium(Double gajiHonorarium) {
- this.gajiHonorarium = gajiHonorarium;
- }
-
- public Double getMinInsentif() {
- return minInsentif;
- }
-
- public void setMinInsentif(Double minInsentif) {
- this.minInsentif = minInsentif;
- }
-
- public Double getMaxInsentif() {
- return maxInsentif;
- }
-
- public void setMaxInsentif(Double maxInsentif) {
- this.maxInsentif = maxInsentif;
- }
-
- public Double getMaxTotalRemunerasi() {
- return maxTotalRemunerasi;
- }
-
- public void setMaxTotalRemunerasi(Double maxTotalRemunerasi) {
- this.maxTotalRemunerasi = maxTotalRemunerasi;
- }
-
- public Date getTanggalPembaharuanData() {
- return tanggalPembaharuanData;
- }
-
- public void setTanggalPembaharuanData(Date tanggalPembaharuanData) {
- this.tanggalPembaharuanData = tanggalPembaharuanData;
- }
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntiBiotikProfilaksis.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntiBiotikProfilaksis.java
index 77608003..e17b72ec 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntiBiotikProfilaksis.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntiBiotikProfilaksis.java
@@ -1,44 +1,30 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import lombok.Getter;
+import lombok.Setter;
-@Entity // @Audited
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
+@Entity
@Table(name = "RM_AntibiotikProfilaksis_M")
public class AntiBiotikProfilaksis extends BaseMaster {
+
@NotNull(message = "Name tidak boleh kosong")
@Column(name = "Name", nullable = false, length = 100)
@Caption(value = "Name")
private String name;
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return this.name;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.AntibiotikProfilaksis_M_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.AntibiotikProfilaksis_M_id_seq", sequenceName = "public.AntibiotikProfilaksis_M_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.AntibiotikProfilaksis_M_id_seq")
+ @SequenceGenerator(name = "public.AntibiotikProfilaksis_M_id_seq", sequenceName = "public.AntibiotikProfilaksis_M_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntrianPasienDiPeriksa.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntrianPasienDiPeriksa.java
index b5babdca..1c14590b 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntrianPasienDiPeriksa.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntrianPasienDiPeriksa.java
@@ -14,6 +14,7 @@ import java.util.Date;
@Entity
@Table(name = "AntrianPasienDiPeriksa_T")
public class AntrianPasienDiPeriksa extends BaseTransaction {
+
private static final long serialVersionUID = 1243474652074108524L;
@ManyToOne(fetch = FetchType.LAZY)
@@ -149,4 +150,5 @@ public class AntrianPasienDiPeriksa extends BaseTransaction {
@Column(name = "statusAntrian", length = 200)
@Caption(value = "Status Antrian ")
private String statusAntrian;
+
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntrianPasienRegistrasi.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntrianPasienRegistrasi.java
index 4e410ad9..94cc3439 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntrianPasienRegistrasi.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntrianPasienRegistrasi.java
@@ -1,660 +1,227 @@
package com.jasamedika.medifirst2000.entities;
-import java.io.Serializable;import org.hibernate.envers.Audited;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+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 org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
-
+import static javax.persistence.FetchType.LAZY;
+@Getter
+@Setter
@Entity
@Table(name = "AntrianPasienRegistrasi_T")
-@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
public class AntrianPasienRegistrasi extends BaseTransaction {
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "Kebangsaan")
- @Caption(value="Object Desa kelurahan")
+ @Caption(value = "Object Desa kelurahan")
private Kebangsaan kebangsaan;
-
- @Column(name = "Kebangsaan", insertable=false,updatable=false,nullable=true)
+
+ @Column(name = "Kebangsaan", insertable = false, updatable = false)
private Integer kebangsaanId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "Negara")
- @Caption(value="Object Desa kelurahan")
+ @Caption(value = "Object Desa kelurahan")
private Negara negara;
-
- @Column(name = "Negara", insertable=false,updatable=false,nullable=true)
+
+ @Column(name = "Negara", insertable = false, updatable = false)
private Integer negaraId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectDesaKelurahanFk")
- @Caption(value="Object Desa kelurahan")
+ @Caption(value = "Object Desa kelurahan")
private DesaKelurahan desaKelurahan;
-
- @Column(name = "ObjectDesaKelurahanFk", insertable=false,updatable=false,nullable=true)
+
+ @Column(name = "ObjectDesaKelurahanFk", insertable = false, updatable = false)
private Integer desaKelurahanId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectKelompokPasienFk")
- @Caption(value="Object Kelompok Pasien")
+ @Caption(value = "Object Kelompok Pasien")
private KelompokPasien jenisPasien;
-
- @Column(name = "ObjectKelompokPasienFk", insertable=false,updatable=false,nullable=true)
+
+ @Column(name = "ObjectKelompokPasienFk", insertable = false, updatable = false)
private Integer jenisPasienId;
-
- @Column(name = "namaAyah", nullable = true , length = 40)
- @Caption(value="Nama Ayah")
+
+ @Column(name = "namaAyah", length = 40)
+ @Caption(value = "Nama Ayah")
private String namaAyah;
-
- @Column(name = "noTelepon", nullable = true , length = 40)
- @Caption(value="Nomor Telepon")
- private String noTelepon;
-
- @Column(name = "namaSuamiIstri", nullable = true , length = 40)
- @Caption(value="Nama/Suami Istri")
+
+ @Column(name = "noTelepon", length = 40)
+ @Caption(value = "Nomor Telepon")
+ private String noTelepon;
+
+ @Column(name = "namaSuamiIstri", length = 40)
+ @Caption(value = "Nama/Suami Istri")
private String namaSuamiIstri;
-
- @Column(name = "isConfirm",nullable=true)
+
+ @Column(name = "isConfirm")
protected Boolean isConfirm;
- @ManyToOne(fetch=FetchType.LAZY)
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectPegawaiFk")
- @Caption(value="Kode Dokter Order")
+ @Caption(value = "Kode Dokter Order")
private Pegawai pegawai;
- @Column(name = "ObjectPegawaiFk", insertable=false,updatable=false,nullable = true)
+ @Column(name = "ObjectPegawaiFk", insertable = false, updatable = false)
private Integer pegawaiId;
- @Column(name = "tipePasien", nullable = true , length = 40)
- @Caption(value="Tipe Pasien")
+ @Column(name = "tipePasien", length = 40)
+ @Caption(value = "Tipe Pasien")
private String tipePasien;
-
- @Column(name = "type", nullable = true , length = 40)
- @Caption(value="Type")
+
+ @Column(name = "type", length = 40)
+ @Caption(value = "Type")
private String type;
-
- @Column(name = "noAntrian", nullable = true , length = 40)
- @Caption(value="no Antrian")
+
+ @Column(name = "noAntrian", length = 40)
+ @Caption(value = "no Antrian")
private Integer noAntrian;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "NoCMFk")
- @Caption(value="No C M")
+ @Caption(value = "No C M")
private Pasien pasien;
- @Column(name = "NoCMFk", insertable=false,updatable=false,nullable = true)
+ @Column(name = "NoCMFk", insertable = false, updatable = false)
private Integer pasienId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectJenisKelaminFk")
- @Caption(value="Object Jenis Kelamin")
+ @Caption(value = "Object Jenis Kelamin")
private JenisKelamin jenisKelamin;
- @Column(name = "ObjectJenisKelaminFk", insertable=false,updatable=false,nullable=true)
+ @Column(name = "ObjectJenisKelaminFk", insertable = false, updatable = false)
private Integer jenisKelaminId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectAgamaFk")
- @Caption(value="Object Agama")
+ @Caption(value = "Object Agama")
private Agama agama;
- @Column(name = "ObjectAgamaFk", insertable=false,updatable=false,nullable=true)
+ @Column(name = "ObjectAgamaFk", insertable = false, updatable = false)
private Integer agamaId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectPendidikanFk")
- @Caption(value="Object Pendidikan")
+ @Caption(value = "Object Pendidikan")
private Pendidikan pendidikan;
- @Column(name = "ObjectPendidikanFk", insertable=false,updatable=false,nullable=true)
+ @Column(name = "ObjectPendidikanFk", insertable = false, updatable = false)
private Integer pendidikanId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectPekerjaanFk")
- @Caption(value="Object Pekerjaan")
+ @Caption(value = "Object Pekerjaan")
private Pekerjaan pekerjaan;
- @Column(name = "ObjectPekerjaanFk", insertable=false,updatable=false,nullable=true)
+ @Column(name = "ObjectPekerjaanFk", insertable = false, updatable = false)
private Integer pekerjaanId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectStatusPerkawinanFk")
- @Caption(value="Object Status Perkawinan")
+ @Caption(value = "Object Status Perkawinan")
private StatusPerkawinan statusPerkawinan;
- @Column(name = "ObjectStatusPerkawinanFk", insertable=false,updatable=false,nullable=true)
+ @Column(name = "ObjectStatusPerkawinanFk", insertable = false, updatable = false)
private Integer statusPerkawinanId;
-
- @Column(name = "TanggalReservasi", nullable = true )
- @Caption(value="Tanggal Reservasi")
+
+ @Column(name = "TanggalReservasi")
+ @Caption(value = "Tanggal Reservasi")
private Date tglReservasi;
-
- @Column(name = "noReservasi", nullable = true )
- @Caption(value="No Reservasi")
+
+ @Column(name = "noReservasi")
+ @Caption(value = "No Reservasi")
private String noReservasi;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectRuanganFk")
- @Caption(value="Object Ruangan")
+ @Caption(value = "Object Ruangan")
private Ruangan ruangan;
- @Column(name = "ObjectRuanganFk", insertable=false,updatable=false,nullable=true)
+ @Column(name = "ObjectRuanganFk", insertable = false, updatable = false)
private Integer ruanganId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectAsalRujukanFk")
- @Caption(value="Object Asal Rujukan")
+ @Caption(value = "Object Asal Rujukan")
private AsalRujukan asalRujukan;
- @Column(name = "ObjectAsalRujukanFk", insertable=false,updatable=false,nullable=true)
+ @Column(name = "ObjectAsalRujukanFk", insertable = false, updatable = false)
private Integer asalRujuakanId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectGolonganDarahFk")
- @Caption(value="Object Golongan Darah")
+ @Caption(value = "Object Golongan Darah")
private GolonganDarah golonganDarah;
- @Column(name = "ObjectGolonganDarahFk", insertable=false,updatable=false,nullable=true)
+ @Column(name = "ObjectGolonganDarahFk", insertable = false, updatable = false)
private Integer golonganDarahId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@JoinColumn(name = "ObjectTitleFk")
- @Caption(value="Object Title")
+ @Caption(value = "Object Title")
private TitlePasien titlePasien;
- @Column(name = "ObjectTitleFk", insertable=false,updatable=false,nullable=true)
+ @Column(name = "ObjectTitleFk", insertable = false, updatable = false)
private Integer titlePasienId;
-
- @Column(name = "noBpjs",nullable=true)
+
+ @Column(name = "noBpjs")
private String noBpjs;
-
- @Column(name = "noAsuransiLain",nullable=true)
+
+ @Column(name = "noAsuransiLain")
private String noAsuransiLain;
-
- @Column(name = "noIdentitas",nullable=true)
+
+ @Column(name = "noIdentitas")
private String noIdentitas;
-
- @Column(name = "tempatLahir",nullable=true)
+
+ @Column(name = "tempatLahir")
private String tempatLahir;
-
- @Column(name = "namaIbu",nullable=true)
+
+ @Column(name = "namaIbu")
private String namaIbu;
-
- @Column(name = "TglLahir", nullable = true)
- @Caption(value="Tanggal Lahir")
+
+ @Column(name = "TglLahir")
+ @Caption(value = "Tanggal Lahir")
private Date tglLahir;
-
- @Column(name = "NamaPasien", nullable = true)
- @Caption(value="Nama Pasien")
+
+ @Column(name = "NamaPasien")
+ @Caption(value = "Nama Pasien")
private String namaPasien;
-
- @Column(name = "alamatLengkap", nullable = true)
- @Caption(value="Alamat Lengkap")
+
+ @Column(name = "alamatLengkap")
+ @Caption(value = "Alamat Lengkap")
private String alamatLengkap;
-
- @OneToOne(fetch=FetchType.LAZY)
+
+ @OneToOne(fetch = LAZY)
@JoinColumn(name = "ObjectStrukReturFk")
- @Caption(value="Object Struk Retur")
+ @Caption(value = "Object Struk Retur")
private StrukRetur strukRetur;
-
- @Column(name = "ObjectStrukReturFk", insertable=false,updatable=false,nullable=true)
+
+ @Column(name = "ObjectStrukReturFk", insertable = false, updatable = false)
private String strukReturId;
-
- @Column(name = "Paspor", nullable = true )
- @Caption(value="Paspor")
+
+ @Column(name = "Paspor")
+ @Caption(value = "Paspor")
private String paspor;
-
- @Column(name = "NoAditional", nullable = true )
- @Caption(value="noAditional")
+
+ @Column(name = "NoAditional")
+ @Caption(value = "noAditional")
private String noAditional;
-
- @Column(name = "Jenis", nullable = true )
- @Caption(value="Jenis")
+
+ @Column(name = "Jenis")
+ @Caption(value = "Jenis")
private String jenis;
-
- @Column(name = "StatusPanggil", nullable = true )
- @Caption(value="StatusPanggil")
+
+ @Column(name = "StatusPanggil")
+ @Caption(value = "StatusPanggil")
private String statusPanggil;
- public Kebangsaan getKebangsaan() {
- return kebangsaan;
- }
-
- public void setKebangsaan(Kebangsaan kebangsaan) {
- this.kebangsaan = kebangsaan;
- }
-
- public Integer getKebangsaanId() {
- return kebangsaanId;
- }
-
- public void setKebangsaanId(Integer kebangsaanId) {
- this.kebangsaanId = kebangsaanId;
- }
-
- 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 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 KelompokPasien getJenisPasien() {
- return jenisPasien;
- }
-
- public void setJenisPasien(KelompokPasien jenisPasien) {
- this.jenisPasien = jenisPasien;
- }
-
- public Integer getJenisPasienId() {
- return jenisPasienId;
- }
-
- public void setJenisPasienId(Integer jenisPasienId) {
- this.jenisPasienId = jenisPasienId;
- }
-
- public String getNamaAyah() {
- return namaAyah;
- }
-
- public void setNamaAyah(String namaAyah) {
- this.namaAyah = namaAyah;
- }
-
- public String getNoTelepon() {
- return noTelepon;
- }
-
- public void setNoTelepon(String noTelepon) {
- this.noTelepon = noTelepon;
- }
-
- public String getNamaSuamiIstri() {
- return namaSuamiIstri;
- }
-
- public void setNamaSuamiIstri(String namaSuamiIstri) {
- this.namaSuamiIstri = namaSuamiIstri;
- }
-
- public Boolean getIsConfirm() {
- return isConfirm;
- }
-
- public void setIsConfirm(Boolean isConfirm) {
- this.isConfirm = isConfirm;
- }
-
- 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 String getTipePasien() {
- return tipePasien;
- }
-
- public void setTipePasien(String tipePasien) {
- this.tipePasien = tipePasien;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public Integer getNoAntrian() {
- return noAntrian;
- }
-
- public void setNoAntrian(Integer noAntrian) {
- this.noAntrian = noAntrian;
- }
-
- 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 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 Agama getAgama() {
- return agama;
- }
-
- public void setAgama(Agama agama) {
- this.agama = agama;
- }
-
- public Integer getAgamaId() {
- return agamaId;
- }
-
- public void setAgamaId(Integer agamaId) {
- this.agamaId = agamaId;
- }
-
- public Pendidikan getPendidikan() {
- return pendidikan;
- }
-
- public void setPendidikan(Pendidikan pendidikan) {
- this.pendidikan = pendidikan;
- }
-
- public Integer getPendidikanId() {
- return pendidikanId;
- }
-
- public void setPendidikanId(Integer pendidikanId) {
- this.pendidikanId = pendidikanId;
- }
-
- public Pekerjaan getPekerjaan() {
- return pekerjaan;
- }
-
- public void setPekerjaan(Pekerjaan pekerjaan) {
- this.pekerjaan = pekerjaan;
- }
-
- public Integer getPekerjaanId() {
- return pekerjaanId;
- }
-
- public void setPekerjaanId(Integer pekerjaanId) {
- this.pekerjaanId = pekerjaanId;
- }
-
- public StatusPerkawinan getStatusPerkawinan() {
- return statusPerkawinan;
- }
-
- public void setStatusPerkawinan(StatusPerkawinan statusPerkawinan) {
- this.statusPerkawinan = statusPerkawinan;
- }
-
- public Integer getStatusPerkawinanId() {
- return statusPerkawinanId;
- }
-
- public void setStatusPerkawinanId(Integer statusPerkawinanId) {
- this.statusPerkawinanId = statusPerkawinanId;
- }
-
- public Date getTglReservasi() {
- return tglReservasi;
- }
-
- public void setTglReservasi(Date tglReservasi) {
- this.tglReservasi = tglReservasi;
- }
-
- public String getNoReservasi() {
- return noReservasi;
- }
-
- public void setNoReservasi(String noReservasi) {
- this.noReservasi = noReservasi;
- }
-
- public Ruangan getRuangan() {
- return ruangan;
- }
-
- public void setRuangan(Ruangan ruangan) {
- this.ruangan = ruangan;
- }
-
- public Integer getRuanganId() {
- return ruanganId;
- }
-
- public void setRuanganId(Integer ruanganId) {
- this.ruanganId = ruanganId;
- }
-
- public AsalRujukan getAsalRujukan() {
- return asalRujukan;
- }
-
- public void setAsalRujukan(AsalRujukan asalRujukan) {
- this.asalRujukan = asalRujukan;
- }
-
- public Integer getAsalRujuakanId() {
- return asalRujuakanId;
- }
-
- public void setAsalRujuakanId(Integer asalRujuakanId) {
- this.asalRujuakanId = asalRujuakanId;
- }
-
- public GolonganDarah getGolonganDarah() {
- return golonganDarah;
- }
-
- public void setGolonganDarah(GolonganDarah golonganDarah) {
- this.golonganDarah = golonganDarah;
- }
-
- public Integer getGolonganDarahId() {
- return golonganDarahId;
- }
-
- public void setGolonganDarahId(Integer golonganDarahId) {
- this.golonganDarahId = golonganDarahId;
- }
-
- public TitlePasien getTitlePasien() {
- return titlePasien;
- }
-
- public void setTitlePasien(TitlePasien titlePasien) {
- this.titlePasien = titlePasien;
- }
-
- public Integer getTitlePasienId() {
- return titlePasienId;
- }
-
- public void setTitlePasienId(Integer titlePasienId) {
- this.titlePasienId = titlePasienId;
- }
-
- public String getNoBpjs() {
- return noBpjs;
- }
-
- public void setNoBpjs(String noBpjs) {
- this.noBpjs = noBpjs;
- }
-
- public String getNoAsuransiLain() {
- return noAsuransiLain;
- }
-
- public void setNoAsuransiLain(String noAsuransiLain) {
- this.noAsuransiLain = noAsuransiLain;
- }
-
- public String getNoIdentitas() {
- return noIdentitas;
- }
-
- public void setNoIdentitas(String noIdentitas) {
- this.noIdentitas = noIdentitas;
- }
-
- public String getTempatLahir() {
- return tempatLahir;
- }
-
- public void setTempatLahir(String tempatLahir) {
- this.tempatLahir = tempatLahir;
- }
-
- public String getNamaIbu() {
- return namaIbu;
- }
-
- public void setNamaIbu(String namaIbu) {
- this.namaIbu = namaIbu;
- }
-
- public Date getTglLahir() {
- return tglLahir;
- }
-
- public void setTglLahir(Date tglLahir) {
- this.tglLahir = tglLahir;
- }
-
- public String getNamaPasien() {
- return namaPasien;
- }
-
- public void setNamaPasien(String namaPasien) {
- this.namaPasien = namaPasien;
- }
-
- public String getAlamatLengkap() {
- return alamatLengkap;
- }
-
- public void setAlamatLengkap(String alamatLengkap) {
- this.alamatLengkap = alamatLengkap;
- }
-
- public StrukRetur getStrukRetur() {
- return strukRetur;
- }
-
- public void setStrukRetur(StrukRetur strukRetur) {
- this.strukRetur = strukRetur;
- }
-
- public String getStrukReturId() {
- return strukReturId;
- }
-
- public void setStrukReturId(String strukReturId) {
- this.strukReturId = strukReturId;
- }
-
- public String getPaspor() {
- return paspor;
- }
-
- public void setPaspor(String paspor) {
- this.paspor = paspor;
- }
-
- public String getNoAditional() {
- return noAditional;
- }
-
- public void setNoAditional(String noAditional) {
- this.noAditional = noAditional;
- }
-
- public String getJenis() {
- return jenis;
- }
-
- public void setJenis(String jenis) {
- this.jenis = jenis;
- }
-
- public String getStatusPanggil() {
- return statusPanggil;
- }
-
- public void setStatusPanggil(String statusPanggil) {
- this.statusPanggil = statusPanggil;
- }
-
}
-
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntrianPasienRegistrasiDetail.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntrianPasienRegistrasiDetail.java
index ed739c29..e4d8259c 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntrianPasienRegistrasiDetail.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AntrianPasienRegistrasiDetail.java
@@ -1,118 +1,60 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.PrimaryKeyJoinColumn;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.annotations.Parameter;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
-@Entity //@Audited
+import javax.persistence.*;
+
+@Getter
+@Setter
+@Entity
@Table(name = "AntrianPasienRegistrasiDetail_T")
-public class AntrianPasienRegistrasiDetail extends BaseTransaction{
- @Column(name = "merchant",length=50)
- @Caption(value="Merchant")
+public class AntrianPasienRegistrasiDetail extends BaseTransaction {
+
+ @Column(name = "merchant", length = 50)
+ @Caption(value = "Merchant")
private String merchant;
- @Column(name = "merchantInvoiceNo",length=20)
- @Caption(value="Merchant Invoice No")
+ @Column(name = "merchantInvoiceNo", length = 20)
+ @Caption(value = "Merchant Invoice No")
private String merchantInvoiceNo;
-
+
@Column(name = "amount")
- @Caption(value="Amount")
+ @Caption(value = "Amount")
private Long amount;
-
+
@ManyToOne
@JoinColumn(name = "ObjectJenisKartuDetailFk")
- @Caption(value="Object AntrianPasienRegistrasiDetail")
+ @Caption(value = "Object AntrianPasienRegistrasiDetail")
private JenisKartuDetail jenisKartuDetail;
-
- @Column(name = "ObjectJenisKartuDetailFk", insertable=false,updatable=false)
+
+ @Column(name = "ObjectJenisKartuDetailFk", insertable = false, updatable = false)
private Integer jenisKartuDetailId;
- public JenisKartuDetail getJenisKartuDetail() {
- return jenisKartuDetail;
- }
- public void setJenisKartuDetail(JenisKartuDetail jenisKartuDetail) {
- this.jenisKartuDetail = jenisKartuDetail;
- }
-
-
@ManyToOne
@JoinColumn(name = "ObjectJenisKartuFk")
- @Caption(value="Object Jenis Kartu")
+ @Caption(value = "Object Jenis Kartu")
private JenisKartu jenisKartu;
-
- @Column(name = "ObjectKartuKreditFk", insertable=false,updatable=false)
+
+ @Column(name = "ObjectKartuKreditFk", insertable = false, updatable = false)
private Integer jenisKartuId;
@ManyToOne
@JoinColumn(name = "ObjectCaraBayarFk")
- @Caption(value="Object Cara Bayar")
+ @Caption(value = "Object Cara Bayar")
private CaraBayar caraBayar;
-
- @Column(name = "ObjectKartuKreditFk", insertable=false,updatable=false)
+
+ @Column(name = "ObjectKartuKreditFk", insertable = false, updatable = false)
private Integer caraBayarId;
- public String getMerchant() {
- return merchant;
- }
- public void setMerchant(String merchant) {
- this.merchant = merchant;
- }
- public String getMerchantInvoiceNo() {
- return merchantInvoiceNo;
- }
- public void setMerchantInvoiceNo(String merchantInvoiceNo) {
- this.merchantInvoiceNo = merchantInvoiceNo;
- }
- public Long getAmount() {
- return amount;
- }
- public void setAmount(Long amount) {
- this.amount = amount;
- }
- public JenisKartu getJenisKartu() {
- return jenisKartu;
- }
- public void setJenisKartu(JenisKartu jenisKartu) {
- this.jenisKartu = jenisKartu;
- }
- public CaraBayar getCaraBayar() {
- return caraBayar;
- }
- public void setCaraBayar(CaraBayar caraBayar) {
- this.caraBayar = caraBayar;
- }
-
@OneToOne
- @JoinColumn(name="ObjectAntrianPasienRegistrasiFK")
- @Caption(value="AntrianPasienRegistrasi")
+ @JoinColumn(name = "ObjectAntrianPasienRegistrasiFK")
+ @Caption(value = "AntrianPasienRegistrasi")
private AntrianPasienRegistrasi antrianPasienRegistrasi;
- public AntrianPasienRegistrasi getAntrianPasienRegistrasi() {
- return antrianPasienRegistrasi;
- }
-
- public void setAntrianPasienRegistrasi(AntrianPasienRegistrasi antrianPasienRegistrasi) {
- this.antrianPasienRegistrasi = antrianPasienRegistrasi;
- }
-
- @Column(name = "ObjectAntrianPasienRegistrasiFK",insertable=false,updatable=false)
+ @Column(name = "ObjectAntrianPasienRegistrasiFK", insertable = false, updatable = false)
private String antrianPasienRegistrasiId;
-
+
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ApresiasiAtasLayanan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ApresiasiAtasLayanan.java
index 7c89c5cb..8dfc9519 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ApresiasiAtasLayanan.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ApresiasiAtasLayanan.java
@@ -1,48 +1,31 @@
package com.jasamedika.medifirst2000.entities;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Getter
+@Setter
@Entity
@Table(name = "ApresiasiAtasLayanan_T")
public class ApresiasiAtasLayanan extends BaseTransaction {
-
+
@ManyToOne
@JoinColumn(name = "ObjectGambarMukaKepuasanFk")
- @NotNull(message="GambarMukaKepuasan tidak boleh kosong")
- @Caption(value="Gambar Muka Kepuasan")
+ @NotNull(message = "GambarMukaKepuasan tidak boleh kosong")
+ @Caption(value = "Gambar Muka Kepuasan")
private GambarMukaKepuasan gambarMukaKepuasan;
-
- @Column(name = "ObjectGambarMukaKepuasanFk", insertable=false,updatable=false, nullable = false)
+
+ @Column(name = "ObjectGambarMukaKepuasanFk", insertable = false, updatable = false, nullable = false)
private Integer gambarMukaKepuasanId;
-
- @Column(name = "tanggal", nullable = true)
- @Caption(value="tanggal")
+
+ @Column(name = "tanggal")
+ @Caption(value = "tanggal")
private Date tanggal;
-
- public GambarMukaKepuasan getGambarMukaKepuasan() {
- return gambarMukaKepuasan;
- }
- public void setGambarMukaKepuasan(GambarMukaKepuasan gambarMukaKepuasan) {
- this.gambarMukaKepuasan = gambarMukaKepuasan;
- }
-
- public Date getTanggal() {
- return tanggal;
- }
-
- public void setTanggal(Date tanggal) {
- this.tanggal = tanggal;
- }
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepIntervensi.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepIntervensi.java
index e85e912d..34ce9a2e 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepIntervensi.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepIntervensi.java
@@ -1,80 +1,45 @@
package com.jasamedika.medifirst2000.entities;
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AsKepIntervensi
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsKepIntervensi_M")
public class AsKepIntervensi extends BaseMaster {
+
@NotNull(message = "Intervensi tidak boleh kosong")
@Column(name = "Intervensi", nullable = false, length = 150)
@Caption(value = "Intervensi")
private String intervensi;
- public void setIntervensi(String intervensi) {
- this.intervensi = intervensi;
- }
-
- public String getIntervensi() {
- return this.intervensi;
- }
-
+ @NotNull(message = "Kd Intervensi tidak boleh kosong")
+ @Column(name = "KdIntervensi", nullable = false)
@Caption(value = "Kode Intervensi")
private Integer kdIntervensi;
- @NotNull(message = "Kd Intervensi tidak boleh kosong")
- @Column(name = "KdIntervensi", nullable = false)
- public Integer getKdIntervensi() {
- return kdIntervensi;
- }
-
- public void setKdIntervensi(Integer kdIntervensi) {
- this.kdIntervensi = kdIntervensi;
- }
-
+ @NotNull(message = "QIntervensi tidak boleh kosong")
+ @Column(name = "QIntervensi", nullable = false)
@Caption(value = "QIntervensi")
private Integer qIntervensi;
- @NotNull(message = "QIntervensi tidak boleh kosong")
- @Column(name = "QIntervensi", nullable = false)
- public Integer getqIntervensi() {
- return qIntervensi;
- }
-
- public void setqIntervensi(Integer qIntervensi) {
- this.qIntervensi = qIntervensi;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.askepintervensi_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.askepintervensi_m_id_seq", sequenceName = "public.askepintervensi_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.askepintervensi_m_id_seq")
+ @SequenceGenerator(name = "public.askepintervensi_m_id_seq", sequenceName = "public.askepintervensi_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepJenisKajian.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepJenisKajian.java
index e8499605..b3ea7c7f 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepJenisKajian.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepJenisKajian.java
@@ -1,84 +1,43 @@
package com.jasamedika.medifirst2000.entities;
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AsKepJenisKajian
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsKepJenisKajian_M")
public class AsKepJenisKajian extends BaseMaster {
+
@NotNull(message = "Jenis Kajian tidak boleh kosong")
@Column(name = "JenisKajian", nullable = false, length = 50)
@Caption(value = "Jenis Kajian")
private String jenisKajian;
- public void setJenisKajian(String jenisKajian) {
- this.jenisKajian = jenisKajian;
- }
-
- public String getJenisKajian() {
- return this.jenisKajian;
- }
-
@Caption(value = "Kode Jenis Kajian")
private Byte kdJenisKajian;
- public Byte getKdJenisKajian() {
- return kdJenisKajian;
- }
-
- public void setKdJenisKajian(Byte kdJenisKajian) {
- this.kdJenisKajian = kdJenisKajian;
- }
-
+ @NotNull(message = "QJenis Kajian tidak boleh kosong")
+ @Column(name = "QJenisKajian", nullable = false)
@Caption(value = "QJenis Kajian")
private Byte qJenisKajian;
- @NotNull(message = "QJenis Kajian tidak boleh kosong")
- @Column(name = "QJenisKajian", nullable = false)
- public Byte getqJenisKajian() {
- return qJenisKajian;
- }
-
- public void setqJenisKajian(Byte qJenisKajian) {
- this.qJenisKajian = qJenisKajian;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.askepjeniskajian_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.askepjeniskajian_m_id_seq", sequenceName = "public.askepjeniskajian_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.askepjeniskajian_m_id_seq")
+ @SequenceGenerator(name = "public.askepjeniskajian_m_id_seq", sequenceName = "public.askepjeniskajian_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepKajian.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepKajian.java
index d6cd866e..08c329a7 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepKajian.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepKajian.java
@@ -1,159 +1,71 @@
package com.jasamedika.medifirst2000.entities;
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AsKepKajian
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsKepKajian_M")
public class AsKepKajian extends BaseMaster {
- @Column(name = "DeskripsiKajian", nullable = true, length = 150)
+
+ @Column(name = "DeskripsiKajian", length = 150)
@Caption(value = "Deskripsi Kajian")
private String deskripsiKajian;
- public void setDeskripsiKajian(String deskripsiKajian) {
- this.deskripsiKajian = deskripsiKajian;
- }
-
- public String getDeskripsiKajian() {
- return this.deskripsiKajian;
- }
-
- @Column(name = "Kajian", nullable = true, length = 150)
+ @Column(name = "Kajian", length = 150)
@Caption(value = "Kajian")
private String kajian;
- public void setKajian(String kajian) {
- this.kajian = kajian;
- }
-
- public String getKajian() {
- return this.kajian;
- }
-
@ManyToOne
@JoinColumn(name = "ObjectJenisKajianFk")
@NotNull(message = "Kd Jenis Kajian tidak boleh kosong")
-
@Caption(value = "Object Jenis Kajian")
private AsKepJenisKajian jenisKajian;
- public void setJenisKajian(AsKepJenisKajian jenisKajian) {
- this.jenisKajian = jenisKajian;
- }
-
- public AsKepJenisKajian getJenisKajian() {
- return this.jenisKajian;
- }
-
@Column(name = "ObjectJenisKajianFk", insertable = false, updatable = false)
private Integer jenisKajianId;
- public Integer getJenisKajianId() {
- return jenisKajianId;
- }
-
- public void setJenisKajianId(Integer jenisKajianId) {
- this.jenisKajianId = jenisKajianId;
- }
-
- @Caption(value = "Kode Kajian")
- private Integer kdKajian;
-
@NotNull(message = "Kd Kajian tidak boleh kosong")
@Column(name = "KdKajian", nullable = false)
- public Integer getKdKajian() {
- return kdKajian;
- }
-
- public void setKdKajian(Integer kdKajian) {
- this.kdKajian = kdKajian;
- }
+ @Caption(value = "Kode Kajian")
+ private Integer kdKajian;
@ManyToOne
@JoinColumn(name = "ObjectKategoryKajianFk")
@NotNull(message = "Kd Kategory Kajian tidak boleh kosong")
-
@Caption(value = "Object Kategory Kajian")
private AsKepKategoryKajian kategoryKajian;
- public void setKategoryKajian(AsKepKategoryKajian kategoryKajian) {
- this.kategoryKajian = kategoryKajian;
- }
-
- public AsKepKategoryKajian getKategoryKajian() {
- return this.kategoryKajian;
- }
-
@Column(name = "ObjectKategoryKajianFk", insertable = false, updatable = false, nullable = false)
private Integer kategoryKajianId;
- public Integer getKategoryKajianId() {
- return kategoryKajianId;
- }
-
- public void setKategoryKajianId(Integer kategoryKajianId) {
- this.kategoryKajianId = kategoryKajianId;
- }
-
@NotNull(message = "Nilai Normal tidak boleh kosong")
@Column(name = "NilaiNormal", nullable = false, length = 50)
@Caption(value = "Nilai Normal")
private String nilaiNormal;
- public void setNilaiNormal(String nilaiNormal) {
- this.nilaiNormal = nilaiNormal;
- }
-
- public String getNilaiNormal() {
- return this.nilaiNormal;
- }
-
+ @NotNull(message = "QKajian tidak boleh kosong")
+ @Column(name = "QKajian", nullable = false)
@Caption(value = "QKajian")
private Integer qKajian;
- @NotNull(message = "QKajian tidak boleh kosong")
- @Column(name = "QKajian", nullable = false)
- public Integer getqKajian() {
- return qKajian;
- }
-
- public void setqKajian(Integer qKajian) {
- this.qKajian = qKajian;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.askepkajian_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.askepkajian_m_id_seq", sequenceName = "public.askepkajian_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.askepkajian_m_id_seq")
+ @SequenceGenerator(name = "public.askepkajian_m_id_seq", sequenceName = "public.askepkajian_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepKategoryKajian.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepKategoryKajian.java
index 2275d96d..f50dc6f9 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepKategoryKajian.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepKategoryKajian.java
@@ -1,97 +1,43 @@
package com.jasamedika.medifirst2000.entities;
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AsKepKategoryKajian
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsKepKategoryKajian_M")
public class AsKepKategoryKajian extends BaseMaster {
+
@NotNull(message = "Kategory Kajian tidak boleh kosong")
@Column(name = "KategoryKajian", nullable = false, length = 50)
@Caption(value = "Kategory Kajian")
private String kategoryKajian;
- public void setKategoryKajian(String kategoryKajian) {
- this.kategoryKajian = kategoryKajian;
- }
-
- public String getKategoryKajian() {
- return this.kategoryKajian;
- }
-
- @Caption(value = "Kode Kategory Kajian")
- private Byte kdKategoryKajian;
-
@NotNull(message = "Kd Kategory Kajian tidak boleh kosong")
@Column(name = "KdKategoryKajian", nullable = false)
- public Byte getKdKategoryKajian() {
- return kdKategoryKajian;
- }
-
- public void setKdKategoryKajian(Byte kdKategoryKajian) {
- this.kdKategoryKajian = kdKategoryKajian;
- }
+ @Caption(value = "Kode Kategory Kajian")
+ private Byte kdKategoryKajian;
@Caption(value = "QKategory Kajian")
private Byte qKategoryKajian;
- public Byte getqKategoryKajian() {
- return qKategoryKajian;
- }
-
- public void setqKategoryKajian(Byte qKategoryKajian) {
- this.qKategoryKajian = qKategoryKajian;
- }
-
- /*
- * @JsonManagedReference
- *
- * @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL,
- * mappedBy="kdkategorykajian") private Set AsKepKajianSet =
- * new HashSet();
- *
- * public Set getAsKepKajianSet() { return AsKepKajianSet; }
- *
- * public void setAsKepKajianSet(Set asKepKajianSet) {
- * AsKepKajianSet = asKepKajianSet; }
- */
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.askepkategorykajian_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.askepkategorykajian_m_id_seq", sequenceName = "public.askepkategorykajian_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.askepkategorykajian_m_id_seq")
+ @SequenceGenerator(name = "public.askepkategorykajian_m_id_seq", sequenceName = "public.askepkategorykajian_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepRasionalI.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepRasionalI.java
index 40b08c28..c935e897 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepRasionalI.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepRasionalI.java
@@ -1,81 +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 javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AsKepRasionalI
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsKepRasionalI_M")
public class AsKepRasionalI extends BaseMaster {
+
@Caption(value = "Kode Rasional I")
private Integer kdRasionalI;
- public Integer getKdRasionalI() {
- return kdRasionalI;
- }
-
- public void setKdRasionalI(Integer kdRasionalI) {
- this.kdRasionalI = kdRasionalI;
- }
-
- @Caption(value = "QRasional I")
- private Integer qRasionalI;
-
@NotNull(message = "QRasional I tidak boleh kosong")
@Column(name = "QRasionalI", nullable = false)
- public Integer getqRasionalI() {
- return qRasionalI;
- }
-
- public void setqRasionalI(Integer qRasionalI) {
- this.qRasionalI = qRasionalI;
- }
+ @Caption(value = "QRasional I")
+ private Integer qRasionalI;
@NotNull(message = "Rasional I tidak boleh kosong")
@Column(name = "RasionalI", nullable = false, length = 150)
@Caption(value = "Rasional I")
private String rasionalI;
- public void setRasionalI(String rasionalI) {
- this.rasionalI = rasionalI;
- }
-
- public String getRasionalI() {
- return this.rasionalI;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.askeprasionali_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.askeprasionali_m_id_seq", sequenceName = "public.askeprasionali_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.askeprasionali_m_id_seq")
+ @SequenceGenerator(name = "public.askeprasionali_m_id_seq", sequenceName = "public.askeprasionali_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepTujuan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepTujuan.java
index f04d360e..5bdf8178 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepTujuan.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsKepTujuan.java
@@ -1,83 +1,45 @@
package com.jasamedika.medifirst2000.entities;
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AsKepTujuan
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsKepTujuan_M")
public class AsKepTujuan extends BaseMaster {
- @Caption(value = "Kode Tujuan")
- private Integer kdTujuan;
@NotNull(message = "Kd Tujuan tidak boleh kosong")
@Column(name = "KdTujuan", nullable = false)
- public Integer getKdTujuan() {
- return kdTujuan;
- }
-
- public void setKdTujuan(Integer kdTujuan) {
- this.kdTujuan = kdTujuan;
- }
-
- @Caption(value = "QTujuan")
- private Integer qTujuan;
+ @Caption(value = "Kode Tujuan")
+ private Integer kdTujuan;
@NotNull(message = "QTujuan tidak boleh kosong")
@Column(name = "QTujuan", nullable = false)
- public Integer getqTujuan() {
- return qTujuan;
- }
-
- public void setqTujuan(Integer qTujuan) {
- this.qTujuan = qTujuan;
- }
+ @Caption(value = "QTujuan")
+ private Integer qTujuan;
@NotNull(message = "Tujuan tidak boleh kosong")
@Column(name = "Tujuan", nullable = false, length = 150)
@Caption(value = "Tujuan")
private String tujuan;
- public void setujuan(String tujuan) {
- this.tujuan = tujuan;
- }
-
- public String getTujuan() {
- return this.tujuan;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.askeptujuan_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.askeptujuan_m_id_seq", sequenceName = "public.askeptujuan_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.askeptujuan_m_id_seq")
+ @SequenceGenerator(name = "public.askeptujuan_m_id_seq", sequenceName = "public.askeptujuan_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Asal.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Asal.java
index 9b317498..96abb9c2 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Asal.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Asal.java
@@ -1,50 +1,50 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
@Entity
@Table(name = "Asal_M")
-public class Asal extends BaseMaster{
+public class Asal extends BaseMaster {
+
@Column(name = "kdAsal", nullable = false)
@Caption(value = "kdAsal")
private Byte kdAsal;
-
+
@Column(name = "namaAsal", nullable = false)
@Caption(value = "namaAsal")
private String namaAsal;
-
+
@ManyToOne
@JoinColumn(name = "asalHeadFk")
- @Caption(value="asalHeadFk")
+ @Caption(value = "asalHeadFk")
private Asal asalHead;
- @Column(name = "asalHeadFk", insertable=false,updatable=false,nullable=true)
+ @Column(name = "asalHeadFk", insertable = false, updatable = false)
private Integer asalHeadId;
@ManyToOne
@JoinColumn(name = "asalAsalFk")
- @Caption(value="asalAsalFk")
+ @Caption(value = "asalAsalFk")
private Asal asalAsal;
- @Column(name = "asalAsalFk", insertable=false,updatable=false,nullable=false)
+ @Column(name = "asalAsalFk", insertable = false, updatable = false, nullable = false)
private Integer asalAsalId;
@ManyToOne
@JoinColumn(name = "departemenFk")
- @Caption(value="departemenFk")
+ @Caption(value = "departemenFk")
private Departemen departemen;
- @Column(name = "departemenFk", insertable=false,updatable=false,nullable=false)
+ @Column(name = "departemenFk", insertable = false, updatable = false, nullable = false)
private Integer departemenId;
@Column(name = "qAsal", nullable = false)
@@ -52,16 +52,9 @@ public class Asal extends BaseMaster{
private Byte qAsal;
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.asal_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.asal_m_id_seq", sequenceName = "public.asal_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.asal_m_id_seq")
+ @SequenceGenerator(name = "public.asal_m_id_seq", sequenceName = "public.asal_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalAnggaran.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalAnggaran.java
index a160d882..311448c8 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalAnggaran.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalAnggaran.java
@@ -1,111 +1,45 @@
package com.jasamedika.medifirst2000.entities;
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AsalAnggaran
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsalAnggaran_M")
public class AsalAnggaran extends BaseMaster {
+
@NotNull(message = "Asal Anggaran tidak boleh kosong")
@Column(name = "AsalAnggaran", nullable = false, length = 50)
@Caption(value = "Asal Anggaran")
private String asalAnggaran;
- public void setAsalAnggaran(String asalAnggaran) {
- this.asalAnggaran = asalAnggaran;
- }
-
- public String getAsalAnggaran() {
- return this.asalAnggaran;
- }
-
@Caption(value = "Kode Asal Anggaran")
private Byte kdAsalAnggaran;
- @NotNull(message = "Kd Asal Anggaran tidak boleh kosong")
- @Column(name = "KdAsalAnggaran", nullable = false)
- public Byte getKdAsalAnggaran() {
- return kdAsalAnggaran;
- }
-
- public void setKdAsalAnggaran(Byte kdAsalAnggaran) {
- this.kdAsalAnggaran = kdAsalAnggaran;
- }
-
- @Column(name = "Keterangan", nullable = true, length = 100)
+ @Column(name = "Keterangan", length = 100)
@Caption(value = "Keterangan")
private String keterangan;
- public void setKeterangan(String keterangan) {
- this.keterangan = keterangan;
- }
-
- public String getKeterangan() {
- return this.keterangan;
- }
-
@Caption(value = "QAsal Anggaran")
private Byte qAsalAnggaran;
- @NotNull(message = "QAsal Anggaran tidak boleh kosong")
- @Column(name = "QAsalAnggaran", nullable = false)
- public Byte getqAsalAnggaran() {
- return qAsalAnggaran;
- }
-
- public void setqAsalAnggaran(Byte qAsalAnggaran) {
- this.qAsalAnggaran = qAsalAnggaran;
- }
-
- /*
- * @JsonManagedReference
- *
- * @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL,
- * mappedBy="kdasalanggaran") private Set AnggaranSet = new
- * HashSet();
- *
- * public Set getAnggaranSet() { return AnggaranSet; }
- *
- * public void setAnggaranSet(Set anggaranSet) { AnggaranSet =
- * anggaranSet; }
- */
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.asalanggaran_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.asalanggaran_m_id_seq", sequenceName = "public.asalanggaran_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.asalanggaran_m_id_seq")
+ @SequenceGenerator(name = "public.asalanggaran_m_id_seq", sequenceName = "public.asalanggaran_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalPeserta.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalPeserta.java
index 16573f38..b91690af 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalPeserta.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalPeserta.java
@@ -1,108 +1,49 @@
package com.jasamedika.medifirst2000.entities;
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AsalPeserta
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsalPeserta_M")
public class AsalPeserta extends BaseMaster {
+
@NotNull(message = "Asal Peserta tidak boleh kosong")
@Column(name = "AsalPeserta", nullable = false, length = 30)
@Caption(value = "Asal Peserta")
private String asalPeserta;
- public void setAsalPeserta(String asalPeserta) {
- this.asalPeserta = asalPeserta;
- }
-
- public String getAsalPeserta() {
- return this.asalPeserta;
- }
-
@Caption(value = "Kode Asal Peserta")
private Byte kdAsalPeserta;
- @NotNull(message = "Kd Asal Peserta tidak boleh kosong")
- @Column(name = "KdAsalPeserta", nullable = false)
- public Byte getKdAsalPeserta() {
- return kdAsalPeserta;
- }
-
- public void setKdAsalPeserta(Byte kdAsalPeserta) {
- this.kdAsalPeserta = kdAsalPeserta;
- }
-
@ManyToOne
@JoinColumn(name = "ObjectDepartemenFk")
-
@Caption(value = "Object Departemen")
private Departemen departemen;
- public void setDepartemen(Departemen departemen) {
- this.departemen = departemen;
- }
-
- public Departemen getDepartemen() {
- return this.departemen;
- }
-
- public Integer getDepartemenId() {
- return departemenId;
- }
-
- public void setDepartemenId(Integer departemenId) {
- this.departemenId = departemenId;
- }
-
@Column(name = "ObjectDepartemenFk", insertable = false, updatable = false)
private Integer departemenId;
@Caption(value = "QAsal Peserta")
private Byte qAsalPeserta;
- @NotNull(message = "QAsal Peserta tidak boleh kosong")
- @Column(name = "QAsalPeserta", nullable = false)
- public Byte getqAsalPeserta() {
- return qAsalPeserta;
- }
-
- public void setqAsalPeserta(Byte qAsalPeserta) {
- this.qAsalPeserta = qAsalPeserta;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.asalpeserta_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.asalpeserta_m_id_seq", sequenceName = "public.asalpeserta_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.asalpeserta_m_id_seq")
+ @SequenceGenerator(name = "public.asalpeserta_m_id_seq", sequenceName = "public.asalpeserta_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalProduk.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalProduk.java
index 54f5d739..5653b5fd 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalProduk.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalProduk.java
@@ -9,6 +9,7 @@ import javax.persistence.*;
import javax.validation.constraints.NotNull;
import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AsalProduk
@@ -20,6 +21,7 @@ import static javax.persistence.FetchType.LAZY;
@Entity
@Table(name = "AsalProduk_M")
public class AsalProduk extends BaseMaster {
+
@NotNull(message = "Asal Produk tidak boleh kosong")
@Column(name = "AsalProduk", nullable = false, length = 30)
@Caption(value = "Asal Produk")
@@ -48,8 +50,9 @@ public class AsalProduk extends BaseMaster {
private Byte qAsalProduk;
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.asalproduk_m_id_seq")
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.asalproduk_m_id_seq")
@SequenceGenerator(name = "public.asalproduk_m_id_seq", sequenceName = "public.asalproduk_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
+
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalRujukan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalRujukan.java
index dbd2c73e..abaecf26 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalRujukan.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalRujukan.java
@@ -1,41 +1,27 @@
package com.jasamedika.medifirst2000.entities;
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-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 com.jasamedika.medifirst2000.util.CommonUtil;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
@Entity
@Table(name = "AsalRujukan_M")
public class AsalRujukan extends BaseMaster {
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.asalrujukan_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.asalrujukan_m_id_seq", sequenceName = "public.asalrujukan_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.asalrujukan_m_id_seq")
+ @SequenceGenerator(name = "public.asalrujukan_m_id_seq", sequenceName = "public.asalrujukan_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
-
+
@NotNull(message = "Asal Rujukan tidak boleh kosong")
@Column(name = "AsalRujukan", nullable = false, length = 30)
@Caption(value = "Asal Rujukan")
@@ -51,36 +37,4 @@ public class AsalRujukan extends BaseMaster {
@Caption(value = "QAsal Rujukan")
private Byte qAsalRujukan;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getAsalRujukan() {
- return asalRujukan;
- }
-
- public void setAsalRujukan(String asalRujukan) {
- this.asalRujukan = asalRujukan;
- }
-
- public String getKdAsalRujukan() {
- return kdAsalRujukan;
- }
-
- public void setKdAsalRujukan(String kdAsalRujukan) {
- this.kdAsalRujukan = kdAsalRujukan;
- }
-
- public Byte getqAsalRujukan() {
- return qAsalRujukan;
- }
-
- public void setqAsalRujukan(Byte qAsalRujukan) {
- this.qAsalRujukan = qAsalRujukan;
- }
-
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalSukuCadang.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalSukuCadang.java
index 3dd69dc9..c6f296d3 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalSukuCadang.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsalSukuCadang.java
@@ -1,57 +1,35 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class asalsukucadang
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsalSukuCadang_M")
public class AsalSukuCadang extends BaseMaster {
-
+
@NotNull(message = "Asal Suku Cadang tidak boleh kosong")
@Column(name = "asalsukucadang", nullable = false, length = 30)
@Caption(value = "Asal Suku Cadang")
private String asalSukuCadang;
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.asalsukucadang_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.asalsukucadang_m_id_seq", sequenceName = "public.asalsukucadang_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.asalsukucadang_m_id_seq")
+ @SequenceGenerator(name = "public.asalsukucadang_m_id_seq", sequenceName = "public.asalsukucadang_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
-
- public String getAsalSukuCadang() {
- return asalSukuCadang;
- }
-
-
- public void setAsalSukuCadang(String asalSukuCadang) {
- this.asalSukuCadang = asalSukuCadang;
- }
-
-
- public Integer getId() {
- return id;
- }
-
-
- public void setId(Integer id) {
- this.id = id;
- }
-
-
-
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenGiziAwal.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenGiziAwal.java
index 597dec03..944ff974 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenGiziAwal.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenGiziAwal.java
@@ -1,111 +1,56 @@
package com.jasamedika.medifirst2000.entities;
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
-
/**
- * class PosisiRahim
+ * class PosisiRahim
*
* @author Generator
*/
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsesmenGiziAwal_T")
public class AsesmenGiziAwal extends BaseTransaction {
- @ManyToOne(fetch= FetchType.LAZY)
+
+ @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "RisikoFk")
-
- @Caption(value="Risiko")
+ @Caption(value = "Risiko")
private RisikoGizi risiko;
- @Column(name = "RisikoFk", insertable=false,updatable=false,nullable = true)
+
+ @Column(name = "RisikoFk", insertable = false, updatable = false)
private Integer risikoId;
-
-
- public RisikoGizi getRisiko() {
- return risiko;
- }
- public void setRisiko(RisikoGizi risiko) {
- this.risiko = risiko;
- }
-
- @ManyToOne(cascade=CascadeType.REFRESH)
+ @ManyToOne(cascade = CascadeType.REFRESH)
@JoinColumn(name = "NoCMFk")
- @NotNull(message="No C M Harus Diisi")
- @Caption(value="No C M")
+ @NotNull(message = "No C M Harus Diisi")
+ @Caption(value = "No C M")
private AntrianPasienDiPeriksa pasienDaftar;
- @Column(name = "NoCMFk", insertable=false,updatable=false,nullable = false)
+ @Column(name = "NoCMFk", insertable = false, updatable = false, nullable = false)
private String pasienId;
-
- @NotNull(message="Tgl Pendaftaran tidak boleh kosong")
- @Column(name = "TanggalPendaftaran", nullable = false )
- @Caption(value="Tanggal Registrasi")
+
+ @NotNull(message = "Tgl Pendaftaran tidak boleh kosong")
+ @Column(name = "TanggalPendaftaran", nullable = false)
+ @Caption(value = "Tanggal Registrasi")
private Date tanggalPendaftaran;
-
+
@JsonBackReference
- @OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "asesmenGiziAwal")
- private Set preskripsiDiets=new HashSet();
-
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "asesmenGiziAwal")
+ private Set preskripsiDiets = new HashSet<>();
+
@JsonBackReference
- @OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "asesmenGiziAwal")
- private Set tindakLanjutGizis=new HashSet();
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "asesmenGiziAwal")
+ private Set tindakLanjutGizis = new HashSet<>();
- public AntrianPasienDiPeriksa getPasien() {
- return pasienDaftar;
- }
-
- public void setPasien(AntrianPasienDiPeriksa pasien) {
- this.pasienDaftar = pasien;
- }
-
- public String getPasienId() {
- return pasienId;
- }
-
- public void setPasienId(String pasienId) {
- this.pasienId = pasienId;
- }
-
- public Date getTanggalPendaftaran() {
- return tanggalPendaftaran;
- }
-
- public void setTanggalPendaftaran(Date tanggalPendaftaran) {
- this.tanggalPendaftaran = tanggalPendaftaran;
- }
-
- public Set getPreskripsiDiets() {
- return preskripsiDiets;
- }
-
- public void setPreskripsiDiets(Set preskripsiDiets) {
- this.preskripsiDiets = preskripsiDiets;
- }
-
- public Set getTindakLanjutGizis() {
- return tindakLanjutGizis;
- }
-
- public void setTindakLanjutGizis(Set tindakLanjutGizis) {
- this.tindakLanjutGizis = tindakLanjutGizis;
- }
-
-
-
}
-
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenGiziLanjut.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenGiziLanjut.java
index 84b08fb0..b26fe7c9 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenGiziLanjut.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenGiziLanjut.java
@@ -1,80 +1,50 @@
package com.jasamedika.medifirst2000.entities;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
-import com.jasamedika.medifirst2000.helper.Caption;
-
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsesmenGiziLanjut_T")
public class AsesmenGiziLanjut extends MedicalRecordTransaction {
private static final long serialVersionUID = -5991896827985648631L;
@NotNull(message = "Riwayat Diet tidak boleh kosong")
- @Column(name = "RiwayatDiet", nullable = true, length = 1000)
+ @Column(name = "RiwayatDiet", length = 1000)
@Caption(value = "Riwayat Diet")
private String riwayatDiet;
-
+
@NotNull(message = "Biokimia tidak boleh kosong")
- @Column(name = "Biokimia", nullable = true, length = 1000)
+ @Column(name = "Biokimia", length = 1000)
@Caption(value = "Biokimia")
private String biokimia;
+
@NotNull(message = "intervensiGizi tidak boleh kosong")
- @Column(name = "IntervensiGizi", nullable = true, length = 1000)
+ @Column(name = "IntervensiGizi", length = 1000)
@Caption(value = "intervensi Gizi")
private String intervensiGizi;
+
@NotNull(message = "riwayatPersonal tidak boleh kosong")
- @Column(name = "RiwayatPersonal", nullable = true, length = 1000)
+ @Column(name = "RiwayatPersonal", length = 1000)
@Caption(value = "riwayatPersonal")
private String riwayatPersonal;
+
@NotNull(message = "monitoringEvaluasi tidak boleh kosong")
- @Column(name = "MonitoringEvaluasi", nullable = true, length = 1000)
+ @Column(name = "MonitoringEvaluasi", length = 1000)
@Caption(value = "monitoringEvaluasi")
private String monitoringEvaluasi;
+
@NotNull(message = "klinikFisik tidak boleh kosong")
- @Column(name = "KlinikFisik", nullable = true, length = 1000)
+ @Column(name = "KlinikFisik", length = 1000)
@Caption(value = "klinikFisik")
private String klinikFisik;
- public String getRiwayatDiet() {
- return riwayatDiet;
- }
- public void setRiwayatDiet(String riwayatDiet) {
- this.riwayatDiet = riwayatDiet;
- }
- public String getBiokimia() {
- return biokimia;
- }
- public void setBiokimia(String biokimia) {
- this.biokimia = biokimia;
- }
- public String getIntervensiGizi() {
- return intervensiGizi;
- }
- public void setIntervensiGizi(String intervensiGizi) {
- this.intervensiGizi = intervensiGizi;
- }
- public String getRiwayatPersonal() {
- return riwayatPersonal;
- }
- public void setRiwayatPersonal(String riwayatPersonal) {
- this.riwayatPersonal = riwayatPersonal;
- }
- public String getMonitoringEvaluasi() {
- return monitoringEvaluasi;
- }
- public void setMonitoringEvaluasi(String monitoringEvaluasi) {
- this.monitoringEvaluasi = monitoringEvaluasi;
- }
- public String getKlinikFisik() {
- return klinikFisik;
- }
- public void setKlinikFisik(String klinikFisik) {
- this.klinikFisik = klinikFisik;
- }
-
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenPsikologis.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenPsikologis.java
index d94680c5..dc4e19e1 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenPsikologis.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenPsikologis.java
@@ -1,55 +1,31 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
import javax.validation.constraints.NotNull;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
-
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsesmenPsikologis_T")
-public class AsesmenPsikologis extends BaseTransaction{
-
+public class AsesmenPsikologis extends BaseTransaction {
+
@ManyToOne
@JoinColumn(name = "PengkajianAwalPsikologiFk")
@NotNull(message = "Pengkajian Awal Psikologi tidak boleh kosong")
private PengkajianAwalPsikologi pengkajianAwalPsikologi;
-
+
@ManyToOne
@JoinColumn(name = "AsesmenPsikologisDetailFk")
@NotNull(message = "Asesmen Psikologis Detail tidak boleh kosong")
private AsesmenPsikologisDetail asesmenPsikologisDetail;
-
+
@Column(name = "keterangan")
@Caption(value = "Keterangan")
private String keterangan;
- public PengkajianAwalPsikologi getPengkajianAwalPsikologi() {
- return pengkajianAwalPsikologi;
- }
-
- public void setPengkajianAwalPsikologi(PengkajianAwalPsikologi pengkajianAwalPsikologi) {
- this.pengkajianAwalPsikologi = pengkajianAwalPsikologi;
- }
-
- public AsesmenPsikologisDetail getAsesmenPsikologisDetail() {
- return asesmenPsikologisDetail;
- }
-
- public void setAsesmenPsikologisDetail(AsesmenPsikologisDetail asesmenPsikologisDetail) {
- this.asesmenPsikologisDetail = asesmenPsikologisDetail;
- }
-
- public String getKeterangan() {
- return keterangan;
- }
-
- public void setKeterangan(String keterangan) {
- this.keterangan = keterangan;
- }
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenPsikologisDetail.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenPsikologisDetail.java
index 6f9a9b93..d1656f2d 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenPsikologisDetail.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsesmenPsikologisDetail.java
@@ -1,44 +1,30 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
import javax.validation.constraints.NotNull;
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
@Table(name = "RM_AsesmenPsikologis_M")
-public class AsesmenPsikologisDetail extends BaseMaster{
-
- @NotNull(message="Name tidak boleh kosong")
+public class AsesmenPsikologisDetail extends BaseMaster {
+
+ @NotNull(message = "Name tidak boleh kosong")
@Column(name = "Name", nullable = false, length = 100)
@Caption(value = "Name")
private String name;
-
- public void setName(String name)
- {
- this.name = name;
- }
- public String getName()
- {
- return this.name;
- }
+
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_AsesmenPsikologis_M_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.RM_AsesmenPsikologis_M_id_seq", sequenceName = "public.RM_AsesmenPsikologis_M_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.RM_AsesmenPsikologis_M_id_seq")
+ @SequenceGenerator(name = "public.RM_AsesmenPsikologis_M_id_seq", sequenceName = "public.RM_AsesmenPsikologis_M_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Asset.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Asset.java
index 8fdeb17d..22780e82 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Asset.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Asset.java
@@ -1,18 +1,19 @@
package com.jasamedika.medifirst2000.entities;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Getter
+@Setter
+@NoArgsConstructor
@Entity
@Table(name = "Asset_T")
@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
@@ -27,23 +28,19 @@ public class Asset extends BaseTransaction {
this.noRec = noRec;
}
- public Asset() {
-
- }
-
@ManyToOne
@JoinColumn(name = "ObjectKelompokAsetFk")
@Caption(value = "Kelompok Asset")
private KelompokAset kelompokAset;
- @Column(name = "ObjectKelompokAsetFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectKelompokAsetFk", insertable = false, updatable = false)
private Integer kelompokAsetId;
@ManyToOne
@JoinColumn(name = "ObjectRuanganFk")
private Ruangan ruangan;
- @Column(name = "ObjectRuanganFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectRuanganFk", insertable = false, updatable = false)
private Integer ruanganId;
@ManyToOne
@@ -51,14 +48,14 @@ public class Asset extends BaseTransaction {
@Caption(value = "Nama Barang")
private Produk produk;
- @Column(name = "ObjectProdukFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectProdukFk", insertable = false, updatable = false)
private Integer produkId;
@ManyToOne
@JoinColumn(name = "ObjectAsalProdukFk")
private AsalProduk asalProduk;
- @Column(name = "ObjectAsalProdukFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectAsalProdukFk", insertable = false, updatable = false)
private Integer asalProdukId;
@ManyToOne
@@ -66,77 +63,77 @@ public class Asset extends BaseTransaction {
@Caption(value = "Type")
private TypeProduk typeProduk;
- @Column(name = "ObjectTypeProdukFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectTypeProdukFk", insertable = false, updatable = false)
private Integer typeProdukId;
@ManyToOne
@JoinColumn(name = "ObjectBahanProdukFk")
private BahanProduk bahanProduk;
- @Column(name = "ObjectBahanProdukFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectBahanProdukFk", insertable = false, updatable = false)
private Integer bahanProdukId;
@ManyToOne
@JoinColumn(name = "ObjectWarnaProdukFk")
private WarnaProduk warnaProduk;
- @Column(name = "ObjectWarnaProdukFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectWarnaProdukFk", insertable = false, updatable = false)
private Integer warnaProdukId;
@ManyToOne
@JoinColumn(name = "ObjectProdusenProdukFk")
private ProdusenProduk produsenProduk;
- @Column(name = "ObjectProdusenProdukFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectProdusenProdukFk", insertable = false, updatable = false)
private Integer produsenProdukId;
@ManyToOne
@JoinColumn(name = "ObjectJenisKontruksiFk")
private JenisKontruksi jenisKontruksi;
- @Column(name = "ObjectJenisKontruksiFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectJenisKontruksiFk", insertable = false, updatable = false)
private Integer jenisKontruksiId;
@ManyToOne
@JoinColumn(name = "ObjectJenisSetifikatFk")
private JenisSertifikat jenisSertifikat;
- @Column(name = "ObjectJenisSetifikatFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectJenisSetifikatFk", insertable = false, updatable = false)
private Integer jenisSertifikatId;
@ManyToOne
@JoinColumn(name = "ObjectAlamatFk")
private Alamat alamat;
- @Column(name = "ObjectAlamatFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectAlamatFk", insertable = false, updatable = false)
private Integer alamatId;
@ManyToOne
@JoinColumn(name = "ObjectPegawaiPenggunaFk")
private PegawaiPengguna pegawaiPengguna;
- @Column(name = "ObjectPegawaiPenggunaFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectPegawaiPenggunaFk", insertable = false, updatable = false)
private Integer pegawaiPenggunaId;
@ManyToOne
@JoinColumn(name = "ObjectKondisiProdukAwalFk")
private KondisiProdukAwal kondisiProdukAwal;
- @Column(name = "ObjectKondisiProdukAwalFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectKondisiProdukAwalFk", insertable = false, updatable = false)
private Integer kondisiProdukAwalId;
@ManyToOne
@JoinColumn(name = "ObjectKondisiProdukCurrentFk")
private KondisiProdukCurrent kondisiProdukCurrent;
- @Column(name = "ObjectKondisiProdukCurrentFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectKondisiProdukCurrentFk", insertable = false, updatable = false)
private Integer kondisiProdukCurrentId;
@ManyToOne
@JoinColumn(name = "ObjectRuanganPosisiCurrentFk")
private RuanganPosisiCurrent ruanganPosisiCurrent;
- @Column(name = "ObjectRuanganPosisiCurrentFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectRuanganPosisiCurrentFk", insertable = false, updatable = false)
private Integer ruanganPosisiCurrentId;
@ManyToOne
@@ -144,7 +141,7 @@ public class Asset extends BaseTransaction {
@Caption(value = "Merk Produk")
private MerkProduk merkProduk;
- @Column(name = "ObjectMerkProdukFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectMerkProdukFk", insertable = false, updatable = false)
private Integer merkProdukId;
@ManyToOne
@@ -152,7 +149,7 @@ public class Asset extends BaseTransaction {
@Caption(value = "Satuan")
private SatuanAset satuanAset;
- @Column(name = "ObjectSatuanAsetFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectSatuanAsetFk", insertable = false, updatable = false)
private Integer satuanAsetId;
@ManyToOne
@@ -160,7 +157,7 @@ public class Asset extends BaseTransaction {
@Caption(value = "Klasifikasi Teknologi")
private KlasifikasiTeknologi klasifikasiTeknologi;
- @Column(name = "ObjectKlasifikasiTeknologiFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectKlasifikasiTeknologiFk", insertable = false, updatable = false)
private Integer klasifikasiTeknologiId;
@ManyToOne
@@ -168,7 +165,7 @@ public class Asset extends BaseTransaction {
@Caption(value = "Usia Asset")
private UsiaAset usiaAset;
- @Column(name = "ObjectUsiaAsetFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectUsiaAsetFk", insertable = false, updatable = false)
private Integer usiaAsetId;
@ManyToOne
@@ -176,7 +173,7 @@ public class Asset extends BaseTransaction {
@Caption(value = "Tahun Perolehan")
private TahunPerolehan tahunPerolehan;
- @Column(name = "ObjectTahunPerolehanFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectTahunPerolehanFk", insertable = false, updatable = false)
private Integer tahunPerolehanId;
@ManyToOne
@@ -184,7 +181,7 @@ public class Asset extends BaseTransaction {
@Caption(value = "Kondisi Asset")
private KondisiAset kondisiAset;
- @Column(name = "ObjectKondisiAsetFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectKondisiAsetFk", insertable = false, updatable = false)
private Integer kondisiAsetId;
@ManyToOne
@@ -192,7 +189,7 @@ public class Asset extends BaseTransaction {
@Caption("Distributor")
private Rekanan rekanan;
- @Column(name = "ObjectRekananFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectRekananFk", insertable = false, updatable = false)
private Integer rekananId;
@ManyToOne
@@ -200,29 +197,29 @@ public class Asset extends BaseTransaction {
@Caption("Lokasi Asset")
private Lokasi lokasi;
- @Column(name = "ObjectLokasiFk", nullable = true, insertable = false, updatable = false)
+ @Column(name = "ObjectLokasiFk", insertable = false, updatable = false)
private Integer lokasiId;
- @Column(name = "NoRegisterAset", nullable = true, length = 15)
+ @Column(name = "NoRegisterAset", length = 15)
@Caption(value = "No Registrasi Asset")
private String noRegisterAset;
- @Column(name = "NoRegisterAset_Int", nullable = true, length = 30)
+ @Column(name = "NoRegisterAset_Int", length = 30)
@Caption(value = "No Register Aset Int")
private String noRegisterAset_Int;
@NotNull(message = "Kode Aspac tidak boleh kosong")
- @Column(name = "KdAspac", nullable = true, length = 50)
+ @Column(name = "KdAspac", length = 50)
@Caption(value = "Kode Aspac")
private String kdAspac;
@NotNull(message = "Kode BMN tidak boleh kosong")
- @Column(name = "KdBmn", nullable = true, length = 50)
+ @Column(name = "KdBmn", length = 50)
@Caption(value = "Kode BMN")
private String kdBmn;
@NotNull(message = "Kode RSABHK tidak boleh kosong")
- @Column(name = "KdRsabhk", nullable = true, length = 50)
+ @Column(name = "KdRsabhk", length = 50)
@Caption(value = "Kode RSABHK")
private String kdRsabhk;
@@ -241,79 +238,79 @@ public class Asset extends BaseTransaction {
@Column(name = "KeteranganLainya", nullable = false, length = 150)
private String keteranganLainya;
- @Column(name = "NoModel", nullable = true, length = 15)
+ @Column(name = "NoModel", length = 15)
@Caption(value = "No Model")
private String noModel;
- @Column(name = "NamaModel", nullable = true, length = 50)
+ @Column(name = "NamaModel", length = 50)
@Caption(value = "Nama Model")
private String namaModel;
- @Column(name = "NoSerial", nullable = true, length = 30)
+ @Column(name = "NoSerial", length = 30)
@Caption(value = "No Serial")
private String noSerial;
- @Column(name = "NoPolisi", nullable = true, length = 15)
+ @Column(name = "NoPolisi", length = 15)
@Caption(value = "No Polisi")
private String noPolisi;
- @Column(name = "NoBpkb", nullable = true, length = 30)
+ @Column(name = "NoBpkb", length = 30)
@Caption(value = "No BPKB")
private String noBPKB;
- @Column(name = "NoMesin", nullable = true, length = 30)
+ @Column(name = "NoMesin", length = 30)
@Caption(value = "No Mesin")
private String noMesin;
- @Column(name = "NoRangka", nullable = true, length = 30)
+ @Column(name = "NoRangka", length = 30)
@Caption(value = "No Rangka")
private String noRangka;
- @Column(name = "BpkbAtasNama", nullable = true, length = 80)
+ @Column(name = "BpkbAtasNama", length = 80)
@Caption(value = "BPKB Atas Nama")
private String bpkbAtasNama;
- @Column(name = "NamaPengguna", nullable = true, length = 80)
+ @Column(name = "NamaPengguna", length = 80)
@Caption(value = "Nama Pengguna")
private String namaPengguna;
- @Column(name = "NoStrukText", nullable = true, length = 10)
+ @Column(name = "NoStrukText", length = 10)
@Caption(value = "No Struk")
private String noStrukText;
- @Column(name = "NoSertifikat", nullable = true, length = 30)
+ @Column(name = "NoSertifikat", length = 30)
@Caption(value = "No Sertifikat")
private String noSertifikat;
- @Column(name = "SertifikatAtasNama", nullable = true, length = 80)
+ @Column(name = "SertifikatAtasNama", length = 80)
@Caption(value = "Sertifikat Atas Nama")
private String sertifikatAtasNama;
- @Column(name = "NamaRuasJalan", nullable = true, length = 100)
+ @Column(name = "NamaRuasJalan", length = 100)
@Caption(value = "Nama Ruas Jalan")
private String namaRuasJalan;
- @Column(name = "FungsiKegunaan", nullable = true, length = 100)
+ @Column(name = "FungsiKegunaan", length = 100)
@Caption(value = "Fungsi Kegunaan")
private String fungsiKegunaan;
- @Column(name = "TglPenerimaanAset", nullable = true)
+ @Column(name = "TglPenerimaanAset")
@Caption(value = "Tgl Penerimaan Asset")
private Date tglPenerimaanAset;
- @Column(name = "MasaBerlakuSertifikat", nullable = true)
+ @Column(name = "MasaBerlakuSertifikat")
@Caption(value = "Masa Berlaku Sertifikat")
private Date masaBerlakuSertifikat;
- @Column(name = "TglProduksi", nullable = true)
+ @Column(name = "TglProduksi")
@Caption(value = "Tgl Produksi")
private Date tglProduksi;
- @Column(name = "TglRegisterAset", nullable = true)
+ @Column(name = "TglRegisterAset")
@Caption(value = "Tgl Register Asset")
private Date tglRegisterAset;
- @Column(name = "TglStrukTerima", nullable = true)
+ @Column(name = "TglStrukTerima")
@Caption(value = "Tgl Struk Terima")
private Date tglStrukTerima;
@@ -322,27 +319,27 @@ public class Asset extends BaseTransaction {
@Caption(value = "Qty")
private Integer qtyAset;
- @Column(name = "HargaPenyusutan", nullable = true)
+ @Column(name = "HargaPenyusutan")
@Caption(value = "Harga Penyusutan")
private float hargaPenyusutan;
- @Column(name = "TotalSudahMenyusut", nullable = true)
+ @Column(name = "TotalSudahMenyusut")
@Caption(value = "Total Sudah Menyusut")
private float totalSudahMenyusut;
- @Column(name = "HargaPertambahan", nullable = true)
+ @Column(name = "HargaPertambahan")
@Caption(value = "Harga Pertambahan")
private float hargaPertambahan;
- @Column(name = "TotalSudahBertambah", nullable = true)
+ @Column(name = "TotalSudahBertambah")
@Caption(value = "Total Sudah Bertambah")
private float totalSudahBertambah;
- @Column(name = "HargaSatuanRevaluasi", nullable = true)
+ @Column(name = "HargaSatuanRevaluasi")
@Caption(value = "Harga Satuan Revaluasi")
private float hargaSatuanRevaluasi;
- @Column(name = "HargaNetto", nullable = true)
+ @Column(name = "HargaNetto")
@Caption(value = "Harga Netto")
private float hargaNetto;
@@ -351,760 +348,40 @@ public class Asset extends BaseTransaction {
@Caption(value = "Harga")
private Double harga;
- @Column(name = "UmurEkonomisRevaluasiTahun", nullable = true)
+ @Column(name = "UmurEkonomisRevaluasiTahun")
@Caption(value = "Umur Ekonomi sRevaluasi Tahun")
private Double umurEkonomisRevaluasiTahun;
- @Column(name = "TotalSisaUmurEkonomisTahun", nullable = true)
+ @Column(name = "TotalSisaUmurEkonomisTahun")
@Caption(value = "Total SisaUmur Ekonomis Tahun")
private Double totalSisaUmurEkonomisTahun;
- @Column(name = "KapasitasMesin", nullable = true)
+ @Column(name = "KapasitasMesin")
@Caption(value = "Kapasitas Mesin")
private Double kapasitasMesin;
- @Column(name = "LtPanjang", nullable = true)
+ @Column(name = "LtPanjang")
@Caption(value = "LT Panjang")
private Double ltPanjang;
- @Column(name = "LtLebar", nullable = true)
+ @Column(name = "LtLebar")
@Caption(value = "LT Lebar")
private Double ltLebar;
- @Column(name = "LbPanjang", nullable = true)
+ @Column(name = "LbPanjang")
@Caption(value = "LB Panjang")
private Double lbPanjang;
- @Column(name = "LbLebar", nullable = true)
+ @Column(name = "LbLebar")
@Caption(value = "LB Lebar")
private Double lbLebar;
- @Column(name = "LbTinggi", nullable = true)
+ @Column(name = "LbTinggi")
@Caption(value = "LB Tinggi")
private Double lbTinggi;
- @Column(name = "QtyLantai", nullable = true)
+ @Column(name = "QtyLantai")
@Caption(value = "Qty Lantai")
private Double qtyLantai;
- public KelompokAset getKelompokAset() {
- return kelompokAset;
- }
-
- public void setKelompokAset(KelompokAset kelompokAset) {
- this.kelompokAset = kelompokAset;
- }
-
- public Integer getKelompokAsetId() {
- return kelompokAsetId;
- }
-
- public void setKelompokAsetId(Integer kelompokAsetId) {
- this.kelompokAsetId = kelompokAsetId;
- }
-
- public Ruangan getRuangan() {
- return ruangan;
- }
-
- public void setRuangan(Ruangan ruangan) {
- this.ruangan = ruangan;
- }
-
- public Integer getRuanganId() {
- return ruanganId;
- }
-
- public void setRuanganId(Integer ruanganId) {
- this.ruanganId = ruanganId;
- }
-
- public Produk getProduk() {
- return produk;
- }
-
- public void setProduk(Produk produk) {
- this.produk = produk;
- }
-
- public Integer getProdukId() {
- return produkId;
- }
-
- public void setProdukId(Integer produkId) {
- this.produkId = produkId;
- }
-
- public AsalProduk getAsalProduk() {
- return asalProduk;
- }
-
- public void setAsalProduk(AsalProduk asalProduk) {
- this.asalProduk = asalProduk;
- }
-
- public Integer getAsalProdukId() {
- return asalProdukId;
- }
-
- public void setAsalProdukId(Integer asalProdukId) {
- this.asalProdukId = asalProdukId;
- }
-
- public TypeProduk getTypeProduk() {
- return typeProduk;
- }
-
- public void setTypeProduk(TypeProduk typeProduk) {
- this.typeProduk = typeProduk;
- }
-
- public Integer getTypeProdukId() {
- return typeProdukId;
- }
-
- public void setTypeProdukId(Integer typeProdukId) {
- this.typeProdukId = typeProdukId;
- }
-
- public BahanProduk getBahanProduk() {
- return bahanProduk;
- }
-
- public void setBahanProduk(BahanProduk bahanProduk) {
- this.bahanProduk = bahanProduk;
- }
-
- public Integer getBahanProdukId() {
- return bahanProdukId;
- }
-
- public void setBahanProdukId(Integer bahanProdukId) {
- this.bahanProdukId = bahanProdukId;
- }
-
- public WarnaProduk getWarnaProduk() {
- return warnaProduk;
- }
-
- public void setWarnaProduk(WarnaProduk warnaProduk) {
- this.warnaProduk = warnaProduk;
- }
-
- public Integer getWarnaProdukId() {
- return warnaProdukId;
- }
-
- public void setWarnaProdukId(Integer warnaProdukId) {
- this.warnaProdukId = warnaProdukId;
- }
-
- public ProdusenProduk getProdusenProduk() {
- return produsenProduk;
- }
-
- public void setProdusenProduk(ProdusenProduk produsenProduk) {
- this.produsenProduk = produsenProduk;
- }
-
- public Integer getProdusenProdukId() {
- return produsenProdukId;
- }
-
- public void setProdusenProdukId(Integer produsenProdukId) {
- this.produsenProdukId = produsenProdukId;
- }
-
- public JenisKontruksi getJenisKontruksi() {
- return jenisKontruksi;
- }
-
- public void setJenisKontruksi(JenisKontruksi jenisKontruksi) {
- this.jenisKontruksi = jenisKontruksi;
- }
-
- public Integer getJenisKontruksiId() {
- return jenisKontruksiId;
- }
-
- public void setJenisKontruksiId(Integer jenisKontruksiId) {
- this.jenisKontruksiId = jenisKontruksiId;
- }
-
- public JenisSertifikat getJenisSertifikat() {
- return jenisSertifikat;
- }
-
- public void setJenisSertifikat(JenisSertifikat jenisSertifikat) {
- this.jenisSertifikat = jenisSertifikat;
- }
-
- public Integer getJenisSertifikatId() {
- return jenisSertifikatId;
- }
-
- public void setJenisSertifikatId(Integer jenisSertifikatId) {
- this.jenisSertifikatId = jenisSertifikatId;
- }
-
- public Alamat getAlamat() {
- return alamat;
- }
-
- public void setAlamat(Alamat alamat) {
- this.alamat = alamat;
- }
-
- public Integer getAlamatId() {
- return alamatId;
- }
-
- public void setAlamatId(Integer alamatId) {
- this.alamatId = alamatId;
- }
-
- public PegawaiPengguna getPegawaiPengguna() {
- return pegawaiPengguna;
- }
-
- public void setPegawaiPengguna(PegawaiPengguna pegawaiPengguna) {
- this.pegawaiPengguna = pegawaiPengguna;
- }
-
- public Integer getPegawaiPenggunaId() {
- return pegawaiPenggunaId;
- }
-
- public void setPegawaiPenggunaId(Integer pegawaiPenggunaId) {
- this.pegawaiPenggunaId = pegawaiPenggunaId;
- }
-
- public KondisiProdukAwal getKondisiProdukAwal() {
- return kondisiProdukAwal;
- }
-
- public void setKondisiProdukAwal(KondisiProdukAwal kondisiProdukAwal) {
- this.kondisiProdukAwal = kondisiProdukAwal;
- }
-
- public Integer getKondisiProdukAwalId() {
- return kondisiProdukAwalId;
- }
-
- public void setKondisiProdukAwalId(Integer kondisiProdukAwalId) {
- this.kondisiProdukAwalId = kondisiProdukAwalId;
- }
-
- public KondisiProdukCurrent getKondisiProdukCurrent() {
- return kondisiProdukCurrent;
- }
-
- public void setKondisiProdukCurrent(KondisiProdukCurrent kondisiProdukCurrent) {
- this.kondisiProdukCurrent = kondisiProdukCurrent;
- }
-
- public Integer getKondisiProdukCurrentId() {
- return kondisiProdukCurrentId;
- }
-
- public void setKondisiProdukCurrentId(Integer kondisiProdukCurrentId) {
- this.kondisiProdukCurrentId = kondisiProdukCurrentId;
- }
-
- public RuanganPosisiCurrent getRuanganPosisiCurrent() {
- return ruanganPosisiCurrent;
- }
-
- public void setRuanganPosisiCurrent(RuanganPosisiCurrent ruanganPosisiCurrent) {
- this.ruanganPosisiCurrent = ruanganPosisiCurrent;
- }
-
- public Integer getRuanganPosisiCurrentId() {
- return ruanganPosisiCurrentId;
- }
-
- public void setRuanganPosisiCurrentId(Integer ruanganPosisiCurrentId) {
- this.ruanganPosisiCurrentId = ruanganPosisiCurrentId;
- }
-
- public MerkProduk getMerkProduk() {
- return merkProduk;
- }
-
- public void setMerkProduk(MerkProduk merkProduk) {
- this.merkProduk = merkProduk;
- }
-
- public Integer getMerkProdukId() {
- return merkProdukId;
- }
-
- public void setMerkProdukId(Integer merkProdukId) {
- this.merkProdukId = merkProdukId;
- }
-
- public SatuanAset getSatuanAset() {
- return satuanAset;
- }
-
- public void setSatuanAset(SatuanAset satuanAset) {
- this.satuanAset = satuanAset;
- }
-
- public Integer getSatuanAsetId() {
- return satuanAsetId;
- }
-
- public void setSatuanAsetId(Integer satuanAsetId) {
- this.satuanAsetId = satuanAsetId;
- }
-
- public KlasifikasiTeknologi getKlasifikasiTeknologi() {
- return klasifikasiTeknologi;
- }
-
- public void setKlasifikasiTeknologi(KlasifikasiTeknologi klasifikasiTeknologi) {
- this.klasifikasiTeknologi = klasifikasiTeknologi;
- }
-
- public Integer getKlasifikasiTeknologiId() {
- return klasifikasiTeknologiId;
- }
-
- public void setKlasifikasiTeknologiId(Integer klasifikasiTeknologiId) {
- this.klasifikasiTeknologiId = klasifikasiTeknologiId;
- }
-
- public UsiaAset getUsiaAset() {
- return usiaAset;
- }
-
- public void setUsiaAset(UsiaAset usiaAset) {
- this.usiaAset = usiaAset;
- }
-
- public Integer getUsiaAsetId() {
- return usiaAsetId;
- }
-
- public void setUsiaAsetId(Integer usiaAsetId) {
- this.usiaAsetId = usiaAsetId;
- }
-
- public TahunPerolehan getTahunPerolehan() {
- return tahunPerolehan;
- }
-
- public void setTahunPerolehan(TahunPerolehan tahunPerolehan) {
- this.tahunPerolehan = tahunPerolehan;
- }
-
- public Integer getTahunPerolehanId() {
- return tahunPerolehanId;
- }
-
- public void setTahunPerolehanId(Integer tahunPerolehanId) {
- this.tahunPerolehanId = tahunPerolehanId;
- }
-
- public KondisiAset getKondisiAset() {
- return kondisiAset;
- }
-
- public void setKondisiAset(KondisiAset kondisiAset) {
- this.kondisiAset = kondisiAset;
- }
-
- public Integer getKondisiAsetId() {
- return kondisiAsetId;
- }
-
- public void setKondisiAsetId(Integer kondisiAsetId) {
- this.kondisiAsetId = kondisiAsetId;
- }
-
- 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 Lokasi getLokasi() {
- return lokasi;
- }
-
- public void setLokasi(Lokasi lokasi) {
- this.lokasi = lokasi;
- }
-
- public Integer getLokasiId() {
- return lokasiId;
- }
-
- public void setLokasiId(Integer lokasiId) {
- this.lokasiId = lokasiId;
- }
-
- public String getNoRegisterAset() {
- return noRegisterAset;
- }
-
- public void setNoRegisterAset(String noRegisterAset) {
- this.noRegisterAset = noRegisterAset;
- }
-
- public String getNoRegisterAset_Int() {
- return noRegisterAset_Int;
- }
-
- public void setNoRegisterAset_Int(String noRegisterAset_Int) {
- this.noRegisterAset_Int = noRegisterAset_Int;
- }
-
- public String getKdAspac() {
- return kdAspac;
- }
-
- public void setKdAspac(String kdAspac) {
- this.kdAspac = kdAspac;
- }
-
- public String getKdBmn() {
- return kdBmn;
- }
-
- public void setKdBmn(String kdBmn) {
- this.kdBmn = kdBmn;
- }
-
- public String getKdRsabhk() {
- return kdRsabhk;
- }
-
- public void setKdRsabhk(String kdRsabhk) {
- this.kdRsabhk = kdRsabhk;
- }
-
- public String getNoSeri() {
- return noSeri;
- }
-
- public void setNoSeri(String noSeri) {
- this.noSeri = noSeri;
- }
-
- public String getDayaListrik() {
- return dayaListrik;
- }
-
- public void setDayaListrik(String dayaListrik) {
- this.dayaListrik = dayaListrik;
- }
-
- public String getKeteranganLainya() {
- return keteranganLainya;
- }
-
- public void setKeteranganLainya(String keteranganLainya) {
- this.keteranganLainya = keteranganLainya;
- }
-
- public String getNoModel() {
- return noModel;
- }
-
- public void setNoModel(String noModel) {
- this.noModel = noModel;
- }
-
- public String getNamaModel() {
- return namaModel;
- }
-
- public void setNamaModel(String namaModel) {
- this.namaModel = namaModel;
- }
-
- public String getNoSerial() {
- return noSerial;
- }
-
- public void setNoSerial(String noSerial) {
- this.noSerial = noSerial;
- }
-
- public String getNoPolisi() {
- return noPolisi;
- }
-
- public void setNoPolisi(String noPolisi) {
- this.noPolisi = noPolisi;
- }
-
- public String getNoBPKB() {
- return noBPKB;
- }
-
- public void setNoBPKB(String noBPKB) {
- this.noBPKB = noBPKB;
- }
-
- public String getNoMesin() {
- return noMesin;
- }
-
- public void setNoMesin(String noMesin) {
- this.noMesin = noMesin;
- }
-
- public String getNoRangka() {
- return noRangka;
- }
-
- public void setNoRangka(String noRangka) {
- this.noRangka = noRangka;
- }
-
- public String getBpkbAtasNama() {
- return bpkbAtasNama;
- }
-
- public void setBpkbAtasNama(String bpkbAtasNama) {
- this.bpkbAtasNama = bpkbAtasNama;
- }
-
- public String getNamaPengguna() {
- return namaPengguna;
- }
-
- public void setNamaPengguna(String namaPengguna) {
- this.namaPengguna = namaPengguna;
- }
-
- public String getNoStrukText() {
- return noStrukText;
- }
-
- public void setNoStrukText(String noStrukText) {
- this.noStrukText = noStrukText;
- }
-
- public String getNoSertifikat() {
- return noSertifikat;
- }
-
- public void setNoSertifikat(String noSertifikat) {
- this.noSertifikat = noSertifikat;
- }
-
- public String getSertifikatAtasNama() {
- return sertifikatAtasNama;
- }
-
- public void setSertifikatAtasNama(String sertifikatAtasNama) {
- this.sertifikatAtasNama = sertifikatAtasNama;
- }
-
- public String getNamaRuasJalan() {
- return namaRuasJalan;
- }
-
- public void setNamaRuasJalan(String namaRuasJalan) {
- this.namaRuasJalan = namaRuasJalan;
- }
-
- public String getFungsiKegunaan() {
- return fungsiKegunaan;
- }
-
- public void setFungsiKegunaan(String fungsiKegunaan) {
- this.fungsiKegunaan = fungsiKegunaan;
- }
-
- public Date getTglPenerimaanAset() {
- return tglPenerimaanAset;
- }
-
- public void setTglPenerimaanAset(Date tglPenerimaanAset) {
- this.tglPenerimaanAset = tglPenerimaanAset;
- }
-
- public Date getMasaBerlakuSertifikat() {
- return masaBerlakuSertifikat;
- }
-
- public void setMasaBerlakuSertifikat(Date masaBerlakuSertifikat) {
- this.masaBerlakuSertifikat = masaBerlakuSertifikat;
- }
-
- public Date getTglProduksi() {
- return tglProduksi;
- }
-
- public void setTglProduksi(Date tglProduksi) {
- this.tglProduksi = tglProduksi;
- }
-
- public Date getTglRegisterAset() {
- return tglRegisterAset;
- }
-
- public void setTglRegisterAset(Date tglRegisterAset) {
- this.tglRegisterAset = tglRegisterAset;
- }
-
- public Date getTglStrukTerima() {
- return tglStrukTerima;
- }
-
- public void setTglStrukTerima(Date tglStrukTerima) {
- this.tglStrukTerima = tglStrukTerima;
- }
-
- public Integer getQtyAset() {
- return qtyAset;
- }
-
- public void setQtyAset(Integer qtyAset) {
- this.qtyAset = qtyAset;
- }
-
- public float getHargaPenyusutan() {
- return hargaPenyusutan;
- }
-
- public void setHargaPenyusutan(float hargaPenyusutan) {
- this.hargaPenyusutan = hargaPenyusutan;
- }
-
- public float getTotalSudahMenyusut() {
- return totalSudahMenyusut;
- }
-
- public void setTotalSudahMenyusut(float totalSudahMenyusut) {
- this.totalSudahMenyusut = totalSudahMenyusut;
- }
-
- public float getHargaPertambahan() {
- return hargaPertambahan;
- }
-
- public void setHargaPertambahan(float hargaPertambahan) {
- this.hargaPertambahan = hargaPertambahan;
- }
-
- public float getTotalSudahBertambah() {
- return totalSudahBertambah;
- }
-
- public void setTotalSudahBertambah(float totalSudahBertambah) {
- this.totalSudahBertambah = totalSudahBertambah;
- }
-
- public float getHargaSatuanRevaluasi() {
- return hargaSatuanRevaluasi;
- }
-
- public void setHargaSatuanRevaluasi(float hargaSatuanRevaluasi) {
- this.hargaSatuanRevaluasi = hargaSatuanRevaluasi;
- }
-
- public float getHargaNetto() {
- return hargaNetto;
- }
-
- public void setHargaNetto(float hargaNetto) {
- this.hargaNetto = hargaNetto;
- }
-
- public Double getHarga() {
- return harga;
- }
-
- public void setHarga(Double harga) {
- this.harga = harga;
- }
-
- public Double getUmurEkonomisRevaluasiTahun() {
- return umurEkonomisRevaluasiTahun;
- }
-
- public void setUmurEkonomisRevaluasiTahun(Double umurEkonomisRevaluasiTahun) {
- this.umurEkonomisRevaluasiTahun = umurEkonomisRevaluasiTahun;
- }
-
- public Double getTotalSisaUmurEkonomisTahun() {
- return totalSisaUmurEkonomisTahun;
- }
-
- public void setTotalSisaUmurEkonomisTahun(Double totalSisaUmurEkonomisTahun) {
- this.totalSisaUmurEkonomisTahun = totalSisaUmurEkonomisTahun;
- }
-
- public Double getKapasitasMesin() {
- return kapasitasMesin;
- }
-
- public void setKapasitasMesin(Double kapasitasMesin) {
- this.kapasitasMesin = kapasitasMesin;
- }
-
- public Double getLtPanjang() {
- return ltPanjang;
- }
-
- public void setLtPanjang(Double ltPanjang) {
- this.ltPanjang = ltPanjang;
- }
-
- public Double getLtLebar() {
- return ltLebar;
- }
-
- public void setLtLebar(Double ltLebar) {
- this.ltLebar = ltLebar;
- }
-
- public Double getLbPanjang() {
- return lbPanjang;
- }
-
- public void setLbPanjang(Double lbPanjang) {
- this.lbPanjang = lbPanjang;
- }
-
- public Double getLbLebar() {
- return lbLebar;
- }
-
- public void setLbLebar(Double lbLebar) {
- this.lbLebar = lbLebar;
- }
-
- public Double getLbTinggi() {
- return lbTinggi;
- }
-
- public void setLbTinggi(Double lbTinggi) {
- this.lbTinggi = lbTinggi;
- }
-
- public Double getQtyLantai() {
- return qtyLantai;
- }
-
- public void setQtyLantai(Double qtyLantai) {
- this.qtyLantai = qtyLantai;
- }
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperasiHeader.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperasiHeader.java
index 8f2b5393..5a849eed 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperasiHeader.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperasiHeader.java
@@ -3,373 +3,116 @@ package com.jasamedika.medifirst2000.entities;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import java.util.Date;
+@Getter
+@Setter
@Entity
@Table(name = "AsuhanKeperawatanPeriOperasiHeader_T")
-@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
public class AsuhanKeperawatanPeriOperasiHeader extends BaseTransaction {
-
- @Column(name ="NoTrans", length = 20)
+
+ @Column(name = "NoTrans", length = 20)
private String noTrans;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "ObjectPasienFk")
@NotNull(message = "Pasien tidak boleh kosong")
private AntrianPasienDiPeriksa pasienDaftar;
-
-// @Column(name = "ObjectPasienFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false)
-// private String pasienId;
@Column(name = "checkInfk", insertable = false, updatable = false)
private String pasienDaftarId;
-
- //@ManyToOne
- //@Caption("Ruangan")
- //@JoinColumn(name="RuanganFk")
- //private Ruangan ruangan;
-
- //@Column(name = "RuanganFk", insertable = false, updatable = false)
- //private int ruanganId;
-
+
@Column(name = "DiagnosaPreOperasi", length = 100)
private String diagnosaPreOperasi;
-
- @Column(name ="Tindakan", length = 100)
+
+ @Column(name = "Tindakan", length = 100)
private String tindakan;
-
+
@Column(name = "DiagnosaPostOperasi", length = 100)
private String diagnosaPostOperasi;
-
+
@ManyToOne
@Caption("DokterBedah")
- @JoinColumn(name="DokterBedahFk")
+ @JoinColumn(name = "DokterBedahFk")
private Pegawai dokterBedah;
-
- @Column(name = "DokterBedahFk", insertable = false, updatable = false)
- private Integer dokterId;
-
+
+ @Column(name = "DokterBedahFk", insertable = false, updatable = false)
+ private Integer dokterId;
+
@ManyToOne
@Caption("AsistenBedah")
- @JoinColumn(name="AsistenBedahFk")
+ @JoinColumn(name = "AsistenBedahFk")
private Pegawai asistenBedah;
-
+
@Column(name = "AsistenBedahFk", insertable = false, updatable = false)
private Integer asistenBedahId;
-
+
@ManyToOne
@Caption("PerawatInstrumen1")
- @JoinColumn(name="PerawatInstrumen1Fk")
+ @JoinColumn(name = "PerawatInstrumen1Fk")
private Pegawai perawatInstrumen1;
-
+
@Column(name = "PerawatInstrumen1Fk", insertable = false, updatable = false)
private Integer perawatInstrumen1Id;
-
+
@ManyToOne
@Caption("PerawatInstrumen2")
- @JoinColumn(name="PerawatInstrumen2Fk")
+ @JoinColumn(name = "PerawatInstrumen2Fk")
private Pegawai perawatInstrument2;
-
+
@Column(name = "PerawatInstrumen2Fk", insertable = false, updatable = false)
private Integer perawatInstrument2Id;
-
+
@ManyToOne
@Caption("PerawatSirkuler")
- @JoinColumn(name="PerawatSirkulerFk")
+ @JoinColumn(name = "PerawatSirkulerFk")
private Pegawai perawatSirkuler;
-
+
@Column(name = "PerawatSirkulerFk", insertable = false, updatable = false)
private Integer perawatSirkulerId;
-
+
@ManyToOne
@Caption("OperatorAlatCanggih")
- @JoinColumn(name="OperatorAlatCanggihFk")
+ @JoinColumn(name = "OperatorAlatCanggihFk")
private Pegawai operatorAlatCanggih;
-
+
@Column(name = "OperatorAlatCanggihFk", insertable = false, updatable = false)
private Integer operatorAlatCanggihId;
-
- @Column(name="OperasiMulai", length = 10)
+
+ @Column(name = "OperasiMulai", length = 10)
private String operasiMulai;
-
+
@Column(name = "OperasiSelesai", length = 10)
private String operasiSelesai;
-
+
@Column(name = "JamMasukOperasi", length = 10)
private String jamMasukOperasi;
-
+
@Column(name = "tanggal")
private Date tanggal;
-
+
@Column(name = "jam", length = 10)
private String jam;
-
+
@Column(name = "tglTindakan", length = 150)
private Date tglTindakan;
-
+
@Column(name = "TeknikAnestesi", length = 150)
private String teknikAnestesi;
-
- @Column(name ="ProsedurOperasi", length = 150)
+
+ @Column(name = "ProsedurOperasi", length = 150)
private String prosedurOperasi;
-
- @Column(name ="Anestesiologi", length = 150)
+
+ @Column(name = "Anestesiologi", length = 150)
private String anestesiologi;
-
- @Column(name ="PenataAnestesi", length = 150)
+
+ @Column(name = "PenataAnestesi", length = 150)
private String penataAnestesi;
-
- public String getJam() {
- return jam;
- }
-
- public void setJam(String jam) {
- this.jam = jam;
- }
-
- //public int getPasienId() {
- // return pasienId;
- //}
-
- //public void setPasienId(int pasienId) {
- // this.pasienId = pasienId;
- //}
-
- //public Ruangan getRuangan() {
- // return ruangan;
- //}
-
- //public void setRuangan(Ruangan ruangan) {
- // this.ruangan = ruangan;
- //}
-
- //public int getRuanganId() {
- // return ruanganId;
- //}
-
- //public void setRuanganId(int ruanganId) {
- // this.ruanganId = ruanganId;
- //}
-
- public String getDiagnosaPreOperasi() {
- return diagnosaPreOperasi;
- }
-
- public void setDiagnosaPreOperasi(String diagnosaPreOperasi) {
- this.diagnosaPreOperasi = diagnosaPreOperasi;
- }
-
- public String getTindakan() {
- return tindakan;
- }
-
- public void setTindakan(String tindakan) {
- this.tindakan = tindakan;
- }
-
- public String getDiagnosaPostOperasi() {
- return diagnosaPostOperasi;
- }
-
- public void setDiagnosaPostOperasi(String diagnosaPostOperasi) {
- this.diagnosaPostOperasi = diagnosaPostOperasi;
- }
-
- public Pegawai getDokterBedah() {
- return dokterBedah;
- }
-
- public void setDokterBedah(Pegawai dokterBedah) {
- this.dokterBedah = dokterBedah;
- }
-
- public int getDokterId() {
- return dokterId;
- }
-
- public void setDokterId(int dokterId) {
- this.dokterId = dokterId;
- }
-
- public Pegawai getAsistenBedah() {
- return asistenBedah;
- }
-
- public void setAsistenBedah(Pegawai asistenBedah) {
- this.asistenBedah = asistenBedah;
- }
-
- public int getAsistenBedahId() {
- return asistenBedahId;
- }
-
- public void setAsistenBedahId(int asistenBedahId) {
- this.asistenBedahId = asistenBedahId;
- }
-
- public Pegawai getPerawatInstrumen1() {
- return perawatInstrumen1;
- }
-
- public void setPerawatInstrumen1(Pegawai perawatInstrumen1) {
- this.perawatInstrumen1 = perawatInstrumen1;
- }
-
- public int getPerawatInstrumen1Id() {
- return perawatInstrumen1Id;
- }
-
- public void setPerawatInstrumen1Id(int perawatInstrumen1Id) {
- this.perawatInstrumen1Id = perawatInstrumen1Id;
- }
-
- public Pegawai getPerawatInstrument2() {
- return perawatInstrument2;
- }
-
- public void setPerawatInstrument2(Pegawai perawatInstrument2) {
- this.perawatInstrument2 = perawatInstrument2;
- }
-
- public int getPerawatInstrument2Id() {
- return perawatInstrument2Id;
- }
-
- public void setPerawatInstrument2Id(int perawatInstrument2Id) {
- this.perawatInstrument2Id = perawatInstrument2Id;
- }
-
- public Pegawai getPerawatSirkuler() {
- return perawatSirkuler;
- }
-
- public void setPerawatSirkuler(Pegawai perawatSirkuler) {
- this.perawatSirkuler = perawatSirkuler;
- }
-
- public int getPerawatSirkulerId() {
- return perawatSirkulerId;
- }
-
- public void setPerawatSirkulerId(int perawatSirkulerId) {
- this.perawatSirkulerId = perawatSirkulerId;
- }
-
- public Pegawai getOperatorAlatCanggih() {
- return operatorAlatCanggih;
- }
-
- public void setOperatorAlatCanggih(Pegawai operatorAlatCanggih) {
- this.operatorAlatCanggih = operatorAlatCanggih;
- }
-
- public int getOperatorAlatCanggihId() {
- return operatorAlatCanggihId;
- }
-
- public void setOperatorAlatCanggihId(int operatorAlatCanggihId) {
- this.operatorAlatCanggihId = operatorAlatCanggihId;
- }
-
- public String getOperasiMulai() {
- return operasiMulai;
- }
-
- public void setOperasiMulai(String operasiMulai) {
- this.operasiMulai = operasiMulai;
- }
-
- public String getOperasiSelesai() {
- return operasiSelesai;
- }
-
- public void setOperasiSelesai(String operasiSelesai) {
- this.operasiSelesai = operasiSelesai;
- }
-
- public String getJamMasukOperasi() {
- return jamMasukOperasi;
- }
-
- public void setJamMasukOperasi(String jamMasukOperasi) {
- this.jamMasukOperasi = jamMasukOperasi;
- }
-
- public Date getTanggal() {
- return tanggal;
- }
-
- public void setTanggal(Date tanggal) {
- this.tanggal = tanggal;
- }
-
- public String getNoTrans() {
- return noTrans;
- }
-
- public void setNoTrans(String noTrans) {
- this.noTrans = noTrans;
- }
-
- public String getPasienDaftarId() {
- return pasienDaftarId;
- }
-
- public void setPasienDaftarId(String pasienDaftarId) {
- this.pasienDaftarId = pasienDaftarId;
- }
-
- public AntrianPasienDiPeriksa getPasienDaftar() {
- return pasienDaftar;
- }
-
- public void setPasienDaftar(AntrianPasienDiPeriksa pasienDaftar) {
- this.pasienDaftar = pasienDaftar;
- }
-
- public Date getTglTindakan() {
- return tglTindakan;
- }
-
- public void setTglTindakan(Date tglTindakan) {
- this.tglTindakan = tglTindakan;
- }
-
- public String getTeknikAnestesi() {
- return teknikAnestesi;
- }
-
- public void setTeknikAnestesi(String teknikAnestesi) {
- this.teknikAnestesi = teknikAnestesi;
- }
-
- public String getProsedurOperasi() {
- return prosedurOperasi;
- }
-
- public void setProsedurOperasi(String prosedurOperasi) {
- this.prosedurOperasi = prosedurOperasi;
- }
-
- public String getAnestesiologi() {
- return anestesiologi;
- }
-
- public void setAnestesiologi(String anestesiologi) {
- this.anestesiologi = anestesiologi;
- }
-
- public String getPenataAnestesi() {
- return penataAnestesi;
- }
-
- public void setPenataAnestesi(String penataAnestesi) {
- this.penataAnestesi = penataAnestesi;
- }
-
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperasiTrans.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperasiTrans.java
index ba13d3cb..fbece00b 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperasiTrans.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperasiTrans.java
@@ -1,150 +1,41 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+
+@Getter
+@Setter
@Entity
@Table(name = "AsuhanKeperawatanPeriOperasiTrans_T")
-@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
public class AsuhanKeperawatanPeriOperasiTrans extends BaseTransaction {
- @Column(name = "AsuhanKeperawatanPeriOperasiHeaderFk", nullable=false)
+
+ @Column(name = "AsuhanKeperawatanPeriOperasiHeaderFk", nullable = false)
private String asuhankeperawatanHeaderId;
-
- //@ManyToOne
- //@Caption("AsuhanKeperawatanPeriOperasiHeaderFk")
- //@JoinColumn(name="AsuhanKeperawatanPeriOperasiHeaderFk")
- //private AsuhanKeperawatanPeriOperasiHeader asuhanKeperawatanPeriOperasiHeader;
-
+
@ManyToOne
@Caption("ObjekDataMasalah")
- @JoinColumn(name="ObjekDataMasalahFk")
+ @JoinColumn(name = "ObjekDataMasalahFk")
private AsuhanKeperawatanPeriOperatif objekDataMasalah;
-
+
@Column(name = "ObjekDataMasalahFk", insertable = false, updatable = false)
private int objekDataMasalahId;
-
- //@ManyToOne
- //@Caption("ObjekIntervensi")
- //@JoinColumn(name="ObjekIntervensiFk")
- //private AsuhanKeperawatanPeriOperatif objekIntervensi;
-
- //@Column(name = "ObjekIntervensiFk", insertable = false, updatable = false)
- //private int objekIntervensiId;
-
- //@ManyToOne
- //@Caption("ObjekEvaluasi")
- //@JoinColumn(name="ObjekEvaluasiFk")
- //private AsuhanKeperawatanPeriOperatif objekEvaluasi;
-
- //@Column(name = "ObjekEvaluasiFk", insertable = false, updatable = false)
- //private int objekEvaluasiId;
-
- @Column(name = "keterangan", length = 255)
+
+ @Column(name = "keterangan")
private String keterangan;
-
+
@Column(name = "FlagHeader", length = 100)
private String flagHeader;
-
- @Column(name ="FlagAsuhan", length = 100)
+
+ @Column(name = "FlagAsuhan", length = 100)
private String flagasuhan;
-
- @Column(name="Uraian", length = 1000)
+
+ @Column(name = "Uraian", length = 1000)
private String uraian;
-
- public String getAsuhankeperawatanHeaderId() {
- return asuhankeperawatanHeaderId;
- }
-
- public void setAsuhankeperawatanHeaderId(String asuhankeperawatanHeaderId) {
- this.asuhankeperawatanHeaderId = asuhankeperawatanHeaderId;
- }
-
- public AsuhanKeperawatanPeriOperatif getObjekDataMasalah() {
- return objekDataMasalah;
- }
-
- public void setObjekDataMasalah(AsuhanKeperawatanPeriOperatif objekDataMasalah) {
- this.objekDataMasalah = objekDataMasalah;
- }
-
- public int getObjekDataMasalahId() {
- return objekDataMasalahId;
- }
-
- public void setObjekDataMasalahId(int objekDataMasalahId) {
- this.objekDataMasalahId = objekDataMasalahId;
- }
-
- //public AsuhanKeperawatanPeriOperatif getObjekIntervensi() {
- // return objekIntervensi;
- //}
-
- //public void setObjekIntervensi(AsuhanKeperawatanPeriOperatif objekIntervensi) {
- // this.objekIntervensi = objekIntervensi;
- //}
-
- //public int getObjekIntervensiId() {
- // return objekIntervensiId;
- //}
-
- //public void setObjekIntervensiId(int objekIntervensiId) {
- // this.objekIntervensiId = objekIntervensiId;
- //}
-
- //public AsuhanKeperawatanPeriOperatif getObjekEvaluasi() {
- // return objekEvaluasi;
- //}
-
- //public void setObjekEvaluasi(AsuhanKeperawatanPeriOperatif objekEvaluasi) {
- // this.objekEvaluasi = objekEvaluasi;
- //}
-
- //public int getObjekEvaluasiId() {
- // return objekEvaluasiId;
- //}
-
- //public void setObjekEvaluasiId(int objekEvaluasiId) {
- // this.objekEvaluasiId = objekEvaluasiId;
- //}
-
- public String getKeterangan() {
- return keterangan;
- }
-
- public void setKeterangan(String keterangan) {
- this.keterangan = keterangan;
- }
-
- public String getFlagHeader() {
- return flagHeader;
- }
-
- public void setFlagHeader(String flagHeader) {
- this.flagHeader = flagHeader;
- }
-
- public String getFlagasuhan() {
- return flagasuhan;
- }
-
- public void setFlagasuhan(String flagasuhan) {
- this.flagasuhan = flagasuhan;
- }
-
- public String getUraian() {
- return uraian;
- }
-
- public void setUraian(String uraian) {
- this.uraian = uraian;
- }
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperatif.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperatif.java
index 7d91f24f..bb8202a7 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperatif.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuhanKeperawatanPeriOperatif.java
@@ -1,95 +1,40 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
@Entity
@Table(name = "AsuhanKeperawatanPeriOperatif_M")
-@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
public class AsuhanKeperawatanPeriOperatif extends BaseMaster {
+
@Id
- @GeneratedValue(
- strategy = GenerationType.SEQUENCE,
- generator = "public.asuhankeperawatanperioperatif_m_id_seq")
- @javax.persistence.SequenceGenerator(
- name = "public.asuhankeperawatanperioperatif_m_id_seq",
- sequenceName = "public.asuhankeperawatanperioperatif_m_id_seq",
- allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.asuhankeperawatanperioperatif_m_id_seq")
+ @SequenceGenerator(name = "public.asuhankeperawatanperioperatif_m_id_seq", sequenceName = "public.asuhankeperawatanperioperatif_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
-
+
@Column(name = "FlagAsuhan", length = 100)
private String flagAsuhan;
-
+
@Column(name = "FlagHeader", length = 100)
private String flagHeader;
-
+
@Column(name = "Keterangan", length = 100)
private String keterangan;
-
+
@Column(name = "FlagParent", length = 100)
private String flagParent;
-
- @Column(name = "IdParent", nullable=true)
+
+ @Column(name = "IdParent")
private int idParent;
-
- public int getIdParent() {
- return idParent;
- }
- public void setIdParent(int idParent) {
- this.idParent = idParent;
- }
-
- public String getFlagParent() {
- return flagParent;
- }
-
- public void setFlagParent(String flagParent) {
- this.flagParent = flagParent;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getFlagAsuhan() {
- return flagAsuhan;
- }
-
- public void setFlagAsuhan(String flagAsuhan) {
- this.flagAsuhan = flagAsuhan;
- }
-
- public String getKeterangan() {
- return keterangan;
- }
-
- public void setKeterangan(String keterangan) {
- this.keterangan = keterangan;
- }
-
- public String getFlagHeader() {
- return flagHeader;
- }
-
- public void setFlagHeader(String flagHeader) {
- this.flagHeader = flagHeader;
- }
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuransiNaker.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuransiNaker.java
index 137db90e..2bfb109c 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuransiNaker.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuransiNaker.java
@@ -1,34 +1,32 @@
package com.jasamedika.medifirst2000.entities;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.*;
-import com.jasamedika.medifirst2000.entities.NamaPegawai;
-import com.jasamedika.medifirst2000.entities.NamaAsuransi;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
import com.jasamedika.medifirst2000.base.BaseTransaction;
-
-import javax.validation.constraints.NotNull;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
/**
* class AsuransiNaker
*
* @author Generator
*/
+@Getter
+@Setter
@Entity
@Table(name = "sdm_AsuransiNaker_T")
public class AsuransiNaker extends BaseTransaction {
-
+
@ManyToOne
@JoinColumn(name = "NamaPegawaiFk")
@NotNull(message = "Nama Pegawai Harus Diisi")
@Caption(value = "Nama Pegawai")
private NamaPegawai namaPegawai;
- @Column(name = "NamaPegawaiFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false,nullable=false)
+ @Column(name = "NamaPegawaiFk", columnDefinition = "CHAR(32)", insertable = false, updatable = false, nullable = false)
private String namaPegawaiId;
@Column(name = "Nip", nullable = false, length = 100)
@@ -56,70 +54,4 @@ public class AsuransiNaker extends BaseTransaction {
@Caption(value = "BPJSNaker")
private String BPJSNaker;
- public NamaPegawai getNamaPegawai() {
- return namaPegawai;
- }
-
- public void setNamaPegawai(NamaPegawai namaPegawai) {
- this.namaPegawai = namaPegawai;
- }
-
- public String getNamaPegawaiId() {
- return namaPegawaiId;
- }
-
- public void setNamaPegawaiId(String namaPegawaiId) {
- this.namaPegawaiId = namaPegawaiId;
- }
-
- public String getNip() {
- return nip;
- }
-
- public void setNip(String nip) {
- this.nip = nip;
- }
-
- public String getNomorpolis() {
- return nomorpolis;
- }
-
- public void setNomorpolis(String nomorpolis) {
- this.nomorpolis = nomorpolis;
- }
-
- public Date getTanggalLahir() {
- return tanggalLahir;
- }
-
- public void setTanggalLahir(Date tanggalLahir) {
- this.tanggalLahir = tanggalLahir;
- }
-
- public NamaAsuransi getNamaAsuransi() {
- return namaAsuransi;
- }
-
- public void setNamaAsuransi(NamaAsuransi namaAsuransi) {
- this.namaAsuransi = namaAsuransi;
- }
-
-
- public Integer getNamaAsuransiId() {
- return namaAsuransiId;
- }
-
- public void setNamaAsuransiId(Integer namaAsuransiId) {
- this.namaAsuransiId = namaAsuransiId;
- }
-
- public String getBPJSNaker() {
- return BPJSNaker;
- }
-
- public void setBPJSNaker(String bPJSNaker) {
- BPJSNaker = bPJSNaker;
- }
-
-
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuransiPasien.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuransiPasien.java
index de537aa2..3bf101d3 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuransiPasien.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuransiPasien.java
@@ -160,4 +160,5 @@ public class AsuransiPasien extends BaseMaster {
@Column(name = "KdProvider", length = 100)
@Caption(value = "KdProvider")
private String kdProvider;
+
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuransiPasienBerlaku.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuransiPasienBerlaku.java
index 455309ad..e3e21b16 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuransiPasienBerlaku.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AsuransiPasienBerlaku.java
@@ -1,175 +1,79 @@
package com.jasamedika.medifirst2000.entities;
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import java.util.Date;
-
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+import static javax.persistence.GenerationType.SEQUENCE;
/**
* class AsuransiPasienBerlaku
*
* @author Generator
*/
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
@Table(name = "AsuransiPasienBerlaku_M")
public class AsuransiPasienBerlaku extends BaseMaster {
- @Caption(value = "Is Collective Plafon")
- private Byte isCollectivePlafon;
@NotNull(message = "Is Collective Plafon tidak boleh kosong")
@Column(name = "isCollectivePlafon", nullable = false)
- public Byte getIsCollectivePlafon() {
- return isCollectivePlafon;
- }
-
- public void setIsCollectivePlafon(Byte isCollectivePlafon) {
- this.isCollectivePlafon = isCollectivePlafon;
- }
+ @Caption(value = "Is Collective Plafon")
+ private Byte isCollectivePlafon;
@ManyToOne
@JoinColumn(name = "ObjectHubunganPesertaFk")
@NotNull(message = "Kd Hubungan Peserta tidak boleh kosong")
-
@Caption(value = "Object Hubungan Peserta")
private HubunganPesertaAsuransi hubunganPeserta;
- public void setHubunganPeserta(HubunganPesertaAsuransi hubunganPeserta) {
- this.hubunganPeserta = hubunganPeserta;
- }
-
- public HubunganPesertaAsuransi getHubunganPeserta() {
- return this.hubunganPeserta;
- }
-
@Column(name = "ObjectHubunganPesertaFk", insertable = false, updatable = false)
private Integer hubunganPesertaId;
- public Integer getHubunganPesertaId() {
- return hubunganPesertaId;
- }
-
- public void setHubunganPesertaId(Integer hubunganPesertaId) {
- this.hubunganPesertaId = hubunganPesertaId;
- }
-
- @Caption(value = "Kode Penjamin Pasien")
- private short kdPenjaminPasien;
-
@NotNull(message = "Kd Penjamin Pasien tidak boleh kosong")
@Column(name = "KdPenjaminPasien", nullable = false)
- public short getKdPenjaminPasien() {
- return kdPenjaminPasien;
- }
-
- public void setKdPenjaminPasien(short kdPenjaminPasien) {
- this.kdPenjaminPasien = kdPenjaminPasien;
- }
+ @Caption(value = "Kode Penjamin Pasien")
+ private short kdPenjaminPasien;
@NotNull(message = "No Asuransi tidak boleh kosong")
@Column(name = "NoAsuransi", nullable = false, length = 30)
@Caption(value = "No Asuransi")
private String noAsuransi;
- public void setNoAsuransi(String noAsuransi) {
- this.noAsuransi = noAsuransi;
- }
-
- public String getNoAsuransi() {
- return this.noAsuransi;
- }
-
+ @Column(name = "TglAkhirBerlaku")
@Caption(value = "Tanggal Akhir Berlaku")
private Date tglAkhirBerlaku;
- @Column(name = "TglAkhirBerlaku", nullable = true)
- public Date getTglAkhirBerlaku() {
- return tglAkhirBerlaku;
- }
-
- public void setTglAkhirBerlaku(Date tglAkhirBerlaku) {
- this.tglAkhirBerlaku = tglAkhirBerlaku;
- }
-
- @Caption(value = "Tanggal Mulai Berlaku")
- private Date tglMulaiBerlaku;
-
@NotNull(message = "Tgl Mulai Berlaku tidak boleh kosong")
@Column(name = "TglMulaiBerlaku", nullable = false)
- public Date getTglMulaiBerlaku() {
- return tglMulaiBerlaku;
- }
-
- public void setTglMulaiBerlaku(Date tglMulaiBerlaku) {
- this.tglMulaiBerlaku = tglMulaiBerlaku;
- }
+ @Caption(value = "Tanggal Mulai Berlaku")
+ private Date tglMulaiBerlaku;
@NotNull(message = "Total Current Terpakai tidak boleh kosong")
@Column(name = "TotalCurrentTerpakai", nullable = false)
@Caption(value = "Total Current Terpakai")
private Double totalCurrentTerpakai;
- public void setTotalCurrentTerpakai(Double totalCurrentTerpakai) {
- this.totalCurrentTerpakai = totalCurrentTerpakai;
- }
-
- public Double getTotalCurrentTerpakai() {
- return this.totalCurrentTerpakai;
- }
-
@NotNull(message = "Total Plafon Tanggungan tidak boleh kosong")
@Column(name = "TotalPlafonTanggungan", nullable = false)
@Caption(value = "Total Plafon Tanggungan")
private Double totalPlafonTanggungan;
- public void setTotalPlafonTanggungan(Double totalPlafonTanggungan) {
- this.totalPlafonTanggungan = totalPlafonTanggungan;
- }
-
- public Double getTotalPlafonTanggungan() {
- return this.totalPlafonTanggungan;
- }
-
@NotNull(message = "Total Saldo Tanggungan tidak boleh kosong")
@Column(name = "TotalSaldoTanggungan", nullable = false)
@Caption(value = "Total Saldo Tanggungan")
private Double totalSaldoTanggungan;
- public void setTotalSaldoTanggungan(Double totalSaldoTanggungan) {
- this.totalSaldoTanggungan = totalSaldoTanggungan;
- }
-
- public Double getTotalSaldoTanggungan() {
- return this.totalSaldoTanggungan;
- }
-
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.asuransipasienberlaku_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.asuransipasienberlaku_m_id_seq", sequenceName = "public.asuransipasienberlaku_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.asuransipasienberlaku_m_id_seq")
+ @SequenceGenerator(name = "public.asuransipasienberlaku_m_id_seq", sequenceName = "public.asuransipasienberlaku_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPakai.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPakai.java
index 94770cce..2fe2d3cd 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPakai.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPakai.java
@@ -21,10 +21,12 @@ import java.io.Serializable;
@Entity
@Table(name = "aturan_pakai_t")
public class AturanPakai extends BaseTransaction implements Serializable {
+
private static final long serialVersionUID = 1472868281196415583L;
@Column(nullable = false)
@NotBlank
@Caption("Keterangan Pakai")
private String keteranganPakai;
+
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPakaiSigna.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPakaiSigna.java
index d4d03841..9685be4b 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPakaiSigna.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPakaiSigna.java
@@ -22,6 +22,7 @@ import static javax.persistence.FetchType.LAZY;
@Entity
@Table(name = "aturan_pakai_signa_t")
public class AturanPakaiSigna extends BaseTransaction implements Serializable {
+
private static final long serialVersionUID = -4925033000498799494L;
@ManyToOne(fetch = LAZY)
@@ -64,4 +65,5 @@ public class AturanPakaiSigna extends BaseTransaction implements Serializable {
@Size(max = 1000)
@Caption("Keterangan Aturan Pakai")
private String keterangan;
+
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPeminjaman.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPeminjaman.java
index 42cab795..a2e2bcda 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPeminjaman.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AturanPeminjaman.java
@@ -1,27 +1,24 @@
package com.jasamedika.medifirst2000.entities;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.*;
-import com.jasamedika.medifirst2000.entities.TipeKeanggotaan;
-import com.jasamedika.medifirst2000.entities.TipeKoleksi;
-import com.jasamedika.medifirst2000.entities.PeriodePinjaman;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
import com.jasamedika.medifirst2000.base.BaseTransaction;
-
-import javax.validation.constraints.NotNull;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
/**
* class AturanPeminjaman
*
* @author Generator
*/
+@Getter
+@Setter
@Entity
@Table(name = "sdm_AturanPeminjaman_T")
public class AturanPeminjaman extends BaseTransaction {
+
@ManyToOne
@JoinColumn(name = "TipeKeanggotaanFk")
@NotNull(message = "Tipe Keanggotaan Harus Diisi")
@@ -57,68 +54,4 @@ public class AturanPeminjaman extends BaseTransaction {
@Caption(value = "DendaHarian")
private String dendaHarian;
- public String getDendaHarian() {
- return dendaHarian;
- }
-
- public void setDendaHarian(String dendaHarian) {
- this.dendaHarian = dendaHarian;
- }
-
- public TipeKeanggotaan getTipeKeanggotaan() {
- return tipeKeanggotaan;
- }
-
- public void setTipeKeanggotaan(TipeKeanggotaan tipeKeanggotaan) {
- this.tipeKeanggotaan = tipeKeanggotaan;
- }
-
- public Integer getTipeKeanggotaanId() {
- return tipeKeanggotaanId;
- }
-
- public void setTipeKeanggotaanId(Integer tipeKeanggotaanId) {
- this.tipeKeanggotaanId = tipeKeanggotaanId;
- }
-
- public TipeKoleksi getTipeKoleksi() {
- return tipeKoleksi;
- }
-
- public void setTipeKoleksi(TipeKoleksi tipeKoleksi) {
- this.tipeKoleksi = tipeKoleksi;
- }
-
- public Integer getTipeKoleksiId() {
- return tipeKoleksiId;
- }
-
- public void setTipeKoleksiId(Integer tipeKoleksiId) {
- this.tipeKoleksiId = tipeKoleksiId;
- }
-
- public Integer getJumlahPinjaman() {
- return jumlahPinjaman;
- }
-
- public void setJumlahPinjaman(Integer jumlahPinjaman) {
- this.jumlahPinjaman = jumlahPinjaman;
- }
-
- public PeriodePinjaman getPeriodePinjaman() {
- return periodePinjaman;
- }
-
- public void setPeriodePinjaman(PeriodePinjaman periodePinjaman) {
- this.periodePinjaman = periodePinjaman;
- }
-
- public Integer getPeriodePinjamanId() {
- return periodePinjamanId;
- }
-
- public void setPeriodePinjamanId(Integer periodePinjamanId) {
- this.periodePinjamanId = periodePinjamanId;
- }
-
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AuditData.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AuditData.java
index b6907714..319bcf04 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AuditData.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/AuditData.java
@@ -1,43 +1,21 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.envers.Audited;
+import com.jasamedika.medifirst2000.listener.AuditLogListener;
+import lombok.Getter;
+import lombok.Setter;
import org.hibernate.envers.DefaultRevisionEntity;
import org.hibernate.envers.RevisionEntity;
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;
-import com.jasamedika.medifirst2000.listener.AuditLogListener;
+import javax.persistence.Entity;
-import org.hibernate.envers.Audited;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
/**
* class Agama
*
* @author Generator
*/
+@Getter
+@Setter
@Entity(name = "AuditData")
@RevisionEntity(AuditLogListener.class)
public class AuditData extends DefaultRevisionEntity {
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.auditdata_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.auditdata_m_id_seq", sequenceName = "public.auditdata_m_id_seq", allocationSize = 1)
- @Column(name = "id")
- protected Integer id;
-
- public int getId() {
-
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Autopsi.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Autopsi.java
index c807ee78..f4e1e41e 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Autopsi.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Autopsi.java
@@ -1,49 +1,35 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
import javax.validation.constraints.NotNull;
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
+import static javax.persistence.GenerationType.SEQUENCE;
/**
- * class Autopsi
+ * class Autopsi
*
* @author Generator
*/
-@Entity //@Audited
+@Getter
+@Setter
+@Entity
@Table(name = "RM_Autopsi_M")
public class Autopsi extends BaseMaster {
- @NotNull(message="Name tidak boleh kosong")
+
+ @NotNull(message = "Name tidak boleh kosong")
@Column(name = "Name", nullable = false, length = 100)
@Caption(value = "Name")
private String name;
- public void setName(String name)
- {
- this.name = name;
- }
- public String getName()
- {
- return this.name;
- }
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.RM_Autopsi_M_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.RM_Autopsi_M_id_seq", sequenceName = "public.RM_Autopsi_M_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.RM_Autopsi_M_id_seq")
+ @SequenceGenerator(name = "public.RM_Autopsi_M_id_seq", sequenceName = "public.RM_Autopsi_M_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Awards.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Awards.java
index 471f3d26..dc86d284 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Awards.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Awards.java
@@ -1,63 +1,56 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
@Entity
@Table(name = "Awards_M")
-public class Awards extends BaseMaster{
+public class Awards extends BaseMaster {
+
@Column(name = "kdAwards", nullable = false)
@Caption(value = "kdAwards")
private Byte kdAwards;
-
+
@Column(name = "namaAwards", nullable = false)
@Caption(value = "namaAwards")
private String namaAwards;
-
+
@ManyToOne
@JoinColumn(name = "awardsHeadFk")
- @Caption(value="awardsHeadFk")
+ @Caption(value = "awardsHeadFk")
private Awards awardsHead;
- @Column(name = "awardsHeadFk", insertable=false,updatable=false,nullable=true)
+ @Column(name = "awardsHeadFk", insertable = false, updatable = false)
private Integer awardsHeadId;
@ManyToOne
@JoinColumn(name = "asalAwardsFk")
- @Caption(value="asalAwardsFk")
+ @Caption(value = "asalAwardsFk")
private Asal asalAwards;
- @Column(name = "asalAwardsFk", insertable=false,updatable=false,nullable=false)
+ @Column(name = "asalAwardsFk", insertable = false, updatable = false, nullable = false)
private Integer asalAwardsId;
@ManyToOne
@JoinColumn(name = "departemenFk")
- @Caption(value="departemenFk")
+ @Caption(value = "departemenFk")
private Departemen departemen;
- @Column(name = "departemenFk", insertable=false,updatable=false,nullable=false)
+ @Column(name = "departemenFk", insertable = false, updatable = false, nullable = false)
private Integer departemenId;
@Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.awards_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.awards_m_id_seq", sequenceName = "public.awards_m_id_seq", allocationSize = 1)
+ @GeneratedValue(strategy = SEQUENCE, generator = "public.awards_m_id_seq")
+ @SequenceGenerator(name = "public.awards_m_id_seq", sequenceName = "public.awards_m_id_seq", allocationSize = 1)
@Column(name = "id")
protected Integer id;
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/B3DaftarBahanBerbahaya.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/B3DaftarBahanBerbahaya.java
index 9b2823ff..0e2ba9da 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/B3DaftarBahanBerbahaya.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/B3DaftarBahanBerbahaya.java
@@ -1,169 +1,73 @@
package com.jasamedika.medifirst2000.entities;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.FetchType.LAZY;
+
+@Getter
+@Setter
@Entity
-@Table(name="B3DaftarBahanBerbahaya_T")
+@Table(name = "B3DaftarBahanBerbahaya_T")
public class B3DaftarBahanBerbahaya extends BaseTransaction {
-
- @ManyToOne(fetch=FetchType.LAZY)
- @Caption(value="B3 Ruangan Input Data")
- @JoinColumn(name="ObjectB3RuanganInputDataFk")
+
+ @ManyToOne(fetch = LAZY)
+ @Caption(value = "B3 Ruangan Input Data")
+ @JoinColumn(name = "ObjectB3RuanganInputDataFk")
private B3RuanganInputData b3RuanganInputData;
-
- @Column(name="ObjectB3RuanganInputDataFk", nullable=false, insertable=false, updatable=false)
+
+ @Column(name = "ObjectB3RuanganInputDataFk", nullable = false, insertable = false, updatable = false)
private String b3RuanganInputDataId;
-
- @ManyToOne(fetch=FetchType.LAZY)
+
+ @ManyToOne(fetch = LAZY)
@Caption("Bahan B3")
- @JoinColumn(name="ObjectBahanB3Fk")
+ @JoinColumn(name = "ObjectBahanB3Fk")
private StokProdukGlobal bahanB3;
-
- @Column(name="ObjectBahanB3Fk", nullable=true, insertable=false, updatable=false)
+
+ @Column(name = "ObjectBahanB3Fk", insertable = false, updatable = false)
private Integer bahanB3Id;
-
+
@ManyToOne
@JoinColumn(name = "ObjectJenisLimbahB3MasukFk")
@Caption(value = "ObjectJenisLimbahB3MasukFk")
private JenisLimbahB3Masuk jenisLimbahB3Masuk;
@Column(name = "ObjectJenisLimbahB3MasukFk", insertable = false, updatable = false)
- private Integer jenisLimbahB3MasukId;
-
- @NotNull(message="Banyak Pemakaian tidak boleh kosong")
+ private Integer jenisLimbahB3MasukId;
+
+ @NotNull(message = "Banyak Pemakaian tidak boleh kosong")
@Caption("Banyak Pemakaian")
- @Column(name="BanyakPemakaian", nullable=false)
+ @Column(name = "BanyakPemakaian", nullable = false)
private Integer banyakPemakaian;
-
- @NotNull(message="Lama Pemakaian tidak boleh kosong")
+
+ @NotNull(message = "Lama Pemakaian tidak boleh kosong")
@Caption("LamaPemakaian")
- @Column(name="LamaPemakaian", nullable=false)
+ @Column(name = "LamaPemakaian", nullable = false)
private Integer lamaPemakaian;
-
- @NotNull(message="Satuan Pemakaian tidak boleh kosong")
+
+ @NotNull(message = "Satuan Pemakaian tidak boleh kosong")
@Caption("Satuan Pemakaian")
- @Column(name="SatuanPemakaian", length=50, nullable=false)
+ @Column(name = "SatuanPemakaian", length = 50, nullable = false)
private String satuanPemakaian;
-
- @NotNull(message="Jumlah tidak boleh kosong")
+
+ @NotNull(message = "Jumlah tidak boleh kosong")
@Caption("Jumlah")
- @Column(name="Jumlah", nullable=false)
+ @Column(name = "Jumlah", nullable = false)
private Integer jumlah;
-
- @NotNull(message="Karakteristik tidak boleh kosong")
+
+ @NotNull(message = "Karakteristik tidak boleh kosong")
@Caption("Karakteristik")
- @Column(name="Karakteristik", length=50, nullable=false)
+ @Column(name = "Karakteristik", length = 50, nullable = false)
private String karakteristik;
-
- @NotNull(message="Karakteristik tidak boleh kosong")
+
+ @NotNull(message = "Karakteristik tidak boleh kosong")
@Caption("Tempat Penyimpanan")
- @Column(name="TempatPenyimpanan", length=50, nullable=false)
+ @Column(name = "TempatPenyimpanan", length = 50, nullable = false)
private String tempatPenyimpanan;
- public B3RuanganInputData getB3RuanganInputData() {
- return b3RuanganInputData;
- }
-
- public void setB3RuanganInputData(B3RuanganInputData b3RuanganInputData) {
- this.b3RuanganInputData = b3RuanganInputData;
- }
-
- public String getB3RuanganInputDataId() {
- return b3RuanganInputDataId;
- }
-
- public void setB3RuanganInputDataId(String b3RuanganInputDataId) {
- this.b3RuanganInputDataId = b3RuanganInputDataId;
- }
-
- public StokProdukGlobal getBahanB3() {
- return bahanB3;
- }
-
- public void setBahanB3(StokProdukGlobal bahanB3) {
- this.bahanB3 = bahanB3;
- }
-
- public Integer getBahanB3Id() {
- return bahanB3Id;
- }
-
- public void setBahanB3Id(Integer bahanB3Id) {
- this.bahanB3Id = bahanB3Id;
- }
-
- public Integer getBanyakPemakaian() {
- return banyakPemakaian;
- }
-
- public void setBanyakPemakaian(Integer banyakPemakaian) {
- this.banyakPemakaian = banyakPemakaian;
- }
-
- public Integer getLamaPemakaian() {
- return lamaPemakaian;
- }
-
- public void setLamaPemakaian(Integer lamaPemakaian) {
- this.lamaPemakaian = lamaPemakaian;
- }
-
- public String getSatuanPemakaian() {
- return satuanPemakaian;
- }
-
- public void setSatuanPemakaian(String satuanPemakaian) {
- this.satuanPemakaian = satuanPemakaian;
- }
-
- public Integer getJumlah() {
- return jumlah;
- }
-
- public void setJumlah(Integer jumlah) {
- this.jumlah = jumlah;
- }
-
- public String getKarakteristik() {
- return karakteristik;
- }
-
- public void setKarakteristik(String karakteristik) {
- this.karakteristik = karakteristik;
- }
-
- public String getTempatPenyimpanan() {
- return tempatPenyimpanan;
- }
-
- public void setTempatPenyimpanan(String tempatPenyimpanan) {
- this.tempatPenyimpanan = tempatPenyimpanan;
- }
-
- public JenisLimbahB3Masuk getJenisLimbahB3Masuk() {
- return jenisLimbahB3Masuk;
- }
-
- public void setJenisLimbahB3Masuk(JenisLimbahB3Masuk jenisLimbahB3Masuk) {
- this.jenisLimbahB3Masuk = jenisLimbahB3Masuk;
- }
-
- public Integer getJenisLimbahB3MasukId() {
- return jenisLimbahB3MasukId;
- }
-
- public void setJenisLimbahB3MasukId(Integer jenisLimbahB3MasukId) {
- this.jenisLimbahB3MasukId = jenisLimbahB3MasukId;
- }
-
-
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/B3RuanganInputData.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/B3RuanganInputData.java
index a7ae08dd..41c72792 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/B3RuanganInputData.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/B3RuanganInputData.java
@@ -1,80 +1,42 @@
package com.jasamedika.medifirst2000.entities;
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import javax.persistence.*;
+import java.util.HashSet;
+import java.util.Set;
+
+import static javax.persistence.CascadeType.ALL;
+import static javax.persistence.FetchType.LAZY;
+
+@Getter
+@Setter
@Entity
-@Table(name="B3RuanganInputData_T")
+@Table(name = "B3RuanganInputData_T")
public class B3RuanganInputData extends BaseTransaction {
- @ManyToOne(fetch=FetchType.LAZY)
- @Caption(value="Ruangan")
- @JoinColumn(name="ObjectRuanganFk")
+ @ManyToOne(fetch = LAZY)
+ @Caption(value = "Ruangan")
+ @JoinColumn(name = "ObjectRuanganFk")
private Ruangan ruangan;
-
- @Column(name="ObjectRuanganFk", nullable=false, insertable=false, updatable=false)
+
+ @Column(name = "ObjectRuanganFk", nullable = false, insertable = false, updatable = false)
private Integer ruanganId;
-
- @ManyToOne(fetch=FetchType.LAZY)
- @Caption(value="Petugas")
- @JoinColumn(name="ObjectPetugasFk")
+
+ @ManyToOne(fetch = LAZY)
+ @Caption(value = "Petugas")
+ @JoinColumn(name = "ObjectPetugasFk")
private Pegawai petugas;
-
- @Column(name="ObjectPetugasFk", nullable=false, insertable=false, updatable=false)
+
+ @Column(name = "ObjectPetugasFk", nullable = false, insertable = false, updatable = false)
private Integer petugasId;
-
+
@JsonBackReference
- @OneToMany(cascade=CascadeType.ALL, fetch=FetchType.LAZY, mappedBy="b3RuanganInputData")
+ @OneToMany(cascade = ALL, fetch = LAZY, mappedBy = "b3RuanganInputData")
private Set b3DaftarBahanBerbahaya = new HashSet<>();
- public Ruangan getRuangan() {
- return ruangan;
- }
-
- public void setRuangan(Ruangan ruangan) {
- this.ruangan = ruangan;
- }
-
- public Integer getRuanganId() {
- return ruanganId;
- }
-
- public void setRuanganId(Integer ruanganId) {
- this.ruanganId = ruanganId;
- }
-
- public Pegawai getPetugas() {
- return petugas;
- }
-
- public void setPetugas(Pegawai petugas) {
- this.petugas = petugas;
- }
-
- public Integer getPetugasId() {
- return petugasId;
- }
-
- public void setPetugasId(Integer petugasId) {
- this.petugasId = petugasId;
- }
-
- public Set