Merge branch 'dev/kepegawaian/golongan-pppk' into dev/no-cron

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

@@ -1,16 +1,9 @@
 package com.jasamedika.medifirst2000.controller;
 
-import java.io.BufferedWriter;
+import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import java.io.File;
+import com.jasamedika.medifirst2000.dao.BridgingDao;
-import java.io.FileInputStream;
+import com.jasamedika.medifirst2000.entities.Profile;
-import java.io.FileWriter;
+import com.jasamedika.medifirst2000.vo.IndikatorBIOSVO;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,10 +11,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.jasamedika.medifirst2000.controller.base.LocaleController;
+import javax.servlet.http.HttpServletResponse;
-import com.jasamedika.medifirst2000.dao.BridgingDao;
+import java.io.*;
-import com.jasamedika.medifirst2000.entities.Profile;
+import java.util.List;
-import com.jasamedika.medifirst2000.vo.IndikatorBIOSVO;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/bios")
@@ -39,7 +32,7 @@ public class BridgingBiosController extends LocaleController<IndikatorBIOSVO> {
 		if (x.size() > 0) {
 			for (int i = 0; i < x.size(); i++) {
 				text = (x.get(i).getAlamatLengkap()) + "|";
-				text = text + (x.get(i).getKdPos()) + "|";
+				text = text + (x.get(i).getKodePos()) + "|";
 				text = text + (x.get(i).getFixedPhone()) + "|";
 				text = text + (x.get(i).getFaksimile()) + "|";
 				text = text + (x.get(i).getAlamatEmail()) + "|";

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

@@ -414,6 +414,7 @@
 		<mapping class="com.jasamedika.medifirst2000.entities.GolonganAsuransi" />
 		<mapping class="com.jasamedika.medifirst2000.entities.GolonganDarah" />
 		<mapping class="com.jasamedika.medifirst2000.entities.GolonganPegawai" />
+		<mapping class="com.jasamedika.medifirst2000.entities.GolonganPPPK" />
 		<mapping class="com.jasamedika.medifirst2000.entities.GolonganProduk" />
 		<mapping class="com.jasamedika.medifirst2000.entities.GradeRemunerasi" />
 		<mapping class="com.jasamedika.medifirst2000.entities.GroupPasien" />
@@ -651,6 +652,8 @@
 		<mapping class="com.jasamedika.medifirst2000.entities.JenisTindakanMedis" />
 		<mapping class="com.jasamedika.medifirst2000.entities.JenisTransaksi" />
 		<mapping class="com.jasamedika.medifirst2000.entities.JenisWaktu" />
+		<mapping class="com.jasamedika.medifirst2000.entities.JenjangGolonganPPPK" />
+		<mapping class="com.jasamedika.medifirst2000.entities.JenjangPPPK" />
 		<mapping class="com.jasamedika.medifirst2000.entities.JumlahBayi" />
 		<mapping class="com.jasamedika.medifirst2000.entities.JumlahDiskonDokter" />
 		<mapping class="com.jasamedika.medifirst2000.entities.JumlahDosis" />
@@ -1400,8 +1403,6 @@
 		<mapping class="com.jasamedika.medifirst2000.entities.PencatatanSuhuMesin" />
 		<mapping class="com.jasamedika.medifirst2000.entities.PencucianLinen" />
 		<mapping class="com.jasamedika.medifirst2000.entities.Pendidikan" />
-		<mapping
-			class="com.jasamedika.medifirst2000.entities.penerimaankasirnonlayanan_v" />
 		<mapping class="com.jasamedika.medifirst2000.entities.PenerimaanLinen" />
 		<mapping class="com.jasamedika.medifirst2000.entities.PenerimaInfo" />
 		<mapping class="com.jasamedika.medifirst2000.entities.Pengadaan" />
@@ -1416,7 +1417,7 @@
 		<mapping
 			class="com.jasamedika.medifirst2000.entities.PengembalianKendaraanDinas" />
 		<mapping class="com.jasamedika.medifirst2000.entities.Pengendali" />
-		<mapping class="com.jasamedika.medifirst2000.entities.penggunaanobat" />
+		<mapping class="com.jasamedika.medifirst2000.entities.PenggunaanObat" />
 		<mapping
 			class="com.jasamedika.medifirst2000.entities.PenghasilanTidakKenaPajak" />
 		<mapping
@@ -1575,7 +1576,6 @@
 		<mapping class="com.jasamedika.medifirst2000.entities.PreskripsiDiet" />
 		<mapping class="com.jasamedika.medifirst2000.entities.Printer" />
 		<mapping class="com.jasamedika.medifirst2000.entities.Produk" />
-		<mapping class="com.jasamedika.medifirst2000.entities.produkbarang_v" />
 		<mapping
 			class="com.jasamedika.medifirst2000.entities.ProdukDetailLabAnatomi" />
 		<mapping
@@ -1585,8 +1585,7 @@
 		<mapping
 			class="com.jasamedika.medifirst2000.entities.ProdukDetailLaboratoriumNilaiNormal" />
 		<mapping class="com.jasamedika.medifirst2000.entities.ProdukFarmakologi" />
-		<mapping
+		<mapping class="com.jasamedika.medifirst2000.entities.ProdukFastSlowMoving" />
-			class="com.jasamedika.medifirst2000.entities.produkfastslowmoving_v" />
 		<mapping class="com.jasamedika.medifirst2000.entities.ProdukFormulaProduksi" />
 		<mapping
 			class="com.jasamedika.medifirst2000.entities.ProdukKeslingNilaiNormal" />
@@ -1689,16 +1688,16 @@
 		<mapping class="com.jasamedika.medifirst2000.entities.ResikoJatuh" />
 		<mapping class="com.jasamedika.medifirst2000.entities.ResikoJatuhDetail" />
 		<mapping class="com.jasamedika.medifirst2000.entities.ResikoMalnutirisi" />
-		<mapping class="com.jasamedika.medifirst2000.entities.responterhadapoperasi" />
+		<mapping class="com.jasamedika.medifirst2000.entities.ResponTerhadapOperasi" />
 		<mapping class="com.jasamedika.medifirst2000.entities.ResultSurvei" />
 		<mapping class="com.jasamedika.medifirst2000.entities.ResultSurveiDetail" />
 		<mapping class="com.jasamedika.medifirst2000.entities.ResumeMedis" />
 		<mapping class="com.jasamedika.medifirst2000.entities.Rhesus" />
 		<mapping class="com.jasamedika.medifirst2000.entities.RincianKegiatan" />
-		<mapping class="com.jasamedika.medifirst2000.entities.RIS_Order" />
+		<mapping class="com.jasamedika.medifirst2000.entities.RISOrder" />
-		<mapping class="com.jasamedika.medifirst2000.entities.RIS_Report" />
+		<mapping class="com.jasamedika.medifirst2000.entities.RISReport" />
-		<mapping class="com.jasamedika.medifirst2000.entities.RIS_Study" />
+		<mapping class="com.jasamedika.medifirst2000.entities.RISStudy" />
-		<mapping class="com.jasamedika.medifirst2000.entities.RIS_User" />
+		<mapping class="com.jasamedika.medifirst2000.entities.RISUser" />
 		<mapping class="com.jasamedika.medifirst2000.entities.Risiko" />
 		<mapping class="com.jasamedika.medifirst2000.entities.RisikoGizi" />
 		<mapping class="com.jasamedika.medifirst2000.entities.RisikoJatuh" />
@@ -1731,23 +1730,18 @@
 			class="com.jasamedika.medifirst2000.entities.RiwayatPerkembanganDetail" />
 		<mapping
 			class="com.jasamedika.medifirst2000.entities.RiwayatPerkembanganPsikomotor" />
-		<mapping class="com.jasamedika.medifirst2000.entities.RmKarakteristikNyeri" />
+		<mapping class="com.jasamedika.medifirst2000.entities.KarakteristikNyeri" />
-		<mapping class="com.jasamedika.medifirst2000.entities.RmLaboratorium" />
-		<mapping class="com.jasamedika.medifirst2000.entities.RmLokasiNyeri" />
-		<mapping class="com.jasamedika.medifirst2000.entities.RmPengaruhNyeri" />
-		<mapping class="com.jasamedika.medifirst2000.entities.RmTypeNyeri" />
 		<mapping class="com.jasamedika.medifirst2000.entities.RouteFarmasi" />
 		<mapping class="com.jasamedika.medifirst2000.entities.Ruangan" />
 		<mapping
 			class="com.jasamedika.medifirst2000.entities.RuanganJenisLayananRemunMedis" />
-		<mapping class="com.jasamedika.medifirst2000.entities.RuanganM" />
 		<mapping class="com.jasamedika.medifirst2000.entities.RuanganPosisiCurrent" />
 		<mapping
 			class="com.jasamedika.medifirst2000.entities.RuanganRawatJalanPenunjang" />
 		<mapping class="com.jasamedika.medifirst2000.entities.RuangPerawatanIGD" />
 		<mapping
 			class="com.jasamedika.medifirst2000.entities.RuangPerawatanKemenkes" />
-		<mapping class="com.jasamedika.medifirst2000.entities.rujukan" />
+		<mapping class="com.jasamedika.medifirst2000.entities.Rujukan" />
 		<mapping class="com.jasamedika.medifirst2000.entities.RunningNumber" />
 		<mapping class="com.jasamedika.medifirst2000.entities.RupAnggaran" />
 		<mapping class="com.jasamedika.medifirst2000.entities.Saksi" />
@@ -1789,7 +1783,7 @@
 		<mapping
 			class="com.jasamedika.medifirst2000.entities.SistemSkoringPasienGawatIGD" />
 		<mapping
-			class="com.jasamedika.medifirst2000.entities.Sitogenetika_AnalisaKromoson" />
+			class="com.jasamedika.medifirst2000.entities.SitogenetikaAnalisaKromoson" />
 		<mapping class="com.jasamedika.medifirst2000.entities.SkalaNyeri" />
 		<mapping
 			class="com.jasamedika.medifirst2000.entities.SkBiayaPegawaiPerjalananDinas" />

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/converter/ModulAplikasiSConverter.java

@@ -1,79 +0,0 @@
-package com.jasamedika.medifirst2000.converter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.BeanUtils;
-
-import com.jasamedika.medifirst2000.converter.base.BaseVoConverter;
-import com.jasamedika.medifirst2000.entities.ModulAplikasiS;
-import com.jasamedika.medifirst2000.vo.ModulAplikasiSVO;
-
-/**
-* 
-* @author Syamsu
-*/
-
-//@Component
-public class ModulAplikasiSConverter implements BaseVoConverter<ModulAplikasiSVO, ModulAplikasiS> {
-
-	@Override
-	public ModulAplikasiS transferVOToModel(ModulAplikasiSVO vo, ModulAplikasiS model) {
-		if (null == model)
-			model = new ModulAplikasiS();
-		
-		BeanUtils.copyProperties(vo, model);
-
-//		try {
-//			String[] fieldsToInclude = null;
-//			Map<String, Object> serialized = vo.serialize(fieldsToInclude,vo.getClass().getName());
-//			Gson gson = new Gson();
-//	        String json = gson.toJson(serialized);
-//	        model = gson.fromJson(json, ModulAplikasiS.class);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//		}
-
-		return model;
-	}
-
-	@Override
-	public List<ModulAplikasiSVO> transferListOfModelToListOfVO(List<ModulAplikasiS> models, List<ModulAplikasiSVO> vos) {
-
-		if (null == vos)
-			vos = new ArrayList<ModulAplikasiSVO>();
-
-		if (null == models)
-			return vos;
-
-		for (ModulAplikasiS modulAplikasi : models) {
-			ModulAplikasiSVO vo = new ModulAplikasiSVO();
-			vo=transferModelToVO(modulAplikasi, vo);
-			vos.add(vo);
-		}
-
-		return vos;
-	}
-
-	@Override
-	public ModulAplikasiSVO transferModelToVO(ModulAplikasiS model, ModulAplikasiSVO vo) {
-		if (null == vo)
-			vo = new ModulAplikasiSVO();
-		
-		BeanUtils.copyProperties(model, vo);
-
-//		try {
-//			String[] fieldsToInclude = null;
-//			//Map<String, Object> serialized = model.serialize(fieldsToInclude,model.getClass().getSimpleName());
-//			Map<String, Object> serialized = model.ToMap();
-//			Gson gson = new Gson();
-//	        String json = gson.toJson(serialized);
-//	        vo = gson.fromJson(json, ModulAplikasiSVO.class);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//		}
-
-		return vo;
-	}
-
-}

jasamedika-business/src/main/java/com/jasamedika/medifirst2000/converter/ObjekModulAplikasiSConverter.java

@@ -1,76 +0,0 @@
-package com.jasamedika.medifirst2000.converter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Component;
-
-import com.jasamedika.medifirst2000.converter.base.BaseVoConverter;
-import com.jasamedika.medifirst2000.entities.ObjekModulAplikasiS;
-import com.jasamedika.medifirst2000.vo.ObjekModulAplikasiSVO;
-
-@Component
-public class ObjekModulAplikasiSConverter implements BaseVoConverter<ObjekModulAplikasiSVO, ObjekModulAplikasiS> {
-
-	@Override
-	public ObjekModulAplikasiS transferVOToModel(ObjekModulAplikasiSVO vo, ObjekModulAplikasiS model) {
-		if (null == model)
-			model = new ObjekModulAplikasiS();
-		
-		BeanUtils.copyProperties(vo, model);
-		
-//		try {
-//			String[] fieldsToInclude = null;
-//			Map<String, Object> serialized = vo.serialize(fieldsToInclude,vo.getClass().getName());
-//			Gson gson = new Gson();
-//	        String json = gson.toJson(serialized);
-//	        model = gson.fromJson(json, ObjekModulAplikasiS.class);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//		}
-
-		return model;
-	}
-
-	@Override
-	public List<ObjekModulAplikasiSVO> transferListOfModelToListOfVO(List<ObjekModulAplikasiS> models,
-			List<ObjekModulAplikasiSVO> vos) {
-		if (null == vos)
-			vos = new ArrayList<ObjekModulAplikasiSVO>();
-
-		if (null == models)
-			return vos;
-
-		for (ObjekModulAplikasiS objekModulAplikasi : models) {
-			ObjekModulAplikasiSVO vo = new ObjekModulAplikasiSVO();
-			vo=transferModelToVO(objekModulAplikasi, vo);
-			vos.add(vo);
-		}
-
-		return vos;
-	}
-
-	@Override
-	public ObjekModulAplikasiSVO transferModelToVO(ObjekModulAplikasiS model, ObjekModulAplikasiSVO vo) {
-		
-		
-		if (null == vo)
-			vo = new ObjekModulAplikasiSVO();
-			BeanUtils.copyProperties(model, vo);
-		
-//		try {
-//			String[] fieldsToInclude = null;
-//			//Map<String, Object> serialized = model.serialize(fieldsToInclude,model.getClass().getSimpleName());
-//			//Map<String, Object> serialized = model.ToMap();
-//			Gson gson = new Gson();
-//	        String json = gson.toJson(model);
-//	        vo = gson.fromJson(json, ObjekModulAplikasiSVO.class);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//		}
-
-		return vo;
-	}
-
-}

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

@@ -0,0 +1,12 @@
+package com.jasamedika.medifirst2000.dao;
+
+import com.jasamedika.medifirst2000.entities.GolonganPPPK;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 2/21/2025
+ */
+public interface GolonganPPPKDao extends JpaRepository<GolonganPPPK, String> {
+}

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

@@ -0,0 +1,13 @@
+package com.jasamedika.medifirst2000.dao;
+
+import com.jasamedika.medifirst2000.entities.JenjangGolonganId;
+import com.jasamedika.medifirst2000.entities.JenjangGolonganPPPK;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 2/21/2025
+ */
+public interface JenjangGolonganPPPKDao extends JpaRepository<JenjangGolonganPPPK, JenjangGolonganId> {
+}

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

@@ -0,0 +1,12 @@
+package com.jasamedika.medifirst2000.dao;
+
+import com.jasamedika.medifirst2000.entities.JenjangPPPK;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 2/21/2025
+ */
+public interface JenjangPPPKDao extends JpaRepository<JenjangPPPK, String> {
+}

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

@@ -1,31 +0,0 @@
-package com.jasamedika.medifirst2000.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import com.jasamedika.medifirst2000.entities.ModulAplikasiS;
-
-/**
-* 
-* @author Syamsu
-*/
-
-//@Repository("ModulAplikasiSDao")
-public interface ModulAplikasiSDao extends JpaRepository<ModulAplikasiS, Integer> {
-
-	
-	ModulAplikasiS findById(@Param("id") Integer id);
-	
-	@Query("select model from ModulAplikasiS model where model.kdModulAplikasiHead is null order by model.modulNoUrut asc")
-	List<ModulAplikasiS> findAllSubSytemOrderByModulNoUrutAsc();
-	
-	@Query("select model from ModulAplikasiS model where model.kdModulAplikasiHead = :kdModulAplikasi order by model.modulNoUrut asc")
-	List<ModulAplikasiS> findAllSubModulOrderByModulNoUrutAsc(@Param("kdModulAplikasi") String kdModulAplikasi);
-	
-
-//	@Query("select new model from ModulAplikasiS model where model.kdModulAplikasiHead is null order by model.modulNoUrut asc")
-//	List<ModulAplikasiS> findAllSubSytemOrderByModulNoUrutAsc();
-}

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

@@ -1,20 +0,0 @@
-package com.jasamedika.medifirst2000.dao;
-
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import com.jasamedika.medifirst2000.entities.ObjekModulAplikasiS;
-
-//@Repository("ObjekModulAplikasiSDao")
-public interface ObjekModulAplikasiSDao extends JpaRepository<ObjekModulAplikasiS, Integer> {
-	
-	@Query("Select m from ObjekModulAplikasiS m where m.kdModulAplikasi = :kdModulAplikasi and m.kdObjekModulAplikasiHead is null ")
-	public List<ObjekModulAplikasiS> findAllObjekModulAplikasi(@Param("kdModulAplikasi") String kdModulAplikasi);
-	
-	public ObjekModulAplikasiS findByAlamatUrlFormObjekModulAplikasi(@Param("AlamatUrlFormObjekModulAplikasi") String AlamatUrlFormObjekModulAplikasi);
-	
-}

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

@@ -1,35 +1,35 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.Date;
+import com.jasamedika.medifirst2000.entities.RISOrder;
-
 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.RIS_Order;
+
+import java.util.Date;
 
 @Repository("RIS_OrderDao")
-public interface RIS_OrderDao extends PagingAndSortingRepository<RIS_Order, Integer>{
+public interface RIS_OrderDao extends PagingAndSortingRepository<RISOrder, Integer>{
 
-	@Query("select model from RIS_Order model where model.EXTENSION6=:noRec")
+	@Query("select model from RISOrder model where model.extension6=:noRec")
-	RIS_Order getOneByNoOrder(@Param("noRec") String noRec);
+    RISOrder getOneByNoOrder(@Param("noRec") String noRec);
 	
-	@Query("select model from RIS_Order model where model.ACCESSION_NUM=:accessionNum")
+	@Query("select model from RISOrder model where model.accessionNum=:accessionNum")
-	RIS_Order getOneByAccessionNum(@Param("accessionNum") String accessionNum);
+    RISOrder getOneByAccessionNum(@Param("accessionNum") String accessionNum);
 	
 	@Query("select "
-			+ "a.ACCESSION_NUM "
+			+ "a.accessionNum "
-			+ "from RIS_Order a "
+			+ "from RISOrder a "
-			+ "where a.ORDER_MODALITY=:kode and a.ORDER_KEY="
+			+ "where a.orderModality=:kode and a.orderKey="
-			+ "(select max(b.ORDER_KEY) "
+			+ "(select max(b.orderKey) "
-			+ "from RIS_Order b "
+			+ "from RISOrder b "
-			+ "where b.ORDER_MODALITY=:kode)")
+			+ "where b.orderModality=:kode)")
-	String AccessionNumCode(@Param("kode") String kode);
+	String accessionNumCode(@Param("kode") String kode);
 	
-	@Query("select max(a.ACCESSION_NUM) "
+	@Query("select max(a.accessionNum) "
-			+ "from RIS_Order a where "
+			+ "from RISOrder a where "
-			+ "substring(a.ACCESSION_NUM, 1, 1)=:kode and "
+			+ "substring(a.accessionNum, 1, 1)=:kode and "
-			+ "month(date(substring(a.CREATE_DATE, 1, 8)))=month(date(:dateNow)) and "
+			+ "month(date(substring(a.createDate, 1, 8)))=month(date(:dateNow)) and "
-			+ "year(date(substring(a.CREATE_DATE, 1, 8)))=year(date(:dateNow))")
+			+ "year(date(substring(a.createDate, 1, 8)))=year(date(:dateNow))")
 	String countAccessionNum(@Param("kode") String kode, @Param("dateNow") Date dateNow);
 }

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

@@ -1,27 +1,26 @@
 package com.jasamedika.medifirst2000.dao;
 
-import java.util.List;
+import com.jasamedika.medifirst2000.entities.RISReport;
-import java.util.Map;
-
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.jasamedika.medifirst2000.entities.RIS_Report;
+import java.util.List;
+import java.util.Map;
 
 @Repository("RIS_ReportDao")
-public interface RIS_ReportDao extends PagingAndSortingRepository<RIS_Report, Integer>{
+public interface RIS_ReportDao extends PagingAndSortingRepository<RISReport, Integer>{
 	
-	@Query("select new Map ( report.CONFIRM_DATE as confirmDate, "+
+	@Query("select new Map ( report.confirmDate as confirmDate, "+
-			"report.CONFIRM_DOC_NAME as confirmDoctor, "+
+			"report.confirmDocName as confirmDoctor, "+
-			"report.REPORT_TEXT as reportText, "+
+			"report.reportText as reportText, "+
-			"report.CONCLUSION as conclusion, "+
+			"report.conclusion as conclusion, "+
-			"report.CREATE_DATE as createDate, "+
+			"report.createDate as createDate, "+
-			"report.ACCESSION_NUM as accesion_num, "+
+			"report.accessionNum as accesion_num, "+
-			"report.READ_DATE as readDate) "+
+			"report.readDate as readDate) "+
-			"from RIS_Report report "+
+			"from RISReport report "+
-			"where substring(report.CREATE_DATE,1,8) between :startDate and :endDate")
+			"where substring(report.createDate,1,8) between :startDate and :endDate")
 	List<Map<String,Object>> getReportByTglCreate(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
 }

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

@@ -2,9 +2,9 @@ package com.jasamedika.medifirst2000.dao;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
-import com.jasamedika.medifirst2000.entities.RIS_Study;
+import com.jasamedika.medifirst2000.entities.RISStudy;
 
 @Repository("RIS_StudyDao")
-public interface RIS_StudyDao extends PagingAndSortingRepository<RIS_Study, Integer>{
+public interface RIS_StudyDao extends PagingAndSortingRepository<RISStudy, Integer>{
 
 }

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

@@ -2,9 +2,9 @@ package com.jasamedika.medifirst2000.dao;
 
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
-import com.jasamedika.medifirst2000.entities.RIS_User;
+import com.jasamedika.medifirst2000.entities.RISUser;
 
 @Repository("RIS_UserDao")
-public interface RIS_UserDao extends PagingAndSortingRepository<RIS_User, Integer>{
+public interface RIS_UserDao extends PagingAndSortingRepository<RISUser, Integer>{
 
 }

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

@@ -1,33 +0,0 @@
-package com.jasamedika.medifirst2000.dao;
-
-import java.util.List;
-
-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.RuanganM;
-
-/**
- * Repository class for Kelas
- * 
- * @author Roberto
- */
-@Repository("RuanganMDao")
-public interface RuanganMDao extends
-		PagingAndSortingRepository<RuanganM, Integer> {
-
-	// native query example, misal ada 2 parameter yaitu param2 dan param2
-	@Query(value = "select namaRuangan from ruangan_M where kdRuangan in (select nilaiField from settingDataFixed_M) and (id =:param1 or id = :param2 ) "
-			+ "union all "
-			+ "select namaDepartemen as namaRuangan from departemen_M  where char_length(namaDepartemen) = 12 "
-			+ "union all", nativeQuery = true)
-	List<Object[]> getNativeNamaRuangan(@Param("param1") String param1,
-			@Param("param2") String param2);
-
-	// native query example
-	@Query(value = "select namakelas as namaRuangan from kelas_M where strpos(namaKelas,'N')=1", nativeQuery = true)
-	List<Object[]> getNativeNamaKelas();
-
-}

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

@@ -1,12 +1,5 @@
 package com.jasamedika.medifirst2000.dao.custom.impl;
 
-import java.util.List;
-import java.util.Map;
-
-import javax.persistence.Query;
-
-import org.springframework.stereotype.Repository;
-
 import com.jasamedika.medifirst2000.dao.custom.StrukPelayananDetailDaoCustom;
 import com.jasamedika.medifirst2000.dao.custom.base.impl.CoreDaoImpl;
 import com.jasamedika.medifirst2000.entities.KelompokUser;
@@ -14,6 +7,11 @@ import com.jasamedika.medifirst2000.entities.Ruangan;
 import com.jasamedika.medifirst2000.entities.StrukPelayananDetail;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.util.DateUtil;
+import org.springframework.stereotype.Repository;
+
+import javax.persistence.Query;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Repository Custom class
@@ -1731,7 +1729,7 @@ public class StrukPelayananDetailDaoCustomImpl extends CoreDaoImpl<StrukPelayana
 		StringBuffer buffer = new StringBuffer();
 		buffer.append(" select new Map( sum(p.jumlah) as jumlah,p.kdProduk as kdProduk ,p.kdRuangan as kdRuangan,p.namaProduk as namaProduk,p.namaRuangan as namaRuangan )");
 		
-		buffer.append(" from produkfastslowmoving_v p where p.kdRuangan=:ruanganId ");
+		buffer.append(" from ProdukFastSlowMoving p where p.kdRuangan=:ruanganId ");
 	
 		if(CommonUtil.isNotNullOrEmpty(kelompokProdukId)){
 			buffer.append(" and p.kelompokProdukId=:kelompokProdukId");
@@ -1778,7 +1776,7 @@ public class StrukPelayananDetailDaoCustomImpl extends CoreDaoImpl<StrukPelayana
 		StringBuffer buffer = new StringBuffer();
 		buffer.append(" select new Map( sum(p.jumlah) as jumlah,p.kdProduk as kdProduk ,p.kdRuangan as kdRuangan,p.namaProduk as namaProduk,p.namaRuangan as namaRuangan )");
 		
-		buffer.append(" from produkfastslowmoving_v p where p.kdRuangan=:ruanganId ");
+		buffer.append(" from ProdukFastSlowMoving p where p.kdRuangan=:ruanganId ");
 	
 		if(CommonUtil.isNotNullOrEmpty(kelompokProdukId)){
 			buffer.append(" and p.kelompokProdukId=:kelompokProdukId");

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

@@ -1,13 +1,10 @@
 package com.jasamedika.medifirst2000.service;
 
-import java.util.List;
-
 import com.jasamedika.medifirst2000.entities.Alamat;
-import com.jasamedika.medifirst2000.vo.ModelVO;
-import com.jasamedika.medifirst2000.vo.ModelVO;
-import com.jasamedika.medifirst2000.entities.PurchasedTest;
 import com.jasamedika.medifirst2000.vo.AlamatVO;
 
+import java.util.List;
+
 /**
  * Alamat Service
  * 

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

@@ -1,16 +1,16 @@
 package com.jasamedika.medifirst2000.service;
 
-import java.util.List;
+public interface ModulAplikasiSService<T> /*
+											 * extends
+											 * BaseVoService<ModulAplikasiS,
+											 * ModulAplikasiSVO, Integer>
+											 */ {
 
-import com.jasamedika.medifirst2000.entities.ModulAplikasiS;
+	// List<ModulAplikasiS> findAllModulAplikasiS();
-import com.jasamedika.medifirst2000.vo.ModulAplikasiSVO;
 
-public interface ModulAplikasiSService<T> /*extends BaseVoService<ModulAplikasiS, ModulAplikasiSVO, Integer>*/ {
+	// List<ModulAplikasiSVO> findAllSubSytemOrderByModulNoUrutAsc();
-	
+	//
-//	List<ModulAplikasiS> findAllModulAplikasiS();
+	// List<ModulAplikasiSVO> findAllSubModulOrderByModulNoUrutAsc(String
-	
+	// kdModulAplikasi);
-//	List<ModulAplikasiSVO> findAllSubSytemOrderByModulNoUrutAsc();
-//	
-//	List<ModulAplikasiSVO> findAllSubModulOrderByModulNoUrutAsc(String kdModulAplikasi);
 
 }

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

@@ -1,15 +1,16 @@
 package com.jasamedika.medifirst2000.service;
 
-import java.util.List;
+public interface ObjekModulAplikasiSService<T> /*
+												 * extends BaseVoService<
+												 * ObjekModulAplikasiS,
+												 * ObjekModulAplikasiSVO,
+												 * Integer>
+												 */ {
 
-import com.jasamedika.medifirst2000.entities.ObjekModulAplikasiS;
+	// public List<ObjekModulAplikasiSVO> findAllModulAplikasi(String
-import com.jasamedika.medifirst2000.vo.ObjekModulAplikasiSVO;
+	// kdModulAplikasi);
-
+	//
-public interface ObjekModulAplikasiSService <T> /*extends BaseVoService<ObjekModulAplikasiS, ObjekModulAplikasiSVO, Integer>*/{
+	// public ObjekModulAplikasiSVO findByAlamatUrlFormObjekModulAplikasi(String
-	
+	// AlamatUrlFormObjekModulAplikasi);
-	
-//	public List<ObjekModulAplikasiSVO> findAllModulAplikasi(String kdModulAplikasi);
-//	
-//	public ObjekModulAplikasiSVO findByAlamatUrlFormObjekModulAplikasi(String AlamatUrlFormObjekModulAplikasi);
 
 }

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

@@ -3,12 +3,12 @@ package com.jasamedika.medifirst2000.service;
 import java.util.List;
 import java.util.Map;
 
-import com.jasamedika.medifirst2000.entities.RIS_Order;
+import com.jasamedika.medifirst2000.entities.RISOrder;
 
 public interface RIS_OrderService {
-	public Map<String, Object> save(RIS_Order vo);
+	public Map<String, Object> save(RISOrder vo);
-	public void delete(RIS_Order vo);
+	public void delete(RISOrder vo);
-	public RIS_Order getOne(RIS_Order vo);
+	public RISOrder getOne(RISOrder vo);
-	public List<RIS_Order> getAll();
+	public List<RISOrder> getAll();
-	public RIS_Order getOneByNoOrder(String noRec);
+	public RISOrder getOneByNoOrder(String noRec);
 }

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

@@ -3,12 +3,12 @@ package com.jasamedika.medifirst2000.service;
 import java.util.List;
 import java.util.Map;
 
-import com.jasamedika.medifirst2000.entities.RIS_Report;
+import com.jasamedika.medifirst2000.entities.RISReport;
 
 public interface RIS_ReportService {
-	public Map<String, Object> save(RIS_Report vo);
+	public Map<String, Object> save(RISReport vo);
 	public List<Map<String, Object>> getReportByTglCreate(String startDate, String endDate);
-	public void delete(RIS_Report vo);
+	public void delete(RISReport vo);
-	public RIS_Report getOne(RIS_Report vo);
+	public RISReport getOne(RISReport vo);
-	public List<RIS_Report> getAll();
+	public List<RISReport> getAll();
 }

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

@@ -3,11 +3,11 @@ package com.jasamedika.medifirst2000.service;
 import java.util.List;
 import java.util.Map;
 
-import com.jasamedika.medifirst2000.entities.RIS_Study;
+import com.jasamedika.medifirst2000.entities.RISStudy;
 
 public interface RIS_StudyService {
-	public Map<String, Object> save(RIS_Study vo);
+	public Map<String, Object> save(RISStudy vo);
-	public void delete(RIS_Study vo);
+	public void delete(RISStudy vo);
-	public RIS_Study getOne(RIS_Study vo);
+	public RISStudy getOne(RISStudy vo);
-	public List<RIS_Study> getAll();
+	public List<RISStudy> getAll();
 }

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

@@ -3,11 +3,11 @@ package com.jasamedika.medifirst2000.service;
 import java.util.List;
 import java.util.Map;
 
-import com.jasamedika.medifirst2000.entities.RIS_User;
+import com.jasamedika.medifirst2000.entities.RISUser;
 
 public interface RIS_UserService {
-	public Map<String, Object> save(RIS_User vo);
+	public Map<String, Object> save(RISUser vo);
-	public void delete(RIS_User vo);
+	public void delete(RISUser vo);
-	public RIS_User getOne(RIS_User vo);
+	public RISUser getOne(RISUser vo);
-	public List<RIS_User> getAll();
+	public List<RISUser> getAll();
 }

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

@@ -1,21 +0,0 @@
-package com.jasamedika.medifirst2000.service;
-
-import java.util.List;
-
-import com.jasamedika.medifirst2000.entities.RuanganM;
-import com.jasamedika.medifirst2000.vo.ModelVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
-import com.jasamedika.medifirst2000.vo.ModelVO;
-import com.jasamedika.medifirst2000.vo.RuanganMVO;
-
-/**
- * RuanganM Service
- * 
- * @author Roberto
- */
-public interface RuanganMService <T> extends BaseVoService<RuanganM, RuanganMVO, String> {
-	
-	RuanganMVO add(RuanganMVO vo);
-
-	
-}

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

@@ -1,18 +1,12 @@
 package com.jasamedika.medifirst2000.service;
 
+import com.jasamedika.medifirst2000.entities.ResultSurvei;
+import com.jasamedika.medifirst2000.vo.ResultSurveiVO;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import com.jasamedika.medifirst2000.entities.Pasien;
-import com.jasamedika.medifirst2000.vo.ModelVO;
-import com.jasamedika.medifirst2000.vo.ModelVO;
-import com.jasamedika.medifirst2000.entities.PurchasedTest;
-import com.jasamedika.medifirst2000.entities.ResultSurvei;
-import com.jasamedika.medifirst2000.vo.PasienVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPasienGawatDaruratVO;
-import com.jasamedika.medifirst2000.vo.ResultSurveiVO;
-
 /**
  * Pasien Service
  * 

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

@@ -1,53 +1,21 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-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;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.jasamedika.medifirst2000.converter.base.BaseVoConverter;
-import com.jasamedika.medifirst2000.dao.ProdukDao;
+import com.jasamedika.medifirst2000.dao.*;
-import com.jasamedika.medifirst2000.dao.ProdukFormulaProduksiDao;
-import com.jasamedika.medifirst2000.dao.ProdukProduksiDao;
-import com.jasamedika.medifirst2000.dao.RuanganDao;
-import com.jasamedika.medifirst2000.dao.SatuanStandarDao;
-import com.jasamedika.medifirst2000.dao.StokProdukDetailDao;
-import com.jasamedika.medifirst2000.dao.StokProdukGlobalDao;
-import com.jasamedika.medifirst2000.dao.StrukHistoriDao;
-import com.jasamedika.medifirst2000.dao.StrukPelayananDao;
 import com.jasamedika.medifirst2000.dao.custom.StokProdukGlobalDaoCustom;
-import com.jasamedika.medifirst2000.entities.AsalProduk;
+import com.jasamedika.medifirst2000.entities.*;
-import com.jasamedika.medifirst2000.entities.DetailJenisProduk;
-import com.jasamedika.medifirst2000.entities.HargaNettoProdukByTerima;
-import com.jasamedika.medifirst2000.entities.KelompokTransaksi;
-import com.jasamedika.medifirst2000.entities.Produk;
-import com.jasamedika.medifirst2000.entities.ProdukFormulaProduksi;
-import com.jasamedika.medifirst2000.entities.ProdukProduksi;
-import com.jasamedika.medifirst2000.entities.Ruangan;
-import com.jasamedika.medifirst2000.entities.SatuanStandar;
-import com.jasamedika.medifirst2000.entities.StokProdukDetail;
-import com.jasamedika.medifirst2000.entities.StokProdukGlobal;
-import com.jasamedika.medifirst2000.entities.StrukHistori;
-import com.jasamedika.medifirst2000.entities.StrukPelayanan;
-import com.jasamedika.medifirst2000.entities.StrukPelayananDetail;
 import com.jasamedika.medifirst2000.service.CssdBmhpService;
 import com.jasamedika.medifirst2000.service.KartuStokService;
 import com.jasamedika.medifirst2000.service.StokProdukGlobalService;
 import com.jasamedika.medifirst2000.service.StrukOrderService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.util.StringUtil;
-import com.jasamedika.medifirst2000.vo.CssdBmhpDetailVO;
+import com.jasamedika.medifirst2000.vo.*;
-import com.jasamedika.medifirst2000.vo.CssdBmhpHeaderVO;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.jasamedika.medifirst2000.vo.CssdProduksiBmhpDetailVO;
+import org.springframework.stereotype.Service;
-import com.jasamedika.medifirst2000.vo.CssdProduksiBmhpHeaderVO;
+import org.springframework.transaction.annotation.Transactional;
-import com.jasamedika.medifirst2000.vo.ProdukVO;
+
+import java.util.*;
 
 @Service("cssdBmhpService")
 public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdBmhpService {
@@ -148,7 +116,7 @@ public class CssdBmhpServiceImpl extends BaseAngaranServiceImpl implements CssdB
 			produkFormulaProduksi.setProdukHasil(produkResult);
 			produkFormulaProduksi.setStatusEnabled(true);
 			produkFormulaProduksi.setFormulaProduksi("Barang bmhp");
-			produkFormulaProduksi.setqtyProdukAsal(cssdBmhpDetail.getQtyProduk());
+			produkFormulaProduksi.setQtyProdukAsal(cssdBmhpDetail.getQtyProduk());
 			produkFormulaProduksiDao.save(produkFormulaProduksi);
 		}
 		data.put("id", produkResult.getId());

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

@@ -6,7 +6,7 @@ import com.jasamedika.medifirst2000.dao.ProdukDao;
 import com.jasamedika.medifirst2000.entities.MapProdukPaket;
 import com.jasamedika.medifirst2000.entities.MapProdukPaketToProduk;
 import com.jasamedika.medifirst2000.entities.Produk;
-import com.jasamedika.medifirst2000.entities.ProdukDto;
+import com.jasamedika.medifirst2000.dto.ProdukDto;
 import com.jasamedika.medifirst2000.service.MapProdukPaketToProdukService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.vo.MapProdukPaketToProdukVO;

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

@@ -1,121 +1,122 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.jasamedika.medifirst2000.converter.ModulAplikasiSConverter;
-import com.jasamedika.medifirst2000.dao.ModulAplikasiSDao;
-import com.jasamedika.medifirst2000.entities.ModulAplikasiS;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.ModulAplikasiSService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.vo.ModulAplikasiSVO;
 
 //@Service("modulAplikasiSService")
-public class ModulAplikasiSServiceImpl /*extends BaseVoServiceImpl*/ implements ModulAplikasiSService<ModulAplikasiSVO> {
+public class ModulAplikasiSServiceImpl
-
+		/* extends BaseVoServiceImpl */ implements ModulAplikasiSService<ModulAplikasiSVO> {
-//	@Autowired
-//	private ModulAplikasiSDao modulAplikasiSDao;
-//
-//	@Autowired
-//	private ModulAplikasiSConverter modulAplikasiSConverter;
-//	
-//	
-//	@Override
-//	@Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
-//	public List<ModulAplikasiSVO> findAllSubModulOrderByModulNoUrutAsc(String kdModulAplikasi) {
-//		return modulAplikasiSConverter.transferListOfModelToListOfVO(modulAplikasiSDao.findAllSubModulOrderByModulNoUrutAsc(kdModulAplikasi), null);
-//	}
-//	
-//	
-//	@Override
-//	@Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
-//	public List<ModulAplikasiSVO> findAllSubSytemOrderByModulNoUrutAsc() {
-//		return modulAplikasiSConverter.transferListOfModelToListOfVO(modulAplikasiSDao.findAllSubSytemOrderByModulNoUrutAsc(), null);
-//	}
-//
-//	@Override
-//	@Transactional(readOnly = false)
-//	public ModulAplikasiSVO add(ModulAplikasiSVO vo) throws JpaSystemException, ServiceVOException {
-//		ModulAplikasiS modulAplikasiS = modulAplikasiSConverter.transferVOToModel(vo, new ModulAplikasiS());
-//		ModulAplikasiS resultModel = modulAplikasiSDao.save(modulAplikasiS);
-//		ModulAplikasiSVO resultVo = new ModulAplikasiSVO();
-//		resultVo = modulAplikasiSConverter.transferModelToVO(resultModel, resultVo);
-//		return resultVo;
-//	}
-//
-//	@Override
-//	@Transactional(readOnly = false)
-//	public ModulAplikasiSVO update(ModulAplikasiSVO vo) throws JpaSystemException, ServiceVOException {
-//
-//		ModulAplikasiS modulAplikasiS = modulAplikasiSDao.findOne(vo.getId());
-//		modulAplikasiS = modulAplikasiSConverter.transferVOToModel(vo, modulAplikasiS);
-//
-//		modulAplikasiSDao.save(modulAplikasiS);
-//		return vo;
-//	}
-//
-//	@Override
-//	@Transactional(readOnly = false)
-//	public Boolean delete(Integer key) throws JpaSystemException {
-//		if (CommonUtil.isNotNullOrEmpty(key)) {
-//
-//			ModulAplikasiS modulAplikasiS = modulAplikasiSDao.findOne(key);
-//			modulAplikasiSDao.delete(modulAplikasiS);
-//			ModulAplikasiSVO modulAplikasiSVO = modulAplikasiSConverter.transferModelToVO(modulAplikasiS, new ModulAplikasiSVO());
-//			modulAplikasiSVO.setStatusEnabled(false);
-//			return true;
-//		} else {
-//			return false;
-//		}
-//
-//	}
-//
-//	@Override
-//	@Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
-//	public ModulAplikasiSVO findById(Integer key) throws JpaSystemException {
-//		return modulAplikasiSConverter.transferModelToVO(modulAplikasiSDao.findOne(key), null);
-//	}
-//
-//	@Override
-//	@Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
-//	public List<ModulAplikasiSVO> findAll() throws JpaSystemException {
-//		return modulAplikasiSConverter.transferListOfModelToListOfVO(modulAplikasiSDao.findAll(), null);
-//	}
-//
-//	@Override
-//	@Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
-//	public Map<String, Object> findAllWithPageAndLimitAndSortByAndDirectionParameter(Integer page, Integer limit,
-//			String sort, String dir) {
-//		
-//		List<ModulAplikasiSVO> modulAplikasiVOList = new ArrayList<ModulAplikasiSVO>();
-//		Pageable pageable = new PageRequest(page, limit, getSortBy(sort, dir));
-//		Page<ModulAplikasiS> resultPage = modulAplikasiSDao.findAll(pageable);
-//		List<ModulAplikasiS> modulAplikasiList = resultPage.getContent();
-//
-//		modulAplikasiSConverter.transferListOfModelToListOfVO(modulAplikasiList, modulAplikasiVOList);
-//
-//		return constructMapReturn(modulAplikasiVOList, resultPage.getTotalElements(), resultPage.getTotalPages());
-//	}
-
-
-
-//	@Override
-//	public List<ModulAplikasiS> findAllModulAplikasiS() {
-//		List<ModulAplikasiS> models = (List<ModulAplikasiS>) modulAplikasiSDao.findAll();
-//		return models;
-//	}
 
+	// @Autowired
+	// private ModulAplikasiSDao modulAplikasiSDao;
+	//
+	// @Autowired
+	// private ModulAplikasiSConverter modulAplikasiSConverter;
+	//
+	//
+	// @Override
+	// @Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
+	// public List<ModulAplikasiSVO> findAllSubModulOrderByModulNoUrutAsc(String
+	// kdModulAplikasi) {
+	// return
+	// modulAplikasiSConverter.transferListOfModelToListOfVO(modulAplikasiSDao.findAllSubModulOrderByModulNoUrutAsc(kdModulAplikasi),
+	// null);
+	// }
+	//
+	//
+	// @Override
+	// @Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
+	// public List<ModulAplikasiSVO> findAllSubSytemOrderByModulNoUrutAsc() {
+	// return
+	// modulAplikasiSConverter.transferListOfModelToListOfVO(modulAplikasiSDao.findAllSubSytemOrderByModulNoUrutAsc(),
+	// null);
+	// }
+	//
+	// @Override
+	// @Transactional(readOnly = false)
+	// public ModulAplikasiSVO add(ModulAplikasiSVO vo) throws
+	// JpaSystemException, ServiceVOException {
+	// ModulAplikasiS modulAplikasiS =
+	// modulAplikasiSConverter.transferVOToModel(vo, new ModulAplikasiS());
+	// ModulAplikasiS resultModel = modulAplikasiSDao.save(modulAplikasiS);
+	// ModulAplikasiSVO resultVo = new ModulAplikasiSVO();
+	// resultVo = modulAplikasiSConverter.transferModelToVO(resultModel,
+	// resultVo);
+	// return resultVo;
+	// }
+	//
+	// @Override
+	// @Transactional(readOnly = false)
+	// public ModulAplikasiSVO update(ModulAplikasiSVO vo) throws
+	// JpaSystemException, ServiceVOException {
+	//
+	// ModulAplikasiS modulAplikasiS = modulAplikasiSDao.findOne(vo.getId());
+	// modulAplikasiS = modulAplikasiSConverter.transferVOToModel(vo,
+	// modulAplikasiS);
+	//
+	// modulAplikasiSDao.save(modulAplikasiS);
+	// return vo;
+	// }
+	//
+	// @Override
+	// @Transactional(readOnly = false)
+	// public Boolean delete(Integer key) throws JpaSystemException {
+	// if (CommonUtil.isNotNullOrEmpty(key)) {
+	//
+	// ModulAplikasiS modulAplikasiS = modulAplikasiSDao.findOne(key);
+	// modulAplikasiSDao.delete(modulAplikasiS);
+	// ModulAplikasiSVO modulAplikasiSVO =
+	// modulAplikasiSConverter.transferModelToVO(modulAplikasiS, new
+	// ModulAplikasiSVO());
+	// modulAplikasiSVO.setStatusEnabled(false);
+	// return true;
+	// } else {
+	// return false;
+	// }
+	//
+	// }
+	//
+	// @Override
+	// @Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
+	// public ModulAplikasiSVO findById(Integer key) throws JpaSystemException {
+	// return
+	// modulAplikasiSConverter.transferModelToVO(modulAplikasiSDao.findOne(key),
+	// null);
+	// }
+	//
+	// @Override
+	// @Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
+	// public List<ModulAplikasiSVO> findAll() throws JpaSystemException {
+	// return
+	// modulAplikasiSConverter.transferListOfModelToListOfVO(modulAplikasiSDao.findAll(),
+	// null);
+	// }
+	//
+	// @Override
+	// @Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
+	// public Map<String, Object>
+	// findAllWithPageAndLimitAndSortByAndDirectionParameter(Integer page,
+	// Integer limit,
+	// String sort, String dir) {
+	//
+	// List<ModulAplikasiSVO> modulAplikasiVOList = new
+	// ArrayList<ModulAplikasiSVO>();
+	// Pageable pageable = new PageRequest(page, limit, getSortBy(sort, dir));
+	// Page<ModulAplikasiS> resultPage = modulAplikasiSDao.findAll(pageable);
+	// List<ModulAplikasiS> modulAplikasiList = resultPage.getContent();
+	//
+	// modulAplikasiSConverter.transferListOfModelToListOfVO(modulAplikasiList,
+	// modulAplikasiVOList);
+	//
+	// return constructMapReturn(modulAplikasiVOList,
+	// resultPage.getTotalElements(), resultPage.getTotalPages());
+	// }
 
+	// @Override
+	// public List<ModulAplikasiS> findAllModulAplikasiS() {
+	// List<ModulAplikasiS> models = (List<ModulAplikasiS>)
+	// modulAplikasiSDao.findAll();
+	// return models;
+	// }
 
 }

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

@@ -1,9 +1,12 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-import java.util.ArrayList;
+import com.jasamedika.medifirst2000.converter.NegaraConverter;
-import java.util.List;
+import com.jasamedika.medifirst2000.dao.NegaraDao;
-import java.util.Map;
+import com.jasamedika.medifirst2000.entities.Negara;
-
+import com.jasamedika.medifirst2000.exception.ServiceVOException;
+import com.jasamedika.medifirst2000.service.NegaraService;
+import com.jasamedika.medifirst2000.util.CommonUtil;
+import com.jasamedika.medifirst2000.vo.NegaraVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -13,15 +16,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.jasamedika.medifirst2000.converter.NegaraConverter;
+import java.util.ArrayList;
-import com.jasamedika.medifirst2000.dao.NegaraDao;
+import java.util.List;
-import com.jasamedika.medifirst2000.dao.NegaraDao;
+import java.util.Map;
-import com.jasamedika.medifirst2000.entities.Negara;
-import com.jasamedika.medifirst2000.entities.Negara;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.NegaraService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.vo.NegaraVO;
 
 @Service("negaraService")
 public class NegaraServiceImpl extends BaseVoServiceImpl implements NegaraService<NegaraVO> {
@@ -53,7 +50,7 @@ public class NegaraServiceImpl extends BaseVoServiceImpl implements NegaraServic
 		negara.setNoRec("11111");
 		negara.setNamaNegara("11111");
 		negara.setKdNegara((byte) 0);
-		negara.setqNegara((byte) 0);
+		negara.setQNegara((byte) 0);
 		negaraDao.save(negara);
 	}
 

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

@@ -1,114 +1,115 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.jasamedika.medifirst2000.converter.ObjekModulAplikasiSConverter;
-import com.jasamedika.medifirst2000.dao.ObjekModulAplikasiSDao;
-import com.jasamedika.medifirst2000.entities.ObjekModulAplikasiS;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.ObjekModulAplikasiSService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.vo.ObjekModulAplikasiSVO;
 
 //@Service("objekModulAplikasiSService")
-public class ObjekModulAplikasiSServiceImpl  /*extends BaseVoServiceImpl*/ implements ObjekModulAplikasiSService<ObjekModulAplikasiSVO>{
+public class ObjekModulAplikasiSServiceImpl
-	
+		/* extends BaseVoServiceImpl */ implements ObjekModulAplikasiSService<ObjekModulAplikasiSVO> {
-	
-//	@Autowired
-//	private ObjekModulAplikasiSDao objekModulAplikasiSDao;
-//	
-//	@Autowired
-//	private ObjekModulAplikasiSConverter objekModulAplikasiSConverter;
-//	
-//	@Override
-//	@Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
-//	public List<ObjekModulAplikasiSVO> findAllModulAplikasi(String kdModulAplikasi) {
-//		return objekModulAplikasiSConverter.transferListOfModelToListOfVO(objekModulAplikasiSDao.findAllObjekModulAplikasi(kdModulAplikasi), null);
-//	}
-//	
-//
-//	@Override
-//	@Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
-//	public ObjekModulAplikasiSVO findByAlamatUrlFormObjekModulAplikasi(String AlamatUrlFormObjekModulAplikasi) {
-//		return objekModulAplikasiSConverter.transferModelToVO(objekModulAplikasiSDao.findByAlamatUrlFormObjekModulAplikasi(AlamatUrlFormObjekModulAplikasi), null);
-//	}
-//
-//	
-//
-//	@Override
-//	@Transactional(readOnly = false)
-//	public ObjekModulAplikasiSVO add(ObjekModulAplikasiSVO vo) throws JpaSystemException, ServiceVOException {
-//		ObjekModulAplikasiS modulAplikasiS = objekModulAplikasiSConverter.transferVOToModel(vo, new ObjekModulAplikasiS());
-//		ObjekModulAplikasiS resultModel = objekModulAplikasiSDao.save(modulAplikasiS);
-//		ObjekModulAplikasiSVO resultVo = new ObjekModulAplikasiSVO();
-//		resultVo = objekModulAplikasiSConverter.transferModelToVO(resultModel, resultVo);
-//		return resultVo;
-//	}
-//
-//	@Override
-//	@Transactional(readOnly = false)
-//	public ObjekModulAplikasiSVO update(ObjekModulAplikasiSVO vo) throws JpaSystemException, ServiceVOException {
-//
-//		ObjekModulAplikasiS modulAplikasiS = objekModulAplikasiSDao.findOne(vo.getId());
-//		modulAplikasiS = objekModulAplikasiSConverter.transferVOToModel(vo, modulAplikasiS);
-//
-//		objekModulAplikasiSDao.save(modulAplikasiS);
-//		return vo;
-//	}
-//
-//	@Override
-//	public Boolean delete(Integer key) throws JpaSystemException {
-//		if (CommonUtil.isNotNullOrEmpty(key)) {
-//
-//			ObjekModulAplikasiS modulAplikasiS = objekModulAplikasiSDao.findOne(key);
-//			objekModulAplikasiSDao.delete(modulAplikasiS);
-//			ObjekModulAplikasiSVO modulApp = objekModulAplikasiSConverter.transferModelToVO(modulAplikasiS, new ObjekModulAplikasiSVO());
-//			modulApp.setStatusEnabled(false);
-//			return true;
-//		} else {
-//			return false;
-//		}
-//
-//	}
-//
-//	@Override
-//	public ObjekModulAplikasiSVO findById(Integer key) throws JpaSystemException {
-//		return null;
-//	}
-//
-//	@Override
-//	public List<ObjekModulAplikasiSVO> findAll() throws JpaSystemException {
-//		return null;
-//	}
-//
-//	@Override
-//	@Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
-//	public Map<String, Object> findAllWithPageAndLimitAndSortByAndDirectionParameter(Integer page, Integer limit,
-//			String sort, String dir) {
-//		
-//		List<ObjekModulAplikasiSVO> modulAplikasiVOList = new ArrayList<ObjekModulAplikasiSVO>();
-//		Pageable pageable = new PageRequest(page, limit, getSortBy(sort, dir));
-//		Page<ObjekModulAplikasiS> resultPage = objekModulAplikasiSDao.findAll(pageable);
-//		List<ObjekModulAplikasiS> modulAplikasiList = resultPage.getContent();
-//
-//		objekModulAplikasiSConverter.transferListOfModelToListOfVO(modulAplikasiList, modulAplikasiVOList);
-//
-//		return constructMapReturn(modulAplikasiVOList, resultPage.getTotalElements(), resultPage.getTotalPages());
-//	}
-
-
-
 
+	// @Autowired
+	// private ObjekModulAplikasiSDao objekModulAplikasiSDao;
+	//
+	// @Autowired
+	// private ObjekModulAplikasiSConverter objekModulAplikasiSConverter;
+	//
+	// @Override
+	// @Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
+	// public List<ObjekModulAplikasiSVO> findAllModulAplikasi(String
+	// kdModulAplikasi) {
+	// return
+	// objekModulAplikasiSConverter.transferListOfModelToListOfVO(objekModulAplikasiSDao.findAllObjekModulAplikasi(kdModulAplikasi),
+	// null);
+	// }
+	//
+	//
+	// @Override
+	// @Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
+	// public ObjekModulAplikasiSVO findByAlamatUrlFormObjekModulAplikasi(String
+	// AlamatUrlFormObjekModulAplikasi) {
+	// return
+	// objekModulAplikasiSConverter.transferModelToVO(objekModulAplikasiSDao.findByAlamatUrlFormObjekModulAplikasi(AlamatUrlFormObjekModulAplikasi),
+	// null);
+	// }
+	//
+	//
+	//
+	// @Override
+	// @Transactional(readOnly = false)
+	// public ObjekModulAplikasiSVO add(ObjekModulAplikasiSVO vo) throws
+	// JpaSystemException, ServiceVOException {
+	// ObjekModulAplikasiS modulAplikasiS =
+	// objekModulAplikasiSConverter.transferVOToModel(vo, new
+	// ObjekModulAplikasiS());
+	// ObjekModulAplikasiS resultModel =
+	// objekModulAplikasiSDao.save(modulAplikasiS);
+	// ObjekModulAplikasiSVO resultVo = new ObjekModulAplikasiSVO();
+	// resultVo = objekModulAplikasiSConverter.transferModelToVO(resultModel,
+	// resultVo);
+	// return resultVo;
+	// }
+	//
+	// @Override
+	// @Transactional(readOnly = false)
+	// public ObjekModulAplikasiSVO update(ObjekModulAplikasiSVO vo) throws
+	// JpaSystemException, ServiceVOException {
+	//
+	// ObjekModulAplikasiS modulAplikasiS =
+	// objekModulAplikasiSDao.findOne(vo.getId());
+	// modulAplikasiS = objekModulAplikasiSConverter.transferVOToModel(vo,
+	// modulAplikasiS);
+	//
+	// objekModulAplikasiSDao.save(modulAplikasiS);
+	// return vo;
+	// }
+	//
+	// @Override
+	// public Boolean delete(Integer key) throws JpaSystemException {
+	// if (CommonUtil.isNotNullOrEmpty(key)) {
+	//
+	// ObjekModulAplikasiS modulAplikasiS = objekModulAplikasiSDao.findOne(key);
+	// objekModulAplikasiSDao.delete(modulAplikasiS);
+	// ObjekModulAplikasiSVO modulApp =
+	// objekModulAplikasiSConverter.transferModelToVO(modulAplikasiS, new
+	// ObjekModulAplikasiSVO());
+	// modulApp.setStatusEnabled(false);
+	// return true;
+	// } else {
+	// return false;
+	// }
+	//
+	// }
+	//
+	// @Override
+	// public ObjekModulAplikasiSVO findById(Integer key) throws
+	// JpaSystemException {
+	// return null;
+	// }
+	//
+	// @Override
+	// public List<ObjekModulAplikasiSVO> findAll() throws JpaSystemException {
+	// return null;
+	// }
+	//
+	// @Override
+	// @Transactional(readOnly = true, propagation = Propagation.SUPPORTS)
+	// public Map<String, Object>
+	// findAllWithPageAndLimitAndSortByAndDirectionParameter(Integer page,
+	// Integer limit,
+	// String sort, String dir) {
+	//
+	// List<ObjekModulAplikasiSVO> modulAplikasiVOList = new
+	// ArrayList<ObjekModulAplikasiSVO>();
+	// Pageable pageable = new PageRequest(page, limit, getSortBy(sort, dir));
+	// Page<ObjekModulAplikasiS> resultPage =
+	// objekModulAplikasiSDao.findAll(pageable);
+	// List<ObjekModulAplikasiS> modulAplikasiList = resultPage.getContent();
+	//
+	// objekModulAplikasiSConverter.transferListOfModelToListOfVO(modulAplikasiList,
+	// modulAplikasiVOList);
+	//
+	// return constructMapReturn(modulAplikasiVOList,
+	// resultPage.getTotalElements(), resultPage.getTotalPages());
+	// }
 
 }

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

@@ -1,15 +1,5 @@
 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 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.converter.PapKebutuhanEdukasiConverter;
 import com.jasamedika.medifirst2000.converter.PapTransaksiEdukasiConverter;
@@ -25,12 +15,15 @@ import com.jasamedika.medifirst2000.entities.PengkajianAwalBaru;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapKebutuhanEdukasiService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.vo.PapEdukasiVO;
-import com.jasamedika.medifirst2000.vo.PapHambatanPembelajaranVO;
 import com.jasamedika.medifirst2000.vo.PapKebutuhanEdukasiVO;
 import com.jasamedika.medifirst2000.vo.PapTransaksiEdukasiVO;
 import com.jasamedika.medifirst2000.vo.PapTransaksiHambatanPembelajaranVO;
 import com.jasamedika.medifirst2000.vo.PengkajianAwalBaruVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.jpa.JpaSystemException;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
 
 @Service("PAPKebutuhanEdukasiService")
 public class PapKebutuhanEdukasiServiceImpl implements PapKebutuhanEdukasiService {
@@ -96,7 +89,7 @@ private AntrianPasienDiPeriksaDao antrianPasienDiperiksaDao;
 		
 		List<PapTransaksiHambatanPembelajaran> listHambatan=new ArrayList<PapTransaksiHambatanPembelajaran>();
 		List<PapTransaksiEdukasi> listEdukasi=new ArrayList<PapTransaksiEdukasi>();
-		model.setPasien(antrianPasienDiperiksaDao.findByNoRec(vo.getPasien().getNoRec()));
+		model.setPasienDaftar(antrianPasienDiperiksaDao.findByNoRec(vo.getPasien().getNoRec()));
 		
 		List<PapTransaksiHambatanPembelajaran> listHambatanExisting = papTransaksiHambatanDao.findPapTransaksiHambatanByNoRec(model.getNoRec());
 		for (PapTransaksiHambatanPembelajaran papTransaksiHambatanPembelajaran : listHambatanExisting) {
@@ -193,7 +186,7 @@ private AntrianPasienDiPeriksaDao antrianPasienDiperiksaDao;
 		
 		model.getEdukasiYgDiperlukan().addAll(listEdukasi);
 		model.getHambatanPembelajaran().addAll(listHambatan);
-		model.setPasien(modelKebutuhanEdukasi.getPasien());
+		model.setPasienDaftar(modelKebutuhanEdukasi.getPasienDaftar());
 		model.setTglInput(modelKebutuhanEdukasi.getTglInput());
 		PapKebutuhanEdukasi resultModel  = papKebutuhanEdukasiDao.save(model);
 		if(CommonUtil.isNotNullOrEmpty(resultModel)){
@@ -211,8 +204,8 @@ private AntrianPasienDiPeriksaDao antrianPasienDiperiksaDao;
 			result.put("noRec", resultModel.getNoRec());
 			result.put("tglInput", resultModel.getTglInput());
 			result.put("dataFound", true);
-			if(CommonUtil.isNotNullOrEmpty(resultModel.getPasien().getPasienDaftar().getPasien().getId())){
+			if(CommonUtil.isNotNullOrEmpty(resultModel.getPasienDaftar().getPasienDaftar().getPasien().getId())){
-				result.put("pasien.noCm", resultModel.getPasien().getPasienDaftar().getPasien().getNoCm());
+				result.put("pasien.noCm", resultModel.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
 			}
 		} else {
 			result.put("dataFound", false);

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

@@ -1,14 +1,5 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-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.orm.jpa.JpaSystemException;
-import org.springframework.stereotype.Service;
-
 import com.jasamedika.medifirst2000.converter.PapKeluhanUtamaConverter;
 import com.jasamedika.medifirst2000.converter.PasienConverter;
 import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
@@ -16,16 +7,21 @@ import com.jasamedika.medifirst2000.dao.PapKeluhanUtamaDao;
 import com.jasamedika.medifirst2000.dao.PasienDao;
 import com.jasamedika.medifirst2000.dao.RegistrasiPelayananPasienDao;
 import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.PapKeluhanTambahan;
 import com.jasamedika.medifirst2000.entities.PapKeluhanUtama;
 import com.jasamedika.medifirst2000.entities.Pasien;
 import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapKeluhanUtamaService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.vo.PapKeluhanTambahanVO;
 import com.jasamedika.medifirst2000.vo.PapKeluhanUtamaVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.jpa.JpaSystemException;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Implement class for PAPKeluhanUtamaService
@@ -52,7 +48,7 @@ public class PapKeluhanUtamaServiceImpl implements PapKeluhanUtamaService {
 		Map<String,Object> result=new HashMap<String,Object>();
 		PapKeluhanUtama model=papKeluhanUtamaConverter.transferVOToModel(vo, new PapKeluhanUtama());
 		AntrianPasienDiPeriksa pasienDaftar = antrianPasienDiPeriksaDao.findByNoRec(vo.getPasien().getNoRec());
-		model.setPasien(pasienDaftar);
+		model.setPasienDaftar(pasienDaftar);
 		PapKeluhanUtama resultModel=papKeluhanUtamaDao.save(model);
 		if(CommonUtil.isNotNullOrEmpty(resultModel)){
 			result.put("noRec", resultModel.getNoRec());

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

@@ -1,35 +1,25 @@
 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.PapRiwayatKelahiranDao;
-import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
+import com.jasamedika.medifirst2000.entities.*;
-import com.jasamedika.medifirst2000.entities.DataPersalinan;
-import com.jasamedika.medifirst2000.entities.PapRiwayatKelahiran;
-import com.jasamedika.medifirst2000.entities.Pasien;
-import com.jasamedika.medifirst2000.entities.StatusYaTidak;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapRiwayatKelahiranService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.vo.DataPersalinanVO;
 import com.jasamedika.medifirst2000.vo.PapRiwayatKelahiranVO;
 import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.StatusYaTidakVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
  * Implement class for PasienService
  * 
  * @author Adik
- * @param <T>
  */
 
 
@@ -74,7 +64,7 @@ public class PapRiwayatKelahiranServiceImpl extends BaseVoServiceImpl implements
 		if(CommonUtil.isNotNullOrEmpty(vo.getPasien())){
 			AntrianPasienDiPeriksa antrianPasienDiPeriksa = new AntrianPasienDiPeriksa();
 			antrianPasienDiPeriksa.setNoRec(vo.getPasien().getNoRec());
-			papRiwayatKelahiran.setPasien(antrianPasienDiPeriksa);
+			papRiwayatKelahiran.setPasienDaftar(antrianPasienDiPeriksa);
 		}
 		
 		papRiwayatKelahiran=papRiwayatKelahiranDao.save(papRiwayatKelahiran);

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

@@ -1,27 +1,24 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-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.orm.jpa.JpaSystemException;
-import org.springframework.stereotype.Service;
-
 import com.jasamedika.medifirst2000.converter.PapTumbuhKembangAnakConverter;
 import com.jasamedika.medifirst2000.dao.PapTumbuhKembangAnakDao;
 import com.jasamedika.medifirst2000.dao.PasienDao;
 import com.jasamedika.medifirst2000.dao.RegistrasiPelayananPasienDao;
-import com.jasamedika.medifirst2000.entities.PapKeluhanTambahan;
 import com.jasamedika.medifirst2000.entities.PapTumbuhKembangAnak;
 import com.jasamedika.medifirst2000.entities.Pasien;
 import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapTumbuhKembangAnakService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.vo.PapKeluhanTambahanVO;
 import com.jasamedika.medifirst2000.vo.PapTumbuhKembangAnakVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.jpa.JpaSystemException;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Implement class for PAPTumbuhKembangAnakService
@@ -47,8 +44,8 @@ public class PapTumbuhKembangAnakServiceImpl implements PapTumbuhKembangAnakServ
 		if(CommonUtil.isNotNullOrEmpty(resultModel)){
 			result.put("noRec", resultModel.getNoRec());
 			result.put("tglInput", resultModel.getTglInput());
-			if(CommonUtil.isNotNullOrEmpty(resultModel.getPasien().getPasienDaftar().getPasien().getId())){
+			if(CommonUtil.isNotNullOrEmpty(resultModel.getPasienDaftar().getPasienDaftar().getPasien().getId())){
-				result.put("pasien.noCm", resultModel.getPasien().getPasienDaftar().getPasien().getNoCm());
+				result.put("pasien.noCm", resultModel.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
 			}
 		}
 		return result;
@@ -63,8 +60,8 @@ public class PapTumbuhKembangAnakServiceImpl implements PapTumbuhKembangAnakServ
 			result.put("noRec", resultModel.getNoRec());
 			result.put("tglInput", resultModel.getTglInput());
 			result.put("dataFound", true);
-			if(CommonUtil.isNotNullOrEmpty(resultModel.getPasien().getPasienDaftar().getPasien().getId())){
+			if(CommonUtil.isNotNullOrEmpty(resultModel.getPasienDaftar().getPasienDaftar().getPasien().getId())){
-				result.put("pasien.noCm", resultModel.getPasien().getPasienDaftar().getPasien().getNoCm());
+				result.put("pasien.noCm", resultModel.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
 			}
 		}else{
 			result.put("dataFound", false);			
@@ -85,8 +82,8 @@ public class PapTumbuhKembangAnakServiceImpl implements PapTumbuhKembangAnakServ
 			result.put("noRec", resultModel.getNoRec());
 			result.put("tglInput", resultModel.getTglInput());
 			result.put("dataFound", true);
-			if(CommonUtil.isNotNullOrEmpty(resultModel.getPasien().getPasienDaftar().getPasien().getId())){
+			if(CommonUtil.isNotNullOrEmpty(resultModel.getPasienDaftar().getPasienDaftar().getPasien().getId())){
-				result.put("pasien.noCm", resultModel.getPasien().getPasienDaftar().getPasien().getNoCm());
+				result.put("pasien.noCm", resultModel.getPasienDaftar().getPasienDaftar().getPasien().getNoCm());
 			}
 		} else {
 			result.put("dataFound", false);

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

@@ -1,29 +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.UUID;
-
-import org.apache.commons.lang.RandomStringUtils;
-import org.apache.commons.lang.math.RandomUtils;
-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.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.PekerjaanService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.entities.Pekerjaan;
-import com.jasamedika.medifirst2000.vo.PekerjaanVO;
 import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
 import com.jasamedika.medifirst2000.dao.PekerjaanDao;
+import com.jasamedika.medifirst2000.entities.Pekerjaan;
+import com.jasamedika.medifirst2000.service.PekerjaanService;
+import com.jasamedika.medifirst2000.util.CommonUtil;
+import com.jasamedika.medifirst2000.vo.PekerjaanVO;
+import org.apache.commons.lang.RandomStringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Implement class for PekerjaanService
@@ -50,7 +38,7 @@ public class PekerjaanServiceImpl extends BaseVoServiceImpl implements Pekerjaan
 		String randomId = RandomStringUtils.randomAlphanumeric(32);
 		
 		Byte nomor = (Byte)this.pekerjaanDao.getMaxPekerjaan();
-		model.setqPekerjaan(nomor);
+		model.setQPekerjaan(nomor);
 		model.setKdPekerjaan(nomor);
 		model.setNoRec(randomId);
 	

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

@@ -1,52 +1,22 @@
 package com.jasamedika.medifirst2000.service.impl;
 
+import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
+import com.jasamedika.medifirst2000.dao.*;
+import com.jasamedika.medifirst2000.dao.custom.PelatihanPaketDaoCustom;
+import com.jasamedika.medifirst2000.entities.*;
+import com.jasamedika.medifirst2000.service.PelatihanPaketService;
+import com.jasamedika.medifirst2000.util.CommonUtil;
+import com.jasamedika.medifirst2000.util.StringUtil;
+import com.jasamedika.medifirst2000.vo.*;
+import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import java.lang.reflect.InvocationTargetException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
-import com.jasamedika.medifirst2000.dao.MapPelatihanPaketToJabatanDao;
-import com.jasamedika.medifirst2000.dao.PelatihanJplDao;
-import com.jasamedika.medifirst2000.dao.PelatihanKreditAkreditasiDao;
-import com.jasamedika.medifirst2000.dao.PelatihanPaketDao;
-import com.jasamedika.medifirst2000.dao.PlanningDiklatHumasMarketBiayaDao;
-import com.jasamedika.medifirst2000.dao.PlanningDiklatHumasMarketDao;
-import com.jasamedika.medifirst2000.dao.ProdukDao;
-import com.jasamedika.medifirst2000.dao.StrukPlanningDao;
-import com.jasamedika.medifirst2000.dao.custom.PelatihanPaketDaoCustom;
-import com.jasamedika.medifirst2000.entities.DetailJenisProduk;
-import com.jasamedika.medifirst2000.entities.Eselon;
-import com.jasamedika.medifirst2000.entities.GolonganPegawai;
-import com.jasamedika.medifirst2000.entities.Jabatan;
-import com.jasamedika.medifirst2000.entities.JenisPelatihan;
-import com.jasamedika.medifirst2000.entities.MapPelatihanPaketToJabatan;
-import com.jasamedika.medifirst2000.entities.Pegawai;
-import com.jasamedika.medifirst2000.entities.PelatihanJpl;
-import com.jasamedika.medifirst2000.entities.PelatihanKreditAkreditasi;
-import com.jasamedika.medifirst2000.entities.PelatihanPaket;
-import com.jasamedika.medifirst2000.entities.PlanningDiklatHumasMarket;
-import com.jasamedika.medifirst2000.entities.PlanningDiklatHumasMarketBiaya;
-import com.jasamedika.medifirst2000.entities.Produk;
-import com.jasamedika.medifirst2000.entities.StatusPekerjaan;
-import com.jasamedika.medifirst2000.entities.StrukPlanning;
-import com.jasamedika.medifirst2000.service.PelatihanPaketService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.util.StringUtil;
-import com.jasamedika.medifirst2000.vo.EselonVO;
-import com.jasamedika.medifirst2000.vo.JabatanVO;
-import com.jasamedika.medifirst2000.vo.JenisPelatihanVO;
-import com.jasamedika.medifirst2000.vo.PegawaiVO;
-import com.jasamedika.medifirst2000.vo.PelatihanJplVO;
-import com.jasamedika.medifirst2000.vo.PelatihanKreditAkreditasiVO;
-import com.jasamedika.medifirst2000.vo.PelatihanPaketBiayaVO;
-import com.jasamedika.medifirst2000.vo.PelatihanPaketVO;
-import com.jasamedika.medifirst2000.vo.ProdukVO;
-
 @Service("pelatihanPaketService")
 public class PelatihanPaketServiceImpl extends BaseAngaranServiceImpl implements PelatihanPaketService {
 
@@ -148,10 +118,10 @@ public class PelatihanPaketServiceImpl extends BaseAngaranServiceImpl implements
 			if (CommonUtil.isNotNullOrEmpty(pelatihanJpl.getEselon())) {
 				entity.setEselon(eselonConverter.transferVOToModel(pelatihanJpl.getEselon(), new Eselon()));
 			}
-			if (CommonUtil.isNotNullOrEmpty(pelatihanJpl.getGolongan())) {
+			if (CommonUtil.isNotNullOrEmpty(pelatihanJpl.getGolonganPegawai())) {
 				GolonganPegawai golPeg = new GolonganPegawai();
 				try {
-					BeanUtils.copyProperties(pelatihanJpl.getGolongan(), golPeg);
+					BeanUtils.copyProperties(pelatihanJpl.getGolonganPegawai(), golPeg);
 				} catch (IllegalAccessException e) {
 					e.printStackTrace();
 				} catch (InvocationTargetException e) {

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

@@ -190,7 +190,7 @@ public class PelayananPiutangRekananServiceImpl implements PelayananPiutangRekan
 					maxTPenjaminAll = String.valueOf(persenTanggunganPenjamin.getMaxTPenjaminAll());
 					persenTPenjaminSelisih = String.valueOf(persenTanggunganPenjamin.getPersenTPenjamindrSelisih());
 					persenTProfileSelisih = String.valueOf(persenTanggunganPenjamin.getPersenTProfiledrSelisih());
-					qtyMaxKunjungan = String.valueOf(persenTanggunganPenjamin.getqtyMaxKunjungan());
+					qtyMaxKunjungan = String.valueOf(persenTanggunganPenjamin.getQtyMaxKunjungan());
 					isPaket = String.valueOf(persenTanggunganPenjamin.getIsPaket());
 				}
 			}

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

@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.jasamedika.medifirst2000.dao.RIS_OrderDao;
-import com.jasamedika.medifirst2000.entities.RIS_Order;
+import com.jasamedika.medifirst2000.entities.RISOrder;
 import com.jasamedika.medifirst2000.service.RIS_OrderService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 
@@ -20,41 +20,41 @@ public class RIS_OrderServiceImpl implements RIS_OrderService {
 	private RIS_OrderDao rIS_OrderDao;
 
 	@Override
-	public Map<String, Object> save(RIS_Order vo) {
+	public Map<String, Object> save(RISOrder vo) {
 		Map<String, Object> result = new HashMap<>();
 		if(CommonUtil.isNotNullOrEmpty(vo)) {
-			RIS_Order model = rIS_OrderDao.save(vo);
+			RISOrder model = rIS_OrderDao.save(vo);
-			result.put("id", model.getORDER_KEY());
+			result.put("id", model.getOrderKey());
 		}
 		return result;
 	}
 
 	@Override
-	public void delete(RIS_Order vo) {
+	public void delete(RISOrder vo) {
 		if(CommonUtil.isNotNullOrEmpty(vo)) {
-			rIS_OrderDao.delete(vo.getORDER_KEY());
+			rIS_OrderDao.delete(vo.getOrderKey());
 		}
 	}
 	
 	@Override
-	public RIS_Order getOne(RIS_Order vo) {
+	public RISOrder getOne(RISOrder vo) {
-		RIS_Order result = new RIS_Order();
+		RISOrder result = new RISOrder();
-		if(CommonUtil.isNotNullOrEmpty(vo.getORDER_KEY())) {
+		if(CommonUtil.isNotNullOrEmpty(vo.getOrderKey())) {
-			result = rIS_OrderDao.findOne(vo.getORDER_KEY());
+			result = rIS_OrderDao.findOne(vo.getOrderKey());
 		}
 		return result;
 	}
 	
 	@Override
-	public List<RIS_Order> getAll(){
+	public List<RISOrder> getAll(){
-		List<RIS_Order> result = new ArrayList<>();
+		List<RISOrder> result = new ArrayList<>();
-		result = (List<RIS_Order>) rIS_OrderDao.findAll();
+		result = (List<RISOrder>) rIS_OrderDao.findAll();
 		return result;
 	}
 	
 	@Override
-	public RIS_Order getOneByNoOrder(String noRec) {
+	public RISOrder getOneByNoOrder(String noRec) {
-		RIS_Order result = new RIS_Order();
+		RISOrder result = new RISOrder();
 		if(CommonUtil.isNotNullOrEmpty(noRec)) {
 			result = rIS_OrderDao.getOneByNoOrder(noRec);
 		}

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

@@ -10,8 +10,8 @@ import org.springframework.stereotype.Service;
 
 import com.jasamedika.medifirst2000.dao.RIS_OrderDao;
 import com.jasamedika.medifirst2000.dao.RIS_ReportDao;
-import com.jasamedika.medifirst2000.entities.RIS_Order;
+import com.jasamedika.medifirst2000.entities.RISOrder;
-import com.jasamedika.medifirst2000.entities.RIS_Report;
+import com.jasamedika.medifirst2000.entities.RISReport;
 import com.jasamedika.medifirst2000.service.RIS_ReportService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 
@@ -25,35 +25,35 @@ public class RIS_ReportServiceImpl implements RIS_ReportService{
 	private RIS_OrderDao rIS_OrderDao;
 	
 	@Override
-	public Map<String, Object> save(RIS_Report vo) {	
+	public Map<String, Object> save(RISReport vo) {
 		Map<String, Object> result = new HashMap<>();
 		if(CommonUtil.isNotNullOrEmpty(vo)) {
-			RIS_Report model = rIS_ReportDao.save(vo);
+			RISReport model = rIS_ReportDao.save(vo);
-			result.put("id", model.getREPORT_KEY());
+			result.put("id", model.getReportKey());
 		}
 		return result;
 	}
 
 	@Override
-	public void delete(RIS_Report vo) {
+	public void delete(RISReport vo) {
 		if(CommonUtil.isNotNullOrEmpty(vo)) {
-			rIS_ReportDao.delete(vo.getREPORT_KEY());
+			rIS_ReportDao.delete(vo.getReportKey());
 		}
 	}
 	
 	@Override
-	public RIS_Report getOne(RIS_Report vo) {
+	public RISReport getOne(RISReport vo) {
-		RIS_Report result = new RIS_Report();
+		RISReport result = new RISReport();
-		if(CommonUtil.isNotNullOrEmpty(vo.getREPORT_KEY())) {
+		if(CommonUtil.isNotNullOrEmpty(vo.getReportKey())) {
-			result = rIS_ReportDao.findOne(vo.getREPORT_KEY());
+			result = rIS_ReportDao.findOne(vo.getReportKey());
 		}
 		return result;
 	}
 	
 	@Override
-	public List<RIS_Report> getAll() {
+	public List<RISReport> getAll() {
-		List<RIS_Report> result = new ArrayList<>();
+		List<RISReport> result = new ArrayList<>();
-		result = (List<RIS_Report>) rIS_ReportDao.findAll();
+		result = (List<RISReport>) rIS_ReportDao.findAll();
 		return result;
 	}
 
@@ -62,10 +62,10 @@ public class RIS_ReportServiceImpl implements RIS_ReportService{
 		List<Map<String, Object>> result = rIS_ReportDao.getReportByTglCreate(startDate.replace("-", ""), endDate.replace("-", ""));
 		for(Map<String, Object> data : result)
 		{
-			RIS_Order order = rIS_OrderDao.getOneByAccessionNum(data.get("accesion_num")+"");
+			RISOrder order = rIS_OrderDao.getOneByAccessionNum(data.get("accesion_num")+"");
 			if(CommonUtil.isNotNullOrEmpty(order))
 			{
-				data.put("patientId", order.getPATIENT_ID());
+				data.put("patientId", order.getPatientId());
 			}
 			else
 			{

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

@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.jasamedika.medifirst2000.dao.RIS_StudyDao;
-import com.jasamedika.medifirst2000.entities.RIS_Study;
+import com.jasamedika.medifirst2000.entities.RISStudy;
 import com.jasamedika.medifirst2000.service.RIS_StudyService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 
@@ -20,35 +20,35 @@ public class RIS_StudyServiceImpl implements RIS_StudyService{
 	private RIS_StudyDao rIS_StudyDao;
 	
 	@Override
-	public Map<String, Object> save(RIS_Study vo) {	
+	public Map<String, Object> save(RISStudy vo) {
 		Map<String, Object> result = new HashMap<>();
 		if(CommonUtil.isNotNullOrEmpty(vo)) {
-			RIS_Study model = rIS_StudyDao.save(vo);
+			RISStudy model = rIS_StudyDao.save(vo);
-			result.put("id", model.getSTUDY_KEY());
+			result.put("id", model.getStudyKey());
 		}
 		return result;
 	}
 
 	@Override
-	public void delete(RIS_Study vo) {
+	public void delete(RISStudy vo) {
 		if(CommonUtil.isNotNullOrEmpty(vo)) {
-			rIS_StudyDao.delete(vo.getSTUDY_KEY());
+			rIS_StudyDao.delete(vo.getStudyKey());
 		}
 	}
 	
 	@Override
-	public RIS_Study getOne(RIS_Study vo) {
+	public RISStudy getOne(RISStudy vo) {
-		RIS_Study result = new RIS_Study();
+		RISStudy result = new RISStudy();
-		if(CommonUtil.isNotNullOrEmpty(vo.getSTUDY_KEY())) {
+		if(CommonUtil.isNotNullOrEmpty(vo.getStudyKey())) {
-			result = rIS_StudyDao.findOne(vo.getSTUDY_KEY());
+			result = rIS_StudyDao.findOne(vo.getStudyKey());
 		}
 		return result;
 	}
 	
 	@Override
-	public List<RIS_Study> getAll() {
+	public List<RISStudy> getAll() {
-		List<RIS_Study> result = new ArrayList<>();
+		List<RISStudy> result = new ArrayList<>();
-		result = (List<RIS_Study>) rIS_StudyDao.findAll();
+		result = (List<RISStudy>) rIS_StudyDao.findAll();
 		return result;
 	}
 }

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

@@ -9,8 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.jasamedika.medifirst2000.dao.RIS_UserDao;
-import com.jasamedika.medifirst2000.entities.RIS_Order;
+import com.jasamedika.medifirst2000.entities.RISUser;
-import com.jasamedika.medifirst2000.entities.RIS_User;
 import com.jasamedika.medifirst2000.service.RIS_UserService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 
@@ -21,35 +20,35 @@ public class RIS_UserServiceImpl implements RIS_UserService{
 	private RIS_UserDao rIS_UserDao;
 	
 	@Override
-	public Map<String, Object> save(RIS_User vo){
+	public Map<String, Object> save(RISUser vo){
 		Map<String, Object> result = new HashMap<>();
 		if(CommonUtil.isNotNullOrEmpty(vo)) {
-			RIS_User model = rIS_UserDao.save(vo);
+			RISUser model = rIS_UserDao.save(vo);
-			result.put("id", model.getUSER_KEY());
+			result.put("id", model.getUserKey());
 		}
 		return result;
 	}
 	
 	@Override
-	public void delete(RIS_User vo) {
+	public void delete(RISUser vo) {
 		if(CommonUtil.isNotNullOrEmpty(vo)) {
-			rIS_UserDao.delete(vo.getUSER_KEY());
+			rIS_UserDao.delete(vo.getUserKey());
 		}
 	}
 	
 	@Override
-	public RIS_User getOne(RIS_User vo) {
+	public RISUser getOne(RISUser vo) {
-		RIS_User result = new RIS_User();
+		RISUser result = new RISUser();
-		if(CommonUtil.isNotNullOrEmpty(vo.getUSER_KEY())) {
+		if(CommonUtil.isNotNullOrEmpty(vo.getUserKey())) {
-			result = rIS_UserDao.findOne(vo.getUSER_KEY());
+			result = rIS_UserDao.findOne(vo.getUserKey());
 		}
 		return result;
 	}
 	
 	@Override
-	public List<RIS_User> getAll(){
+	public List<RISUser> getAll(){
-		List<RIS_User> result = new ArrayList<>();
+		List<RISUser> result = new ArrayList<>();
-		result = (List<RIS_User>) rIS_UserDao.findAll();
+		result = (List<RISUser>) rIS_UserDao.findAll();
 		return result;
 	}
 }

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

@@ -45,7 +45,7 @@ import com.jasamedika.medifirst2000.entities.Pegawai;
 import com.jasamedika.medifirst2000.entities.PelayananPasien;
 import com.jasamedika.medifirst2000.entities.PelayananPasienDetail;
 import com.jasamedika.medifirst2000.entities.Produk;
-import com.jasamedika.medifirst2000.entities.RIS_Order;
+import com.jasamedika.medifirst2000.entities.RISOrder;
 import com.jasamedika.medifirst2000.entities.Ruangan;
 import com.jasamedika.medifirst2000.entities.StrukOrder;
 import com.jasamedika.medifirst2000.service.PelayananPiutangRekananService;
@@ -60,7 +60,7 @@ import com.jasamedika.medifirst2000.vo.RuanganVO;
 import com.jasamedika.medifirst2000.vo.StrukOrderVO;
 
 @Service("RadiologiService")
-public class RadiologiServiceImpl implements RadiologiService{
+public class RadiologiServiceImpl implements RadiologiService {
 
 	@Autowired
 	private PasienDao pasienDao;
@@ -126,93 +126,99 @@ public class RadiologiServiceImpl implements RadiologiService{
 	public String accessionNum(String kdExternal, String flag) {
 		String kode = "";
 		String noUsulan = "";
-		if(flag.equalsIgnoreCase("CR")){
+		if (flag.equalsIgnoreCase("CR")) {
-			if(kdExternal.equalsIgnoreCase("1")) {
+			if (kdExternal.equalsIgnoreCase("1")) {
-				kode="1";
+				kode = "1";
 			} else {
-				kode="2";
+				kode = "2";
 			}
-		}else if (flag.equalsIgnoreCase("US")){
+		} else if (flag.equalsIgnoreCase("US")) {
-			kode="3";
+			kode = "3";
-		}else if (flag.equalsIgnoreCase("CT")){
+		} else if (flag.equalsIgnoreCase("CT")) {
-			kode="4";
+			kode = "4";
-		}else if (flag.equalsIgnoreCase("MR")){
+		} else if (flag.equalsIgnoreCase("MR")) {
-			kode="5";
+			kode = "5";
 		}
 
-		if(CommonUtil.isNotNullOrEmpty(kode)) {
+		if (CommonUtil.isNotNullOrEmpty(kode)) {
 			String accessNum = rIS_OrderDao.countAccessionNum(kode, DateUtil.now());
-			String monthNow=String.valueOf(DateUtil.getMonthFromDate(new Date()));
+			String monthNow = String.valueOf(DateUtil.getMonthFromDate(new Date()));
-			String yearNow=String.valueOf(DateUtil.getYearFromDate(new Date())).substring(2, 4);
+			String yearNow = String.valueOf(DateUtil.getYearFromDate(new Date())).substring(2, 4);
-			String digit=null;
+			String digit = null;
 
 			Long number = null;
-			if(CommonUtil.isNotNullOrEmpty(accessNum)) {
+			if (CommonUtil.isNotNullOrEmpty(accessNum)) {
-				number = Long.valueOf(accessNum.substring(5))+1;
+				number = Long.valueOf(accessNum.substring(5)) + 1;
 			} else {
 				number = (long) 1;
 			}
 
-			if(number.toString().length()==1){
+			if (number.toString().length() == 1) {
-				digit="000";}
+				digit = "000";
-			else if(number.toString().length()==2){
+			} else if (number.toString().length() == 2) {
-				digit="00";}
+				digit = "00";
-			else if(number.toString().length()==3){
+			} else if (number.toString().length() == 3) {
-				digit="0";}
+				digit = "0";
-			if(monthNow.length()==1)
+			}
-				monthNow = "0"+monthNow;
+			if (monthNow.length() == 1)
+				monthNow = "0" + monthNow;
 
-			if(kode.equalsIgnoreCase("1")) {
+			if (kode.equalsIgnoreCase("1")) {
-				noUsulan="1"+yearNow+monthNow+digit+number;	
+				noUsulan = "1" + yearNow + monthNow + digit + number;
-			} else if(kode.equalsIgnoreCase("2")) {
+			} else if (kode.equalsIgnoreCase("2")) {
-				noUsulan="2"+yearNow+monthNow+digit+number;	
+				noUsulan = "2" + yearNow + monthNow + digit + number;
-			} else if(kode.equalsIgnoreCase("3")) {
+			} else if (kode.equalsIgnoreCase("3")) {
-				noUsulan="3"+yearNow+monthNow+digit+number;
+				noUsulan = "3" + yearNow + monthNow + digit + number;
-			} else if(kode.equalsIgnoreCase("4")) {
+			} else if (kode.equalsIgnoreCase("4")) {
-				noUsulan="4"+yearNow+monthNow+digit+number;
+				noUsulan = "4" + yearNow + monthNow + digit + number;
-			} else if(kode.equalsIgnoreCase("5")) {
+			} else if (kode.equalsIgnoreCase("5")) {
-				noUsulan="5"+yearNow+monthNow+digit+number;
+				noUsulan = "5" + yearNow + monthNow + digit + number;
 			}
 		}
 		return noUsulan;
 	}
 
 	@Override
-	public Map<String, Object> updateOrderRadiologi(StrukOrderVO vo){
+	public Map<String, Object> updateOrderRadiologi(StrukOrderVO vo) {
 		Map<String, Object> result = new HashMap<>();
 
-		if(CommonUtil.isNotNullOrEmpty(vo.getNoOrder())) {
+		if (CommonUtil.isNotNullOrEmpty(vo.getNoOrder())) {
-			RIS_Order rIS_Order = rIS_OrderService.getOneByNoOrder(vo.getNoOrder());
+			RISOrder rIS_Order = rIS_OrderService.getOneByNoOrder(vo.getNoOrder());
 
-			if(CommonUtil.isNullOrEmpty(rIS_Order)) {
+			if (CommonUtil.isNullOrEmpty(rIS_Order)) {
-				List<Map<String, Object>> orderPelayananList = orderPelayananDao.getOrderRadiologiByStrukOrder(vo.getNoRec());
+				List<Map<String, Object>> orderPelayananList = orderPelayananDao
-				if(CommonUtil.isNotNullOrEmpty(orderPelayananList)) {
+						.getOrderRadiologiByStrukOrder(vo.getNoRec());
-					for(Map<String, Object> OrderPelayanan : orderPelayananList){
+				if (CommonUtil.isNotNullOrEmpty(orderPelayananList)) {
-						orderPelayananDao.delete((String)OrderPelayanan.get("noRec"));
+					for (Map<String, Object> OrderPelayanan : orderPelayananList) {
-						result.put("deleted", (String)OrderPelayanan.get("noRec"));
+						orderPelayananDao.delete((String) OrderPelayanan.get("noRec"));
+						result.put("deleted", (String) OrderPelayanan.get("noRec"));
 					}
 				}
 
 				StrukOrder strukOrder = strukOrderDao.findOne(vo.getNoRec());
 
-				if(CommonUtil.isNotNullOrEmpty(vo.getOrderPelayanan())) {
+				if (CommonUtil.isNotNullOrEmpty(vo.getOrderPelayanan())) {
-					for(OrderPelayananVO orderPelayananVO : vo.getOrderPelayanan()) {
+					for (OrderPelayananVO orderPelayananVO : vo.getOrderPelayanan()) {
 
-						OrderPelayanan orderPelayanan = orderPelayananConverter.transferVOToModel(orderPelayananVO, new OrderPelayanan());
+						OrderPelayanan orderPelayanan = orderPelayananConverter.transferVOToModel(orderPelayananVO,
-						if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+								new OrderPelayanan());
+						if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
 							orderPelayanan.setStrukOrder(strukOrder);
 							orderPelayanan.setNoOrder(strukOrder);
 						}
-						if(CommonUtil.isNotNullOrEmpty(orderPelayananVO.getRuangan())) {
+						if (CommonUtil.isNotNullOrEmpty(orderPelayananVO.getRuangan())) {
-							orderPelayanan.setRuangan(ruanganConverter.transferVOToModel(orderPelayananVO.getRuangan(), new Ruangan()));
+							orderPelayanan.setRuangan(
+									ruanganConverter.transferVOToModel(orderPelayananVO.getRuangan(), new Ruangan()));
 						}
-						if(CommonUtil.isNotNullOrEmpty(orderPelayananVO.getRuanganTujuan())) {
+						if (CommonUtil.isNotNullOrEmpty(orderPelayananVO.getRuanganTujuan())) {
-							orderPelayanan.setRuanganTujuan(ruanganConverter.transferVOToModel(orderPelayananVO.getRuanganTujuan(), new Ruangan()));
+							orderPelayanan.setRuanganTujuan(ruanganConverter
+									.transferVOToModel(orderPelayananVO.getRuanganTujuan(), new Ruangan()));
 						}
-						if(CommonUtil.isNotNullOrEmpty(orderPelayananVO.getProduk())) {
+						if (CommonUtil.isNotNullOrEmpty(orderPelayananVO.getProduk())) {
-							orderPelayanan.setProduk(produkConverter.transferVOToModel(orderPelayananVO.getProduk(), new Produk()));
+							orderPelayanan.setProduk(
+									produkConverter.transferVOToModel(orderPelayananVO.getProduk(), new Produk()));
 						}
-						if(CommonUtil.isNotNullOrEmpty(orderPelayanan)) {
+						if (CommonUtil.isNotNullOrEmpty(orderPelayanan)) {
 							OrderPelayanan orderPelayananResult = orderPelayananDao.save(orderPelayanan);
 							result.put("added", orderPelayananResult.getNoRec());
 						}
@@ -224,8 +230,8 @@ public class RadiologiServiceImpl implements RadiologiService{
 	}
 
 	@Override
-	@Transactional(readOnly=false)
+	@Transactional(readOnly = false)
-	public Map<String, Object> saveOrderRadiologi(OrderRadiologiVO vo){
+	public Map<String, Object> saveOrderRadiologi(OrderRadiologiVO vo) {
 		Map<String, Object> result = new HashMap<>();
 
 		try {
@@ -233,125 +239,131 @@ public class RadiologiServiceImpl implements RadiologiService{
 			AntrianPasienDiPeriksa antrian = antrianPasienDiPeriksaDao.findByNoRec(vo.getNoRecAntrian());
 			OrderPelayanan orderPelayanan = null;
 
-			for(OrderPelayananVO orderPelayananVO : vo.getStrukOrder().getOrderPelayanan()){
+			for (OrderPelayananVO orderPelayananVO : vo.getStrukOrder().getOrderPelayanan()) {
 				PelayananPasien pelayananPasien = new PelayananPasien();
 
 				orderPelayanan = orderPelayananDao.findOne(orderPelayananVO.getNoRec());
 
 				Produk produk = produkDao.findOne(orderPelayananVO.getProdukId());
-				if(CommonUtil.isNotNullOrEmpty(vo.getStrukOrder())) {
+				if (CommonUtil.isNotNullOrEmpty(vo.getStrukOrder())) {
 
 					Map<String, Object> harga = getHarga(antrian, produk, orderPelayanan.getJumlah());
-					if(CommonUtil.isNotNullOrEmpty(orderPelayananVO.getIsVerifikasi())) {
+					if (CommonUtil.isNotNullOrEmpty(orderPelayananVO.getIsVerifikasi())) {
 						orderPelayanan.setIsVerifikasi(orderPelayananVO.getIsVerifikasi());
 					}
-					if(CommonUtil.isNotNullOrEmpty(DateUtil.now())) {
+					if (CommonUtil.isNotNullOrEmpty(DateUtil.now())) {
 						pelayananPasien.setTglPelayanan(DateUtil.now());
 					}
-					if(CommonUtil.isNotNullOrEmpty(orderPelayanan.getStrukOrder())) {
+					if (CommonUtil.isNotNullOrEmpty(orderPelayanan.getStrukOrder())) {
 						pelayananPasien.setStrukOrder(orderPelayanan.getStrukOrder());
 					}
-					if(CommonUtil.isNotNullOrEmpty(orderPelayanan.getKelas())) {
+					if (CommonUtil.isNotNullOrEmpty(orderPelayanan.getKelas())) {
 						pelayananPasien.setKelas(orderPelayanan.getKelas().getKelas());
 					}
-					if(CommonUtil.isNotNullOrEmpty(antrian)) {
+					if (CommonUtil.isNotNullOrEmpty(antrian)) {
 						pelayananPasien.setPasienDaftar(antrian);
 					}
-					if(CommonUtil.isNotNullOrEmpty(produk)) {
+					if (CommonUtil.isNotNullOrEmpty(produk)) {
 						pelayananPasien.setProduk(produk);
 					}
-					if(CommonUtil.isNotNullOrEmpty(harga.get("hargaJual"))){
+					if (CommonUtil.isNotNullOrEmpty(harga.get("hargaJual"))) {
 						pelayananPasien.setHargaJual((Double) harga.get("hargaJual"));
 					}
-					if(CommonUtil.isNotNullOrEmpty(harga.get("hargaNetto"))) {
+					if (CommonUtil.isNotNullOrEmpty(harga.get("hargaNetto"))) {
 						pelayananPasien.setHargaNetto((Double) harga.get("hargaJual"));
 						pelayananPasien.setHargaSatuan((Double) harga.get("hargaJual"));
 					}
-					if(CommonUtil.isNotNullOrEmpty(harga.get("hargaPiutangPenjamin"))) {
+					if (CommonUtil.isNotNullOrEmpty(harga.get("hargaPiutangPenjamin"))) {
 						pelayananPasien.setPiutangPenjamin((Double) harga.get("hargaPiutangPenjamin"));
 					}
-					if(CommonUtil.isNotNullOrEmpty(harga.get("hargaPiutangRumahSakit"))) {
+					if (CommonUtil.isNotNullOrEmpty(harga.get("hargaPiutangRumahSakit"))) {
 						pelayananPasien.setPiutangRumahSakit((Double) harga.get("hargaPiutangRumahSakit"));
 					}
-					if(CommonUtil.isNotNullOrEmpty(harga.get("stok"))) {
+					if (CommonUtil.isNotNullOrEmpty(harga.get("stok"))) {
 						pelayananPasien.setStock((Double) harga.get("stok"));
 					}
-					if(CommonUtil.isNotNullOrEmpty(harga.get("jumlah"))) {
+					if (CommonUtil.isNotNullOrEmpty(harga.get("jumlah"))) {
 						pelayananPasien.setJumlah((Double) harga.get("jumlah"));
 					}
-					if(CommonUtil.isNotNullOrEmpty(produk)) {
+					if (CommonUtil.isNotNullOrEmpty(produk)) {
 
-						//Ruangan ruangan = ruanganDao.findOne(orderPelayanan.getRuangan().getId());
+						// Ruangan ruangan =
-						/*List<HargaNettoProdukByKelasD> detail = hargaNettoProdukByKelasDDao.
+						// ruanganDao.findOne(orderPelayanan.getRuangan().getId());
-								findByKelasNProduk(ruangan.getId(), produk.getId());*/
+						/*
-						List<HargaNettoProdukByKelasD> detail = hargaNettoProdukByKelasDDao.findByKelasNProduk(antrian.getKelasId(), produk.getId());
+						 * List<HargaNettoProdukByKelasD> detail =
+						 * hargaNettoProdukByKelasDDao.
+						 * findByKelasNProduk(ruangan.getId(), produk.getId());
+						 */
+						List<HargaNettoProdukByKelasD> detail = hargaNettoProdukByKelasDDao
+								.findByKelasNProduk(antrian.getKelasId(), produk.getId());
 
 						Set<PelayananPasienDetail> pelayananPasienDetailSet = new HashSet<>();
-						for(HargaNettoProdukByKelasD hargaNetto : detail) {
+						for (HargaNettoProdukByKelasD hargaNetto : detail) {
 							PelayananPasienDetail pelayananPasienDetail = new PelayananPasienDetail();
 
-							if(CommonUtil.isNotNullOrEmpty(pelayananPasien)) {
+							if (CommonUtil.isNotNullOrEmpty(pelayananPasien)) {
 								pelayananPasienDetail.setPelayananPasien(pelayananPasien);
 							}
-							if(CommonUtil.isNotNullOrEmpty(hargaNetto.getProduk())) {
+							if (CommonUtil.isNotNullOrEmpty(hargaNetto.getProduk())) {
 								pelayananPasienDetail.setProduk(hargaNetto.getProduk());
 							}
-							if(CommonUtil.isNotNullOrEmpty(antrian)){
+							if (CommonUtil.isNotNullOrEmpty(antrian)) {
 								pelayananPasienDetail.setPasienDaftar(antrian);
 							}
-							if(CommonUtil.isNotNullOrEmpty(orderPelayanan.getStrukOrder().getStatusOrder())){
+							if (CommonUtil.isNotNullOrEmpty(orderPelayanan.getStrukOrder().getStatusOrder())) {
 								pelayananPasienDetail.setStatusOrder(orderPelayanan.getStrukOrder().getStatusOrder());
 							}
-							if(CommonUtil.isNotNullOrEmpty(hargaNetto.getKomponenHarga())){
+							if (CommonUtil.isNotNullOrEmpty(hargaNetto.getKomponenHarga())) {
 								pelayananPasienDetail.setKomponenHarga(hargaNetto.getKomponenHarga());
 							}
-							if(CommonUtil.isNotNullOrEmpty(pelayananPasien.getTglPelayanan())){
+							if (CommonUtil.isNotNullOrEmpty(pelayananPasien.getTglPelayanan())) {
 								pelayananPasienDetail.setTglPelayanan(pelayananPasien.getTglPelayanan());
 							}
-							if(CommonUtil.isNotNullOrEmpty(hargaNetto.getHargaSatuan())){
+							if (CommonUtil.isNotNullOrEmpty(hargaNetto.getHargaSatuan())) {
 								pelayananPasienDetail.setHargaSatuan(hargaNetto.getHargaSatuan());
 							}
-							if(CommonUtil.isNotNullOrEmpty(harga.get("hargaJual"))){
+							if (CommonUtil.isNotNullOrEmpty(harga.get("hargaJual"))) {
 								pelayananPasienDetail.setHargaJual((Double) harga.get("hargaJual"));
 							}
-							if(CommonUtil.isNotNullOrEmpty(hargaNetto.getHargaNetto1())) {
+							if (CommonUtil.isNotNullOrEmpty(hargaNetto.getHargaNetto1())) {
 								pelayananPasienDetail.setHargaNetto(hargaNetto.getHargaNetto1());
 							}
-							if(CommonUtil.isNotNullOrEmpty(harga.get("hargaPiutangPenjamin"))) {
+							if (CommonUtil.isNotNullOrEmpty(harga.get("hargaPiutangPenjamin"))) {
 								pelayananPasienDetail.setPiutangPenjamin((Double) harga.get("hargaPiutangPenjamin"));
 							}
-							if(CommonUtil.isNotNullOrEmpty(harga.get("hargaPiutangRumahSakit"))) {
+							if (CommonUtil.isNotNullOrEmpty(harga.get("hargaPiutangRumahSakit"))) {
-								pelayananPasienDetail.setPiutangRumahSakit((Double) harga.get("hargaPiutangRumahSakit"));
+								pelayananPasienDetail
+										.setPiutangRumahSakit((Double) harga.get("hargaPiutangRumahSakit"));
 							}
-							if(CommonUtil.isNotNullOrEmpty(hargaNetto.getQtyCurrentStok())) {
+							if (CommonUtil.isNotNullOrEmpty(hargaNetto.getQtyCurrentStok())) {
 								pelayananPasienDetail.setStock(hargaNetto.getQtyCurrentStok().intValue());
 							}
-							if(CommonUtil.isNotNullOrEmpty(harga.get("jumlah"))) {
+							if (CommonUtil.isNotNullOrEmpty(harga.get("jumlah"))) {
 								pelayananPasienDetail.setJumlah((Double) harga.get("jumlah"));
 							}
-							if(CommonUtil.isNotNullOrEmpty(pelayananPasienDetail)) {
+							if (CommonUtil.isNotNullOrEmpty(pelayananPasienDetail)) {
 								pelayananPasienDetailSet.add(pelayananPasienDetail);
 							}
 						}
-						if(CommonUtil.isNotNullOrEmpty(pelayananPasienDetailSet)) {
+						if (CommonUtil.isNotNullOrEmpty(pelayananPasienDetailSet)) {
 							pelayananPasien.setPelayananPasienDetailSet(pelayananPasienDetailSet);
 						}
 					}
 				}
 
-				if(CommonUtil.isNotNullOrEmpty(pelayananPasien)) {
+				if (CommonUtil.isNotNullOrEmpty(pelayananPasien)) {
 					PelayananPasien pelayananPasienResult = pelayananPasienDao.save(pelayananPasien);
-					System.out.println(pelayananPasienResult.getNoRec()+"norec pelayanan pasien ");
+					System.out.println(pelayananPasienResult.getNoRec() + "norec pelayanan pasien ");
 					result.put("noRec pelayanan pasien", pelayananPasienResult.getNoRec());
-					if(CommonUtil.isNotNullOrEmpty(pelayananPasienResult)) {
+					if (CommonUtil.isNotNullOrEmpty(pelayananPasienResult)) {
 						orderPelayananDao.save(orderPelayanan);
 					}
 				}
 			}
-			if(CommonUtil.isNotNullOrEmpty(orderPelayanan.getStrukOrder())) {
+			if (CommonUtil.isNotNullOrEmpty(orderPelayanan.getStrukOrder())) {
 				try {
 					RIS_ORDER(vo, antrian, orderPelayanan.getStrukOrder());
-				}catch(Exception ex) {
+				} catch (Exception ex) {
 					ex.printStackTrace();
 				}
 				try {
@@ -359,290 +371,295 @@ public class RadiologiServiceImpl implements RadiologiService{
 					strukOrder.setIsVerifikasi(true);
 					StrukOrder strukOrderResult = strukOrderDao.save(strukOrder);
 					result.put("noOrder", strukOrderResult.getNoOrder());
-				}catch(Exception ex) {
+				} catch (Exception ex) {
 					ex.printStackTrace();
 				}
 			}
-		}catch(Exception ex) {
+		} catch (Exception ex) {
 			ex.printStackTrace();
 		}
 
 		return result;
 	}
 
-	@Transactional(readOnly=false)
+	@Transactional(readOnly = false)
-	private Map<String, Object> getHarga(AntrianPasienDiPeriksa antrian, Produk produk, Double jumlah){
+	private Map<String, Object> getHarga(AntrianPasienDiPeriksa antrian, Produk produk, Double jumlah) {
 		Map<String, Object> result = new HashMap<>();
 
-		Map<String, Object> map = pelayananPiutangRekananService.getHargaPiutangRekananProfile(antrian.getNoRec(), produk, jumlah, 0);
+		Map<String, Object> map = pelayananPiutangRekananService.getHargaPiutangRekananProfile(antrian.getNoRec(),
-		if(CommonUtil.isNotNullOrEmpty(map)) {
+				produk, jumlah, 0);
-			List<PiutangRekananProfileTemp> listPiutangRekananProfileTemp=(List<PiutangRekananProfileTemp>) map.get("list");
+		if (CommonUtil.isNotNullOrEmpty(map)) {
-			Double mapHargaCito=0.0;
+			List<PiutangRekananProfileTemp> listPiutangRekananProfileTemp = (List<PiutangRekananProfileTemp>) map
-			Double mapHargaSatuan=0.0;
+					.get("list");
-			Double mapHargaDiskon=0.0;
+			Double mapHargaCito = 0.0;
-			Double mapHargaNetto=0.0;
+			Double mapHargaSatuan = 0.0;
-			Double mapHargaPiutangRekanan=0.0;
+			Double mapHargaDiskon = 0.0;
-			Double mapHargaPiutangProfile=0.0;
+			Double mapHargaNetto = 0.0;
-			for(PiutangRekananProfileTemp abcd:listPiutangRekananProfileTemp){
+			Double mapHargaPiutangRekanan = 0.0;
-				mapHargaCito=Double.valueOf(abcd.getHargaCito());
+			Double mapHargaPiutangProfile = 0.0;
-				mapHargaSatuan=Double.valueOf(abcd.getHargaSatuan());
+			for (PiutangRekananProfileTemp abcd : listPiutangRekananProfileTemp) {
-				mapHargaDiskon=Double.valueOf(abcd.getHargaDiskon());
+				mapHargaCito = Double.valueOf(abcd.getHargaCito());
-				mapHargaNetto=Double.valueOf(abcd.getHargaNetto());
+				mapHargaSatuan = Double.valueOf(abcd.getHargaSatuan());
-				mapHargaPiutangRekanan=Double.valueOf(abcd.getHargaPiutangRekanan());
+				mapHargaDiskon = Double.valueOf(abcd.getHargaDiskon());
-				mapHargaPiutangProfile=Double.valueOf(abcd.getHargaPiutangProfile());
+				mapHargaNetto = Double.valueOf(abcd.getHargaNetto());
+				mapHargaPiutangRekanan = Double.valueOf(abcd.getHargaPiutangRekanan());
+				mapHargaPiutangProfile = Double.valueOf(abcd.getHargaPiutangProfile());
 			}
 			result.put("hargaSatuan", mapHargaSatuan);
 			result.put("hargaJual", mapHargaSatuan);
 			result.put("hargaNetto", mapHargaNetto);
 			result.put("hargaPiutangPenjamin", mapHargaPiutangRekanan);
 			result.put("hargaPiutangRumahSakit", mapHargaPiutangProfile);
-			result.put("stok", (Double)1.00);
+			result.put("stok", (Double) 1.00);
-			result.put("jumlah", (Double)1.00);
+			result.put("jumlah", (Double) 1.00);
 		}
 		return result;
 	}
 
-	@Transactional(readOnly=false)
+	@Transactional(readOnly = false)
 	private Map<String, Object> RIS_ORDER(OrderRadiologiVO vo, AntrianPasienDiPeriksa antrian, StrukOrder strukOrder) {
 		Map<String, Object> result = new HashMap<>();
 
-		if(CommonUtil.isNotNullOrEmpty(vo.getStrukOrder())) {
+		if (CommonUtil.isNotNullOrEmpty(vo.getStrukOrder())) {
 
-			for(OrderPelayananVO orderPelayananVO : vo.getStrukOrder().getOrderPelayanan()) {
+			for (OrderPelayananVO orderPelayananVO : vo.getStrukOrder().getOrderPelayanan()) {
-				RIS_Order ris_order = new RIS_Order();
+				RISOrder ris_order = new RISOrder();
 
-				if(CommonUtil.isNotNullOrEmpty(orderPelayananVO)) {
+				if (CommonUtil.isNotNullOrEmpty(orderPelayananVO)) {
 					Produk produk = produkDao.findOne(orderPelayananVO.getProdukId());
 
-					if(CommonUtil.isNotNullOrEmpty(produk.getId())) {
+					if (CommonUtil.isNotNullOrEmpty(produk.getId())) {
-						ris_order.setORDER_CODE(produk.getId().toString());
+						ris_order.setOrderCode(produk.getId().toString());
 					}
-					if(CommonUtil.isNotNullOrEmpty(produk.getNamaProduk())) {
+					if (CommonUtil.isNotNullOrEmpty(produk.getNamaProduk())) {
-						ris_order.setORDER_NAME(produk.getNamaProduk());
+						ris_order.setOrderName(produk.getNamaProduk());
 					}
-					if(CommonUtil.isNotNullOrEmpty(produk.getDetailJenisProduk().getJenisProduk())) {
+					if (CommonUtil.isNotNullOrEmpty(produk.getDetailJenisProduk().getJenisProduk())) {
 						JenisProduk jenisProduk = produk.getDetailJenisProduk().getJenisProduk();
 
-						if(CommonUtil.isNotNullOrEmpty(jenisProduk.getNamaExternal())) {
+						if (CommonUtil.isNotNullOrEmpty(jenisProduk.getNamaExternal())) {
-							ris_order.setORDER_MODALITY(jenisProduk.getNamaExternal());
+							ris_order.setOrderModality(jenisProduk.getNamaExternal());
 						}
 
-						if(CommonUtil.isNotNullOrEmpty(jenisProduk.getJenisProduk())) {
+						if (CommonUtil.isNotNullOrEmpty(jenisProduk.getJenisProduk())) {
-							ris_order.setACCESSION_NUM(accessionNum(produk.getDetailJenisProduk().getKodeExternal(), jenisProduk.getNamaExternal()));
+							ris_order.setAccessionNum(accessionNum(produk.getDetailJenisProduk().getKodeExternal(),
+									jenisProduk.getNamaExternal()));
 						}
 					}
 				}
-				if(CommonUtil.isNotNullOrEmpty(DateUtil.now())) {
+				if (CommonUtil.isNotNullOrEmpty(DateUtil.now())) {
 					SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmm");
-					ris_order.setCREATE_DATE(dateFormat.format(DateUtil.now()));
+					ris_order.setCreateDate(dateFormat.format(DateUtil.now()));
 				}
-				if(CommonUtil.isNotNullOrEmpty(vo.getPasien())) {
+				if (CommonUtil.isNotNullOrEmpty(vo.getPasien())) {
 					Pasien pasien = pasienDao.findById(vo.getPasien().getId());
 
-					if(CommonUtil.isNotNullOrEmpty(pasien.getNoCm())) {
+					if (CommonUtil.isNotNullOrEmpty(pasien.getNoCm())) {
-						ris_order.setPATIENT_ID(pasien.getNoCm());
+						ris_order.setPatientId(pasien.getNoCm());
 					}
-					if(CommonUtil.isNotNullOrEmpty(pasien.getNamaPasien())) {
+					if (CommonUtil.isNotNullOrEmpty(pasien.getNamaPasien())) {
-						ris_order.setPATIENT_NAME(pasien.getNamaPasien());
+						ris_order.setPatientName(pasien.getNamaPasien());
 					}
-					if(CommonUtil.isNotNullOrEmpty(pasien.getNamaBelakang())) {
+					if (CommonUtil.isNotNullOrEmpty(pasien.getNamaBelakang())) {
-						ris_order.setLAST_NAME(pasien.getNamaBelakang());
+						ris_order.setLastName(pasien.getNamaBelakang());
 					}
-					if(CommonUtil.isNotNullOrEmpty(pasien.getNamaDepan())) {
+					if (CommonUtil.isNotNullOrEmpty(pasien.getNamaDepan())) {
-						ris_order.setFIRST_NAME(pasien.getNamaDepan());
+						ris_order.setFirstName(pasien.getNamaDepan());
 					}
-					if(CommonUtil.isNotNullOrEmpty(pasien.getTglLahir())) {
+					if (CommonUtil.isNotNullOrEmpty(pasien.getTglLahir())) {
 						SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
-						ris_order.setPATIENT_BIRTH_DATE(dateFormat.format(pasien.getTglLahir()));
+						ris_order.setPatientBirthDate(dateFormat.format(pasien.getTglLahir()));
 					}
-					if(CommonUtil.isNotNullOrEmpty(pasien.getJenisKelamin())) {
+					if (CommonUtil.isNotNullOrEmpty(pasien.getJenisKelamin())) {
 						JenisKelamin jenisKelamin = pasien.getJenisKelamin();
 
-						if(jenisKelamin.getJenisKelamin().equalsIgnoreCase("Laki-laki")) {
+						if (jenisKelamin.getJenisKelamin().equalsIgnoreCase("Laki-laki")) {
-							ris_order.setPATIENT_SEX("M");
+							ris_order.setPatientSex("M");
-						} else if(jenisKelamin.getJenisKelamin().equalsIgnoreCase("Perempuan")) {
+						} else if (jenisKelamin.getJenisKelamin().equalsIgnoreCase("Perempuan")) {
-							ris_order.setPATIENT_SEX("F");
+							ris_order.setPatientSex("F");
 						} else {
-							ris_order.setPATIENT_SEX("O");
+							ris_order.setPatientSex("O");
 						}
 					}
-					if(CommonUtil.isNotNullOrEmpty(pasien.getGolonganDarah())) {
+					if (CommonUtil.isNotNullOrEmpty(pasien.getGolonganDarah())) {
 						GolonganDarah golonganDarah = pasien.getGolonganDarah();
 
-						if(CommonUtil.isNotNullOrEmpty(golonganDarah.getGolonganDarah())) {
+						if (CommonUtil.isNotNullOrEmpty(golonganDarah.getGolonganDarah())) {
-							ris_order.setPATIENT_BLOOD(golonganDarah.getGolonganDarah());
+							ris_order.setPatientBlood(golonganDarah.getGolonganDarah());
 						}
 					}
-					if(CommonUtil.isNotNullOrEmpty(pasien)) {
+					if (CommonUtil.isNotNullOrEmpty(pasien)) {
-						ris_order.setMIDDLE_NAME("-");
+						ris_order.setMiddleName("-");
 					}
-					if(CommonUtil.isNotNullOrEmpty(pasien)) {
+					if (CommonUtil.isNotNullOrEmpty(pasien)) {
-						ris_order.setAETITLE("-");
+						ris_order.setAetitle("-");
 					}
-					if(CommonUtil.isNotNullOrEmpty(pasien)) {
+					if (CommonUtil.isNotNullOrEmpty(pasien)) {
-						ris_order.setPATIENT_UID("-");
+						ris_order.setPatientUid("-");
 					}
 				}
-				if(CommonUtil.isNotNullOrEmpty(vo.getStrukOrder())) {
+				if (CommonUtil.isNotNullOrEmpty(vo.getStrukOrder())) {
 
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setFLAG("Y");
+						ris_order.setFlag("Y");
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder.getTglOrder())) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder.getTglOrder())) {
 						SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmm");
-						ris_order.setSTUDY_RESERV_DATE(dateFormat.format(strukOrder.getTglOrder()));
+						ris_order.setStudyReservDate(dateFormat.format(strukOrder.getTglOrder()));
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder.getTglOrder())) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder.getTglOrder())) {
 						SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmm");
-						ris_order.setORDER_DATE(dateFormat.format(strukOrder.getTglOrder()));
+						ris_order.setOrderDate(dateFormat.format(strukOrder.getTglOrder()));
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder.getNoOrderIntern())) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder.getNoOrderIntern())) {
-						ris_order.setORDER_NO(strukOrder.getNoOrderIntern());
+						ris_order.setOrderNo(strukOrder.getNoOrderIntern());
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder.getCito())) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder.getCito())) {
-						if(strukOrder.getCito()) {
+						if (strukOrder.getCito()) {
-							ris_order.setPATIENT_IO("E");
+							ris_order.setPatientIo("E");
 						} else {
-							ris_order.setPATIENT_IO("I");
+							ris_order.setPatientIo("I");
 						}
-					}else {
+					} else {
-						ris_order.setPATIENT_IO("I");//what happen with this? where the O for outpatient condition?
+						ris_order.setPatientIo("I");// what happen with this?
+													// where the O for
+													// outpatient condition?
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setORDER_STATUS("NW");// nw : new ; ca : cancel
+						ris_order.setOrderStatus("NW");// nw : new ; ca : cancel
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setORDER_REASON("-");
+						ris_order.setOrderReason("-");
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setSTUDY_REMARK("-");
+						ris_order.setStudyRemark("-");
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setORDER_BODYPART("-");
+						ris_order.setOrderBodypart("-");
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setORDER_CNT(0);
+						ris_order.setOrderCnt(0);
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setGROUP1("-");
+						ris_order.setGroup1("-");
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setGROUP2("-");
+						ris_order.setGroup2("-");
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setGROUP3("-");
+						ris_order.setGroup3("-");
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setORDER_COMMENT("-");
+						ris_order.setOrderComment("-");
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setEXTENSION7("-");
+						ris_order.setExtension7("-");
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setEXTENSION8("-");
+						ris_order.setExtension8("-");
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setEXTENSION9("-");
+						ris_order.setExtension9("-");
 					}
-					if(CommonUtil.isNotNullOrEmpty(strukOrder)) {
+					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-						ris_order.setEXTENSION10("-");
+						ris_order.setExtension10("-");
 					}
 				}
-				if(CommonUtil.isNotNullOrEmpty(vo.getRuangan())) {
+				if (CommonUtil.isNotNullOrEmpty(vo.getRuangan())) {
 					Ruangan ruangan = ruanganDao.findOne(vo.getRuangan().getId());
 
-					if(CommonUtil.isNotNullOrEmpty(ruangan.getNamaRuangan())) {
+					if (CommonUtil.isNotNullOrEmpty(ruangan.getNamaRuangan())) {
-						ris_order.setORDER_DEPT(ruangan.getNamaRuangan());
+						ris_order.setOrderDept(ruangan.getNamaRuangan());
 					}
 				}
-				if(CommonUtil.isNotNullOrEmpty(vo.getRuanganPengirim())) {
+				if (CommonUtil.isNotNullOrEmpty(vo.getRuanganPengirim())) {
 					Ruangan ruanganPengirim = ruanganDao.findOne(vo.getRuanganPengirim().getId());
 
-					if(CommonUtil.isNotNullOrEmpty(ruanganPengirim.getNamaRuangan())) {
+					if (CommonUtil.isNotNullOrEmpty(ruanganPengirim.getNamaRuangan())) {
-						ris_order.setPATIENT_WARD(ruanganPengirim.getNamaRuangan());
+						ris_order.setPatientWard(ruanganPengirim.getNamaRuangan());
 					}
 				}
-				if(CommonUtil.isNotNullOrEmpty(vo.getDokterRadilogi())) {
+				if (CommonUtil.isNotNullOrEmpty(vo.getDokterRadilogi())) {
 					Pegawai pegawai = pegawaiDao.findOne(vo.getDokterRadilogi().getId());
 
-					if(CommonUtil.isNotNullOrEmpty(pegawai.getId())) {
+					if (CommonUtil.isNotNullOrEmpty(pegawai.getId())) {
-						ris_order.setCHARGE_DOC_ID(pegawai.getId().toString());
+						ris_order.setChargeDocId(pegawai.getId().toString());
 					}
-					if(CommonUtil.isNotNullOrEmpty(pegawai.getNamaLengkap())) {
+					if (CommonUtil.isNotNullOrEmpty(pegawai.getNamaLengkap())) {
-						ris_order.setCHARGE_DOC_NAME(pegawai.getNamaLengkap());
+						ris_order.setChargeDocName(pegawai.getNamaLengkap());
 					}
 				}
-				if(CommonUtil.isNotNullOrEmpty(vo.getDokterOrder())) {
+				if (CommonUtil.isNotNullOrEmpty(vo.getDokterOrder())) {
 					Pegawai pegawai = pegawaiDao.findOne(vo.getDokterOrder().getId());
 
-					if(CommonUtil.isNotNullOrEmpty(pegawai.getId())) {
+					if (CommonUtil.isNotNullOrEmpty(pegawai.getId())) {
-						ris_order.setCONSULT_DOC_ID(pegawai.getId().toString());
+						ris_order.setConsultDocId(pegawai.getId().toString());
 					}
-					if(CommonUtil.isNotNullOrEmpty(pegawai.getNamaLengkap())) {
+					if (CommonUtil.isNotNullOrEmpty(pegawai.getNamaLengkap())) {
-						ris_order.setCONSULT_DOC_NAME(pegawai.getNamaLengkap());
+						ris_order.setConsultDocName(pegawai.getNamaLengkap());
 					}
 				}
-				if(CommonUtil.isNotNullOrEmpty(vo.getPegawaiVerifikasi())) {
+				if (CommonUtil.isNotNullOrEmpty(vo.getPegawaiVerifikasi())) {
 					Pegawai pegawai = pegawaiDao.findOne(vo.getPegawaiVerifikasi().getId());
 
-					if(CommonUtil.isNotNullOrEmpty(pegawai.getNamaLengkap())) {
+					if (CommonUtil.isNotNullOrEmpty(pegawai.getNamaLengkap())) {
-						ris_order.setEXTENSION6(pegawai.getNamaLengkap());
+						ris_order.setExtension6(pegawai.getNamaLengkap());
 					}
 				}
-				if(CommonUtil.isNotNullOrEmpty(vo.getRuangan())) {
+				if (CommonUtil.isNotNullOrEmpty(vo.getRuangan())) {
 					Ruangan ruangan = ruanganDao.findOne(vo.getRuangan().getId());
 
-					if(CommonUtil.isNotNullOrEmpty(ruangan.getDepartemen())) {
+					if (CommonUtil.isNotNullOrEmpty(ruangan.getDepartemen())) {
 						String rawatJalan = settingDataFixedDao.getSettingDataFixed("KdDepartemenInstalasiRawatJalan");
 
-						if(ruangan.getDepartemen().getId() == Integer.parseInt(rawatJalan)){
+						if (ruangan.getDepartemen().getId() == Integer.parseInt(rawatJalan)) {
-							ris_order.setIO_DATE("O");
+							ris_order.setIoDate("O");
 						} else {
-							ris_order.setIO_DATE("I");
+							ris_order.setIoDate("I");
 						}
 					}
 				}
-				if(CommonUtil.isNotNullOrEmpty(antrian.getNoRec())) {
+				if (CommonUtil.isNotNullOrEmpty(antrian.getNoRec())) {
 					antrian = antrianPasienDiPeriksaDao.findByStrukOrderNoRec(vo.getStrukOrder().getNoRec());
 					List<DiagnosaPasien> list = diagnosaPasienDao.findDiagnosaPasienByAntrian(antrian.getNoRec());
-					for(DiagnosaPasien diagnosa : list) {
+					for (DiagnosaPasien diagnosa : list) {
 
-						for(DetailDiagnosaPasien detailDiagnosa : diagnosa.getDiagnosis()) {
+						for (DetailDiagnosaPasien detailDiagnosa : diagnosa.getDiagnosis()) {
-							if(detailDiagnosa.getJenisDiagnosa().getId()==1) {
+							if (detailDiagnosa.getJenisDiagnosa().getId() == 1) {
-								ris_order.setEXTENSION2(detailDiagnosa.getDiagnosa().getNamaDiagnosa());
+								ris_order.setExtension2(detailDiagnosa.getDiagnosa().getNamaDiagnosa());
-								ris_order.setEXTENSION4(detailDiagnosa.getDiagnosa().getNamaDiagnosa());
+								ris_order.setExtension4(detailDiagnosa.getDiagnosa().getNamaDiagnosa());
 							}
-							if(detailDiagnosa.getJenisDiagnosa().getId()==2) {
+							if (detailDiagnosa.getJenisDiagnosa().getId() == 2) {
-								ris_order.setEXTENSION3(detailDiagnosa.getDiagnosa().getNamaDiagnosa());
+								ris_order.setExtension3(detailDiagnosa.getDiagnosa().getNamaDiagnosa());
 							}
 						}
-					}//added by susy 2017-09-18
+					} // added by susy 2017-09-18
 					PasienDaftar pasienDaftar = pasienDaftarDao.findByNoRec(antrian.getPasienDaftarId());
-					if(CommonUtil.isNotNullOrEmpty(pasienDaftar))
+					if (CommonUtil.isNotNullOrEmpty(pasienDaftar)) {
-					{
+						if (CommonUtil.isNotNullOrEmpty(pasienDaftar.getRuangan())) {
-						if(CommonUtil.isNotNullOrEmpty(pasienDaftar.getRuangan()))
+							List<Map<String, Object>> antrianPasienDiperiksa = antrianPasienDiPeriksaDao
-						{
+									.findAntrianByNoRecPasienDaftar(pasienDaftar.getNoRec(),
-							List<Map<String,Object>> antrianPasienDiperiksa = antrianPasienDiPeriksaDao.findAntrianByNoRecPasienDaftar(pasienDaftar.getNoRec(), pasienDaftar.getRuanganId());
+											pasienDaftar.getRuanganId());
-							if(CommonUtil.isNotNullOrEmpty(antrianPasienDiperiksa) && CommonUtil.isNotNullOrEmpty(antrianPasienDiperiksa.get(0).get("idKelas")))
+							if (CommonUtil.isNotNullOrEmpty(antrianPasienDiperiksa)
-							{
+									&& CommonUtil.isNotNullOrEmpty(antrianPasienDiperiksa.get(0).get("idKelas"))) {
-								Integer id=(Integer)antrianPasienDiperiksa.get(0).get("idKelas");
+								Integer id = (Integer) antrianPasienDiperiksa.get(0).get("idKelas");
 								Kelas kelas = kelasDao.findKelasById(id);
 								ris_order.setKelas(kelas);
 							}
 						}
 					}
 				}
-				if(CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())) {
+				if (CommonUtil.isNotNullOrEmpty(vo.getPasienDaftar())) {
-					ris_order.setEXTENSION1(vo.getPasienDaftar().getNoRegistrasi());
+					ris_order.setExtension1(vo.getPasienDaftar().getNoRegistrasi());
 				}
-				if(CommonUtil.isNotNullOrEmpty(vo.getKelompokPasienVO())) {
+				if (CommonUtil.isNotNullOrEmpty(vo.getKelompokPasienVO())) {
 					KelompokPasien kelompokPasien = kelompokPasienDao.findOne(vo.getKelompokPasienVO().getId());
 
-					if(CommonUtil.isNotNullOrEmpty(kelompokPasien)) {
+					if (CommonUtil.isNotNullOrEmpty(kelompokPasien)) {
-						ris_order.setEXTENSION5(kelompokPasien.getKelompokPasien());
+						ris_order.setExtension5(kelompokPasien.getKelompokPasien());
 					}
 				}
-				if(CommonUtil.isNotNullOrEmpty(ris_order)) {
+				if (CommonUtil.isNotNullOrEmpty(ris_order)) {
 					Map<String, Object> resultMap = rIS_OrderService.save(ris_order);
 					result = resultMap;
 				}
@@ -651,5 +668,4 @@ public class RadiologiServiceImpl implements RadiologiService{
 		return result;
 	}
 
-	
 }

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

@@ -1,200 +1,31 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-import java.text.ParseException;
+import com.google.gson.Gson;
-import java.text.SimpleDateFormat;
+import com.jasamedika.medifirst2000.converter.*;
-import java.util.ArrayList;
+import com.jasamedika.medifirst2000.dao.*;
-import java.util.Calendar;
+import com.jasamedika.medifirst2000.dao.custom.AntrianPasienDiPeriksaDaoCustom;
-import java.util.Collections;
+import com.jasamedika.medifirst2000.dto.AntrianPasienGiziDto;
-import java.util.Comparator;
+import com.jasamedika.medifirst2000.dto.RuanganJumlah;
-import java.util.Date;
+import com.jasamedika.medifirst2000.entities.*;
-import java.util.HashMap;
+import com.jasamedika.medifirst2000.enums.StatusAntrianEnum;
-import java.util.HashSet;
+import com.jasamedika.medifirst2000.enums.StatusPenyakitEnum;
-import java.util.List;
+import com.jasamedika.medifirst2000.enums.TipePasienEnum;
-import java.util.Map;
+import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import java.util.Set;
+import com.jasamedika.medifirst2000.service.*;
-
+import com.jasamedika.medifirst2000.util.CommonUtil;
+import com.jasamedika.medifirst2000.util.DateUtil;
+import com.jasamedika.medifirst2000.util.JsonUtil;
+import com.jasamedika.medifirst2000.util.StringUtil;
+import com.jasamedika.medifirst2000.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.orm.jpa.JpaSystemException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.google.gson.Gson;
+import java.text.ParseException;
-import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
+import java.text.SimpleDateFormat;
-import com.jasamedika.medifirst2000.converter.KelompokPasienConverter;
+import java.util.*;
-import com.jasamedika.medifirst2000.converter.KonsultasiConverter;
-import com.jasamedika.medifirst2000.converter.PasienConverter;
-import com.jasamedika.medifirst2000.converter.PasienDaftarConverter;
-import com.jasamedika.medifirst2000.converter.PegawaiConverter;
-import com.jasamedika.medifirst2000.dao.AlamatDao;
-import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
-import com.jasamedika.medifirst2000.dao.AsalRujukanDao;
-import com.jasamedika.medifirst2000.dao.AsuransiPasienDao;
-import com.jasamedika.medifirst2000.dao.DetailSepDao;
-import com.jasamedika.medifirst2000.dao.DiagnosaDao;
-import com.jasamedika.medifirst2000.dao.DiagnosaPasienDao;
-import com.jasamedika.medifirst2000.dao.DiagnosaTindakanPasienDao;
-import com.jasamedika.medifirst2000.dao.DokumenDao;
-import com.jasamedika.medifirst2000.dao.HargaNettoProdukByKelasDDao;
-import com.jasamedika.medifirst2000.dao.HargaNettoProdukByKelasDao;
-import com.jasamedika.medifirst2000.dao.HasilPemeriksaanDao;
-import com.jasamedika.medifirst2000.dao.JadwalDokterDao;
-import com.jasamedika.medifirst2000.dao.KamarDao;
-import com.jasamedika.medifirst2000.dao.KasusPenyakitDao;
-import com.jasamedika.medifirst2000.dao.KelasDao;
-import com.jasamedika.medifirst2000.dao.KelompokPasienDao;
-import com.jasamedika.medifirst2000.dao.KonsultasiDao;
-import com.jasamedika.medifirst2000.dao.MappingPasienPacsDao;
-import com.jasamedika.medifirst2000.dao.OrderPelayananDao;
-import com.jasamedika.medifirst2000.dao.OrderProdukDao;
-import com.jasamedika.medifirst2000.dao.PapDataTandaVitalDao;
-import com.jasamedika.medifirst2000.dao.PapKeluhanTambahanDao;
-import com.jasamedika.medifirst2000.dao.PapKeluhanUtamaDao;
-import com.jasamedika.medifirst2000.dao.PapTandaVitalDao;
-import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
-import com.jasamedika.medifirst2000.dao.PasienDao;
-import com.jasamedika.medifirst2000.dao.PasienDiRujukKeIntExtDao;
-import com.jasamedika.medifirst2000.dao.PasienInstruksiDao;
-import com.jasamedika.medifirst2000.dao.PasienInstruksiPerjanjianDao;
-import com.jasamedika.medifirst2000.dao.PegawaiDao;
-import com.jasamedika.medifirst2000.dao.PelayananPasienDao;
-import com.jasamedika.medifirst2000.dao.PemakaianAsuransiDao;
-import com.jasamedika.medifirst2000.dao.PersetujuanUmumDao;
-import com.jasamedika.medifirst2000.dao.ProdukDao;
-import com.jasamedika.medifirst2000.dao.RegistrasiPelayananPasienDao;
-import com.jasamedika.medifirst2000.dao.RuanganDao;
-import com.jasamedika.medifirst2000.dao.RunningNumberDao;
-import com.jasamedika.medifirst2000.dao.SoapDao;
-import com.jasamedika.medifirst2000.dao.StrukHasilPemeriksaanDao;
-import com.jasamedika.medifirst2000.dao.StrukKirimDao;
-import com.jasamedika.medifirst2000.dao.StrukOrderDao;
-import com.jasamedika.medifirst2000.dao.StrukPelayananDao;
-import com.jasamedika.medifirst2000.dao.StrukReturDao;
-import com.jasamedika.medifirst2000.dao.SuratPermintaanMasukDao;
-import com.jasamedika.medifirst2000.dao.TempatTidurDao;
-import com.jasamedika.medifirst2000.dao.custom.AntrianPasienDiPeriksaDaoCustom;
-import com.jasamedika.medifirst2000.dto.AntrianPasienGiziDto;
-import com.jasamedika.medifirst2000.dto.RuanganJumlah;
-import com.jasamedika.medifirst2000.entities.Agama;
-import com.jasamedika.medifirst2000.entities.Alamat;
-import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-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.DetailSep;
-import com.jasamedika.medifirst2000.entities.Diagnosa;
-import com.jasamedika.medifirst2000.entities.DiagnosaPasien;
-import com.jasamedika.medifirst2000.entities.Dokumen;
-import com.jasamedika.medifirst2000.entities.GolonganAsuransi;
-import com.jasamedika.medifirst2000.entities.HargaNettoProdukByKelasD;
-import com.jasamedika.medifirst2000.entities.HasilPemeriksaan;
-import com.jasamedika.medifirst2000.entities.HubunganPesertaAsuransi;
-import com.jasamedika.medifirst2000.entities.JadwalDokter;
-import com.jasamedika.medifirst2000.entities.JenisDokumen;
-import com.jasamedika.medifirst2000.entities.JenisKelamin;
-import com.jasamedika.medifirst2000.entities.JenisProduk;
-import com.jasamedika.medifirst2000.entities.Kamar;
-import com.jasamedika.medifirst2000.entities.KasusPenyakit;
-import com.jasamedika.medifirst2000.entities.Kebangsaan;
-import com.jasamedika.medifirst2000.entities.Kecamatan;
-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.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.Pasien;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
-import com.jasamedika.medifirst2000.entities.PasienDiRujukKeIntExt;
-import com.jasamedika.medifirst2000.entities.PasienInstruksiPerjanjianT;
-import com.jasamedika.medifirst2000.entities.Pegawai;
-import com.jasamedika.medifirst2000.entities.Pekerjaan;
-import com.jasamedika.medifirst2000.entities.PelayananPasien;
-import com.jasamedika.medifirst2000.entities.PelayananPasienDetail;
-import com.jasamedika.medifirst2000.entities.PemakaianAsuransi;
-import com.jasamedika.medifirst2000.entities.Pendidikan;
-import com.jasamedika.medifirst2000.entities.Produk;
-import com.jasamedika.medifirst2000.entities.ProdukDetailLaboratorium;
-import com.jasamedika.medifirst2000.entities.ProdukDetailLaboratoriumNilaiNormal;
-import com.jasamedika.medifirst2000.entities.Propinsi;
-import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien;
-import com.jasamedika.medifirst2000.entities.Rekanan;
-import com.jasamedika.medifirst2000.entities.Ruangan;
-import com.jasamedika.medifirst2000.entities.RunningNumber;
-import com.jasamedika.medifirst2000.entities.Soap;
-import com.jasamedika.medifirst2000.entities.StatusBed;
-import com.jasamedika.medifirst2000.entities.StatusKeluar;
-import com.jasamedika.medifirst2000.entities.StatusPerkawinan;
-import com.jasamedika.medifirst2000.entities.StrukHasilPemeriksaan;
-import com.jasamedika.medifirst2000.entities.StrukKirim;
-import com.jasamedika.medifirst2000.entities.StrukOrder;
-import com.jasamedika.medifirst2000.entities.StrukPelayanan;
-import com.jasamedika.medifirst2000.entities.StrukRetur;
-import com.jasamedika.medifirst2000.entities.SuratPermintaanMasuk;
-import com.jasamedika.medifirst2000.entities.TempatTidur;
-import com.jasamedika.medifirst2000.enums.StatusAntrianEnum;
-import com.jasamedika.medifirst2000.enums.StatusPenyakitEnum;
-import com.jasamedika.medifirst2000.enums.TipePasienEnum;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
-import com.jasamedika.medifirst2000.service.AdmisiRencanaPindahRuanganService;
-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.LoginUserService;
-import com.jasamedika.medifirst2000.service.MasukKamarService;
-import com.jasamedika.medifirst2000.service.PasienDaftarService;
-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.JsonUtil;
-import com.jasamedika.medifirst2000.util.StringUtil;
-import com.jasamedika.medifirst2000.vo.AdmisiRencanaPindahRuanganVO;
-import com.jasamedika.medifirst2000.vo.AgamaVO;
-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.DiagnosaVO;
-import com.jasamedika.medifirst2000.vo.DokumenRekamMedisVO;
-import com.jasamedika.medifirst2000.vo.DokumenVO;
-import com.jasamedika.medifirst2000.vo.GolonganAsuransiVO;
-import com.jasamedika.medifirst2000.vo.GridAntrianPasienDiPeriksaVO;
-import com.jasamedika.medifirst2000.vo.HubunganPesertaAsuransiVO;
-import com.jasamedika.medifirst2000.vo.JenisKelaminVO;
-import com.jasamedika.medifirst2000.vo.KamarVO;
-import com.jasamedika.medifirst2000.vo.KasusPenyakitVO;
-import com.jasamedika.medifirst2000.vo.KebangsaanVO;
-import com.jasamedika.medifirst2000.vo.KecamatanVO;
-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.NegaraVO;
-import com.jasamedika.medifirst2000.vo.OrderProdukVO;
-import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
-import com.jasamedika.medifirst2000.vo.PasienVO;
-import com.jasamedika.medifirst2000.vo.PekerjaanVO;
-import com.jasamedika.medifirst2000.vo.PemakaianAsuransiVO;
-import com.jasamedika.medifirst2000.vo.PendidikanVO;
-import com.jasamedika.medifirst2000.vo.PropinsiVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPasienPenunjangVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPasienVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPelayananPasienVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
-import com.jasamedika.medifirst2000.vo.RekananVO;
-import com.jasamedika.medifirst2000.vo.RuanganVO;
-import com.jasamedika.medifirst2000.vo.StatusKeluarVO;
-import com.jasamedika.medifirst2000.vo.StatusPerkawinanVO;
-import com.jasamedika.medifirst2000.vo.StrukKirimVO;
-import com.jasamedika.medifirst2000.vo.StrukOrderVO;
-import com.jasamedika.medifirst2000.vo.StrukReturVO;
-import com.jasamedika.medifirst2000.vo.TempatTidurVO;
 
 /**
  * Implement class for RegistrasiPasienService
@@ -2002,8 +1833,8 @@ public class RegistrasiPelayananServiceImpl extends BaseVoServiceImpl
 					List<ProdukDetailLaboratorium> dataSorting = new ArrayList<ProdukDetailLaboratorium>(data);
 					Collections.sort(dataSorting, new Comparator<ProdukDetailLaboratorium>() {
 						public int compare(ProdukDetailLaboratorium o1, ProdukDetailLaboratorium o2) {
-							String i1 = o1.getqCharDetailPemeriksaan();
+							String i1 = o1.getQCharDetailPemeriksaan();
-							String i2 = o2.getqCharDetailPemeriksaan();
+							String i2 = o2.getQCharDetailPemeriksaan();
 							String i3 = o1.getDetailPemeriksaan();
 							String i4 = o2.getDetailPemeriksaan();
 							int i = i1.compareTo(i2);

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

@@ -66,6 +66,9 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
 	@Autowired
 	private BaseConverterImpl<GolonganPegawaiVO, GolonganPegawai> golonganPegawaiConverter;
 
+	@Autowired
+	private BaseConverterImpl<GolonganPPPKVO, GolonganPPPK> golonganPPPKConverter;
+
 	@Autowired
 	private BaseConverterImpl<AgamaVO, Agama> agamaConverter;
 
@@ -780,6 +783,19 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
 				pegawai.setGolonganPegawai(null);
 			}
 
+			if (CommonUtil.isNotNullOrEmpty(pegawai.getGolonganPPPKId()) && CommonUtil.isNotNullOrEmpty(vo.getGolonganPPPK())) {
+				if (!pegawai.getGolonganPPPKId().equals(vo.getGolonganPPPK().getId())) {
+					pegawai.setGolonganPPPK(golonganPPPKConverter.transferVOToModel(vo.getGolonganPPPK(), new GolonganPPPK()));
+					perubahan += "ubah golongan pppk, ";
+				}
+			} else if (CommonUtil.isNullOrEmpty(pegawai.getGolonganPPPKId()) && CommonUtil.isNotNullOrEmpty(vo.getGolonganPPPK())) {
+				pegawai.setGolonganPPPK(golonganPPPKConverter.transferVOToModel(vo.getGolonganPPPK(), new GolonganPPPK()));
+				perubahan += "golongan pppk, ";
+			} else if (CommonUtil.isNotNullOrEmpty(pegawai.getGolonganPPPKId()) && CommonUtil.isNullOrEmpty(vo.getGolonganPPPK())) {
+				pegawai.setGolonganPPPK(null);
+				perubahan += "hapus golongan pppk, ";
+			}
+
 			if (CommonUtil.isNotNullOrEmpty(pegawai.getEselonId()) && CommonUtil.isNotNullOrEmpty(vo.getEselon())) {
 				if (!pegawai.getEselonId().equals(vo.getEselon().getId())) {
 					pegawai.setEselon(eselonConverter.transferVOToModel(vo.getEselon(), new Eselon()));
@@ -1434,6 +1450,10 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
 				gol.setId(gp.getId());
 				pegawai.setGolongan(gol);
 			}
+			if (CommonUtil.isNotNullOrEmpty(vo.getGolonganPPPK())) {
+				pegawai.setGolonganPPPK(golonganPPPKConverter.transferVOToModel(vo.getGolonganPPPK(), new GolonganPPPK()));
+				perubahan += "golongan pppk, ";
+			}
 			if (CommonUtil.isNotNullOrEmpty(vo.getEselon())) {
 				pegawai.setEselon(eselonConverter.transferVOToModel(vo.getEselon(), new Eselon()));
 				perubahan += "eselon, ";
@@ -2196,6 +2216,12 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
 					golonganPegawaiConverter.transferVOToModel(vo.getGolonganPegawai(), new GolonganPegawai()));
 			perubahan += "golongan, ";
 		}
+		// Golongan PPPK
+		if (CommonUtil.isNotNullOrEmpty(vo.getGolonganPPPK())) {
+			model.setGolonganPPPK(
+					golonganPPPKConverter.transferVOToModel(vo.getGolonganPPPK(), new GolonganPPPK()));
+			perubahan += "golongan pppk, ";
+		}
 		// Jabatan Internal
 		if (CommonUtil.isNotNullOrEmpty(vo.getJabatanInternal())) {
 			model.setJabatanInternal(jabatanConverter.transferVOToModel(vo.getJabatanInternal(), new Jabatan()));
@@ -2553,7 +2579,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
 		if (CommonUtil.isNotNullOrEmpty(model)) {
 			LoginUser loginUser = loginUserService.getLoginUser();
 			model = rekamDataPegawaiDao.findOne(model.getId());
-			if (CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) {
+			if (CommonUtil.isNotNullOrEmpty(loginUser) && CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) {
 				historyDataPegawai.setPetugas(loginUser.getPegawai());
 			}
 
@@ -2650,8 +2676,13 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
 			model.setKedudukan(pegawai.getKedudukan().getName());
 		}
 		// Golongan Pegawai
-		if (CommonUtil.isNotNullOrEmpty(pegawai.getGolongan())) {
+		if (CommonUtil.isNotNullOrEmpty(pegawai.getGolonganPegawai())) {
-			model.setGolongan(pegawai.getGolongan().getName());
+			model.setGolonganPegawai(pegawai.getGolonganPegawai().getGolonganPegawai());
+		}
+
+		// Golongan PPPK
+		if (CommonUtil.isNotNullOrEmpty(pegawai.getGolonganPPPK())) {
+			model.setGolonganPPPK(pegawai.getGolonganPPPK().getNamaGolongan());
 		}
 
 		// Jabatan Internal
@@ -2843,7 +2874,7 @@ public class RekamDataPegawaiServiceImpl extends BaseVoServiceImpl implements Re
 		if (CommonUtil.isNotNullOrEmpty(model)) {
 			LoginUser loginUser = loginUserService.getLoginUser();
 			model = mapPegawaiJabatanToUnitKerjaDao.findOne(model.getId());
-			if (CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) {
+			if (CommonUtil.isNotNullOrEmpty(loginUser) && CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) {
 				historyDataPegawai.setPetugas(loginUser.getPegawai());
 			}
 

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

@@ -1,22 +1,14 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 
-import javax.naming.CommunicationException;
-import javax.persistence.EntityManager;
-
-import org.apache.poi.hssf.record.CommonObjectDataSubRecord;
 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.AntrianPasienDiPeriksaVO;
 import com.jasamedika.medifirst2000.vo.AsalRujukanVO;
@@ -24,7 +16,6 @@ import com.jasamedika.medifirst2000.vo.DetailRencanaOperasiVO;
 import com.jasamedika.medifirst2000.vo.JenisOperasiVO;
 import com.jasamedika.medifirst2000.vo.JenisPetugasPelaksanaVO;
 import com.jasamedika.medifirst2000.vo.KamarVO;
-import com.jasamedika.medifirst2000.vo.LoginUserVO;
 import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
 import com.jasamedika.medifirst2000.vo.PasienVO;
 import com.jasamedika.medifirst2000.vo.PegawaiVO;
@@ -35,11 +26,9 @@ import com.jasamedika.medifirst2000.entities.DetailRencanaOperasi;
 import com.jasamedika.medifirst2000.entities.JenisOperasi;
 import com.jasamedika.medifirst2000.entities.JenisPetugasPelaksana;
 import com.jasamedika.medifirst2000.entities.Kamar;
-import com.jasamedika.medifirst2000.entities.LoginUser;
 import com.jasamedika.medifirst2000.entities.Pasien;
 import com.jasamedika.medifirst2000.entities.PasienDaftar;
 import com.jasamedika.medifirst2000.entities.Pegawai;
-import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.AntrianPasienDiPeriksaService;
 import com.jasamedika.medifirst2000.service.RencanaOperasiService;
 import com.jasamedika.medifirst2000.service.StrukOrderService;
@@ -48,20 +37,15 @@ import com.jasamedika.medifirst2000.util.JsonUtil;
 import com.jasamedika.medifirst2000.entities.RencanaOperasi;
 import com.jasamedika.medifirst2000.entities.Ruangan;
 import com.jasamedika.medifirst2000.entities.StrukOrder;
-import com.jasamedika.medifirst2000.entities.responterhadapoperasi;
-import com.jasamedika.medifirst2000.enums.StatusAntrianEnum;
 import com.jasamedika.medifirst2000.vo.RencanaOperasiVO;
 import com.jasamedika.medifirst2000.vo.RuanganVO;
 import com.jasamedika.medifirst2000.vo.StrukOrderVO;
-import com.jasamedika.medifirst2000.vo.rujukanVO;
 //import com.jasamedika.medifirst2000.converter.AsalRujukanConverter;
 import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
-import com.jasamedika.medifirst2000.converter.KelasConverter;
 import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
 import com.jasamedika.medifirst2000.dao.DetailRencanaOperasiDao;
 import com.jasamedika.medifirst2000.dao.RencanaOperasiDao;
 import com.jasamedika.medifirst2000.dao.StrukOrderDao;
-import com.jasamedika.medifirst2000.dto.AntrianPasien;
 
 /**
  * Implement class for RencanaOperasiService
@@ -143,13 +127,15 @@ public class RencanaOperasiServiceImpl extends BaseVoServiceImpl implements Renc
 			DetailRencanaOperasi modelItem = new DetailRencanaOperasi();
 			modelItem = detailRencanaOperasiConverter.transferVOToModel(item, modelItem);
 			modelItem.setRencanaOperasi(resultDomain);
-			/*if (CommonUtil.isNotNullOrEmpty(item.getPegawai())) {
+			/*
-				modelItem.setPegawai(pegawaiConverter.transferVOToModel(item.getPegawai(), new Pegawai()));
+			 * if (CommonUtil.isNotNullOrEmpty(item.getPegawai())) {
-			}
+			 * modelItem.setPegawai(pegawaiConverter.transferVOToModel(item.
-			if (CommonUtil.isNotNullOrEmpty(item.getJenisPelaksana())) {
+			 * getPegawai(), new Pegawai())); } if
-				modelItem.setJenisPelaksana(jenisPetugasPelaksanaConverter.transferVOToModel(item.getJenisPelaksana(),
+			 * (CommonUtil.isNotNullOrEmpty(item.getJenisPelaksana())) {
-						new JenisPetugasPelaksana()));
+			 * modelItem.setJenisPelaksana(jenisPetugasPelaksanaConverter.
-			}*/
+			 * transferVOToModel(item.getJenisPelaksana(), new
+			 * JenisPetugasPelaksana())); }
+			 */
 
 			DetailRencanaOperasi resultDomainItem = detailRencanaOperasiDao.save(modelItem);
 			if (CommonUtil.isNotNullOrEmpty(resultDomain)) {
@@ -176,39 +162,42 @@ public class RencanaOperasiServiceImpl extends BaseVoServiceImpl implements Renc
 
 		Map<String, Object> result = new HashMap<String, Object>();
 		Map<String, Object> data = new HashMap<String, Object>();
-		if(CommonUtil.isNotNullOrEmpty(vo))
+		if (CommonUtil.isNotNullOrEmpty(vo)) {
-		{
 			RencanaOperasiVO temp = vo.getRencanaOperasi();
 			RencanaOperasi model = rencanaOperasiDao.findRencanaOperasiByNorec(vo.getStrukOrder().getNoRec());
 
-			if(CommonUtil.isNotNullOrEmpty(model) && CommonUtil.isNullOrEmpty(model.getTglOperasi()))
+			if (CommonUtil.isNotNullOrEmpty(model) && CommonUtil.isNullOrEmpty(model.getTglOperasi())) {
-			{
 				model.setTglRencana(vo.getRencanaOperasi().getTglRencana());
-				/*if (CommonUtil.isNotNullOrEmpty(vo.getRencanaOperasi().getKamar())) {
+				/*
-					model.setKamar(kamarConverter.transferVOToModel(vo.getRencanaOperasi().getKamar(), new Kamar()));
+				 * if
-				}*/
+				 * (CommonUtil.isNotNullOrEmpty(vo.getRencanaOperasi().getKamar(
-				/*if (CommonUtil.isNotNullOrEmpty(vo.getRencanaOperasi().getJenisOperasi())) {
+				 * ))) { model.setKamar(kamarConverter.transferVOToModel(vo.
-					model.setJenisOperasi(jenisOperasiConverter.transferVOToModel(vo.getRencanaOperasi().getJenisOperasi(), new JenisOperasi()));
+				 * getRencanaOperasi().getKamar(), new Kamar())); }
-				}*/
+				 */
+				/*
+				 * if (CommonUtil.isNotNullOrEmpty(vo.getRencanaOperasi().
+				 * getJenisOperasi())) {
+				 * model.setJenisOperasi(jenisOperasiConverter.transferVOToModel
+				 * (vo.getRencanaOperasi().getJenisOperasi(), new
+				 * JenisOperasi())); }
+				 */
 				Set<DetailRencanaOperasi> listDetailRencanaOperasi = new HashSet<DetailRencanaOperasi>();
 
 				for (DetailRencanaOperasiVO item : vo.getRencanaOperasi().getDetailPelaksana()) {
 
-					for(PegawaiVO pegawai : item.getPegawaiList())
+					for (PegawaiVO pegawai : item.getPegawaiList()) {
-					{
 						DetailRencanaOperasi modelItem = new DetailRencanaOperasi();
-						modelItem = detailRencanaOperasiConverter.transferVOToModel(item,  modelItem);
+						modelItem = detailRencanaOperasiConverter.transferVOToModel(item, modelItem);
 						modelItem.setRencanaOperasi(model);
 						if (CommonUtil.isNotNullOrEmpty(pegawai)) {
 							modelItem.setPegawai(pegawaiConverter.transferVOToModel(pegawai, new Pegawai()));
 
 						}
 						if (CommonUtil.isNotNullOrEmpty(item.getJenisPelaksana())) {
-							modelItem.setJenisPelaksana(jenisPetugasPelaksanaConverter.transferVOToModel(item.getJenisPelaksana(),
+							modelItem.setJenisPelaksana(jenisPetugasPelaksanaConverter
-									new JenisPetugasPelaksana()));
+									.transferVOToModel(item.getJenisPelaksana(), new JenisPetugasPelaksana()));
 						}
-						if(CommonUtil.isNotNullOrEmpty(item.getRuangan()))
+						if (CommonUtil.isNotNullOrEmpty(item.getRuangan())) {
-						{
 							modelItem.setRuangan(ruanganConverter.transferVOToModel(item.getRuangan(), new Ruangan()));
 						}
 						model.getDetailPelaksana().clear();
@@ -216,8 +205,7 @@ public class RencanaOperasiServiceImpl extends BaseVoServiceImpl implements Renc
 					}
 				}
 				model.setDetailPelaksana(listDetailRencanaOperasi);
-				if(CommonUtil.isNotNullOrEmpty(model))
+				if (CommonUtil.isNotNullOrEmpty(model)) {
-				{
 					RencanaOperasi resultDomain = rencanaOperasiDao.save(model);
 					if (CommonUtil.isNotNullOrEmpty(resultDomain)) {
 						result.put("noRec", resultDomain.getNoRec());
@@ -230,7 +218,6 @@ public class RencanaOperasiServiceImpl extends BaseVoServiceImpl implements Renc
 		return result;
 	}
 
-	
 	@Override
 	public Map<String, Object> savePermintaanOperasi(RencanaOperasiCustomVO vox) {
 		Map<String, Object> result = new HashMap<String, Object>();
@@ -238,13 +225,11 @@ public class RencanaOperasiServiceImpl extends BaseVoServiceImpl implements Renc
 		StrukOrder strukOrder = new StrukOrder();
 		RencanaOperasiVO vo = vox.getRencanaOperasi();
 		StrukOrderVO strukOrderVO = vox.getStrukOrder();
-		if(CommonUtil.isNotNullOrEmpty(vox))
+		if (CommonUtil.isNotNullOrEmpty(vox)) {
-		{
 
-			if(CommonUtil.isNotNullOrEmpty(strukOrderVO))
+			if (CommonUtil.isNotNullOrEmpty(strukOrderVO)) {
-			{
 				strukOrder = strukOrderConverter.transferVOToModel(strukOrderVO, new StrukOrder());
-				strukOrder.setIsDelivered((byte)1);
+				strukOrder.setIsDelivered((byte) 1);
 				String noOrder = strukOrderService.formatNoUrut("Struk Order", "STO");
 				String noOrderIntern = strukOrderService.formatNoUrut("Struk Order Operasi", "OK");
 				strukOrder.setNoOrder(noOrder);
@@ -257,43 +242,43 @@ public class RencanaOperasiServiceImpl extends BaseVoServiceImpl implements Renc
 				strukOrder.setTotalHarusDibayar(0.0);
 				strukOrder.setTotalPph(0.0);
 				strukOrder.setTotalPpn(0.0);
-				if(CommonUtil.isNotNullOrEmpty(strukOrderVO.getNoCm()))
+				if (CommonUtil.isNotNullOrEmpty(strukOrderVO.getNoCm())) {
-				{
 					strukOrder.setNoCm(pasienConverter.transferVOToModel(strukOrderVO.getNoCm(), new Pasien()));
 				}
-				if(CommonUtil.isNotNullOrEmpty(strukOrderVO.getNoRegistrasi()))
+				if (CommonUtil.isNotNullOrEmpty(strukOrderVO.getNoRegistrasi())) {
-				{
+					strukOrder.setNoRegistrasi(pasienDaftarConverter.transferVOToModel(strukOrderVO.getNoRegistrasi(),
-					strukOrder.setNoRegistrasi(pasienDaftarConverter.transferVOToModel(strukOrderVO.getNoRegistrasi(), new PasienDaftar()));
+							new PasienDaftar()));
 				}
 				if (CommonUtil.isNotNullOrEmpty(strukOrderVO.getPegawaiOrder())) {
-					strukOrder.setPegawaiOrder(pegawaiConverter.transferVOToModel(strukOrderVO.getPegawaiOrder(), new Pegawai()));
+					strukOrder.setPegawaiOrder(
+							pegawaiConverter.transferVOToModel(strukOrderVO.getPegawaiOrder(), new Pegawai()));
 				}
 				if (CommonUtil.isNotNullOrEmpty(strukOrderVO.getRuangan())) {
 					strukOrder.setRuangan(ruanganConverter.transferVOToModel(strukOrderVO.getRuangan(), new Ruangan()));
 				}
 				if (CommonUtil.isNotNullOrEmpty(strukOrderVO.getRuanganTujuan())) {
-					strukOrder.setRuanganTujuan(ruanganConverter.transferVOToModel(strukOrderVO.getRuangan(), new Ruangan()));
+					strukOrder.setRuanganTujuan(
+							ruanganConverter.transferVOToModel(strukOrderVO.getRuangan(), new Ruangan()));
 				}
 			}
-			if(CommonUtil.isNotNullOrEmpty(vo)){
+			if (CommonUtil.isNotNullOrEmpty(vo)) {
 				Set<RencanaOperasi> rencanaOperasiSet = new HashSet<>();
-				if(CommonUtil.isNotNullOrEmpty(vo.getStrukOrder().getRencanaOperasi())){
+				if (CommonUtil.isNotNullOrEmpty(vo.getStrukOrder().getRencanaOperasi())) {
 
 					model = rencanaOperasiConverter.transferVOToModel(vo, model);
 					if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
 						model.setStrukOrder(strukOrder);
 					}
-					if(CommonUtil.isNotNullOrEmpty(model)) {
+					if (CommonUtil.isNotNullOrEmpty(model)) {
 						rencanaOperasiSet.add(model);
 					}
 				}
-				if(CommonUtil.isNotNullOrEmpty(rencanaOperasiSet)) {
+				if (CommonUtil.isNotNullOrEmpty(rencanaOperasiSet)) {
 					strukOrder.setRencanaOperasi(rencanaOperasiSet);
 				}
 			}
 
-			if(CommonUtil.isNotNullOrEmpty(strukOrder))
+			if (CommonUtil.isNotNullOrEmpty(strukOrder)) {
-			{
 				StrukOrder resultDomain = strukOrderDao.save(strukOrder);
 				if (CommonUtil.isNotNullOrEmpty(resultDomain)) {
 					result.put("noRec", resultDomain.getNoRec());
@@ -309,45 +294,48 @@ public class RencanaOperasiServiceImpl extends BaseVoServiceImpl implements Renc
 		Map<String, Object> result = new HashMap<String, Object>();
 		AntrianPasienDiPeriksa antrianPasienDiPeriksa = new AntrianPasienDiPeriksa();
 
-		if(CommonUtil.isNotNullOrEmpty(vo.getStrukOrder())) {
+		if (CommonUtil.isNotNullOrEmpty(vo.getStrukOrder())) {
 			RencanaOperasi rencanaOperasi = rencanaOperasiDao.findRencanaOperasiByNorec(vo.getStrukOrder().getNoRec());
 
 			StrukOrder strukOrder = strukOrderDao.findByNoRec(vo.getStrukOrder().getNoRec());
 
 			Map<String, Object> antrian = antrianPasienDiPeriksaDao.findAntrianByNoRec(vo.getNoCm().getNoRec());
 
-			//noRec: 2c90e38f5f34cc89015f34da5eea0004
+			// noRec: 2c90e38f5f34cc89015f34da5eea0004
-			AntrianPasienDiPeriksa antrianPasienSebelumnya =  rencanaOperasiDao.getAntrianSebelumnyaByNoRec((String) antrian.get("noRecPasienDaftar"));
+			AntrianPasienDiPeriksa antrianPasienSebelumnya = rencanaOperasiDao
+					.getAntrianSebelumnyaByNoRec((String) antrian.get("noRecPasienDaftar"));
 
-			if(CommonUtil.isNotNullOrEmpty(vo.getTglOperasi())) {
+			if (CommonUtil.isNotNullOrEmpty(vo.getTglOperasi())) {
 				rencanaOperasi.setTglOperasi(vo.getTglOperasi());
 			}
 
 			RencanaOperasi resultdata = rencanaOperasiDao.save(rencanaOperasi);
 
-			if(CommonUtil.isNotNullOrEmpty(vo.getNoCm().getNoRec())) {
+			if (CommonUtil.isNotNullOrEmpty(vo.getNoCm().getNoRec())) {
-				antrianPasienDiPeriksa.setNoRec((String)antrian.get("noRec"));
+				antrianPasienDiPeriksa.setNoRec((String) antrian.get("noRec"));
-				antrianPasienDiPeriksa.setNoAntrian(antrianPasienDiPeriksaService.getFormatNumberByMonthYearRuangan(
+				antrianPasienDiPeriksa.setNoAntrian(antrianPasienDiPeriksaService
-						vo.getTglOperasi(), strukOrder.getRuanganTujuan().getId()));
+						.getFormatNumberByMonthYearRuangan(vo.getTglOperasi(), strukOrder.getRuanganTujuan().getId()));
-				antrianPasienDiPeriksa.setTglRegistrasi((Date)antrian.get("tglRegistrasi"));
+				antrianPasienDiPeriksa.setTglRegistrasi((Date) antrian.get("tglRegistrasi"));
 
-				if(CommonUtil.isNotNullOrEmpty(antrian.get("statusPasien"))) {
+				if (CommonUtil.isNotNullOrEmpty(antrian.get("statusPasien"))) {
-					antrianPasienDiPeriksa.setStatusPasien((byte)antrian.get("statusPasien"));
+					antrianPasienDiPeriksa.setStatusPasien((byte) antrian.get("statusPasien"));
 				}
-				if(CommonUtil.isNotNullOrEmpty(antrian.get("statusAntrian"))){
+				if (CommonUtil.isNotNullOrEmpty(antrian.get("statusAntrian"))) {
-					antrianPasienDiPeriksa.setStatusAntrian((String)antrian.get("statusAntrian"));
+					antrianPasienDiPeriksa.setStatusAntrian((String) antrian.get("statusAntrian"));
 				}
 
-				antrianPasienDiPeriksa.setAsalRujukan(asalRujukanConverter.transferVOToModel(vo.getAsalRujukan(), new AsalRujukan()));
+				antrianPasienDiPeriksa
+						.setAsalRujukan(asalRujukanConverter.transferVOToModel(vo.getAsalRujukan(), new AsalRujukan()));
 				antrianPasienDiPeriksa.setPasienDaftar(strukOrder.getNoRegistrasi());
 				antrianPasienDiPeriksa.setKelas(antrianPasienSebelumnya.getKelas());
-				antrianPasienDiPeriksa.setPegawai(pegawaiConverter.transferVOToModel(vo.getStrukOrder().getPegawaiOrder(), strukOrder.getPegawaiOrder()));
+				antrianPasienDiPeriksa.setPegawai(pegawaiConverter
+						.transferVOToModel(vo.getStrukOrder().getPegawaiOrder(), strukOrder.getPegawaiOrder()));
 				antrianPasienDiPeriksa.setRuangan(ruanganConverter.transferVOToModel(vo.getRuangan(), new Ruangan()));
 				antrianPasienDiPeriksa.setStrukOrder(strukOrder);
 
 				AntrianPasienDiPeriksa resultAntrian = antrianPasienDiPeriksaDao.save(antrianPasienDiPeriksa);
 
-				if(CommonUtil.isNotNullOrEmpty(resultAntrian)) {
+				if (CommonUtil.isNotNullOrEmpty(resultAntrian)) {
 					result.put("noRec", resultAntrian.getNoRec());
 				}
 
@@ -359,7 +347,6 @@ public class RencanaOperasiServiceImpl extends BaseVoServiceImpl implements Renc
 
 	}
 
-	
 	@Override
 	public List<Map<String, Object>> getRencanaOperasi(String noRec) {
 		List<Map<String, Object>> result = rencanaOperasiDao.findRencanaOperasi(noRec);
@@ -369,15 +356,20 @@ public class RencanaOperasiServiceImpl extends BaseVoServiceImpl implements Renc
 	@Override
 	public Map<String, Object> savePembatalanOperasi(RencanaOperasiVO vo) {
 		Map<String, Object> result = new HashMap<String, Object>();
-		RencanaOperasi rencanaOperasi = rencanaOperasiDao.findByNorec(vo.getNoRec());//get Rencana operasi where tglOperasi is null
+		RencanaOperasi rencanaOperasi = rencanaOperasiDao.findByNorec(vo.getNoRec());// get
-		if(CommonUtil.isNotNullOrEmpty(rencanaOperasi))
+																						// Rencana
-		{
+																						// operasi
+																						// where
+																						// tglOperasi
+																						// is
+																						// null
+		if (CommonUtil.isNotNullOrEmpty(rencanaOperasi)) {
 			rencanaOperasi.setStatusBatal(vo.getStatusBatal());
 			rencanaOperasi.setKeterangan(vo.getKeterangan());
-			rencanaOperasi.setPegawaiYangMembatalkan(pegawaiConverter.transferVOToModel(vo.getPegawaiYangMembatalkan(), new Pegawai()));
+			rencanaOperasi.setPegawaiYangMembatalkan(
+					pegawaiConverter.transferVOToModel(vo.getPegawaiYangMembatalkan(), new Pegawai()));
 			RencanaOperasi model = rencanaOperasiDao.save(rencanaOperasi);
-			if(CommonUtil.isNotNullOrEmpty(model))
+			if (CommonUtil.isNotNullOrEmpty(model)) {
-			{
 				result.put("noRec", model.getNoRec());
 			}
 		}
@@ -399,7 +391,8 @@ public class RencanaOperasiServiceImpl extends BaseVoServiceImpl implements Renc
 
 	@Override
 	public List<Map<String, Object>> getPermintaanOperasi(String startDate, String endDate, String noCm) {
-		List<Map<String, Object>> result = rencanaOperasiDao.findPermintaanOperasiByNocmAndDate(startDate, endDate, noCm);
+		List<Map<String, Object>> result = rencanaOperasiDao.findPermintaanOperasiByNocmAndDate(startDate, endDate,
+				noCm);
 		return result;
 	}
 
@@ -421,5 +414,4 @@ public class RencanaOperasiServiceImpl extends BaseVoServiceImpl implements Renc
 		return result;
 	}
 
-	
 }

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

@@ -1,41 +1,29 @@
 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.converter.SignInOperationConverter;
-import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
+import com.jasamedika.medifirst2000.dao.*;
-import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
+import com.jasamedika.medifirst2000.entities.*;
-import com.jasamedika.medifirst2000.dao.PengobatanKhususSiginDao;
-import com.jasamedika.medifirst2000.dao.SignInOperationDao;
-import com.jasamedika.medifirst2000.dao.SignInOperationDetailDao;
-import com.jasamedika.medifirst2000.dao.SignInOperationDetailQuisionerDao;
-import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.KonfirmasiSignIn;
-import com.jasamedika.medifirst2000.entities.PengobatanKhususSignIn;
-import com.jasamedika.medifirst2000.entities.SignInOperation;
-import com.jasamedika.medifirst2000.entities.SignInOperationDetail;
-import com.jasamedika.medifirst2000.entities.SignInOperationDetailQuisioner;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.SignInOperationService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
 import com.jasamedika.medifirst2000.vo.SignInOperationDetailQuisionerVO;
 import com.jasamedika.medifirst2000.vo.SignInOperationDetailVO;
 import com.jasamedika.medifirst2000.vo.SignInOperationVO;
+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;
 
 
 /**
  * Implement class for PasienService
  * 
  * @author Roberto
- * @param <T>
  */
 @Service("SignInOperationService")
 public class SignInOperationServiceImpl implements SignInOperationService{
@@ -90,7 +78,7 @@ public class SignInOperationServiceImpl implements SignInOperationService{
 					PengobatanKhususSignIn pengobatanKhususItem = new PengobatanKhususSignIn();
 					pengobatanKhususItem.setId(quisioner.getPengobatanKhusus().getId());
 					operationDetailQuisioner.setPengobatanKhusus(pengobatanKhususItem);
-					operationDetailQuisioner.setSignIn(model);
+					operationDetailQuisioner.setSignInOperation(model);
 					operationDetailQuisioner.setNoRec(quisioner.getNoRec());
 					operationDetailQuisioner.setValue(quisioner.getValue());	
 					operationDetailQuisioner.setStatusEnabled(quisioner.getStatusEnabled());

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

@@ -1,29 +1,25 @@
 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.vo.StatusMandiriVO;
-import com.jasamedika.medifirst2000.entities.StatusMandiri;
-
-
-import com.jasamedika.medifirst2000.service.StatusKemandirianService;
-import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.entities.StatusKemandirian;
-import com.jasamedika.medifirst2000.vo.StatusKemandirianVO;
 import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
 import com.jasamedika.medifirst2000.dao.AntrianPasienDiPeriksaDao;
 import com.jasamedika.medifirst2000.dao.PasienDaftarDao;
 import com.jasamedika.medifirst2000.dao.StatusKemandirianDao;
+import com.jasamedika.medifirst2000.entities.StatusKemandirian;
+import com.jasamedika.medifirst2000.entities.StatusMandiri;
+import com.jasamedika.medifirst2000.service.StatusKemandirianService;
+import com.jasamedika.medifirst2000.util.CommonUtil;
+import com.jasamedika.medifirst2000.vo.StatusKemandirianVO;
+import com.jasamedika.medifirst2000.vo.StatusMandiriVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Implement class for StatusKemandirianService
  * 
  * @author Generator
- * @param <T>
  */
 @Service("statusKemandirianService")
 public class StatusKemandirianServiceImpl extends BaseVoServiceImpl implements StatusKemandirianService 
@@ -80,23 +76,23 @@ public class StatusKemandirianServiceImpl extends BaseVoServiceImpl implements S
 		}
 		if (CommonUtil.isNotNullOrEmpty(vo.gethPWajahRambutTangan()))
 		{
-				model.sethPWajahRambutTangan(statusMandiriConverter.transferVOToModel(vo.gethPWajahRambutTangan(), new StatusMandiri()));
+				model.setHPWajahRambutTangan(statusMandiriConverter.transferVOToModel(vo.gethPWajahRambutTangan(), new StatusMandiri()));
 		}
 		if (CommonUtil.isNotNullOrEmpty(vo.gethPBatangTubuhDanPerineum()))
 		{
-				model.sethPBatangTubuhDanPerineum(statusMandiriConverter.transferVOToModel(vo.gethPBatangTubuhDanPerineum(), new StatusMandiri()));
+				model.setHPBatangTubuhDanPerineum(statusMandiriConverter.transferVOToModel(vo.gethPBatangTubuhDanPerineum(), new StatusMandiri()));
 		}
 		if (CommonUtil.isNotNullOrEmpty(vo.gethPEkstremitasBawah()))
 		{
-				model.sethPEkstremitasBawah(statusMandiriConverter.transferVOToModel(vo.gethPEkstremitasBawah(), new StatusMandiri()));
+				model.setHPEkstremitasBawah(statusMandiriConverter.transferVOToModel(vo.gethPEkstremitasBawah(), new StatusMandiri()));
 		}
 		if (CommonUtil.isNotNullOrEmpty(vo.gethPTraktusDigestivus()))
 		{
-				model.sethPTraktusDigestivus(statusMandiriConverter.transferVOToModel(vo.gethPTraktusDigestivus(), new StatusMandiri()));
+				model.setHPTraktusDigestivus(statusMandiriConverter.transferVOToModel(vo.gethPTraktusDigestivus(), new StatusMandiri()));
 		}
 		if (CommonUtil.isNotNullOrEmpty(vo.gethPTraktusUrinarius()))
 		{
-				model.sethPTraktusUrinarius(statusMandiriConverter.transferVOToModel(vo.gethPTraktusUrinarius(), new StatusMandiri()));
+				model.setHPTraktusUrinarius(statusMandiriConverter.transferVOToModel(vo.gethPTraktusUrinarius(), new StatusMandiri()));
 		}		
 
 		StatusKemandirian resultDomain = statusKemandirianDao.save(model);

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

@@ -1,40 +1,20 @@
 package com.jasamedika.medifirst2000.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.apache.commons.collections.IteratorUtils;
-import org.hibernate.Hibernate;
-import org.hibernate.proxy.HibernateProxy;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
 import com.jasamedika.medifirst2000.dao.ResultSurveiDao;
 import com.jasamedika.medifirst2000.dao.ResultSurveiDetailDao;
-import com.jasamedika.medifirst2000.entities.Pasien;
-import com.jasamedika.medifirst2000.vo.ModelVO;
-import com.jasamedika.medifirst2000.vo.ModelVO;
-import com.jasamedika.medifirst2000.entities.PurchasedTest;
 import com.jasamedika.medifirst2000.entities.ResultSurvei;
 import com.jasamedika.medifirst2000.entities.ResultSurveiDetail;
 import com.jasamedika.medifirst2000.entities.SurveiDetail;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.SurveiService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPasienGawatDaruratVO;
 import com.jasamedika.medifirst2000.vo.ResultSurveiVO;
+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 java.util.*;
 /**
  * Implement class for PasienService
  * 

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

@@ -1,76 +1,18 @@
 package com.jasamedika.medifirst2000.service.impl;
 
 
-import java.util.Date;
-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;
-
 import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
 import com.jasamedika.medifirst2000.dao.TransferPasienExsternalDao;
 import com.jasamedika.medifirst2000.dao.TransferPasienInternalDao;
-import com.jasamedika.medifirst2000.entities.Alergi;
+import com.jasamedika.medifirst2000.entities.*;
-import com.jasamedika.medifirst2000.entities.AntrianPasienDiPeriksa;
-import com.jasamedika.medifirst2000.entities.DetailDiagnosaSekunder;
-import com.jasamedika.medifirst2000.entities.DetailInformasiMedis;
-import com.jasamedika.medifirst2000.entities.Diagnosa;
-import com.jasamedika.medifirst2000.entities.Fasilitas;
-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.PapTandaVital;
-import com.jasamedika.medifirst2000.entities.PasienDaftar;
-import com.jasamedika.medifirst2000.entities.Pegawai;
-import com.jasamedika.medifirst2000.entities.Peralatan;
-import com.jasamedika.medifirst2000.entities.PeralatanDetail;
-import com.jasamedika.medifirst2000.entities.PetugasPendampingDetail;
-import com.jasamedika.medifirst2000.entities.Produk;
-import com.jasamedika.medifirst2000.entities.ResikoJatuh;
-import com.jasamedika.medifirst2000.entities.Ruangan;
-import com.jasamedika.medifirst2000.entities.StatusKemandirian;
-import com.jasamedika.medifirst2000.entities.StatusMandiri;
-import com.jasamedika.medifirst2000.entities.StatusPsikologis;
-import com.jasamedika.medifirst2000.entities.StatusYaTidak;
-import com.jasamedika.medifirst2000.entities.Tenaga;
-import com.jasamedika.medifirst2000.entities.TerapiSaatPindahDetail;
-import com.jasamedika.medifirst2000.entities.TransferPasienExsternal;
-import com.jasamedika.medifirst2000.entities.TransferPasienInternal;
 import com.jasamedika.medifirst2000.service.StatusKemandirianService;
 import com.jasamedika.medifirst2000.service.TransferPasienInternalService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
-import com.jasamedika.medifirst2000.vo.AlergiVO;
+import com.jasamedika.medifirst2000.vo.*;
-import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
+import org.springframework.beans.factory.annotation.Autowired;
-import com.jasamedika.medifirst2000.vo.DetailDiagnosaSekunderVO;
+import org.springframework.stereotype.Service;
-import com.jasamedika.medifirst2000.vo.DetailInformasiMedisVO;
+
-import com.jasamedika.medifirst2000.vo.DiagnosaVO;
+import java.util.*;
-import com.jasamedika.medifirst2000.vo.FasilitasVO;
-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.PapTandaVitalVO;
-import com.jasamedika.medifirst2000.vo.PasienDaftarVO;
-import com.jasamedika.medifirst2000.vo.PegawaiVO;
-import com.jasamedika.medifirst2000.vo.PeralatanDetailVO;
-import com.jasamedika.medifirst2000.vo.PeralatanVO;
-import com.jasamedika.medifirst2000.vo.PetugasPendampingDetailVO;
-import com.jasamedika.medifirst2000.vo.ProdukVO;
-import com.jasamedika.medifirst2000.vo.ResikoJatuhVO;
-import com.jasamedika.medifirst2000.vo.RuanganVO;
-import com.jasamedika.medifirst2000.vo.StatusKemandirianVO;
-import com.jasamedika.medifirst2000.vo.StatusMandiriVO;
-import com.jasamedika.medifirst2000.vo.StatusPsikologisVO;
-import com.jasamedika.medifirst2000.vo.StatusYaTidakVO;
-import com.jasamedika.medifirst2000.vo.TenagaVO;
-import com.jasamedika.medifirst2000.vo.TerapiSaatPindahDetailVO;
-import com.jasamedika.medifirst2000.vo.TransferPasienExsternalVO;
-import com.jasamedika.medifirst2000.vo.TransferPasienInternalVO;
 
 
 /**
@@ -324,23 +266,23 @@ public class TransferPasienInternalServiceImpl extends BaseVoServiceImpl impleme
 			}
 			if (CommonUtil.isNotNullOrEmpty(statusKemandirianVO.gethPWajahRambutTangan()))
 			{
-					model.sethPWajahRambutTangan(statusMandiriConverter.transferVOToModel(statusKemandirianVO.gethPWajahRambutTangan(), new StatusMandiri()));
+					model.setHPWajahRambutTangan(statusMandiriConverter.transferVOToModel(statusKemandirianVO.gethPWajahRambutTangan(), new StatusMandiri()));
 			}
 			if (CommonUtil.isNotNullOrEmpty(statusKemandirianVO.gethPBatangTubuhDanPerineum()))
 			{
-					model.sethPBatangTubuhDanPerineum(statusMandiriConverter.transferVOToModel(statusKemandirianVO.gethPBatangTubuhDanPerineum(), new StatusMandiri()));
+					model.setHPBatangTubuhDanPerineum(statusMandiriConverter.transferVOToModel(statusKemandirianVO.gethPBatangTubuhDanPerineum(), new StatusMandiri()));
 			}
 			if (CommonUtil.isNotNullOrEmpty(statusKemandirianVO.gethPEkstremitasBawah()))
 			{
-					model.sethPEkstremitasBawah(statusMandiriConverter.transferVOToModel(statusKemandirianVO.gethPEkstremitasBawah(), new StatusMandiri()));
+					model.setHPEkstremitasBawah(statusMandiriConverter.transferVOToModel(statusKemandirianVO.gethPEkstremitasBawah(), new StatusMandiri()));
 			}
 			if (CommonUtil.isNotNullOrEmpty(statusKemandirianVO.gethPTraktusDigestivus()))
 			{
-					model.sethPTraktusDigestivus(statusMandiriConverter.transferVOToModel(statusKemandirianVO.gethPTraktusDigestivus(), new StatusMandiri()));
+					model.setHPTraktusDigestivus(statusMandiriConverter.transferVOToModel(statusKemandirianVO.gethPTraktusDigestivus(), new StatusMandiri()));
 			}
 			if (CommonUtil.isNotNullOrEmpty(statusKemandirianVO.gethPTraktusUrinarius()))
 			{
-					model.sethPTraktusUrinarius(statusMandiriConverter.transferVOToModel(statusKemandirianVO.gethPTraktusUrinarius(), new StatusMandiri()));
+					model.setHPTraktusUrinarius(statusMandiriConverter.transferVOToModel(statusKemandirianVO.gethPTraktusUrinarius(), new StatusMandiri()));
 			}		
 			model.setTransferPasienInternal(transferPasienInternal);
 			transferPasienInternal.setStatusKemandirian(model);

jasamedika-config/src/main/resources/com/jasamedika/medifirst2000/purchasedTest.hbm.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<!-- Generated 26 April 2011 11:37:37 AM by Hibernate Tools 3.4.0.CR1 -->
-<hibernate-mapping>
-	<class name="com.jasamedika.medifirst2000.entities.PurchasedTest" table="tests_purchased">
-
-		<composite-id >
-			<key-property name="testId" column="TEST_ID" />
-			<key-property name="customerId" column="CUSTOMER_ID" />
-		</composite-id>
-
-		<property name="purchaseDate" type="timestamp">
-			<column name="created_date" not-null="true" />			
-		</property>
-
-	</class>
-</hibernate-mapping>

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

@@ -1,5 +1,6 @@
-package com.jasamedika.medifirst2000.entities;
+package com.jasamedika.medifirst2000.dto;
 
+import com.jasamedika.medifirst2000.entities.Produk;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

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

@@ -1,6 +1,5 @@
 package com.jasamedika.medifirst2000.dto;
 
-import com.jasamedika.medifirst2000.entities.ProdukDto;
 import com.jasamedika.medifirst2000.entities.constant.TipePaket;
 import com.jasamedika.medifirst2000.helper.Caption;
 import lombok.AllArgsConstructor;

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

@@ -0,0 +1,34 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseActive;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.validator.constraints.NotBlank;
+
+import javax.persistence.*;
+import javax.validation.constraints.Size;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 2/21/2025
+ */
+@Getter
+@Setter
+@Entity
+@Table(schema = "public", name = "sdm_pppk_golongan_m")
+public class GolonganPPPK extends BaseActive {
+
+	@Id
+	@GeneratedValue(generator = "UUID")
+	@GenericGenerator(name = "UUID", strategy = "uuid")
+	@Column(columnDefinition = "char(36)", updatable = false, nullable = false)
+	private String id;
+
+	@Size(max = 10, message = "Nama golongan maksimal {max} karakter")
+	@NotBlank(message = "Kode golongan tidak boleh kosong")
+	@Column(length = 10, nullable = false)
+	private String namaGolongan;
+
+}

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

@@ -0,0 +1,36 @@
+package com.jasamedika.medifirst2000.entities;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.persistence.Embeddable;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import java.io.Serializable;
+
+import static javax.persistence.FetchType.LAZY;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 2/21/2025
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Embeddable
+public class JenjangGolonganId implements Serializable {
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "pppkjenjangfk")
+	@ToString.Exclude
+	private JenjangPPPK jenjangPPPK;
+
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "pppkgolonganfk")
+	@ToString.Exclude
+	private GolonganPPPK golonganPPPK;
+
+}

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

@@ -0,0 +1,25 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseModel;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 2/21/2025
+ */
+@Getter
+@Setter
+@Entity
+@Table(schema = "public", name = "sdm_pppk_jenjang_golongan_m")
+public class JenjangGolonganPPPK extends BaseModel {
+
+	@EmbeddedId
+	private JenjangGolonganId id;
+
+}

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

@@ -0,0 +1,34 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseActive;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.validator.constraints.NotBlank;
+
+import javax.persistence.*;
+import javax.validation.constraints.Size;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 2/21/2025
+ */
+@Getter
+@Setter
+@Entity
+@Table(schema = "public", name = "sdm_pppk_jenjang_m")
+public class JenjangPPPK extends BaseActive {
+
+	@Id
+	@GeneratedValue(generator = "UUID")
+	@GenericGenerator(name = "UUID", strategy = "uuid")
+	@Column(columnDefinition = "char(36)", updatable = false, nullable = false)
+	private String id;
+
+	@Size(max = 100, message = "Jenjang jabatan maksimal {max} karakter")
+	@NotBlank(message = "Jenjang jabatan tidak boleh kosong")
+	@Column(length = 100, nullable = false)
+	private String jenjangJabatan;
+
+}

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

@@ -0,0 +1,30 @@
+package com.jasamedika.medifirst2000.entities;
+
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "RM_KarakteristikNyeri")
+public class KarakteristikNyeri extends BaseMaster {
+
+	@NotNull(message = "name tidak boleh kosong")
+	@Column(name = "name")
+	@Caption(value = "name")
+	private String name;
+
+	@Id
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.rmkarakteristiknyeri_m_id_seq")
+	@SequenceGenerator(name = "public.rmkarakteristiknyeri_m_id_seq", sequenceName = "public.rmkarakteristiknyeri_m_id_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Integer id;
+
+}

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

@@ -1,7 +1,6 @@
 package com.jasamedika.medifirst2000.entities;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
 import lombok.Getter;
@@ -14,7 +13,6 @@ import java.util.Date;
 @Setter
 @Entity
 @Table(name = "konsultasi_t")
-@JsonSerialize
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class Konsultasi extends BaseTransaction {
 

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

@@ -63,4 +63,10 @@ public class ModulAplikasi extends BaseMaster {
 	@OrderBy("noUrut")
 	private Set<ModulAplikasi> children = new HashSet<>();
 
+	@Column(name = "ModulIconImage")
+	private String modulIconImage;
+
+	@Column(name = "ModulNoUrut")
+	private Integer modulNoUrut;
+
 }

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

@@ -1,137 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;
-
-/**
-* 
-* @author Syamsu
-*/
-public class ModulAplikasiS extends BaseMaster {
-
-	private static final long serialVersionUID = 8990329094182697203L;
-	
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.modulaplikasi_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.modulaplikasi_m_id_seq", sequenceName = "public.modulaplikasi_m_id_seq", allocationSize = 1)
-	@Column(name = "id")
-	protected Integer id;
-
-	@NotNull(message = "Kd Modul Aplikasi tidak boleh kosong")
-	@Column(name = "KdModulAplikasi", nullable = false, length = 2)
-	@Caption(value = "Kode Modul Aplikasi")
-	private String kdModulAplikasi;
-	
-	public String getKdModulAplikasi() {
-		return kdModulAplikasi;
-	}
-
-	public void setKdModulAplikasi(String kdModulAplikasi) {
-		this.kdModulAplikasi = kdModulAplikasi;
-	}
-	
-	@Column(name = "KdModulAplikasiHead")
-	@Caption(value = "Kode Modul Aplikasi Head")
-	private String kdModulAplikasiHead;
-	
-	public String getKdModulAplikasiHead() {
-		return kdModulAplikasiHead;
-	}
-
-	public void setKdModulAplikasiHead(String kdModulAplikasiHead) {
-		this.kdModulAplikasiHead = kdModulAplikasiHead;
-	}
-
-	@NotNull(message = "Modul Aplikasi tidak boleh kosong")
-	@Column(name = "ModulAplikasi", nullable = false, length = 50)
-	@Caption(value = "Modul Aplikasi")
-	private String modulAplikasi;
-	
-	public String getModulAplikasi() {
-		return modulAplikasi;
-	}
-
-	public void setModulAplikasi(String modulAplikasi) {
-		this.modulAplikasi = modulAplikasi;
-	}
-	
-	@Column(name = "ModulIconImage")
-	private String modulIconImage;
-	
-
-	public String getModulIconImage() {
-		return modulIconImage;
-	}
-
-	public void setModulIconImage(String modulIconImage) {
-		this.modulIconImage = modulIconImage;
-	}
-	
-	@Column(name = "ModulNoUrut")
-	private int modulNoUrut;
-
-
-	public int getModulNoUrut() {
-		return modulNoUrut;
-	}
-
-	public void setModulNoUrut(int modulNoUrut) {
-		this.modulNoUrut = modulNoUrut;
-	}
-	
-	/////////////////////
-	/// Foreign Keys
-	//////////////////
-	
-	
-	@OneToMany(fetch = FetchType.LAZY)
-	@JoinColumn(name="kdModulAplikasi", referencedColumnName="kdModulAplikasi", insertable = false, updatable = false)
-	@JsonIgnore
-	private Set<ObjekModulAplikasiS> objekModulAplikasiS;
-	
-	
-	public Set<ObjekModulAplikasiS> getObjekModulAplikasiS() {
-		return objekModulAplikasiS;
-	}
-
-	public void setObjekModulAplikasiS(Set<ObjekModulAplikasiS> objekModulAplikasiS) {
-		this.objekModulAplikasiS = objekModulAplikasiS;
-	}
-	
-	
-	/////////////////////
-	// Link Back Keys
-	////////////////////
-
-
-	@NotFound(action = NotFoundAction.IGNORE)
-	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true, targetEntity = ModulAplikasiS.class)	
-	@JoinColumn(name="kdModulAplikasiHead", referencedColumnName="kdModulAplikasi")	
-	private Set<ModulAplikasiS> children = new HashSet<>();
-
-	public Set<ModulAplikasiS> getChildren() {
-		return children;
-	}
-
-	public void setChildren(Set<ModulAplikasiS> children) {
-		this.children = children;
-	}
-
-}

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

@@ -1,20 +1,16 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import lombok.Getter;
-import javax.persistence.GeneratedValue;
+import lombok.Setter;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 
-@Entity // @Audited
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+@Entity
 @Table(name = "Monitoring_T")
 public class Monitoring extends BaseTransaction {
 
@@ -33,29 +29,4 @@ public class Monitoring extends BaseTransaction {
 	@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 MonitoringDetail getMonitoringDetail() {
-		return monitoringDetail;
-	}
-
-	public void setMonitoringDetail(MonitoringDetail monitoringDetail) {
-		this.monitoringDetail = monitoringDetail;
-	}
-
- 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MonitoringAbsen.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_MonitoringAbsen_T")
 public class MonitoringAbsen extends BaseTransaction {
@@ -37,35 +34,35 @@ public class MonitoringAbsen extends BaseTransaction {
 	private Integer shiftKerjaId;
 
 	@Caption(value = "alasan")
-	@Column(name = "alasan", nullable = true)
+	@Column(name = "alasan")
 	private String alasan;
 
 	@Caption(value = "jadwalPulang")
-	@Column(name = "jadwalPulang", nullable = true)
+	@Column(name = "jadwalPulang")
 	private String jadwalPulang;
 
 	@Caption(value = "jadwalmasuk")
-	@Column(name = "jadwalmasuk", nullable = true)
+	@Column(name = "jadwalmasuk")
 	private String jadwalmasuk;
 
 	@Caption(value = "absensiMasuk")
-	@Column(name = "absensiMasuk", nullable = true)
+	@Column(name = "absensiMasuk")
 	private String absensiMasuk;
 
 	@Caption(value = "absensiPulang")
-	@Column(name = "absensiPulang", nullable = true)
+	@Column(name = "absensiPulang")
 	private String absensiPulang;
 
 	@Caption(value = "terlambat")
-	@Column(name = "terlambat", nullable = true)
+	@Column(name = "terlambat")
 	private Long terlambat;
 
 	@Caption(value = "pulangAwal")
-	@Column(name = "pulangAwal", nullable = true)
+	@Column(name = "pulangAwal")
 	private Long pulangAwal;
 
 	@Caption(value = "jamEfektif")
-	@Column(name = "jamEfektif", nullable = true)
+	@Column(name = "jamEfektif")
 	private String jamEfektif;
 
 	@Caption(value = "tanggal")
@@ -77,7 +74,6 @@ public class MonitoringAbsen extends BaseTransaction {
 	@Temporal(TemporalType.DATE)
 	private Date tglPresensi;
 
-	// Untuk Absensi verifikasi
 	@ManyToOne
 	@JoinColumn(name = "verifikasiUnitKerjaFK")
 	@NotNull(message = "verifikasiUnitKerjaFK")
@@ -100,215 +96,23 @@ public class MonitoringAbsen extends BaseTransaction {
 	private Integer verifiedLembur;
 
 	@Caption(value = "kelebihanJamKerja")
-	@Column(name = "kelebihanJamKerja", nullable = true)
+	@Column(name = "kelebihanJamKerja")
 	private Long kelebihanJamKerja;
 
 	@Caption(value = "Status Foto Sesuai")
-	@Column(name = "isfotosesuai", nullable = true)
+	@Column(name = "isfotosesuai")
 	private Boolean isFotoSesuai;
 
 	@Caption(value = "Status Lokasi Sesuai")
-	@Column(name = "islokasisesuai", nullable = true)
+	@Column(name = "islokasisesuai")
 	private Boolean isLokasiSesuai;
 
 	@Caption(value = "Status Atribut Lengkap")
-	@Column(name = "isatributlengkap", nullable = true)
+	@Column(name = "isatributlengkap")
 	private Boolean isAtributLengkap;
 
 	@Caption(value = "Status Verifikasi")
-	@Column(name = "isverifikasi", nullable = true)
+	@Column(name = "isverifikasi")
 	private Boolean isVerifikasi;
 
-	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 ShiftKerja getShiftKerja() {
-		return shiftKerja;
-	}
-
-	public void setShiftKerja(ShiftKerja shiftKerja) {
-		this.shiftKerja = shiftKerja;
-	}
-
-	public Integer getShiftKerjaId() {
-		return shiftKerjaId;
-	}
-
-	public void setShiftKerjaId(Integer shiftKerjaId) {
-		this.shiftKerjaId = shiftKerjaId;
-	}
-
-	public String getAlasan() {
-		return alasan;
-	}
-
-	public void setAlasan(String alasan) {
-		this.alasan = alasan;
-	}
-
-	public String getJadwalPulang() {
-		return jadwalPulang;
-	}
-
-	public void setJadwalPulang(String jadwalPulang) {
-		this.jadwalPulang = jadwalPulang;
-	}
-
-	public String getJadwalmasuk() {
-		return jadwalmasuk;
-	}
-
-	public void setJadwalmasuk(String jadwalmasuk) {
-		this.jadwalmasuk = jadwalmasuk;
-	}
-
-	public String getAbsensiMasuk() {
-		return absensiMasuk;
-	}
-
-	public void setAbsensiMasuk(String absensiMasuk) {
-		this.absensiMasuk = absensiMasuk;
-	}
-
-	public String getAbsensiPulang() {
-		return absensiPulang;
-	}
-
-	public void setAbsensiPulang(String absensiPulang) {
-		this.absensiPulang = absensiPulang;
-	}
-
-	public Long getTerlambat() {
-		return terlambat;
-	}
-
-	public void setTerlambat(Long terlambat) {
-		this.terlambat = terlambat;
-	}
-
-	public Long getPulangAwal() {
-		return pulangAwal;
-	}
-
-	public void setPulangAwal(Long pulangAwal) {
-		this.pulangAwal = pulangAwal;
-	}
-
-	public String getJamEfektif() {
-		return jamEfektif;
-	}
-
-	public void setJamEfektif(String jamEfektif) {
-		this.jamEfektif = jamEfektif;
-	}
-
-	public String getTanggal() {
-		return tanggal;
-	}
-
-	public void setTanggal(String tanggal) {
-		this.tanggal = tanggal;
-	}
-
-	public Date getTglPresensi() {
-		return tglPresensi;
-	}
-
-	public void setTglPresensi(Date tglPresensi) {
-		this.tglPresensi = tglPresensi;
-	}
-
-	public StrukVerifikasi getStrukVerifikasi() {
-		return strukVerifikasi;
-	}
-
-	public void setStrukVerifikasi(StrukVerifikasi strukVerifikasi) {
-		this.strukVerifikasi = strukVerifikasi;
-	}
-
-	public StrukVerifikasi getStrukVerifikasiSdm() {
-		return strukVerifikasiSdm;
-	}
-
-	public void setStrukVerifikasiSdm(StrukVerifikasi strukVerifikasiSdm) {
-		this.strukVerifikasiSdm = strukVerifikasiSdm;
-	}
-
-	public Long getKelebihanJamKerja() {
-		return kelebihanJamKerja;
-	}
-
-	public void setKelebihanJamKerja(Long kelebihanJamKerja) {
-		this.kelebihanJamKerja = kelebihanJamKerja;
-	}
-
-	public String getVerifikasiUnitKerjaFK() {
-		return verifikasiUnitKerjaFK;
-	}
-
-	public void setVerifikasiUnitKerjaFK(String verifikasiUnitKerjaFK) {
-		this.verifikasiUnitKerjaFK = verifikasiUnitKerjaFK;
-	}
-
-	public String getVerifikasiSdmFK() {
-		return verifikasiSdmFK;
-	}
-
-	public void setVerifikasiSdmFK(String verifikasiSdmFK) {
-		this.verifikasiSdmFK = verifikasiSdmFK;
-	}
-
-	public Integer getVerifiedLembur() {
-		return verifiedLembur;
-	}
-
-	public void setVerifiedLembur(Integer verifiedLembur) {
-		this.verifiedLembur = verifiedLembur;
-	}
-
-	public Boolean getIsFotoSesuai() {
-		return isFotoSesuai;
-	}
-
-	public void setIsFotoSesuai(Boolean isFotoSesuai) {
-		this.isFotoSesuai = isFotoSesuai;
-	}
-
-	public Boolean getIsLokasiSesuai() {
-		return isLokasiSesuai;
-	}
-
-	public void setIsLokasiSesuai(Boolean isLokasiSesuai) {
-		this.isLokasiSesuai = isLokasiSesuai;
-	}
-
-	public Boolean getIsAtributLengkap() {
-		return isAtributLengkap;
-	}
-
-	public void setIsAtributLengkap(Boolean isAtributLengkap) {
-		this.isAtributLengkap = isAtributLengkap;
-	}
-
-	public Boolean getIsVerifikasi() {
-		return isVerifikasi;
-	}
-
-	public void setIsVerifikasi(Boolean isVerifikasi) {
-		this.isVerifikasi = isVerifikasi;
-	}
-
 }

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

@@ -1,161 +1,56 @@
 package com.jasamedika.medifirst2000.entities;
 
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import java.util.Date;
 
-import javax.persistence.Column;
+@Getter
-import javax.persistence.Entity;
+@Setter
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-
 @Entity
-@DynamicInsert
+@Table(name = "MonitoringAlatSteril_T")
-@DynamicUpdate
+public class MonitoringAlatSteril extends BaseTransaction {
-@Table(name="MonitoringAlatSteril_T")
+
-public class MonitoringAlatSteril extends BaseTransaction{
+	@Column(name = "TanggalPengecekan")
-	@Column(name="TanggalPengecekan")
 	private Date tanggalPengecekan;
 
 	@ManyToOne
-	@JoinColumn(name="ObjectRuanganFk")
+	@JoinColumn(name = "ObjectRuanganFk")
 	private Ruangan ruangan;
 
-	@Column(name="ObjectRuanganFk", insertable=false, updatable=false, nullable=true)
+	@Column(name = "ObjectRuanganFk", insertable = false, updatable = false)
 	private Integer RuanganId;
 
 	@ManyToOne
-	@JoinColumn(name="ObjectAlatFk")
+	@JoinColumn(name = "ObjectAlatFk")
 	private Alat alat;
 
-	@Column(name="ObjectAlatFk", insertable=false, updatable=false, nullable=true)
+	@Column(name = "ObjectAlatFk", insertable = false, updatable = false)
 	private Integer alatId;
 
-	@Column(name="TanggalSteril")
+	@Column(name = "TanggalSteril")
 	private Date tanggalSteril;
 
-	@Column(name="TanggalKadaluarsa")
+	@Column(name = "TanggalKadaluarsa")
 	private Date tanggalKadaluarsa;
 
 	@ManyToOne
-	@JoinColumn(name="ObjectSatuanFk")
+	@JoinColumn(name = "ObjectSatuanFk")
 	private SatuanStandar satuan;
 
-	@Column(name="ObjectsatuanFk", insertable=false, updatable=false, nullable=true)
+	@Column(name = "ObjectsatuanFk", insertable = false, updatable = false)
 	private Integer satuanId;
 
-	@Column(name="jumlah", length=10)
+	@Column(name = "jumlah", length = 10)
 	private String jumlah;
 
 	@ManyToOne
 	@JoinColumn
 	private Pegawai petugas;
 
-	@Column(name="ObjectPetugasFk", insertable=false, updatable=false, nullable=true)
+	@Column(name = "ObjectPetugasFk", insertable = false, updatable = false)
 	private Integer petugasId;
 
-	public Date getTanggalPengecekan() {
-		return tanggalPengecekan;
-	}
-
-	public void setTanggalPengecekan(Date tanggalPengecekan) {
-		this.tanggalPengecekan = tanggalPengecekan;
-	}
-
-	public Ruangan getRuangan() {
-		return ruangan;
-	}
-
-	public void setRuangan(Ruangan ruangan) {
-		this.ruangan = ruangan;
-	}
-
-	public Integer getRuanganId() {
-		return RuanganId;
-	}
-
-	public void setRuanganId(Integer ruanganId) {
-		RuanganId = ruanganId;
-	}
-
-	public Alat getAlat() {
-		return alat;
-	}
-
-	public void setAlat(Alat alat) {
-		this.alat = alat;
-	}
-
-	public Integer getAlatId() {
-		return alatId;
-	}
-
-	public void setAlatId(Integer alatId) {
-		this.alatId = alatId;
-	}
-
-	public Date getTanggalSteril() {
-		return tanggalSteril;
-	}
-
-	public void setTanggalSteril(Date tanggalSteril) {
-		this.tanggalSteril = tanggalSteril;
-	}
-
-	public Date getTanggalKadaluarsa() {
-		return tanggalKadaluarsa;
-	}
-
-	public void setTanggalKadaluarsa(Date tanggalKadaluarsa) {
-		this.tanggalKadaluarsa = tanggalKadaluarsa;
-	}
-
-	public SatuanStandar getSatuan() {
-		return satuan;
-	}
-
-	public void setSatuan(SatuanStandar satuan) {
-		this.satuan = satuan;
-	}
-
-	public Integer getSatuanId() {
-		return satuanId;
-	}
-
-	public void setSatuanId(Integer satuanId) {
-		this.satuanId = satuanId;
-	}
-
-	public String getJumlah() {
-		return jumlah;
-	}
-
-	public void setJumlah(String jumlah) {
-		this.jumlah = jumlah;
-	}
-
-	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;
-	}
-	
-	
-	
-	
-
 }

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

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

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

@@ -1,6 +1,7 @@
 package com.jasamedika.medifirst2000.entities;
 
 import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.entities.constant.NilaiAnggaran;
 import com.jasamedika.medifirst2000.helper.Caption;
 import lombok.Getter;
 import lombok.Setter;
@@ -24,6 +25,7 @@ import static javax.persistence.FetchType.LAZY;
 @Entity
 @Table(name = "monitoring_kinerja_t", schema = "mkko")
 public class MonitoringKinerja extends BaseTransaction implements Serializable {
+
 	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "kinerja_fk", nullable = false)
 	@NotNull(message = "Kinerja tidak boleh kosong")
@@ -49,4 +51,5 @@ public class MonitoringKinerja extends BaseTransaction implements Serializable {
 	@Column(name = "nilai_kinerja", nullable = false, columnDefinition = "numeric(15,2) default 0.00")
 	@NotNull(message = "Nilai kinerja tidak boleh kosong")
 	private BigDecimal nilaiKinerja;
+
 }

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

@@ -1,6 +1,7 @@
 package com.jasamedika.medifirst2000.entities;
 
 import com.jasamedika.medifirst2000.base.BaseTransaction;
+import com.jasamedika.medifirst2000.entities.constant.NilaiAnggaran;
 import com.jasamedika.medifirst2000.helper.Caption;
 import lombok.Getter;
 import lombok.Setter;
@@ -26,6 +27,7 @@ import static javax.persistence.TemporalType.TIMESTAMP;
 @Entity
 @Table(name = "monitoring_kinerja_harian_t", schema = "mkko")
 public class MonitoringKinerjaHarian extends BaseTransaction implements Serializable {
+
 	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "kinerja_fk", nullable = false)
 	@NotNull(message = "Kinerja tidak boleh kosong")
@@ -53,4 +55,5 @@ public class MonitoringKinerjaHarian extends BaseTransaction implements Serializ
 	@Column(name = "nilai_kinerja", nullable = false, columnDefinition = "numeric(15,2) default 0.00")
 	@NotNull(message = "Nilai kinerja tidak boleh kosong")
 	private BigDecimal nilaiKinerja;
+
 }

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

@@ -1,116 +1,46 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.base.BaseTransaction;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+import java.util.Date;
+
+import static javax.persistence.FetchType.LAZY;
+
+@Getter
+@Setter
 @Entity
-@DynamicInsert
+@JsonIgnoreProperties({ "notInterstingMember", "forgetThisField" })
-@DynamicUpdate
+@Table(name = "MonitoringMesinAutoClaveBowidick_T")
-@JsonIgnoreProperties({"notInterstingMember", "forgetThisField"})
+public class MonitoringMesinAutoClaveBowidick extends BaseTransaction {
-@Table(name="MonitoringMesinAutoClaveBowidick_T")
+
-public class MonitoringMesinAutoClaveBowidick extends BaseTransaction{
+	@Column(name = "Tanggal")
-	@Column(name="Tanggal")
 	private Date tanggal;
 
-	@Column(name="Program")
+	@Column(name = "Program")
 	private String program;
 
-	@ManyToOne(fetch=FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name="ObjectMesinFk")
+	@JoinColumn(name = "ObjectMesinFk")
 	private Mesin mesin;
 
-	@Column(name="ObjectMesinFk", insertable=false, updatable=false, nullable=true)
+	@Column(name = "ObjectMesinFk", insertable = false, updatable = false)
 	private Integer mesinId;
 
-	@Column(name="Hasil", length=200)
+	@Column(name = "Hasil", length = 200)
 	private String hasil;
 
-	@ManyToOne(fetch=FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
-	@JoinColumn(name="ObjectOperatorFk")
+	@JoinColumn(name = "ObjectOperatorFk")
 	private Pegawai operator;
 
-	@Column(name="ObjectOperatorFk", insertable=false, updatable=false)
+	@Column(name = "ObjectOperatorFk", insertable = false, updatable = false)
 	private Integer operatorId;
 
-	@Column(name="Keterangan", length=200)
+	@Column(name = "Keterangan", length = 200)
 	private String keterangan;
 
-	public Date getTanggal() {
-		return tanggal;
-	}
-
-	public void setTanggal(Date tanggal) {
-		this.tanggal = tanggal;
-	}
-
-	public String getProgram() {
-		return program;
-	}
-
-	public void setProgram(String program) {
-		this.program = program;
-	}
-
-	public Mesin getMesin() {
-		return mesin;
-	}
-
-	public void setMesin(Mesin mesin) {
-		this.mesin = mesin;
-	}
-
-	public Integer getMesinId() {
-		return mesinId;
-	}
-
-	public void setMesinId(Integer mesinId) {
-		this.mesinId = mesinId;
-	}
-
-	public String getHasil() {
-		return hasil;
-	}
-
-	public void setHasil(String hasil) {
-		this.hasil = hasil;
-	}
-
-	public Pegawai getOperator() {
-		return operator;
-	}
-
-	public void setOperator(Pegawai operator) {
-		this.operator = operator;
-	}
-
-	public Integer getOperatorId() {
-		return operatorId;
-	}
-
-	public void setOperatorId(Integer operatorId) {
-		this.operatorId = operatorId;
-	}
-
-	public String getKeterangan() {
-		return keterangan;
-	}
-
-	public void setKeterangan(String keterangan) {
-		this.keterangan = keterangan;
-	}
-	
-	
-
 }

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

@@ -1,101 +1,38 @@
 package com.jasamedika.medifirst2000.entities;
 
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import java.util.Date;
 
-import javax.persistence.Column;
+@Getter
-import javax.persistence.Entity;
+@Setter
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-
 @Entity
-@DynamicInsert
+@Table(name = "MonitoringTestEthylenOxide_T")
-@DynamicUpdate
-@Table(name="MonitoringTestEthylenOxide_T")
 public class MonitoringTestEthylenOxide extends BaseTransaction {
-	@Column(name="TanggalMulai")
+
+	@Column(name = "TanggalMulai")
 	private Date tanggalMulai;
 
-	@Column(name="TanggalSelesai")
+	@Column(name = "TanggalSelesai")
 	private Date tanggalSelesai;
 
-	@Column(name="JamMulai")
+	@Column(name = "JamMulai")
 	private String jamMulai;
 
-	@Column(name="JamSelesai")
+	@Column(name = "JamSelesai")
 	private String jamSelesai;
 
-	@Column(name="Pemeriksaan")
+	@Column(name = "Pemeriksaan")
 	private String pemeriksaan;
 
 	@ManyToOne
-	@JoinColumn(name="ObjectPetugasFk")
+	@JoinColumn(name = "ObjectPetugasFk")
 	private Pegawai petugas;
 
-	@Column(name="ObjectPetugasFk", insertable= false, updatable=false, nullable=true)
+	@Column(name = "ObjectPetugasFk", insertable = false, updatable = false)
 	private Integer petugasId;
 
-	public Date getTanggalMulai() {
-		return tanggalMulai;
-	}
-
-	public void setTanggalMulai(Date tanggalMulai) {
-		this.tanggalMulai = tanggalMulai;
-	}
-
-	public Date getTanggalSelesai() {
-		return tanggalSelesai;
-	}
-
-	public void setTanggalSelesai(Date tanggalSelesai) {
-		this.tanggalSelesai = tanggalSelesai;
-	}
-
-	public String getJamMulai() {
-		return jamMulai;
-	}
-
-	public void setJamMulai(String jamMulai) {
-		this.jamMulai = jamMulai;
-	}
-
-	public String getJamSelesai() {
-		return jamSelesai;
-	}
-
-	public void setJamSelesai(String jamSelesai) {
-		this.jamSelesai = jamSelesai;
-	}
-
-	public String getPemeriksaan() {
-		return pemeriksaan;
-	}
-
-	public void setPemeriksaan(String pemeriksaan) {
-		this.pemeriksaan = pemeriksaan;
-	}
-
-	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;
-	}
-	
-	
-
 }

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

@@ -1,135 +1,48 @@
 package com.jasamedika.medifirst2000.entities;
 
+import com.jasamedika.medifirst2000.base.BaseTransaction;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
 import java.util.Date;
 
-import javax.persistence.Column;
+@Getter
-import javax.persistence.Entity;
+@Setter
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-
 @Entity
-@DynamicInsert
+@Table(name = "MonitoringTestMesinAutoclave_T")
-@DynamicUpdate
-@Table(name="MonitoringTestMesinAutoclave_T")
 public class MonitoringTestMesinAutoclave extends BaseTransaction {
-	@Column(name="Tanggal")
+
+	@Column(name = "Tanggal")
 	private Date tanggal;
 
 	@ManyToOne
-	@JoinColumn(name="ObjectMesinFk")
+	@JoinColumn(name = "ObjectMesinFk")
 	private Mesin mesin;
 
-	@Column(name="ObjectMesinFk", insertable=false, updatable=false, nullable=true)
+	@Column(name = "ObjectMesinFk", insertable = false, updatable = false)
 	private Integer mesinId;
 
-	@Column(name="Suhu", length=10)
+	@Column(name = "Suhu", length = 10)
 	private String suhu;
 
-	@Column(name="JamMasuk", length=50)
+	@Column(name = "JamMasuk", length = 50)
 	private String jamMasuk;
 
-	@Column(name="JamKeluar", length=50)
+	@Column(name = "JamKeluar", length = 50)
 	private String jamKeluar;
 
-	@Column(name="Pemeriksaan", length=100)
+	@Column(name = "Pemeriksaan", length = 100)
 	private String pemeriksaan;
 
 	@ManyToOne
-	@JoinColumn(name="ObjectPetugasFk")
+	@JoinColumn(name = "ObjectPetugasFk")
 	private Pegawai petugas;
 
-	@Column(name="ObjectPetugasFk", insertable=false, updatable=false, nullable=true)
+	@Column(name = "ObjectPetugasFk", insertable = false, updatable = false)
 	private Integer petugasId;
 
-	@Column(name="Keterangan", length=200)
+	@Column(name = "Keterangan", length = 200)
 	private String keterangan;
 
-	public Date getTanggal() {
-		return tanggal;
-	}
-
-	public void setTanggal(Date tanggal) {
-		this.tanggal = tanggal;
-	}
-
-	public Mesin getMesin() {
-		return mesin;
-	}
-
-	public void setMesin(Mesin mesin) {
-		this.mesin = mesin;
-	}
-
-	public Integer getMesinId() {
-		return mesinId;
-	}
-
-	public void setMesinId(Integer mesinId) {
-		this.mesinId = mesinId;
-	}
-
-	public String getSuhu() {
-		return suhu;
-	}
-
-	public void setSuhu(String suhu) {
-		this.suhu = suhu;
-	}
-
-	public String getJamMasuk() {
-		return jamMasuk;
-	}
-
-	public void setJamMasuk(String jamMasuk) {
-		this.jamMasuk = jamMasuk;
-	}
-
-	public String getJamKeluar() {
-		return jamKeluar;
-	}
-
-	public void setJamKeluar(String jamKeluar) {
-		this.jamKeluar = jamKeluar;
-	}
-
-	public String getPemeriksaan() {
-		return pemeriksaan;
-	}
-
-	public void setPemeriksaan(String pemeriksaan) {
-		this.pemeriksaan = pemeriksaan;
-	}
-
-	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 getKeterangan() {
-		return keterangan;
-	}
-
-	public void setKeterangan(String keterangan) {
-		this.keterangan = keterangan;
-	}
-	
-	
-
 }

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

@@ -1,47 +1,32 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import lombok.Getter;
-import javax.persistence.GeneratedValue;
+import lombok.Setter;
-import javax.persistence.GenerationType;
+
-import javax.persistence.Id;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class MorfologiNeoplasma
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "MorfologiNeoplasma_M")
 public class MorfologiNeoplasma extends BaseMaster {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectDiagnosaFk")
 	@NotNull(message = "Kd Diagnosa tidak boleh kosong")
-
 	@Caption(value = "Object Diagnosa")
 	private Diagnosa diagnosa;
 
-	public void setDiagnosa(Diagnosa diagnosa) {
-		this.diagnosa = diagnosa;
-	}
-
-	public Diagnosa getDiagnosa() {
-		return this.diagnosa;
-	}
-
 	@Column(name = "ObjectDiagnosaFk", insertable = false, updatable = false)
 	private Integer diagnosaId;
 
@@ -50,52 +35,20 @@ public class MorfologiNeoplasma extends BaseMaster {
 	@Caption(value = "Kode Morfologi Neoplasma")
 	private Byte kdMorfologiNeoplasma;
 
-	public void setKdMorfologiNeoplasma(Byte kdMorfologiNeoplasma) {
-		this.kdMorfologiNeoplasma = kdMorfologiNeoplasma;
-	}
-
-	public Byte getKdMorfologiNeoplasma() {
-		return this.kdMorfologiNeoplasma;
-	}
-
 	@NotNull(message = "Morfologi Neoplasma tidak boleh kosong")
 	@Column(name = "MorfologiNeoplasma", nullable = false, length = 100)
 	@Caption(value = "Morfologi Neoplasma")
 	private String morfologiNeoplasma;
 
-	public void setMorfologiNeoplasma(String morfologiNeoplasma) {
-		this.morfologiNeoplasma = morfologiNeoplasma;
-	}
-
-	public String getMorfologiNeoplasma() {
-		return this.morfologiNeoplasma;
-	}
-
 	@NotNull(message = "QMorfologi Neoplasma tidak boleh kosong")
 	@Column(name = "QMorfologiNeoplasma", nullable = false)
 	@Caption(value = "QMorfologi Neoplasma")
 	private Byte qMorfologiNeoplasma;
 
-	public void setqMorfologiNeoplasma(Byte qMorfologiNeoplasma) {
-		this.qMorfologiNeoplasma = qMorfologiNeoplasma;
-	}
-
-	public Byte getqMorfologiNeoplasma() {
-		return this.qMorfologiNeoplasma;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.morfologineoplasma_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.morfologineoplasma_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.morfologineoplasma_m_id_seq", sequenceName = "public.morfologineoplasma_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.morfologineoplasma_m_id_seq", sequenceName = "public.morfologineoplasma_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

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

@@ -1,222 +1,85 @@
 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 com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
-@Entity //@Audited
+import javax.persistence.*;
+import java.util.Date;
+
+@Getter
+@Setter
+@Entity
 @Table(name = "sdm_MouPks_T")
-public class MouPks extends BaseTransaction{	
+public class MouPks extends BaseTransaction {
 
 	@ManyToOne
 	@JoinColumn(name = "ObjectStatusInstitusiPendidikanFk")
-	@Caption(value="Object Status Institusi Pendidikan")
+	@Caption(value = "Object Status Institusi Pendidikan")
 	private StatusInstitusiPendidikan statusInstitusiPendidikan;
 
 	@Column(name = "ObjectStatusInstitusiPendidikanFk", insertable = false, updatable = false, nullable = false)
 	private Integer statusInstitusiPendidikanId;
 
-	@Column(name = "jurusan", nullable = false )
+	@Column(name = "jurusan", nullable = false)
-	@Caption(value="jurusan")
+	@Caption(value = "jurusan")
 	private String jurusan;
 
-	@Column(name = "programStudi", nullable = false )
+	@Column(name = "programStudi", nullable = false)
-	@Caption(value="programStudi")
+	@Caption(value = "programStudi")
 	private String programStudi;
 
-	@Column(name = "badanAkreditasi", nullable = false )
+	@Column(name = "badanAkreditasi", nullable = false)
-	@Caption(value="badanAkreditasi")
+	@Caption(value = "badanAkreditasi")
 	private String badanAkreditasi;
 
-	@Column(name = "Tkt", nullable = false )
+	@Column(name = "Tkt", nullable = false)
-	@Caption(value="Tkt")
+	@Caption(value = "Tkt")
 	private String tkt;
 
-	@Column(name = "awalMasaBerlaku", nullable = false )
+	@Column(name = "awalMasaBerlaku", nullable = false)
-	@Caption(value="awalMasaBerlaku")
+	@Caption(value = "awalMasaBerlaku")
 	private Date awalMasaBerlaku;
 
-	@Column(name = "akhirMasaBerlaku", nullable = false )
+	@Column(name = "akhirMasaBerlaku", nullable = false)
-	@Caption(value="akhirMasaBerlaku")
+	@Caption(value = "akhirMasaBerlaku")
 	private Date akhirMasaBerlaku;
 
-	@Column(name = "terakhirPKL", nullable = false )
+	@Column(name = "terakhirPKL", nullable = false)
-	@Caption(value="terakhirPKL")
+	@Caption(value = "terakhirPKL")
 	private String terakhirPKL;
 
-	@Column(name = "bangunan", nullable = false )
+	@Column(name = "bangunan", nullable = false)
-	@Caption(value="bangunan")
+	@Caption(value = "bangunan")
 	private String bangunan;
 
-	@Column(name = "noPks", nullable = false )
+	@Column(name = "noPks", nullable = false)
-	@Caption(value="noPks")
+	@Caption(value = "noPks")
 	private String noPks;
 
-	@Column(name = "awalMasaBerlakuPks", nullable = false )
+	@Column(name = "awalMasaBerlakuPks", nullable = false)
-	@Caption(value="awalMasaBerlakuPks")
+	@Caption(value = "awalMasaBerlakuPks")
 	private Date awalMasaBerlakuPks;
 
-	@Column(name = "akhirMasaBerlakuPks", nullable = false )
+	@Column(name = "akhirMasaBerlakuPks", nullable = false)
-	@Caption(value="akhirMasaBerlakuPks")
+	@Caption(value = "akhirMasaBerlakuPks")
 	private Date akhirMasaBerlakuPks;
 
-	@Column(name = "hambatan", nullable = true )
+	@Column(name = "hambatan")
-	@Caption(value="hambatan")
+	@Caption(value = "hambatan")
 	private String hambatan;
 
-	@Column(name = "saran", nullable = true )
+	@Column(name = "saran")
-	@Caption(value="saran")
+	@Caption(value = "saran")
 	private String saran;
 
-	@Column(name = "keterangan", nullable = true )
+	@Column(name = "keterangan")
-	@Caption(value="keterangan")
+	@Caption(value = "keterangan")
 	private String keterangan;
 
-	@Column(name = "pathFile", nullable = true )
+	@Column(name = "pathFile")
-	@Caption(value="pathFile")
+	@Caption(value = "pathFile")
 	private String pathFile;
 
-	public StatusInstitusiPendidikan getStatusInstitusiPendidikan() {
-		return statusInstitusiPendidikan;
-	}
-
-	public void setStatusInstitusiPendidikan(StatusInstitusiPendidikan statusInstitusiPendidikan) {
-		this.statusInstitusiPendidikan = statusInstitusiPendidikan;
-	}
-
-	public Integer getStatusInstitusiPendidikanId() {
-		return statusInstitusiPendidikanId;
-	}
-
-	public void setStatusInstitusiPendidikanId(Integer statusInstitusiPendidikanId) {
-		this.statusInstitusiPendidikanId = statusInstitusiPendidikanId;
-	}
-
-	public String getJurusan() {
-		return jurusan;
-	}
-
-	public void setJurusan(String jurusan) {
-		this.jurusan = jurusan;
-	}
-
-	public String getProgramStudi() {
-		return programStudi;
-	}
-
-	public void setProgramStudi(String programStudi) {
-		this.programStudi = programStudi;
-	}
-
-	public String getBadanAkreditasi() {
-		return badanAkreditasi;
-	}
-
-	public void setBadanAkreditasi(String badanAkreditasi) {
-		this.badanAkreditasi = badanAkreditasi;
-	}
-
-	public String getTkt() {
-		return tkt;
-	}
-
-	public void setTkt(String tkt) {
-		this.tkt = tkt;
-	}
-
-	public Date getAwalMasaBerlaku() {
-		return awalMasaBerlaku;
-	}
-
-	public void setAwalMasaBerlaku(Date awalMasaBerlaku) {
-		this.awalMasaBerlaku = awalMasaBerlaku;
-	}
-
-	public Date getAkhirMasaBerlaku() {
-		return akhirMasaBerlaku;
-	}
-
-	public void setAkhirMasaBerlaku(Date akhirMasaBerlaku) {
-		this.akhirMasaBerlaku = akhirMasaBerlaku;
-	}
-
-	public String getTerakhirPKL() {
-		return terakhirPKL;
-	}
-
-	public void setTerakhirPKL(String terakhirPKL) {
-		this.terakhirPKL = terakhirPKL;
-	}
-
-	public String getBangunan() {
-		return bangunan;
-	}
-
-	public void setBangunan(String bangunan) {
-		this.bangunan = bangunan;
-	}
-
-	public String getNoPks() {
-		return noPks;
-	}
-
-	public void setNoPks(String noPks) {
-		this.noPks = noPks;
-	}
-
-	public Date getAwalMasaBerlakuPks() {
-		return awalMasaBerlakuPks;
-	}
-
-	public void setAwalMasaBerlakuPks(Date awalMasaBerlakuPks) {
-		this.awalMasaBerlakuPks = awalMasaBerlakuPks;
-	}
-
-	public Date getAkhirMasaBerlakuPks() {
-		return akhirMasaBerlakuPks;
-	}
-
-	public void setAkhirMasaBerlakuPks(Date akhirMasaBerlakuPks) {
-		this.akhirMasaBerlakuPks = akhirMasaBerlakuPks;
-	}
-
-	public String getHambatan() {
-		return hambatan;
-	}
-
-	public void setHambatan(String hambatan) {
-		this.hambatan = hambatan;
-	}
-
-	public String getSaran() {
-		return saran;
-	}
-
-	public void setSaran(String saran) {
-		this.saran = saran;
-	}
-
-	public String getKeterangan() {
-		return keterangan;
-	}
-
-	public void setKeterangan(String keterangan) {
-		this.keterangan = keterangan;
-	}
-
-	public String getPathFile() {
-		return pathFile;
-	}
-
-	public void setPathFile(String pathFile) {
-		this.pathFile = pathFile;
-	}
-
 }

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

@@ -1,27 +1,28 @@
 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;
+
+import static javax.persistence.FetchType.LAZY;
 
 /**
- *  class MutasiPegawai
+ * class MutasiPegawai
  * 
  * @author Generator
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "sdm_MutasiPegawai_T")
-public class MutasiPegawai extends BaseTransaction{
+public class MutasiPegawai extends BaseTransaction {
 
-	@Column(name = "NomorAgenda", nullable = false , length = 100)
+	@Column(name = "NomorAgenda", nullable = false, length = 100)
 	@Caption(value = "NomorAgenda")
 	private String nomorAgenda;
 
@@ -31,7 +32,7 @@ public class MutasiPegawai extends BaseTransaction{
 	@Caption(value = "Pegawai")
 	private Pegawai pegawai;
 
-	@Column(name = "ObjectPegawaiFk", insertable=false, updatable=false)
+	@Column(name = "ObjectPegawaiFk", insertable = false, updatable = false)
 	private Integer pegawaiId;
 
 	@ManyToOne
@@ -40,18 +41,18 @@ public class MutasiPegawai extends BaseTransaction{
 	@Caption(value = "JenisSk")
 	private JenisSk jenisSK;
 
-	@Column(name = "JenisSkFk", insertable=false, updatable=false)
+	@Column(name = "JenisSkFk", insertable = false, updatable = false)
 	private Integer jenisSkId;
 
-	@Column(name = "TanggalSK", nullable = true , length = 100)
+	@Column(name = "TanggalSK", length = 100)
 	@Caption(value = "TanggalSK")
 	private Date tanggalSK;
 
-	@Column(name = "Nomor", nullable = true , length = 100)
+	@Column(name = "Nomor", length = 100)
 	@Caption(value = "Nomor")
 	private String nomor;
 
-	@Column(name = "Uraian", nullable = true , length = 100)
+	@Column(name = "Uraian", length = 100)
 	@Caption(value = "Uraian")
 	private String uraian;
 
@@ -61,7 +62,7 @@ public class MutasiPegawai extends BaseTransaction{
 	@Caption(value = "SkDari")
 	private Pegawai skDari;
 
-	@Column(name = "SkDariFk", insertable=false, updatable=false)
+	@Column(name = "SkDariFk", insertable = false, updatable = false)
 	private Integer skDariId;
 
 	@ManyToOne
@@ -70,7 +71,7 @@ public class MutasiPegawai extends BaseTransaction{
 	@Caption(value = "SkDari")
 	private KategoryPegawai statusPegawai;
 
-	@Column(name = "StatusPegawaiFk", insertable=false,updatable=false)
+	@Column(name = "StatusPegawaiFk", insertable = false, updatable = false)
 	private Integer statusPegawaiId;
 
 	@ManyToOne
@@ -79,14 +80,14 @@ public class MutasiPegawai extends BaseTransaction{
 	@Caption(value = "Kedudukan")
 	private Kedudukan kedudukan;
 
-	@Column(name = "KedudukanFk", insertable=false,updatable=false)
+	@Column(name = "KedudukanFk", insertable = false, updatable = false)
 	private Integer kedudukanId;
 
-	@Column(name = "TanggalMeninggal", nullable = true , length = 100)
+	@Column(name = "TanggalMeninggal", length = 100)
 	@Caption(value = "TanggalMeninggal")
 	private Date tanggalMeninggal;
 
-	@Column(name = "KodeGapok", nullable = true , length = 100)
+	@Column(name = "KodeGapok", length = 100)
 	@Caption(value = "KodeGapok")
 	private String kodeGapok;
 
@@ -96,42 +97,47 @@ public class MutasiPegawai extends BaseTransaction{
 	@Caption(value = "KodeGol")
 	private GolonganPegawai kodeGol;
 
-	@Column(name = "KodeGolFk", insertable=false,updatable=false)
+	@Column(name = "KodeGolFk", insertable = false, updatable = false)
 	private Integer kodeGolId;
 
-	@Column(name = "KodeJabatan", nullable = true , length = 100)
+	@ManyToOne(fetch = LAZY)
+	@JoinColumn(name = "objectgolonganpppkfk")
+	@Caption(value = "Golongan PPPK")
+	private GolonganPPPK golonganPPPK;
+
+	@Column(name = "objectgolonganpppkfk", insertable = false, updatable = false)
+	private String golonganPPPKId;
+
+	@Column(name = "KodeJabatan", length = 100)
 	@Caption(value = "KodeJabatan")
 	private String kodeJabatan;
 
-//	@OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "jabatan")
-//	private Set<MapPegawaiJabatanToUnitKerja> listJabatanInternal = new HashSet<MapPegawaiJabatanToUnitKerja>();
-	
 	@ManyToOne
 	@JoinColumn(name = "JabatanFungsionalFk")
 	@NotNull(message = "Jabatan Fungsional Harus Diisi")
 	@Caption(value = "jabatanFungsional")
 	private Jabatan jabatanFungsional;
 
-	@Column(name = "JabatanFungsionalFk", insertable=false,updatable=false)
+	@Column(name = "JabatanFungsionalFk", insertable = false, updatable = false)
 	private Integer jabatanFungsionalId;
 
-	@Column(name = "Pensiun", nullable = true , length = 100)
+	@Column(name = "Pensiun", length = 100)
 	@Caption(value = "Pensiun")
 	private Integer pensiun;
 
-	@Column(name = "TunjanganFungsional", nullable = true , length = 100)
+	@Column(name = "TunjanganFungsional", length = 100)
 	@Caption(value = "TunjanganFungsional")
 	private String tunjanganFungsional;
 
-	@Column(name = "TunjanganUmum", nullable = true , length = 100)
+	@Column(name = "TunjanganUmum", length = 100)
 	@Caption(value = "TunjanganUmum")
 	private String tunjanganUmum;
 
-	@Column(name = "TunjanganPapua", nullable = true , length = 100)
+	@Column(name = "TunjanganPapua", length = 100)
 	@Caption(value = "TunjanganPapua")
 	private String tunjanganPapua;
 
-	@Column(name = "WilayahTerperinci", nullable = true , length = 100)
+	@Column(name = "WilayahTerperinci", length = 100)
 	@Caption(value = "WilayahTerperinci")
 	private String wilayahTerperinci;
 
@@ -141,7 +147,7 @@ public class MutasiPegawai extends BaseTransaction{
 	@Caption(value = "StatusKawin")
 	private StatusPerkawinanPegawai statusKawin;
 
-	@Column(name = "StatusKawinFk", insertable=false,updatable=false)
+	@Column(name = "StatusKawinFk", insertable = false, updatable = false)
 	private Integer statusKawinId;
 
 	@ManyToOne
@@ -150,7 +156,7 @@ public class MutasiPegawai extends BaseTransaction{
 	@Caption(value = "Eselon")
 	private Eselon eselon;
 
-	@Column(name = "EselonFk", insertable=false,updatable=false)
+	@Column(name = "EselonFk", insertable = false, updatable = false)
 	private Integer eselonId;
 
 	@ManyToOne
@@ -159,343 +165,31 @@ public class MutasiPegawai extends BaseTransaction{
 	@Caption(value = "JenisHukuman")
 	private JenisHukuman jenisHukuman;
 
-	@Column(name = "JenisHukumanFk", insertable=false,updatable=false)
+	@Column(name = "JenisHukumanFk", insertable = false, updatable = false)
 	private Integer jenisHukumanId;
 
-	@Column(name = "Beras", nullable = true , length = 100)
+	@Column(name = "Beras", length = 100)
 	@Caption(value = "Beras")
 	private String beras;
 
-	@Column(name = "Jumlah", nullable = true , length = 100)
+	@Column(name = "Jumlah", length = 100)
 	@Caption(value = "Jumlah")
 	private Integer jumlah;
 
-	@Column(name = "Grade", nullable = true , length = 100)
+	@Column(name = "Grade", length = 100)
 	@Caption(value = "Grade")
 	private Integer grade;
 
-	@Column(name = "TanggalTMT", nullable = true , length = 100)
+	@Column(name = "TanggalTMT", length = 100)
 	@Caption(value = "TanggalTMT")
 	private Date tanggalTMT;
 
-	@Column(name = "TanggalRekam", nullable = false , length = 100)
+	@Column(name = "TanggalRekam", nullable = false, length = 100)
 	@Caption(value = "TanggalRekam")
 	private Date tanggalRekam;
 
-	@Column(name = "Defauld", nullable = true , length = 100)
+	@Column(name = "Defauld", length = 100)
 	@Caption(value = "Defauld")
 	private Integer defauld;
 
-	public String getNomorAgenda() {
-		return nomorAgenda;
-	}
-
-	public void setNomorAgenda(String nomorAgenda) {
-		this.nomorAgenda = nomorAgenda;
-	}
-
-	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 JenisSk getJenisSK() {
-		return jenisSK;
-	}
-
-	public void setJenisSK(JenisSk jenisSK) {
-		this.jenisSK = jenisSK;
-	}
-
-	public Integer getJenisSkId() {
-		return jenisSkId;
-	}
-
-	public void setJenisSkId(Integer jenisSkId) {
-		this.jenisSkId = jenisSkId;
-	}
-
-	public Date getTanggalSK() {
-		return tanggalSK;
-	}
-
-	public void setTanggalSK(Date tanggalSK) {
-		this.tanggalSK = tanggalSK;
-	}
-
-	public String getNomor() {
-		return nomor;
-	}
-
-	public void setNomor(String nomor) {
-		this.nomor = nomor;
-	}
-
-	public String getUraian() {
-		return uraian;
-	}
-
-	public void setUraian(String uraian) {
-		this.uraian = uraian;
-	}
-
-	public Pegawai getSkDari() {
-		return skDari;
-	}
-
-	public void setSkDari(Pegawai skDari) {
-		this.skDari = skDari;
-	}
-
-	public Integer getSkDariId() {
-		return skDariId;
-	}
-
-	public void setSkDariId(Integer skDariId) {
-		this.skDariId = skDariId;
-	}
-
-	public KategoryPegawai getStatusPegawai() {
-		return statusPegawai;
-	}
-
-	public void setStatusPegawai(KategoryPegawai statusPegawai) {
-		this.statusPegawai = statusPegawai;
-	}
-
-	public Integer getStatusPegawaiId() {
-		return statusPegawaiId;
-	}
-
-	public void setStatusPegawaiId(Integer statusPegawaiId) {
-		this.statusPegawaiId = statusPegawaiId;
-	}
-
-	public Kedudukan getKedudukan() {
-		return kedudukan;
-	}
-
-	public void setKedudukan(Kedudukan kedudukan) {
-		this.kedudukan = kedudukan;
-	}
-
-	public Integer getKedudukanId() {
-		return kedudukanId;
-	}
-
-	public void setKedudukanId(Integer kedudukanId) {
-		this.kedudukanId = kedudukanId;
-	}
-
-	public Date getTanggalMeninggal() {
-		return tanggalMeninggal;
-	}
-
-	public void setTanggalMeninggal(Date tanggalMeninggal) {
-		this.tanggalMeninggal = tanggalMeninggal;
-	}
-
-	public String getKodeGapok() {
-		return kodeGapok;
-	}
-
-	public void setKodeGapok(String kodeGapok) {
-		this.kodeGapok = kodeGapok;
-	}
-
-	public GolonganPegawai getKodeGol() {
-		return kodeGol;
-	}
-
-	public void setKodeGol(GolonganPegawai kodeGol) {
-		this.kodeGol = kodeGol;
-	}
-
-	public Integer getKodeGolId() {
-		return kodeGolId;
-	}
-
-	public void setKodeGolId(Integer kodeGolId) {
-		this.kodeGolId = kodeGolId;
-	}
-
-	public String getKodeJabatan() {
-		return kodeJabatan;
-	}
-
-	public void setKodeJabatan(String kodeJabatan) {
-		this.kodeJabatan = kodeJabatan;
-	}
-
-//	public Set<MapPegawaiJabatanToUnitKerja> getListJabatanInternal() {
-//		return listJabatanInternal;
-//	}
-
-//	public void setListJabatanInternal(Set<MapPegawaiJabatanToUnitKerja> listJabatanInternal) {
-//		this.listJabatanInternal = listJabatanInternal;
-//	}
-
-	public Jabatan getJabatanFungsional() {
-		return jabatanFungsional;
-	}
-
-	public void setJabatanFungsional(Jabatan jabatanFungsional) {
-		this.jabatanFungsional = jabatanFungsional;
-	}
-
-	public Integer getJabatanFungsionalId() {
-		return jabatanFungsionalId;
-	}
-
-	public void setJabatanFungsionalId(Integer jabatanFungsionalId) {
-		this.jabatanFungsionalId = jabatanFungsionalId;
-	}
-
-	public Integer getPensiun() {
-		return pensiun;
-	}
-
-	public void setPensiun(Integer pensiun) {
-		this.pensiun = pensiun;
-	}
-
-	public String getTunjanganFungsional() {
-		return tunjanganFungsional;
-	}
-
-	public void setTunjanganFungsional(String tunjanganFungsional) {
-		this.tunjanganFungsional = tunjanganFungsional;
-	}
-
-	public String getTunjanganUmum() {
-		return tunjanganUmum;
-	}
-
-	public void setTunjanganUmum(String tunjanganUmum) {
-		this.tunjanganUmum = tunjanganUmum;
-	}
-
-	public String getTunjanganPapua() {
-		return tunjanganPapua;
-	}
-
-	public void setTunjanganPapua(String tunjanganPapua) {
-		this.tunjanganPapua = tunjanganPapua;
-	}
-
-	public String getWilayahTerperinci() {
-		return wilayahTerperinci;
-	}
-
-	public void setWilayahTerperinci(String wilayahTerperinci) {
-		this.wilayahTerperinci = wilayahTerperinci;
-	}
-
-	public StatusPerkawinanPegawai getStatusKawin() {
-		return statusKawin;
-	}
-
-	public void setStatusKawin(StatusPerkawinanPegawai statusKawin) {
-		this.statusKawin = statusKawin;
-	}
-
-	public Integer getStatusKawinId() {
-		return statusKawinId;
-	}
-
-	public void setStatusKawinId(Integer statusKawinId) {
-		this.statusKawinId = statusKawinId;
-	}
-
-	public Eselon getEselon() {
-		return eselon;
-	}
-
-	public void setEselon(Eselon eselon) {
-		this.eselon = eselon;
-	}
-
-	public Integer getEselonId() {
-		return eselonId;
-	}
-
-	public void setEselonId(Integer eselonId) {
-		this.eselonId = eselonId;
-	}
-
-	public JenisHukuman getJenisHukuman() {
-		return jenisHukuman;
-	}
-
-	public void setJenisHukuman(JenisHukuman jenisHukuman) {
-		this.jenisHukuman = jenisHukuman;
-	}
-
-	public Integer getJenisHukumanId() {
-		return jenisHukumanId;
-	}
-
-	public void setJenisHukumanId(Integer jenisHukumanId) {
-		this.jenisHukumanId = jenisHukumanId;
-	}
-
-	public String getBeras() {
-		return beras;
-	}
-
-	public void setBeras(String beras) {
-		this.beras = beras;
-	}
-
-	public Integer getJumlah() {
-		return jumlah;
-	}
-
-	public void setJumlah(Integer jumlah) {
-		this.jumlah = jumlah;
-	}
-
-	public Integer getGrade() {
-		return grade;
-	}
-
-	public void setGrade(Integer grade) {
-		this.grade = grade;
-	}
-
-	public Date getTanggalTMT() {
-		return tanggalTMT;
-	}
-
-	public void setTanggalTMT(Date tanggalTMT) {
-		this.tanggalTMT = tanggalTMT;
-	}
-
-	public Date getTanggalRekam() {
-		return tanggalRekam;
-	}
-
-	public void setTanggalRekam(Date tanggalRekam) {
-		this.tanggalRekam = tanggalRekam;
-	}
-
-	public Integer getDefauld() {
-		return defauld;
-	}
-
-	public void setDefauld(Integer defauld) {
-		this.defauld = defauld;
-	}
-
 }

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

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

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

@@ -1,50 +1,35 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import lombok.Getter;
-import javax.persistence.GeneratedValue;
+import lombok.Setter;
-import javax.persistence.GenerationType;
+
-import javax.persistence.Id;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class NamaDokter
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "RM_NamaDokter_M")
 public class NamaDokter 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.namadokter_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.namadokter_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.namadokter_m_id_seq", sequenceName = "public.namadokter_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.namadokter_m_id_seq", sequenceName = "public.namadokter_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

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

@@ -1,24 +1,25 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-import javax.persistence.*;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.jasamedika.medifirst2000.base.BaseTransaction;
-
-import javax.validation.constraints.NotNull;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
 
 /**
  * class NamaPegawai
  * 
  * @author Generator
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "sdm_NamaPegawai_T")
 public class NamaPegawai extends BaseTransaction {
+
 	@Column(name = "Id", nullable = false, length = 100)
 	@Caption(value = "Id")
 	private Integer id;
@@ -47,62 +48,4 @@ public class NamaPegawai extends BaseTransaction {
 	@Caption(value = "ReportDisplay")
 	private String reportDisplay;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getNamaExternal() {
-		return namaExternal;
-	}
-
-	public void setNamaExternal(String namaExternal) {
-		this.namaExternal = namaExternal;
-	}
-
-	public String getNoRec() {
-		return noRec;
-	}
-
-	public void setNoRec(String noRec) {
-		this.noRec = noRec;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Integer getKode() {
-		return kode;
-	}
-
-	public void setKode(Integer kode) {
-		this.kode = kode;
-	}
-
-	public Integer getKodeExternal() {
-		return kodeExternal;
-	}
-
-	public void setKodeExternal(Integer kodeExternal) {
-		this.kodeExternal = kodeExternal;
-	}
-
-	public String getReportDisplay() {
-		return reportDisplay;
-	}
-
-	public void setReportDisplay(String reportDisplay) {
-		this.reportDisplay = reportDisplay;
-	}
-	
-	
-
 }

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

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

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

@@ -1,101 +1,47 @@
 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.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import lombok.Getter;
-import javax.persistence.GeneratedValue;
+import lombok.Setter;
-import javax.persistence.GenerationType;
+
-import javax.persistence.Id;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class Negara
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "Negara_M")
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class Negara extends BaseMaster {
+
 	@NotNull(message = "Kd Negara tidak boleh kosong")
 	@Column(name = "KdNegara", nullable = false)
 	@Caption(value = "Kode Negara")
 	private Byte kdNegara;
 
-	public void setKdNegara(Byte kdNegara) {
-		this.kdNegara = kdNegara;
-	}
-
-	public Byte getKdNegara() {
-		return this.kdNegara;
-	}
-
 	@NotNull(message = "Nama Negara tidak boleh kosong")
 	@Column(name = "NamaNegara", nullable = false, length = 50)
 	@Caption(value = "Nama Negara")
 	private String namaNegara;
 
-	public void setNamaNegara(String namaNegara) {
-		this.namaNegara = namaNegara;
-	}
-
-	public String getNamaNegara() {
-		return this.namaNegara;
-	}
-
 	@NotNull(message = "QNegara tidak boleh kosong")
 	@Column(name = "QNegara", nullable = false)
 	@Caption(value = "QNegara")
 	private Byte qNegara;
 
-	public void setqNegara(Byte qNegara) {
-		this.qNegara = qNegara;
-	}
-
-	public Byte getqNegara() {
-		return this.qNegara;
-	}
-
-	/*
-	 * @JsonManagedReference
-	 * 
-	 * @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL,
-	 * mappedBy="kdnegara") private Set<Alamat> AlamatSet = new
-	 * HashSet<Alamat>();
-	 * 
-	 * public Set<Alamat> getAlamatSet() { return AlamatSet; }
-	 * 
-	 * public void setAlamatSet(Set<Alamat> alamatSet) { AlamatSet = alamatSet;
-	 * }
-	 */
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.negara_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.negara_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.negara_m_id_seq", sequenceName = "public.negara_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.negara_m_id_seq", sequenceName = "public.negara_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

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

@@ -1,141 +1,61 @@
 package com.jasamedika.medifirst2000.entities;
+
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+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;
+@Getter
-import javax.persistence.Column;
+@Setter
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;
-
 @Entity
 @Table(name = "NeracaLimbah_T")
 public class NeracaLimbah extends BaseTransaction {
 
 	@Column(name = "periodeAwal", nullable = false)
 	@Caption(value = "Periode Awal")
-	@NotNull(message="Periode Awal harus Disi")
+	@NotNull(message = "Periode Awal harus Disi")
 	private Date periodeAwal;
 
 	@Column(name = "periodeAhir", nullable = false)
 	@Caption(value = "Periode Ahir")
-	@NotNull(message="Periode Ahir harus Disi")
+	@NotNull(message = "Periode Ahir harus Disi")
 	private Date periodeAhir;
 
 	@Column(name = "residu", nullable = false)
 	@Caption(value = "Residu")
-	@NotNull(message="residu Harus Diisi")
+	@NotNull(message = "residu Harus Diisi")
 	private Double residu;
 
 	@Column(name = "jumlahYangBelumTerkelola", nullable = false)
 	@Caption(value = "Jumlah Yang Belum terkelola")
-	@NotNull(message="Jumlah Yang Belum terkelola harus diisi")
+	@NotNull(message = "Jumlah Yang Belum terkelola harus diisi")
 	private Double jumlahYangBelumTerkelola;
 
 	@Column(name = "kinerjaPengelolaan", nullable = false)
 	@Caption(value = "kinerja Pengelolaan")
-	@NotNull(message="kinerja Pengelolaan harus diisi")
+	@NotNull(message = "kinerja Pengelolaan harus diisi")
 	private Double kinerjaPengelolaan;
 
-	@Column(name = "Catatan", nullable = true,columnDefinition="TEXT")
+	@Column(name = "Catatan", columnDefinition = "TEXT")
 	@Caption(value = "kinerja Pengelolaan")
 	private String Catatan;
 
-	@Column(name="totalLimbahMasuk")
+	@Column(name = "totalLimbahMasuk")
 	private Double totalLimbahMasuk;
 
 	@JsonManagedReference
-	@OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "neracaLimbah")
+	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "neracaLimbah")
-	private Set<DetailPerlakuan> detailPerlakuan = new HashSet<DetailPerlakuan>();
+	private Set<DetailPerlakuan> detailPerlakuan = new HashSet<>();
 
 	@JsonManagedReference
-	@OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "neracaLimbah")
+	@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "neracaLimbah")
-	private Set<DetailJenisLimbah> detailJenisLimbah = new HashSet<DetailJenisLimbah>();
+	private Set<DetailJenisLimbah> detailJenisLimbah = new HashSet<>();
-
-
-
-	public Date getPeriodeAwal() {
-		return periodeAwal;
-	}
-
-	public void setPeriodeAwal(Date periodeAwal) {
-		this.periodeAwal = periodeAwal;
-	}
-
-	public Date getPeriodeAhir() {
-		return periodeAhir;
-	}
-
-	public void setPeriodeAhir(Date periodeAhir) {
-		this.periodeAhir = periodeAhir;
-	}
-
-	public Double getResidu() {
-		return residu;
-	}
-
-	public void setResidu(Double residu) {
-		this.residu = residu;
-	}
-
-	public Double getJumlahYangBelumTerkelola() {
-		return jumlahYangBelumTerkelola;
-	}
-
-	public void setJumlahYangBelumTerkelola(Double jumlahYangBelumTerkelola) {
-		this.jumlahYangBelumTerkelola = jumlahYangBelumTerkelola;
-	}
-
-	public Double getKinerjaPengelolaan() {
-		return kinerjaPengelolaan;
-	}
-
-	public void setKinerjaPengelolaan(Double kinerjaPengelolaan) {
-		this.kinerjaPengelolaan = kinerjaPengelolaan;
-	}
-
-	public String getCatatan() {
-		return Catatan;
-	}
-
-	public void setCatatan(String catatan) {
-		Catatan = catatan;
-	}
-
-	public Set<DetailPerlakuan> getDetailPerlakuan() {
-		return detailPerlakuan;
-	}
-
-	public void setDetailPerlakuan(Set<DetailPerlakuan> detailPerlakuan) {
-		this.detailPerlakuan = detailPerlakuan;
-	}
-
-	public Set<DetailJenisLimbah> getDetailJenisLimbah() {
-		return detailJenisLimbah;
-	}
-
-	public void setDetailJenisLimbah(Set<DetailJenisLimbah> detailJenisLimbah) {
-		this.detailJenisLimbah = detailJenisLimbah;
-	}
-
-	public Double getTotalLimbahMasuk() {
-		return totalLimbahMasuk;
-	}
-
-	public void setTotalLimbahMasuk(Double totalLimbahMasuk) {
-		this.totalLimbahMasuk = totalLimbahMasuk;
-	}
-	
-	
-	
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/NeurologiKejang.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 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_NeurologiKejang_M")
 public class NeurologiKejang 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.neurologikejang_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.neurologikejang_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.neurologikejang_m_id_seq", sequenceName = "public.neurologikejang_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.neurologikejang_m_id_seq", sequenceName = "public.neurologikejang_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

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

@@ -1,47 +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_NeurologiKomponen_M")
 public class NeurologiKomponen 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) {
+	@Id
-		this.name = name;
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.neurologikomponen_m_id_seq")
-	}
+	@SequenceGenerator(name = "public.neurologikomponen_m_id_seq", sequenceName = "public.neurologikomponen_m_id_seq", allocationSize = 1)
-
+	@Column(name = "id")
-	public String getName() {
+	protected Integer id;
-		return this.name;
-	}
-
- @Id
-@GeneratedValue(
-  strategy=GenerationType.SEQUENCE, 
-   generator="public.neurologikomponen_m_id_seq")
-@javax.persistence.SequenceGenerator(
-	name="public.neurologikomponen_m_id_seq",	sequenceName="public.neurologikomponen_m_id_seq",
-		allocationSize=1		)
-@Column(name = "id")	protected Integer id;
-	public Integer getId() {
-
-	return id;
-	}
-public void setId(Integer id) {
-	this.id = id;
-	}
-
 
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/NilaiHarapan.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 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_NilaiHarapan_M")
 public class NilaiHarapan 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.nilaiharapan_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.nilaiharapan_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.nilaiharapan_m_id_seq", sequenceName = "public.nilaiharapan_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.nilaiharapan_m_id_seq", sequenceName = "public.nilaiharapan_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

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

@@ -1,15 +1,15 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "sdm_NilaiIndexKinerjaIndividu_T")
 public class NilaiIndexKinerjaIndividu extends BaseTransaction {
@@ -28,99 +28,27 @@ public class NilaiIndexKinerjaIndividu extends BaseTransaction {
 	private String periode;
 
 	@Caption(value = "totalKuantitas")
-	@Column(name = "totalKuantitas", nullable = true)
+	@Column(name = "totalKuantitas")
 	private Double totalKuantitas;
 
 	@Caption(value = "totalKualitas")
-	@Column(name = "totalKualitas", nullable = true)
+	@Column(name = "totalKualitas")
 	private Double totalKualitas;
 
 	@Caption(value = "totalPerilaku")
-	@Column(name = "totalPerilaku", nullable = true)
+	@Column(name = "totalPerilaku")
 	private Double totalPerilaku;
 
 	@Caption(value = "totalInovasi")
-	@Column(name = "totalInovasi", nullable = true)
+	@Column(name = "totalInovasi")
 	private Double totalInovasi;
 
 	@Caption(value = "totalIKI")
-	@Column(name = "totalIKI", nullable = true)
+	@Column(name = "totalIKI")
 	private Double totalIKI;
 
 	@Caption(value = "iki")
-	@Column(name = "iki", nullable = true)
+	@Column(name = "iki")
 	private Double iki;
 
-	public Double getIki() {
-		return iki;
-	}
-
-	public void setIki(Double iki) {
-		this.iki = iki;
-	}
-
-	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 getPeriode() {
-		return periode;
-	}
-
-	public void setPeriode(String periode) {
-		this.periode = periode;
-	}
-
-	public Double getTotalKuantitas() {
-		return totalKuantitas;
-	}
-
-	public void setTotalKuantitas(Double totalKuantitas) {
-		this.totalKuantitas = totalKuantitas;
-	}
-
-	public Double getTotalKualitas() {
-		return totalKualitas;
-	}
-
-	public void setTotalKualitas(Double totalKualitas) {
-		this.totalKualitas = totalKualitas;
-	}
-
-	public Double getTotalPerilaku() {
-		return totalPerilaku;
-	}
-
-	public void setTotalPerilaku(Double totalPerilaku) {
-		this.totalPerilaku = totalPerilaku;
-	}
-
-	public Double getTotalInovasi() {
-		return totalInovasi;
-	}
-
-	public void setTotalInovasi(Double totalInovasi) {
-		this.totalInovasi = totalInovasi;
-	}
-
-	public Double getTotalIKI() {
-		return totalIKI;
-	}
-
-	public void setTotalIKI(Double totalIKI) {
-		this.totalIKI = totalIKI;
-	}
-
 }

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

@@ -1,27 +1,32 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class KelompokJabatan
  * 
  * @author Generator
  */
+@Getter
+@Setter
 @Entity
 @Table(name = "NilaiKelompokJabatan_M")
 public class NilaiKelompokJabatan extends BaseMaster {
 
+	@Id
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.NilaiKelompokJabatan_M_id_seq")
+	@SequenceGenerator(name = "public.NilaiKelompokJabatan_M_id_seq", sequenceName = "public.NilaiKelompokJabatan_M_id_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Integer id;
+
 	@ManyToOne
 	@JoinColumn(name = "KelompokJabatanFk")
 	@NotNull(message = "KelompokJabatan Harus Diisi")
@@ -55,12 +60,6 @@ public class NilaiKelompokJabatan extends BaseMaster {
 	@Caption(value = "NilaiTertinggi")
 	private Integer nilaiTertinggi;
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.NilaiKelompokJabatan_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.NilaiKelompokJabatan_M_id_seq", sequenceName = "public.NilaiKelompokJabatan_M_id_seq", allocationSize = 1)
-	@Column(name = "id")
-	protected Integer id;
-
 	@Column(name = "GajiHonorarium", nullable = false)
 	@Caption(value = "Gaji Honorarium")
 	private Double gajiHonorarium;
@@ -77,108 +76,4 @@ public class NilaiKelompokJabatan extends BaseMaster {
 	@Caption(value = "Maksimal Total Remunerasi")
 	private Double maxTotalRemunerasi;
 
-	public KelompokJabatan getKelompokJabatan() {
-		return kelompokJabatan;
-	}
-
-	public void setKelompokJabatan(KelompokJabatan kelompokJabatan) {
-		this.kelompokJabatan = kelompokJabatan;
-	}
-
-	public Integer getKelompokJabatanId() {
-		return kelompokJabatanId;
-	}
-
-	public void setKelompokJabatanId(Integer kelompokJabatanId) {
-		this.kelompokJabatanId = kelompokJabatanId;
-	}
-
-	public String getDetailKelompokJabatan() {
-		return detailKelompokJabatan;
-	}
-
-	public void setDetailKelompokJabatan(String detailKelompokJabatan) {
-		this.detailKelompokJabatan = detailKelompokJabatan;
-	}
-
-	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 String getGradeDesc() {
-		return gradeDesc;
-	}
-
-	public void setGradeDesc(String gradeDesc) {
-		this.gradeDesc = gradeDesc;
-	}
-
-	public Integer getNilaiTerendah() {
-		return nilaiTerendah;
-	}
-
-	public void setNilaiTerendah(Integer nilaiTerendah) {
-		this.nilaiTerendah = nilaiTerendah;
-	}
-
-	public Integer getNilaiTertinggi() {
-		return nilaiTertinggi;
-	}
-
-	public void setNilaiTertinggi(Integer nilaiTertinggi) {
-		this.nilaiTertinggi = nilaiTertinggi;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	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;
-	}
-
 }

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

@@ -1,27 +1,27 @@
 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="NilaiNilai_T")
+@Table(name = "NilaiNilai_T")
-public class NilaiNilai extends BaseTransaction{
+public class NilaiNilai extends BaseTransaction {
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectPasienDaftarFk")
-	@NotNull(message="PasienDaftar Harus Diisi")
+	@NotNull(message = "PasienDaftar Harus Diisi")
-	@Caption(value="PasienDaftar")
+	@Caption(value = "PasienDaftar")
 	private AntrianPasienDiPeriksa pasienDaftar;
 
-	@Column(name = "ObjectPasienDaftarFk", insertable=false,updatable=false, nullable=false)
+	@Column(name = "ObjectPasienDaftarFk", insertable = false, updatable = false, nullable = false)
 	private String pasienDaftarId;
 
 	@NotNull(message = "Tgl Input tidak boleh kosong")
@@ -31,52 +31,20 @@ public class NilaiNilai extends BaseTransaction{
 
 	@ManyToOne
 	@JoinColumn(name = "ObjectMengatasiPenyakitFk")
-	@NotNull(message="Object MengatasiPenyakit Harus Diisi")
+	@NotNull(message = "Object MengatasiPenyakit Harus Diisi")
-	@Caption(value="Object MengatasiPenyakit")	
+	@Caption(value = "Object MengatasiPenyakit")
 	private StatusMengatasiPenyakit mengatasiPenyakit;
 
-	@Column(name = "ObjectMengatasiPenyakitFk", insertable=false,updatable=false, nullable=false)
+	@Column(name = "ObjectMengatasiPenyakitFk", insertable = false, updatable = false, nullable = false)
 	private Integer penangananStressId;
 
 	@ManyToOne
 	@JoinColumn(name = "ObjectHarapanPasienFk")
-	@NotNull(message="Object HarapanPasien Harus Diisi")
+	@NotNull(message = "Object HarapanPasien Harus Diisi")
-	@Caption(value="Object HarapanPasien")
+	@Caption(value = "Object HarapanPasien")
 	private StatusHarapanPasien harapanPasien;
 
-	@Column(name = "ObjectMengatasiPenyakitFk", insertable=false,updatable=false, nullable=false)
+	@Column(name = "ObjectMengatasiPenyakitFk", insertable = false, updatable = false, nullable = false)
 	private Integer harapanPasienId;
 
-	public AntrianPasienDiPeriksa getPasienDaftar() {
-		return pasienDaftar;
-	}
-
-	public void setPasienDaftar(AntrianPasienDiPeriksa pasienDaftar) {
-		this.pasienDaftar = pasienDaftar;
-	}
-
-	public Date getTglInput() {
-		return tglInput;
-	}
-
-	public void setTglInput(Date tglInput) {
-		this.tglInput = tglInput;
-	}
-
-	public StatusMengatasiPenyakit getMengatasiPenyakit() {
-		return mengatasiPenyakit;
-	}
-
-	public void setMengatasiPenyakit(StatusMengatasiPenyakit mengatasiPenyakit) {
-		this.mengatasiPenyakit = mengatasiPenyakit;
-	}
-
-	public StatusHarapanPasien getHarapanPasien() {
-		return harapanPasien;
-	}
-
-	public void setHarapanPasien(StatusHarapanPasien harapanPasien) {
-		this.harapanPasien = harapanPasien;
-	}
-	
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/NilaiPertolongan.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 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_NilaiPertolongan_M")
 public class NilaiPertolongan 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.nilaipertolongan_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.nilaipertolongan_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.nilaipertolongan_m_id_seq", sequenceName = "public.nilaipertolongan_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.nilaipertolongan_m_id_seq", sequenceName = "public.nilaipertolongan_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

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

@@ -1,194 +1,77 @@
 package com.jasamedika.medifirst2000.entities;
 
-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 com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 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 java.util.HashSet;
+import java.util.Set;
+
+import static javax.persistence.CascadeType.ALL;
+import static javax.persistence.FetchType.LAZY;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "NotaDinas_T")
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
-public class NotaDinas extends BaseTransaction{
+public class NotaDinas extends BaseTransaction {
 
-	/*@ManyToOne(fetch = FetchType.LAZY)
+	@Column(name = "NoSurat")
-	@JoinColumn(name = "ObjectDokumenFk")
+	@Caption(value = "noSurat")
-	@NotNull(message="Object Dokumen Harus Diisi")
-	@Caption(value="Object Dokumen")
-	private Dokumen dokumen;
-	
-	@Column(name = "ObjectDokumenFk", insertable=false,updatable=false)
-	private Integer ObjectDokumenId;
-	*/
-	@Column(name = "NoSurat", nullable = true )
-	@Caption(value="noSurat")
 	private String noSurat;
 
-	@Column(name = "hal", nullable = true )
+	@Column(name = "hal")
-	@Caption(value="judul")
+	@Caption(value = "judul")
 	private String hal;
 
 	@ManyToOne
 	@JoinColumn(name = "ObjectJabatanFk")
-	@Caption(value="Jabatan")
+	@Caption(value = "Jabatan")
 	private Jabatan jabatan;
 
-	@Column(name = "ObjectJabatanFk", insertable=false,updatable=false, nullable = true)
+	@Column(name = "ObjectJabatanFk", insertable = false, updatable = false)
 	private Integer jabatanId;
 
-	@Column(name = "IsiSurat", nullable = true)
+	@Column(name = "IsiSurat")
-	@Caption(value="isiSurat")
+	@Caption(value = "isiSurat")
 	private String isiSurat;
 
 	@JsonManagedReference
-	@OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "notaDinas")
+	@OneToMany(cascade = ALL, fetch = LAZY, mappedBy = "notaDinas")
-	private Set<NotaDinasJabatan> notaDinasJabatan=new HashSet<NotaDinasJabatan>();
+	private Set<NotaDinasJabatan> notaDinasJabatan = new HashSet<>();
 
-	@Column(name = "tanggal", nullable = true )
+	@Column(name = "tanggal")
-	@Caption(value="Tanggal")
+	@Caption(value = "Tanggal")
 	private Date tanggal;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectPegawaiPembuatFk")
 	@Caption(value = "Object Pegawai Pembuat")
 	private Pegawai pegawaiPembuat;
 
-	@Column(name = "ObjectPegawaiPembuatFk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "ObjectPegawaiPembuatFk", insertable = false, updatable = false)
 	private Integer pegawaiPembuatId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectJenisSuratFk")
 	@Caption(value = "Object Jenis Surat")
 	private JenisSurat jenisSurat;
 
-	@Column(name = "ObjectJenisSuratFk", insertable = false, updatable = false, nullable = true)
+	@Column(name = "ObjectJenisSuratFk", insertable = false, updatable = false)
 	private Integer jenisSuratId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectRuanganFk")
 	@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;
 
-	
-	/*public Dokumen getDokumen() {
-		return dokumen;
-	}
-
-	public void setDokumen(Dokumen dokumen) {
-		this.dokumen = dokumen;
-	}
-
-	public Integer getObjectDokumenId() {
-		return ObjectDokumenId;
-	}
-
-	public void setObjectDokumenId(Integer objectDokumenId) {
-		ObjectDokumenId = objectDokumenId;
-	}*/
-
-	public String getNoSurat() {
-		return noSurat;
-	}
-
-	public void setNoSurat(String noSurat) {
-		this.noSurat = noSurat;
-	}
-
-	public String getHal() {
-		return hal;
-	}
-
-	public void setHal(String hal) {
-		this.hal = hal;
-	}
-
-	public Jabatan getJabatan() {
-		return jabatan;
-	}
-
-	public void setJabatan(Jabatan jabatan) {
-		this.jabatan = jabatan;
-	}
-
-	public Integer getJabatanId() {
-		return jabatanId;
-	}
-
-	public void setJabatanId(Integer jabatanId) {
-		this.jabatanId = jabatanId;
-	}
-
-	public String getIsiSurat() {
-		return isiSurat;
-	}
-
-	public void setIsiSurat(String isiSurat) {
-		this.isiSurat = isiSurat;
-	}
-
-	public Set<NotaDinasJabatan> getNotaDinasJabatan() {
-		return notaDinasJabatan;
-	}
-
-	public void setNotaDinasJabatan(Set<NotaDinasJabatan> notaDinasJabatan) {
-		this.notaDinasJabatan = notaDinasJabatan;
-	}
-
-	public Date getTanggal() {
-		return tanggal;
-	}
-
-	public void setTanggal(Date tanggal) {
-		this.tanggal = tanggal;
-	}
-
-	public Pegawai getPegawaiPembuat() {
-		return pegawaiPembuat;
-	}
-
-	public void setPegawaiPembuat(Pegawai pegawaiPembuat) {
-		this.pegawaiPembuat = pegawaiPembuat;
-	}
-
-	public Integer getPegawaiPembuatId() {
-		return pegawaiPembuatId;
-	}
-
-	public void setPegawaiPembuatId(Integer pegawaiPembuatId) {
-		this.pegawaiPembuatId = pegawaiPembuatId;
-	}
-
-	public JenisSurat getJenisSurat() {
-		return jenisSurat;
-	}
-
-	public void setJenisSurat(JenisSurat jenisSurat) {
-		this.jenisSurat = jenisSurat;
-	}
-
-	public Integer getJenisSuratId() {
-		return jenisSuratId;
-	}
-
-	public void setJenisSuratId(Integer jenisSuratId) {
-		this.jenisSuratId = jenisSuratId;
-	}
-	
-	
-	
 }

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

@@ -1,105 +1,50 @@
 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 com.fasterxml.jackson.annotation.JsonBackReference;
 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 static javax.persistence.FetchType.LAZY;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "NotaDinasJabatan_T")
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class NotaDinasJabatan extends BaseTransaction {
 
 	@JsonBackReference
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectNotaDinasFk")
-	@Caption(value="NotaDinas")
+	@Caption(value = "NotaDinas")
 	private NotaDinas notaDinas;
 
-	@Column(name = "ObjectNotaDinasFk", insertable=false,updatable=false, nullable = true)
+	@Column(name = "ObjectNotaDinasFk", insertable = false, updatable = false)
 	private String notaDinasId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectJabatanFk")
-	@Caption(value="jabatan")
+	@Caption(value = "jabatan")
 	private Jabatan jabatan;
 
-	@Column(name = "ObjectJabatanFk", insertable=false,updatable=false, nullable = true)
+	@Column(name = "ObjectJabatanFk", insertable = false, updatable = false)
 	private Integer jabatanId;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "ObjectPegawaiFk")
-	@Caption(value="pegawai")
+	@Caption(value = "pegawai")
 	private Pegawai pegawai;
 
-	@Column(name = "ObjectPegawaiFk", insertable=false,updatable=false, nullable = true)
+	@Column(name = "ObjectPegawaiFk", insertable = false, updatable = false)
 	private Integer pegawaiId;
 
-	@Column(name = "isRead",columnDefinition = "boolean default false")
+	@Column(name = "isRead", columnDefinition = "boolean default false")
 	@Caption("Is Nota Dinas/ Disposisi was read")
 	public Boolean isRead;
 
-	public NotaDinas getNotaDinas() {
-		return notaDinas;
-	}
-
-	public void setNotaDinas(NotaDinas notaDinas) {
-		this.notaDinas = notaDinas;
-	}
-
-	public String getNotaDinasId() {
-		return notaDinasId;
-	}
-
-	public void setNotaDinasId(String notaDinasId) {
-		this.notaDinasId = notaDinasId;
-	}
-
-	public Jabatan getJabatan() {
-		return jabatan;
-	}
-
-	public void setJabatan(Jabatan jabatan) {
-		this.jabatan = jabatan;
-	}
-
-	public Integer getJabatanId() {
-		return jabatanId;
-	}
-
-	public void setJabatanId(Integer jabatanId) {
-		this.jabatanId = jabatanId;
-	}
-
-	public 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 Boolean getIsRead() {
-		return isRead;
-	}
-
-	public void setIsRead(Boolean isRead) {
-		this.isRead = isRead;
-	}
-	
 }

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

@@ -1,30 +1,16 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.jasamedika.medifirst2000.base.BaseMaster;
+import org.hibernate.annotations.NotFound;
+import org.hibernate.annotations.NotFoundAction;
+
+import javax.persistence.*;
+import java.util.Set;
 
 @Entity
 @Table(name = "NotifMessaging_S")
-@JsonSerialize
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class NotifMessaging extends BaseMaster {
 
@@ -32,11 +18,7 @@ public class NotifMessaging extends BaseMaster {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.notif_messaging_s_id_seq")
-	@javax.persistence.SequenceGenerator(
+	@javax.persistence.SequenceGenerator(name = "public.notif_messaging_s_id_seq", sequenceName = "public.notif_messaging_s_id_seq", allocationSize = 1)
-			name = "public.notif_messaging_s_id_seq", 
-			sequenceName = "public.notif_messaging_s_id_seq", 
-			allocationSize = 1
-	)
 	@Column(name = "id")
 	private Integer id;
 
@@ -52,7 +34,6 @@ public class NotifMessaging extends BaseMaster {
 	@Column(name = "urlBackEnd")
 	private String urlBackEnd;
 
-
 	public Integer getId() {
 		return id;
 	}
@@ -93,12 +74,10 @@ public class NotifMessaging extends BaseMaster {
 		this.urlBackEnd = urlBackEnd;
 	}
 
-
 	/////////////////////
 	/// Foreign Keys
 	//////////////////
 
-
 	@Column(name = "ObjekModulAplikasiId")
 	private Integer objekModulAplikasiId;
 

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

@@ -1,174 +1,71 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.util.Date;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.jasamedika.medifirst2000.base.BaseMaster;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.persistence.*;
+import java.util.Date;
+
+import static javax.persistence.CascadeType.ALL;
+import static javax.persistence.CascadeType.MERGE;
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.SEQUENCE;
+import static javax.persistence.TemporalType.DATE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "NotifMessagingScheduler_S")
-@JsonSerialize
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class NotifMessagingScheduler extends BaseMaster {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -3097911644440148472L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.notifikasi_modul_message_s_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.notifikasi_modul_message_s_id_seq")
-	@javax.persistence.SequenceGenerator(
+	@SequenceGenerator(name = "public.notifikasi_modul_message_s_id_seq", sequenceName = "public.notifikasi_modul_message_s_id_seq", allocationSize = 1)
-			name = "public.notifikasi_modul_message_s_id_seq", 
-			sequenceName = "public.notifikasi_modul_message_s_id_seq", 
-			allocationSize = 1
-	)	
 	@Column(name = "id")
 	private Integer id;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	
 	@Column(name = "TglKirim")
-	@Temporal(TemporalType.DATE)
+	@Temporal(DATE)
 	private Date tglKirim;
 
-	public Date getTglKirim() {
-		return tglKirim;
-	}
-
-	public void setTglKirim(Date tglKirim) {
-		this.tglKirim = tglKirim;
-	}
-	
 	private boolean terkirim;
 
-	public boolean isTerkirim() {
-		return terkirim;
-	}
-
-	public void setTerkirim(boolean terkirim) {
-		this.terkirim = terkirim;
-	}
-	
-	///////////////////////////
-	// Foreign Key
-	///////////////////////////
-	
-
 	@Column(name = "NotifMessagingId")
 	private Integer notifMessagingId;
 
-	public Integer getNotifMessagingId() {
+	@ManyToOne(fetch = LAZY, cascade = ALL)
-		return notifMessagingId;
-	}
-
-	public void setNotifMessagingId(Integer notifMessagingId) {
-		this.notifMessagingId = notifMessagingId;
-	}
-	
-	@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 	@JoinColumn(name = "notifMessagingId", insertable = false, updatable = false)
 	@JsonIgnore
 	private NotifMessaging notifMessaging;
 
-	public NotifMessaging getNotifMessaging() {
-		return notifMessaging;
-	}
-
-	public void setNotifMessaging(NotifMessaging notifMessaging) {
-		this.notifMessaging = notifMessaging;
-	}
-	
 	@Column(name = "RuanganIdAsal")
 	private Integer ruanganIdAsal;
 
-	public Integer getRuanganIdAsal() {
+	@ManyToOne(fetch = LAZY, cascade = MERGE)
-		return ruanganIdAsal;
-	}
-
-	public void setRuanganIdAsal(Integer ruanganId) {
-		this.ruanganIdAsal = ruanganId;
-	}
-	
-	@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
 	@JoinColumn(name = "ruanganIdAsal", insertable = false, updatable = false)
 	@JsonIgnore
 	private Ruangan ruanganAsal;
 
-	public Ruangan getRuanganAsal() {
-		return ruanganAsal;
-	}
-
-	public void setRuanganAsal(Ruangan ruangan) {
-		this.ruanganAsal = ruangan;
-	}
-	
 	@Column(name = "RuanganIdTujuan")
 	private Integer ruanganIdTujuan;
 
-	public Integer getRuanganIdTujuan() {
+	@ManyToOne(fetch = LAZY, cascade = MERGE)
-		return ruanganIdTujuan;
-	}
-	public void setRuanganIdTujuan(Integer ruanganIdTujuan) {
-		this.ruanganIdTujuan = ruanganIdTujuan;
-	}
-	
-	@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
 	@JoinColumn(name = "ruanganIdTujuan", insertable = false, updatable = false)
 	@JsonIgnore
 	private Ruangan ruanganTujuan;
 
-	public Ruangan getRuanganTujuan() {
-		return ruanganTujuan;
-	}
-	
-	public void setRuanganTujuan(Ruangan ruanganTujuan) {
-		this.ruanganTujuan = ruanganTujuan;
-	}
-	
 	@Column(name = "PegawaiId")
 	private Integer pegawaiId;
 
-	public Integer getPegawaiId() {
+	@ManyToOne(fetch = LAZY, cascade = MERGE)
-		return pegawaiId;
-	}
-	
-	public void setPegawaiId(Integer pegawaiId) {
-		this.pegawaiId = pegawaiId;
-	}
-	
-	@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
 	@JoinColumn(name = "pegawaiId", insertable = false, updatable = false)
 	@JsonIgnore
 	private Pegawai pegawai;
 
-	public Pegawai getPegawai() {
-		return pegawai;
-	}
-	
-	public void setPegawai(Pegawai pegawai) {
-		this.pegawai = pegawai;
-	}
-
 }

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

@@ -1,39 +1,25 @@
 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.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 
+import javax.persistence.*;
+
+import static javax.persistence.CascadeType.ALL;
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.SEQUENCE;
+
 @Entity
 @Table(name = "NotifikasiMessageObjekModul_S")
-@JsonSerialize
 @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
 public class NotifikasiMessageObjekModul extends BaseMaster {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -8108786967496072913L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.notifikasi_message_objek_modul_s_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.notifikasi_message_objek_modul_s_id_seq")
-	@javax.persistence.SequenceGenerator(
+	@SequenceGenerator(name = "public.notifikasi_message_objek_modul_s_id_seq", sequenceName = "public.notifikasi_message_objek_modul_s_id_seq", allocationSize = 1)
-			name = "public.notifikasi_message_objek_modul_s_id_seq", 
-			sequenceName = "public.notifikasi_message_objek_modul_s_id_seq", 
-			allocationSize = 1
-	)
 	@Column(name = "id")
 	private Integer id;
 
@@ -49,152 +35,33 @@ public class NotifikasiMessageObjekModul extends BaseMaster {
 	@Column(name = "NamaFungsiFrontEnd")
 	private String namaFungsiFrontEnd;
 
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	
-	public String getTitleNotifikasi() {
-		return titleNotifikasi;
-	}
-
-	public void setTitleNotifikasi(String titleNotifikasi) {
-		this.titleNotifikasi = titleNotifikasi;
-	}
-
-	
-	public String getPesanNotifikasi() {
-		return pesanNotifikasi;
-	}
-
-	public void setPesanNotifikasi(String pesanNotifikasi) {
-		this.pesanNotifikasi = pesanNotifikasi;
-	}
-	
-	public String getCustomURLObjekModul() {
-		return customURLObjekModul;
-	}
-
-	public void setCustomURLObjekModul(String customURLObjekModul) {
-		this.customURLObjekModul = customURLObjekModul;
-	}
-	
-	public String getNamaFungsiFrontEnd() {
-		return namaFungsiFrontEnd;
-	}
-
-	public void setNamaFungsiFrontEnd(String namaFungsiFrontEnd) {
-		this.namaFungsiFrontEnd = namaFungsiFrontEnd;
-	}
-	
-
-	/////////////////////
-	/// Foreign Keys
-	//////////////////
-
-
-
-
-
-
 	@Column(name = "NotifMessagingId")
 	private Integer notifMessagingId;
 
-	
-	public Integer getNotifMessagingId() {
-		return notifMessagingId;
-	}
-
-	public void setNotifMessagingId(Integer notifMessagingId) {
-		this.notifMessagingId = notifMessagingId;
-	}
-	
 	@Column(name = "ObjekModulAplikasiId")
 	private Integer objekModulAplikasiId;
 
-	public Integer getObjekModulAplikasiId() {
-		return objekModulAplikasiId;
-	}
-
-	public void setObjekModulAplikasiId(Integer objekModulAplikasiId) {
-		this.objekModulAplikasiId = objekModulAplikasiId;
-	}
-
 	@Column(name = "ModulAplikasiId")
 	private Integer modulAplikasiId;
 
-	public Integer getModulAplikasiId() {
-		return modulAplikasiId;
-	}
-
-	public void setModulAplikasiId(Integer modulAplikasiId) {
-		this.modulAplikasiId = modulAplikasiId;
-	}
-
 	@Column(name = "RuanganId")
 	private Integer ruanganId;
 
-	public Integer getRuanganId() {
+	@ManyToOne(fetch = LAZY, cascade = ALL)
-		return ruanganId;
-	}
-
-	public void setRuanganId(Integer ruanganId) {
-		this.ruanganId = ruanganId;
-	}
-
-	
-	@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 	@JoinColumn(name = "notifMessagingId", insertable = false, updatable = false)
 	@JsonIgnore
 	private NotifMessaging notifMessaging;
 
-	public NotifMessaging getNotifMessaging() {
+	@ManyToOne(fetch = LAZY, cascade = ALL)
-		return notifMessaging;
-	}
-
-	public void setNotifMessaging(NotifMessaging notifMessaging) {
-		this.notifMessaging = notifMessaging;
-	}
-		
-	@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 	@JoinColumn(name = "ruanganId", insertable = false, updatable = false)
 	private Ruangan ruangan;
 
-	public Ruangan getRuangan() {
+	@ManyToOne(fetch = LAZY, cascade = ALL)
-		return ruangan;
-	}
-
-	public void setRuangan(Ruangan ruangan) {
-		this.ruangan = ruangan;
-	}
-	
-	@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 	@JoinColumn(name = "modulAplikasiId", insertable = false, updatable = false)
 	private ModulAplikasi modulAplikasi;
 
-	public ModulAplikasi getModulAplikasi() {
+	@ManyToOne(fetch = LAZY, cascade = ALL)
-		return modulAplikasi;
-	}
-
-	public void setModulAplikasi(ModulAplikasi modulAplikasi) {
-		this.modulAplikasi = modulAplikasi;
-	}
-	
-	@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 	@JoinColumn(name = "objekModulAplikasiId", insertable = false, updatable = false)
 	private ObjekModulAplikasi objekModulAplikasi;
 
-	public ObjekModulAplikasi getObjekModulAplikasi() {
-		return objekModulAplikasi;
-	}
-
-	public void setObjekModulAplikasi(ObjekModulAplikasi objekModulAplikasi) {
-		this.objekModulAplikasi = objekModulAplikasi;
-	}
-	
-	
-
 }

jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/NutrisiMual.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 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_NutrisiMual_M")
 public class NutrisiMual 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.nutrisimual_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.nutrisimual_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.nutrisimual_m_id_seq", sequenceName = "public.nutrisimual_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.nutrisimual_m_id_seq", sequenceName = "public.nutrisimual_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

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

@@ -1,47 +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 javax.persistence.GeneratedValue;
+import lombok.Getter;
-import javax.persistence.GenerationType;
+import lombok.Setter;
-import javax.persistence.Id;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "rm_NutrisiMukosa_M")
 public class NutrisiMukosa 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.nutrisimukosa_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.nutrisimukosa_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.nutrisimukosa_m_id_seq", sequenceName = "public.nutrisimukosa_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.nutrisimukosa_m_id_seq", sequenceName = "public.nutrisimukosa_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

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

@@ -1,47 +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 javax.persistence.GeneratedValue;
+import lombok.Getter;
-import javax.persistence.GenerationType;
+import lombok.Setter;
-import javax.persistence.Id;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "rm_NutrisiMuntah_M")
 public class NutrisiMuntah 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.nutrisimuntah_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.nutrisimuntah_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.nutrisimuntah_m_id_seq", sequenceName = "public.nutrisimuntah_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.nutrisimuntah_m_id_seq", sequenceName = "public.nutrisimuntah_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

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

@@ -1,47 +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 javax.persistence.GeneratedValue;
+import lombok.Getter;
-import javax.persistence.GenerationType;
+import lombok.Setter;
-import javax.persistence.Id;
 
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
 @Entity
 @Table(name = "rm_NutrisiStomatitis_M")
 public class NutrisiStomatitis 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.nutrisistomatitis_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.nutrisistomatitis_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.nutrisistomatitis_m_id_seq", sequenceName = "public.nutrisistomatitis_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.nutrisistomatitis_m_id_seq", sequenceName = "public.nutrisistomatitis_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

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

@@ -1,17 +1,17 @@
 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 org.hibernate.envers.Audited;
+import lombok.Getter;
-import javax.persistence.GeneratedValue;
+import lombok.Setter;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 
-@Entity // @Audited
+import javax.persistence.*;
+
+import static javax.persistence.GenerationType.SEQUENCE;
+
+@Getter
+@Setter
+@Entity
 @Table(name = "Obat_M")
 public class Obat extends BaseMaster {
 
@@ -19,26 +19,10 @@ public class Obat extends BaseMaster {
 	@Caption(value = "Nama Obat")
 	private String namaObat;
 
-	public String getNamaObat() {
-		return namaObat;
-	}
-
-	public void setNamaObat(String namaObat) {
-		this.namaObat = namaObat;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.obat_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.obat_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.obat_m_id_seq", sequenceName = "public.obat_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.obat_m_id_seq", sequenceName = "public.obat_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

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

@@ -60,4 +60,5 @@ public class ObatLayananTindakan extends BaseTransaction implements Serializable
 	@NotNull(message = "Ruangan farmasi Tidak boleh Kosong")
 	@Caption(value = "Ruangan Farmasi")
 	private Ruangan ruanganFarmasi;
+
 }

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

@@ -1,45 +1,30 @@
 package com.jasamedika.medifirst2000.entities;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-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 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_ObatObatan_M")
 public class ObatObatan 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.obatobatan_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.obatobatan_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.obatobatan_m_id_seq", sequenceName = "public.obatobatan_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.obatobatan_m_id_seq", sequenceName = "public.obatobatan_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
 }

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

@@ -43,4 +43,5 @@ public class ObatTindakan extends BaseTransaction implements Serializable {
 	@Column(nullable = false, columnDefinition = "numeric(6,2)")
 	@NotNull(message = "Jumlah obat tidak boleh kosong")
 	private Double jumlah;
+
 }

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

@@ -1,184 +1,73 @@
 package com.jasamedika.medifirst2000.entities;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.NotFound;
+
+import javax.persistence.*;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import javax.persistence.CascadeType;
+import static javax.persistence.CascadeType.ALL;
-import javax.persistence.Column;
+import static javax.persistence.FetchType.EAGER;
-import javax.persistence.Entity;
+import static javax.persistence.FetchType.LAZY;
-import javax.persistence.FetchType;
+import static javax.persistence.GenerationType.SEQUENCE;
-import javax.persistence.GeneratedValue;
+import static org.hibernate.annotations.NotFoundAction.IGNORE;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;
 
+@Getter
+@Setter
 @Entity
 @Table(name = "ObjekModulAplikasi_S")
 public class ObjekModulAplikasi extends BaseMaster {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -4478308018473778656L;
 
 	@Id
-	@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="public.objekmodulaplikasi_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.objekmodulaplikasi_m_id_seq")
-	@javax.persistence.SequenceGenerator(
+	@SequenceGenerator(name = "public.objekmodulaplikasi_m_id_seq", sequenceName = "public.objekmodulaplikasi_m_id_seq", allocationSize = 1)
-			name="public.objekmodulaplikasi_m_id_seq",	
-			sequenceName="public.objekmodulaplikasi_m_id_seq", 
-			allocationSize=1
-	)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	
-	
-//	@NotNull(message = "Kd Objek  Modul Aplikasi tidak boleh kosong")
 	@Column(name = "KdObjekModulAplikasi", nullable = false, length = 6)
 	@Caption(value = "Kode Modul Aplikasi")
 	private String kdObjekModulAplikasi;
 
-	public String getKdObjekModulAplikasi() {
+	@Column(name = "ObjekModulAplikasi", length = 200)
-		return kdObjekModulAplikasi;
+	@Caption(value = "Objek Modul Aplikasi")
-	}
-
-	public void setKdObjekModulAplikasi(String kdObjekModulAplikasi) {
-		this.kdObjekModulAplikasi = kdObjekModulAplikasi;
-	}
-	
-	@Column(name = "ObjekModulAplikasi", nullable = true , length = 200)
-	@Caption(value="Objek Modul Aplikasi")
 	private String objekModulAplikasi;
 
-	public String getObjekModulAplikasi() {
+	@Column(name = "Fungsi", length = 500)
-		return objekModulAplikasi;
+	@Caption(value = "Fungsi")
-	}
-	
-	public void setObjekModulAplikasi(String objekModulAplikasi) {
-		this.objekModulAplikasi = objekModulAplikasi;
-	}
-	
-	@Column(name = "Fungsi", nullable = true , length = 500)
-	@Caption(value="Fungsi")
 	private String fungsi;
 
-	public String getFungsi() {
+	@Column(name = "AlamatUrlForm", length = 100)
-		return fungsi;
+	@Caption(value = "Alamat Url Form")
-	}
-
-	public void setFungsi(String fungsi) {
-		this.fungsi = fungsi;
-	}
-	
-	@Column(name = "AlamatUrlForm", nullable = true , length = 100)
-	@Caption(value="Alamat Url Form")
 	private String alamatUrlForm;
 
-	public String getAlamatUrlForm() {
+	@Column(name = "Keterangan", length = 500)
-		return alamatUrlForm;
+	@Caption(value = "Keterangan")
-	}
-
-	public void setAlamatUrlForm(String alamatUrlForm) {
-		this.alamatUrlForm = alamatUrlForm;
-	}
-
-	
-	@Column(name = "Keterangan", nullable = true , length = 500)
-	@Caption(value="Keterangan")
 	private String keterangan;
 
-	public String getKeterangan() {
-		return keterangan;
-	}
-	
-	public void setKeterangan(String keterangan) {
-		this.keterangan = keterangan;
-	}
-	
-	
 	@Column(name = "NoUrut")
 	private Integer noUrut;
 
-	public Integer getNoUrut() {
+	@ManyToMany(fetch = LAZY)
-		return noUrut;
+	@JoinTable(name = "MapObjekModulAplikasiToModulAplikasi_S", joinColumns = @JoinColumn(name = "objekModulAplikasiId"), inverseJoinColumns = @JoinColumn(name = "modulAplikasiId"))
-	}
-
-	public void setNoUrut(Integer noUrut) {
-		this.noUrut = noUrut;
-	}
-	
-	/////////////////////
-	// Many To Many Relationship
-	////////////////////
-
-	@ManyToMany(fetch = FetchType.LAZY)
-	@JoinTable(name = "MapObjekModulAplikasiToModulAplikasi_S", 
-			joinColumns = @JoinColumn(name = "objekModulAplikasiId"), 
-			inverseJoinColumns = @JoinColumn(name = "modulAplikasiId"))
 	@JsonIgnore
 	private List<ModulAplikasi> modulAplikasi = new ArrayList<>();
 
-	
+	@Column(name = "KdObjekModulAplikasiHead", insertable = false, updatable = false)
-	public List<ModulAplikasi> getModulAplikasi() {
-		return modulAplikasi;
-	}
-
-	public void setModulAplikasi(List<ModulAplikasi> modulAplikasi) {
-		this.modulAplikasi = modulAplikasi;
-	}
-
-	
-	/////////////////////
-	// Link Back Keys
-	////////////////////
-	
-
-
-	@Column(name = "KdObjekModulAplikasiHead", insertable=false, updatable=false, nullable=true)
 	private Integer kdObjekModulAplikasiHead;
 
-	public Integer getKdObjekModulAplikasiHead() {
+	@NotFound(action = IGNORE)
-		return kdObjekModulAplikasiHead;
+	@OneToMany(fetch = EAGER, cascade = ALL, orphanRemoval = true, targetEntity = ObjekModulAplikasi.class)
-	}
+	@JoinColumn(name = "KdObjekModulAplikasiHead")
-
-	public void setKdObjekModulAplikasiHead(Integer kdObjekModulAplikasiHead) {
-		this.kdObjekModulAplikasiHead = kdObjekModulAplikasiHead;
-	}
-
-	@NotFound(action = NotFoundAction.IGNORE)
-	@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true, targetEntity = ObjekModulAplikasi.class)	
-	@JoinColumn(name="KdObjekModulAplikasiHead")	
 	@OrderBy("noUrut")
 	private Set<ObjekModulAplikasi> children = new HashSet<>();
 
-	public Set<ObjekModulAplikasi> getChildren() {
-		return children;
-	}
-
-	public void setChildren(Set<ObjekModulAplikasi> children) {
-		this.children = children;
-	}
-	
 }

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

@@ -1,188 +0,0 @@
-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.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;
-
-//
-/**
- * 
- * @author Syamsu
- */
-
-//@Entity
-//@Table(name = "ObjekModulAplikasi_S_Sample")
-//@JsonSerialize
-//@JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
-public class ObjekModulAplikasiS extends BaseMaster {
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.objekmodulaplikasi_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.objekmodulaplikasi_m_id_seq", sequenceName = "public.objekmodulaplikasi_m_id_seq", allocationSize = 1)
-	@Column(name = "id")
-	protected Integer id;
-
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	@NotNull(message = "Kd Objek  Modul Aplikasi tidak boleh kosong")
-	@Column(name = "KdObjekModulAplikasi", nullable = false, length = 6)
-	@Caption(value = "Kode Modul Aplikasi")
-	private String kdObjekModulAplikasi;
-
-	public String getKdObjekModulAplikasi() {
-		return kdObjekModulAplikasi;
-	}
-
-	public void setKdObjekModulAplikasi(String kdObjekModulAplikasi) {
-		this.kdObjekModulAplikasi = kdObjekModulAplikasi;
-	}
-
-	@Column(name = "KdObjekModulAplikasiHead")
-	@Caption(value = "Kode Objek Modul Aplikasi Head")
-	private String kdObjekModulAplikasiHead;
-
-	public String getKdObjekModulAplikasiHead() {
-		return kdObjekModulAplikasiHead;
-	}
-
-	public void setKdObjekModulAplikasiHead(String kdObjekModulAplikasiHead) {
-		this.kdObjekModulAplikasiHead = kdObjekModulAplikasiHead;
-	}
-
-	@NotNull(message = "Objek Modul Aplikasi tidak boleh kosong")
-	@Column(name = "ObjekModulAplikasi", nullable = false, length = 50)
-	@Caption(value = "Objek Modul Aplikasi")
-	private String objekModulAplikasi;
-
-	public String getObjekModulAplikasi() {
-		return objekModulAplikasi;
-	}
-
-	public void setObjekModulAplikasi(String objekModulAplikasi) {
-		this.objekModulAplikasi = objekModulAplikasi;
-	}
-
-	@Column(name = "KdModulAplikasi", nullable = false, length = 2)
-	@Caption(value = "Kode Modul Aplikasi")
-	private String kdModulAplikasi;
-
-	public String getKdModulAplikasi() {
-		return kdModulAplikasi;
-	}
-
-	public void setKdModulAplikasi(String kdModulAplikasi) {
-		this.kdModulAplikasi = kdModulAplikasi;
-	}
-
-	@NotNull(message = "Fungsi tidak boleh kosong")
-	@Column(name = "Fungsi", nullable = false, length = 500)
-	@Caption(value = "Fungsi")
-	private String fungsi;
-
-	public void setFungsi(String fungsi) {
-		this.fungsi = fungsi;
-	}
-
-	public String getFungsi() {
-		return this.fungsi;
-	}
-
-	@NotNull(message = "Keterangan tidak boleh kosong")
-	@Column(name = "Keterangan", nullable = false, length = 500)
-	@Caption(value = "Keterangan")
-	private String keterangan;
-
-	public void setKeterangan(String keterangan) {
-		this.keterangan = keterangan;
-	}
-
-	public String getKeterangan() {
-		return this.keterangan;
-	}
-
-	@Column(name = "AlamatUrlFormObjekModulAplikasi")
-	private String alamatUrlFormObjekModulAplikasi;
-
-	public String getAlamatUrlFormObjekModulAplikasi() {
-		return alamatUrlFormObjekModulAplikasi;
-	}
-
-	public void setAlamatUrlFormObjekModulAplikasi(String alamatUrlFormObjekModulAplikasi) {
-		this.alamatUrlFormObjekModulAplikasi = alamatUrlFormObjekModulAplikasi;
-	}
-
-	@Column(name = "ObjekModulNoUrut")
-	private int objekModulNoUrut;
-
-	public int getObjekModulNoUrut() {
-		return objekModulNoUrut;
-	}
-
-	public void setObjekModulNoUrut(int objekModulNoUrut) {
-		this.objekModulNoUrut = objekModulNoUrut;
-	}
-
-	/////////////////////
-	/// Foreign Keys
-	//////////////////
-
-	@ManyToOne(fetch = FetchType.LAZY)
-	@JoinColumn(name = "kdModulAplikasi", referencedColumnName = "kdModulAplikasi", insertable = false, updatable = false)
-	@JsonIgnore
-	private ModulAplikasiS modulAplikasiS;
-
-	public ModulAplikasiS getModulAplikasiS() {
-		return modulAplikasiS;
-	}
-
-	public void setModulAplikasiS(ModulAplikasiS modulAplikasiS) {
-		this.modulAplikasiS = modulAplikasiS;
-	}
-
-	/////////////////////
-	// Link Back Keys
-	////////////////////
-
-
-	@NotFound(action = NotFoundAction.IGNORE)
-	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true, targetEntity = ObjekModulAplikasiS.class)	
-	@JoinColumn(name="kdObjekModulAplikasiHead", referencedColumnName="kdObjekModulAplikasi")	
-	private Set<ObjekModulAplikasiS> children = new HashSet<>();
-
-	public Set<ObjekModulAplikasiS> getChildren() {
-		return children;
-	}
-
-	public void setChildren(Set<ObjekModulAplikasiS> children) {
-		this.children = children;
-	}
-
-}

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

@@ -1,66 +1,43 @@
 package com.jasamedika.medifirst2000.entities;
 
-import java.io.Serializable;
-import org.hibernate.envers.Audited;
-import javax.persistence.*;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
-import org.hibernate.envers.Audited;
+import lombok.Getter;
-import javax.persistence.GeneratedValue;
+import lombok.Setter;
-import javax.persistence.GenerationType;
+
-import javax.persistence.Id;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+import static javax.persistence.GenerationType.SEQUENCE;
 
 /**
  * class ObjekPajak
  * 
  * @author Generator
  */
-@Entity // @Audited
+@Getter
+@Setter
+@Entity
 @Table(name = "ObjekPajak_M")
 public class ObjekPajak extends BaseMaster {
-	@Column(name = "Deskripsi", nullable = true, length = 300)
+
+	@Column(name = "Deskripsi", length = 300)
 	@Caption(value = "Deskripsi")
 	private String deskripsi;
 
-	public void setDeskripsi(String deskripsi) {
-		this.deskripsi = deskripsi;
-	}
-
-	public String getDeskripsi() {
-		return this.deskripsi;
-	}
-
 	@NotNull(message = "Kd Objek Pajak tidak boleh kosong")
 	@Column(name = "KdObjekPajak", nullable = false)
 	@Caption(value = "Kode Objek Pajak")
 	private Byte kdObjekPajak;
 
-	public void setKdObjekPajak(Byte kdObjekPajak) {
-		this.kdObjekPajak = kdObjekPajak;
-	}
-
-	public Byte getKdObjekPajak() {
-		return this.kdObjekPajak;
-	}
-
 	@ManyToOne
 	@JoinColumn(name = "ObjectPajakFk")
 	@NotNull(message = "Kd Pajak tidak boleh kosong")
-
 	@Caption(value = "Object Pajak")
 	private Pajak pajak;
 
 	@ManyToOne
-	@JoinColumn(name = "ObjectKomponenHargaFk", nullable= true)
+	@JoinColumn(name = "ObjectKomponenHargaFk")
 	@NotNull(message = "Kd KomponenHarga tidak boleh kosong")
 	@Caption(value = "Object KomponenHarga")
 	private KomponenHarga komponenHarga;
@@ -68,31 +45,14 @@ public class ObjekPajak extends BaseMaster {
 	@Column(name = "ObjectKomponenHargaFk", insertable = false, updatable = false)
 	private Integer komponenHargaId;
 
-	public void setPajak(Pajak pajak) {
-		this.pajak = pajak;
-	}
-
-	public Pajak getPajak() {
-		return this.pajak;
-	}
-
 	@Column(name = "ObjectPajakFk", insertable = false, updatable = false)
 	private Integer pajakId;
 
 	@ManyToOne
 	@JoinColumn(name = "ObjectProdukFk")
-
 	@Caption(value = "Object Produk")
 	private Produk produk;
 
-	public void setProduk(Produk produk) {
-		this.produk = produk;
-	}
-
-	public Produk getProduk() {
-		return this.produk;
-	}
-
 	@Column(name = "ObjectProdukFk", insertable = false, updatable = false, nullable = false)
 	private Integer produkId;
 
@@ -101,71 +61,15 @@ public class ObjekPajak extends BaseMaster {
 	@Caption(value = "Objek Pajak")
 	private String objekPajak;
 
-	public void setObjekPajak(String objekPajak) {
-		this.objekPajak = objekPajak;
-	}
-
-	public String getObjekPajak() {
-		return this.objekPajak;
-	}
-
 	@NotNull(message = "QObjek Pajak tidak boleh kosong")
 	@Column(name = "QObjekPajak", nullable = false)
 	@Caption(value = "QObjek Pajak")
 	private Byte qObjekPajak;
 
-	public void setqObjekPajak(Byte qObjekPajak) {
-		this.qObjekPajak = qObjekPajak;
-	}
-
-	public Byte getqObjekPajak() {
-		return this.qObjekPajak;
-	}
-
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.objekpajak_m_id_seq")
+	@GeneratedValue(strategy = SEQUENCE, generator = "public.objekpajak_m_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.objekpajak_m_id_seq", sequenceName = "public.objekpajak_m_id_seq", allocationSize = 1)
+	@SequenceGenerator(name = "public.objekpajak_m_id_seq", sequenceName = "public.objekpajak_m_id_seq", allocationSize = 1)
 	@Column(name = "id")
 	protected Integer id;
 
-	public Integer getId() {
-
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public KomponenHarga getKomponenHarga() {
-		return komponenHarga;
-	}
-
-	public void setKomponenHarga(KomponenHarga komponenHarga) {
-		this.komponenHarga = komponenHarga;
-	}
-
-	public Integer getKomponenHargaId() {
-		return komponenHargaId;
-	}
-
-	public void setKomponenHargaId(Integer komponenHargaId) {
-		this.komponenHargaId = komponenHargaId;
-	}
-
-	public Integer getPajakId() {
-		return pajakId;
-	}
-
-	public void setPajakId(Integer pajakId) {
-		this.pajakId = pajakId;
-	}
-
-	public Integer getProdukId() {
-		return produkId;
-	}
-
-	public void setProdukId(Integer produkId) {
-		this.produkId = produkId;
-	}
 }