Update controller dan domain entity

Perbaikan runtime error

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-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/vo/AntrianPasienRegistrasiDetailVO.java

@@ -64,15 +64,11 @@ public class AntrianPasienRegistrasiDetailVO extends BaseTransactionVO {
 		this.antrianPasienRegistrasi = antrianPasienRegistrasi;
 	}
 
-	@Column(name = "ObjectAntrianPasienRegistrasiFK", insertable = false, updatable = false, nullable = true)
 	private String antrianPasienRegistrasiId;
 
-	@ManyToOne
-	@JoinColumn(name = "ObjectJenisKartuDetailFk")
 	@Caption(value = "Object AntrianPasienRegistrasiDetail")
 	private JenisKartuDetailVO jenisKartuDetail;
 
-	@Column(name = "ObjectJenisKartuDetailFk", insertable = false, updatable = false)
 	private Integer jenisKartuDetailId;
 
 	public JenisKartuDetailVO getJenisKartuDetail() {

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

@@ -3,7 +3,7 @@ package com.jasamedika.medifirst2000.vo;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.entities.ProdukDto;
+import com.jasamedika.medifirst2000.dto.ProdukDto;
 import com.jasamedika.medifirst2000.helper.Caption;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -2,7 +2,7 @@ package com.jasamedika.medifirst2000.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.entities.ProdukDto;
+import com.jasamedika.medifirst2000.dto.ProdukDto;
 import com.jasamedika.medifirst2000.enums.JenisMappingProdukPaket;
 import com.jasamedika.medifirst2000.helper.Caption;
 import lombok.Getter;

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AgamaController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.Agama;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.AgamaService;
 import com.jasamedika.medifirst2000.util.rest.RestUtil;
@@ -38,7 +37,7 @@ public class AgamaController extends LocaleController<AgamaVO> {
 	private static final Logger LOGGER = getLogger(AgamaController.class);
 
 	@Autowired
-	private AgamaService<Agama> agamaService;
+	private AgamaService<AgamaVO> agamaService;
 
 	@RequestMapping(value = "/save-agama/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<String> addVO(@Valid @RequestBody AgamaVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.dto.AlatDto;
-import com.jasamedika.medifirst2000.entities.Alat;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.AlatService;
 import com.jasamedika.medifirst2000.vo.AlatVO;
@@ -37,7 +36,7 @@ public class AlatController extends LocaleController<AlatVO> {
 	private static final Logger LOGGER = getLogger(AlatController.class);
 
 	@Autowired
-	private AlatService<Alat> alatService;
+	private AlatService<AlatVO> alatService;
 
 	@RequestMapping(value = "/find-all-alat/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> getAllVO(HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BakuMutuController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.BakuMutu;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.BakuMutuService;
 import com.jasamedika.medifirst2000.vo.BakuMutuVO;
@@ -36,7 +35,7 @@ public class BakuMutuController extends LocaleController<BakuMutuVO> {
 	private static final Logger LOGGER = getLogger(BakuMutuController.class);
 
 	@Autowired
-	private BakuMutuService<BakuMutu> bakuMutuService;
+	private BakuMutuService<BakuMutuVO> bakuMutuService;
 
 	@RequestMapping(value = "/save-baku-mutu/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody BakuMutuVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CheckInController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.CheckIn;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.CheckInService;
 import com.jasamedika.medifirst2000.vo.CheckInVO;
@@ -38,7 +37,7 @@ public class CheckInController extends LocaleController<CheckInVO> {
 	private static final Logger LOGGER = getLogger(CheckInController.class);
 
 	@Autowired
-	private CheckInService<CheckIn> checkInService;
+	private CheckInService<CheckInVO> checkInService;
 
 	@RequestMapping(value = "/save-check-in/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody CheckInVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java

@@ -2,6 +2,7 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
+import com.jasamedika.medifirst2000.entities.UnitCost;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.UnitCostService;
 import com.jasamedika.medifirst2000.vo.UnitCostVO;
@@ -31,7 +32,7 @@ public class DaftarKegiatanController extends LocaleController<UnitCostVO> {
 	private static final Logger LOGGER = getLogger(DaftarKegiatanController.class);
 
 	@Autowired
-	private UnitCostService<UnitCostVO> unitCostService;
+	private UnitCostService<UnitCost> unitCostService;
 
 	@RequestMapping(value = "/detail-unit-cost", method = GET)
 	public ResponseEntity<Map<String, Object>> findAllDepartemenById5And6(

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DepartemenController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.Departemen;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DepartemenService;
 import com.jasamedika.medifirst2000.vo.DepartemenVO;
@@ -35,7 +34,7 @@ public class DepartemenController extends LocaleController<DepartemenVO> {
 	private static final Logger LOGGER = getLogger(DepartemenController.class);
 
 	@Autowired
-	private DepartemenService<Departemen> departemenService;
+	private DepartemenService<DepartemenVO> departemenService;
 
 	@RequestMapping(value = "/save-departemen/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<String> addVO(@Valid @RequestBody DepartemenVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FisisPemeriksaanDokterController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.FisisPemeriksaanDokter;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.FisisPemeriksaanDokterService;
 import com.jasamedika.medifirst2000.vo.FisisPemeriksaanDokterVO;
@@ -42,7 +41,7 @@ public class FisisPemeriksaanDokterController extends LocaleController<FisisPeme
 	private static final Logger LOGGER = getLogger(FisisPemeriksaanDokterController.class);
 
 	@Autowired
-	private FisisPemeriksaanDokterService<FisisPemeriksaanDokter> fisisPemeriksaanDokterService;
+	private FisisPemeriksaanDokterService<FisisPemeriksaanDokterVO> fisisPemeriksaanDokterService;
 
 	@RequestMapping(value = "/save-fisis-dokter", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody FisisPemeriksaanDokterVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GeneralCheckUpController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.GeneralCheckUp;
 import com.jasamedika.medifirst2000.service.GeneralCheckUpService;
 import com.jasamedika.medifirst2000.vo.GeneralCheckUpVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 public class GeneralCheckUpController extends LocaleController<GeneralCheckUpVO> {
 
 	@Autowired
-	private GeneralCheckUpService<GeneralCheckUp> generalCheckUpService;
+	private GeneralCheckUpService<GeneralCheckUpVO> generalCheckUpService;
 
 	@RequestMapping(value = "/find-by-pegawai-id/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> findByPegawaiId(

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GenericViewController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.GenericView;
 import com.jasamedika.medifirst2000.service.GenericViewService;
 import com.jasamedika.medifirst2000.vo.GenericViewVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +28,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 public class GenericViewController extends LocaleController<GenericViewVO> {
 
 	@Autowired
-	private GenericViewService<GenericView> papGenericViewService;
+	private GenericViewService<GenericViewVO> papGenericViewService;
 
 	@RequestMapping(value = "/StatusAdaTidakAda", method = GET, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<List<GenericViewVO>> findAdaTidakAda(HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GolonganDarahRhesusController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.GolonganDarah;
 import com.jasamedika.medifirst2000.service.GolonganDarahRhesusService;
 import com.jasamedika.medifirst2000.vo.GolonganDarahRhesusVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +31,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 public class GolonganDarahRhesusController extends LocaleController<GolonganDarahRhesusVO> {
 
 	@Autowired
-	private GolonganDarahRhesusService<GolonganDarah> golonganDarahRhesusService;
+	private GolonganDarahRhesusService<GolonganDarahRhesusVO> golonganDarahRhesusService;
 
 	@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> findAll(HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanPraKerjaController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.HasilPemeriksaanPraKerja;
 import com.jasamedika.medifirst2000.service.HasilPemeriksaanPraKerjaService;
 import com.jasamedika.medifirst2000.vo.HasilPemeriksaanPraKerjaVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +32,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 public class HasilPemeriksaanPraKerjaController extends LocaleController<HasilPemeriksaanPraKerjaVO> {
 
 	@Autowired
-	private HasilPemeriksaanPraKerjaService<HasilPemeriksaanPraKerja> hasilPemeriksaanPraKerjaService;
+	private HasilPemeriksaanPraKerjaService<HasilPemeriksaanPraKerjaVO> hasilPemeriksaanPraKerjaService;
 
 	@RequestMapping(value = "/find-by-pegawai-id/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> findByPegawaiId(

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanSwaPantauLimbahCairController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.HasilPemeriksaanSwaPantauLimbahCair;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.HasilPemeriksaanSwaPantauLimbahCairService;
 import com.jasamedika.medifirst2000.vo.HasilPemeriksaanSwaPantauLimbahCairVO;
@@ -35,7 +34,7 @@ public class HasilPemeriksaanSwaPantauLimbahCairController
 	private static final Logger LOGGER = getLogger(HasilPemeriksaanSwaPantauLimbahCairController.class);
 
 	@Autowired
-	private HasilPemeriksaanSwaPantauLimbahCairService<HasilPemeriksaanSwaPantauLimbahCair> hasilPemeriksaanSwaPantauLimbahCairService;
+	private HasilPemeriksaanSwaPantauLimbahCairService<HasilPemeriksaanSwaPantauLimbahCairVO> hasilPemeriksaanSwaPantauLimbahCairService;
 
 	@RequestMapping(value = "/save-hasil-pemeriksaan-swa-pantau-limbah-cair/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody HasilPemeriksaanSwaPantauLimbahCairVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLimbahB3MasukController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.JenisLimbahB3Masuk;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.JenisLimbahB3MasukService;
 import com.jasamedika.medifirst2000.vo.JenisLimbahB3MasukVO;
@@ -36,7 +35,7 @@ public class JenisLimbahB3MasukController extends LocaleController<JenisLimbahB3
 	private static final Logger LOGGER = getLogger(JenisLimbahB3MasukController.class);
 
 	@Autowired
-	private JenisLimbahB3MasukService<JenisLimbahB3Masuk> jenisLimbahB3MasukService;
+	private JenisLimbahB3MasukService<JenisLimbahB3MasukVO> jenisLimbahB3MasukService;
 
 	@RequestMapping(value = "/save-jenis-limbah-b3-masuk/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody JenisLimbahB3MasukVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KebutuhanDasarController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.KebutuhanDasar;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KebutuhanDasarService;
 import com.jasamedika.medifirst2000.vo.KebutuhanDasarVO;
@@ -44,7 +43,7 @@ public class KebutuhanDasarController extends LocaleController<KebutuhanDasarVO>
 	private static final Logger LOGGER = getLogger(KebutuhanDasarController.class);
 
 	@Autowired
-	private KebutuhanDasarService<KebutuhanDasar> kebutuhanDasarService;
+	private KebutuhanDasarService<KebutuhanDasarVO> kebutuhanDasarService;
 
 	@RequestMapping(value = "/save-kebutuhan-dasar", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody KebutuhanDasarVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KelasController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.Kelas;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KelasService;
 import com.jasamedika.medifirst2000.vo.KelasVO;
@@ -37,7 +36,7 @@ public class KelasController extends LocaleController<KelasVO> {
 	private static final Logger LOGGER = getLogger(KelasController.class);
 
 	@Autowired
-	private KelasService<Kelas> kelasService;
+	private KelasService<KelasVO> kelasService;
 
 	@RequestMapping(value = "/save-kelas/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<String> addVO(@Valid @RequestBody KelasVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsepDiriController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.KonsepDiri;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KonsepDiriService;
 import com.jasamedika.medifirst2000.vo.KonsepDiriVO;
@@ -42,7 +41,7 @@ public class KonsepDiriController extends LocaleController<KonsepDiriVO> {
 	private static final Logger LOGGER = getLogger(KonsepDiriController.class);
 
 	@Autowired
-	private KonsepDiriService<KonsepDiri> konsepDiriService;
+	private KonsepDiriService<KonsepDiriVO> konsepDiriService;
 
 	@RequestMapping(value = "/save-konsep-diri", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody KonsepDiriVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java

@@ -3,13 +3,12 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.Konsultasi;
-import com.jasamedika.medifirst2000.entities.RegistrasiPelayananPasien;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KonsultasiService;
 import com.jasamedika.medifirst2000.service.RegistrasiPelayananService;
 import com.jasamedika.medifirst2000.vo.AntrianPasienDiPeriksaVO;
 import com.jasamedika.medifirst2000.vo.KonsultasiVO;
+import com.jasamedika.medifirst2000.vo.RegistrasiPelayananVO;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -46,10 +45,10 @@ public class KonsultasiController extends LocaleController<AntrianPasienDiPeriks
 	private static final Logger LOGGER = getLogger(KonsultasiController.class);
 
 	@Autowired
-	private KonsultasiService<Konsultasi> konsultasiService;
+	private KonsultasiService<KonsultasiVO> konsultasiService;
 
 	@Autowired
-	private RegistrasiPelayananService<RegistrasiPelayananPasien> registrasiPelayananService;
+	private RegistrasiPelayananService<RegistrasiPelayananVO> registrasiPelayananService;
 
 	@RequestMapping(value = "/save-konsultasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody KonsultasiVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.Koping;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.KopingService;
 import com.jasamedika.medifirst2000.vo.KopingVO;
@@ -42,7 +41,7 @@ public class KopingController extends LocaleController<KopingVO> {
 	private static final Logger LOGGER = getLogger(KopingController.class);
 
 	@Autowired
-	private KopingService<Koping> kopingService;
+	private KopingService<KopingVO> kopingService;
 
 	@RequestMapping(value = "/save-koping", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody KopingVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.LaporanUjiHasil;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.LaporanUjiHasilService;
 import com.jasamedika.medifirst2000.vo.LaporanUjiHasilVO;
@@ -36,7 +35,7 @@ public class LaporanUjiHasilController extends LocaleController<LaporanUjiHasilV
 	private static final Logger LOGGER = getLogger(LaporanUjiHasilController.class);
 
 	@Autowired
-	private LaporanUjiHasilService<LaporanUjiHasil> laporanUjiHasilService;
+	private LaporanUjiHasilService<LaporanUjiHasilVO> laporanUjiHasilService;
 
 	@RequestMapping(value = "/save-laporan-uji-hasil/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody LaporanUjiHasilVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java

@@ -2,12 +2,11 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.LimbahB3Keluar;
-import com.jasamedika.medifirst2000.entities.LimbahB3Masuk;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.LimbahB3KeluarService;
 import com.jasamedika.medifirst2000.service.LimbahB3MasukService;
 import com.jasamedika.medifirst2000.vo.LimbahB3KeluarVO;
+import com.jasamedika.medifirst2000.vo.LimbahB3MasukVO;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -38,10 +37,10 @@ public class LimbahB3KeluarController extends LocaleController<LimbahB3KeluarVO>
 	private static final Logger LOGGER = getLogger(LimbahB3KeluarController.class);
 
 	@Autowired
-	private LimbahB3KeluarService<LimbahB3Keluar> limbahB3KeluarService;
+	private LimbahB3KeluarService<LimbahB3KeluarVO> limbahB3KeluarService;
 
 	@Autowired
-	private LimbahB3MasukService<LimbahB3Masuk> limbahB3MasukService;
+	private LimbahB3MasukService<LimbahB3MasukVO> limbahB3MasukService;
 
 	@RequestMapping(value = "/save-limbah-b3-keluar/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody LimbahB3KeluarVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapRuanganToKelasController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.MapRuanganToKelas;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.MapRuanganToKelasService;
 import com.jasamedika.medifirst2000.vo.MapRuanganToKelasVO;
@@ -38,7 +37,7 @@ public class MapRuanganToKelasController extends LocaleController<MapRuanganToKe
 	private static final Logger LOGGER = getLogger(MapRuanganToKelasController.class);
 
 	@Autowired
-	private MapRuanganToKelasService<MapRuanganToKelas> mapRuanganToKelasService;
+	private MapRuanganToKelasService<MapRuanganToKelasVO> mapRuanganToKelasService;
 
 	@RequestMapping(value = "/save-map-ruangan-to-kelas", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<String> addVO(@Valid @RequestBody MapRuanganToKelasVO_ vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingBmhpToSetAlatController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.MappingBmhpToSetAlat;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.MappingBmhpToSetAlatService;
 import com.jasamedika.medifirst2000.vo.MappingBmhpToSetAlatVO;
@@ -10,7 +9,10 @@ import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -34,7 +36,7 @@ public class MappingBmhpToSetAlatController extends LocaleController<MappingBmhp
 	private static final Logger LOGGER = getLogger(MappingBmhpToSetAlatController.class);
 
 	@Autowired
-	private MappingBmhpToSetAlatService<MappingBmhpToSetAlat> mappingBmhpToSetAlatService;
+	private MappingBmhpToSetAlatService<MappingBmhpToSetAlatVO> mappingBmhpToSetAlatService;
 
 	@RequestMapping(value = "/save-all-mapping-bmhp-to-set-alat/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVOS(@Valid @RequestBody List<MappingBmhpToSetAlatVO> vos,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java

@@ -56,7 +56,6 @@ public class NeracaLimbahController extends LocaleController<NeracaLimbahVO> {
 		}
 	}
 
-	/* TODO: No service called */
 	@RequestMapping(value = "/update-neraca-limbah/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> updateVO(@Valid @RequestBody NeracaLimbahVO vo,
 			HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NilaiNilaiController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.NilaiNilai;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.NilaiNilaiService;
 import com.jasamedika.medifirst2000.vo.NilaiNilaiVO;
@@ -42,7 +41,7 @@ public class NilaiNilaiController extends LocaleController<NilaiNilaiVO> {
 	private static final Logger LOGGER = getLogger(NilaiNilaiController.class);
 
 	@Autowired
-	private NilaiNilaiService<NilaiNilai> nilaiNilaiService;
+	private NilaiNilaiService<NilaiNilaiVO> nilaiNilaiService;
 
 	@RequestMapping(value = "/save-nilai-nilai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody NilaiNilaiVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAlergiController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapAlergi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapAlergiService;
 import com.jasamedika.medifirst2000.vo.PapAlergiVO;
@@ -41,7 +40,7 @@ public class PapAlergiController extends LocaleController<PapAlergiVO> {
 	private static final Logger LOGGER = getLogger(PapAlergiController.class);
 
 	@Autowired
-	private PapAlergiService<PapAlergi> papAlergiService;
+	private PapAlergiService<PapAlergiVO> papAlergiService;
 
 	@RequestMapping(value = "/save-alergi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapAlergiVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAnamesisController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapAnamesis;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapAnamesisService;
 import com.jasamedika.medifirst2000.vo.PapAnamesisVO;
@@ -41,7 +40,7 @@ public class PapAnamesisController extends LocaleController<PapAnamesisVO> {
 	private static final Logger LOGGER = getLogger(PapAnamesisController.class);
 
 	@Autowired
-	private PapAnamesisService<PapAnamesis> papAnamesisService;
+	private PapAnamesisService<PapAnamesisVO> papAnamesisService;
 
 	@RequestMapping(value = "/save-anamesis", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapAnamesisVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapBedahController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapBedah;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapBedahService;
 import com.jasamedika.medifirst2000.vo.PapBedahVO;
@@ -41,7 +40,7 @@ public class PapBedahController extends LocaleController<PapBedahVO> {
 	private static final Logger LOGGER = getLogger(PapBedahController.class);
 
 	@Autowired
-	private PapBedahService<PapBedah> papBedahService;
+	private PapBedahService<PapBedahVO> papBedahService;
 
 	@RequestMapping(value = "/save-bedah", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapBedahVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapEliminasiController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapEliminasi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapEliminasiService;
 import com.jasamedika.medifirst2000.vo.PapEliminasiVO;
@@ -41,7 +40,7 @@ public class PapEliminasiController extends LocaleController<PapEliminasiVO> {
 	private static final Logger LOGGER = getLogger(PapEliminasiController.class);
 
 	@Autowired
-	private PapEliminasiService<PapEliminasi> papEliminasiService;
+	private PapEliminasiService<PapEliminasiVO> papEliminasiService;
 
 	@RequestMapping(value = "/save-eliminasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapEliminasiVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGastrointestinalController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapGastrointestinal;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapGastrointestinalService;
 import com.jasamedika.medifirst2000.vo.PapGastrointestinalVO;
@@ -41,7 +40,7 @@ public class PapGastrointestinalController extends LocaleController<PapGastroint
 	private static final Logger LOGGER = getLogger(PapGastrointestinalController.class);
 
 	@Autowired
-	private PapGastrointestinalService<PapGastrointestinal> papGastrointestinalService;
+	private PapGastrointestinalService<PapGastrointestinalVO> papGastrointestinalService;
 
 	@RequestMapping(value = "/save-gastrointestinal", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapGastrointestinalVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenataliaController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapGenatalia;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapGenataliaService;
 import com.jasamedika.medifirst2000.util.DateUtil;
@@ -45,7 +44,7 @@ public class PapGenataliaController extends LocaleController<PapGenataliaVO> {
 	private static final Logger LOGGER = getLogger(PapGenataliaController.class);
 
 	@Autowired
-	private PapGenataliaService<PapGenatalia> papGenataliaService;
+	private PapGenataliaService<PapGenataliaVO> papGenataliaService;
 
 	@RequestMapping(value = "/save-genatalia", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapGenataliaVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenericController.java

@@ -3,8 +3,8 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.GenericView;
 import com.jasamedika.medifirst2000.service.GenericViewService;
+import com.jasamedika.medifirst2000.vo.GenericViewVO;
 import com.jasamedika.medifirst2000.vo.PapAlergiVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -33,7 +33,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 public class PapGenericController extends LocaleController<PapAlergiVO> {
 
 	@Autowired
-	private GenericViewService<GenericView> genericViewService;
+	private GenericViewService<GenericViewVO> genericViewService;
 
 	@RequestMapping(value = "/find-medical-record-noRec/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> findMedicalRecordByNoRec(

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGigiMulutController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapGigiMulut;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapGigiMulutService;
 import com.jasamedika.medifirst2000.vo.PapGigiMulutVO;
@@ -41,7 +40,7 @@ public class PapGigiMulutController extends LocaleController<PapGigiMulutVO> {
 	private static final Logger LOGGER = getLogger(PapGigiMulutController.class);
 
 	@Autowired
-	private PapGigiMulutService<PapGigiMulut> papGigiMulutService;
+	private PapGigiMulutService<PapGigiMulutVO> papGigiMulutService;
 
 	@RequestMapping(value = "/save-gigi-mulut", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapGigiMulutVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGinekologiController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapGinekologi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapGinekologiService;
 import com.jasamedika.medifirst2000.vo.PapGinekologiVO;
@@ -45,7 +44,7 @@ public class PapGinekologiController extends LocaleController<PapGinekologiVO> {
 	private static final Logger LOGGER = getLogger(PapGinekologiController.class);
 
 	@Autowired
-	private PapGinekologiService<PapGinekologi> papGinekologiService;
+	private PapGinekologiService<PapGinekologiVO> papGinekologiService;
 
 	@RequestMapping(value = "/save-ginekologi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapGinekologiVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapIntegumenController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapIntegumen;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapIntegumenService;
 import com.jasamedika.medifirst2000.vo.PapIntegumenVO;
@@ -41,7 +40,7 @@ public class PapIntegumenController extends LocaleController<PapIntegumenVO> {
 	private static final Logger LOGGER = getLogger(PapIntegumenController.class);
 
 	@Autowired
-	private PapIntegumenService<PapIntegumen> papIntegumenService;
+	private PapIntegumenService<PapIntegumenVO> papIntegumenService;
 
 	@RequestMapping(value = "/save-integumen", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapIntegumenVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKebutuhanEdukasiController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapKebutuhanEdukasi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapKebutuhanEdukasiService;
 import com.jasamedika.medifirst2000.vo.PapKebutuhanEdukasiVO;
@@ -36,7 +35,7 @@ public class PapKebutuhanEdukasiController extends LocaleController<PapKebutuhan
 	private static final Logger LOGGER = getLogger(PapKebutuhanEdukasiController.class);
 
 	@Autowired
-	private PapKebutuhanEdukasiService<PapKebutuhanEdukasi> papKebutuhanEdukasiService;
+	private PapKebutuhanEdukasiService<PapKebutuhanEdukasiVO> papKebutuhanEdukasiService;
 
 	@RequestMapping(value = "/save-kebutuhan-edukasi/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody PapKebutuhanEdukasiVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanTambahanController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapKeluhanTambahan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapKeluhanTambahanService;
 import com.jasamedika.medifirst2000.util.DateUtil;
@@ -43,7 +42,7 @@ public class PapKeluhanTambahanController extends LocaleController<PapKeluhanTam
 	private static final Logger LOGGER = getLogger(PapKeluhanTambahanController.class);
 
 	@Autowired
-	private PapKeluhanTambahanService<PapKeluhanTambahan> papKeluhanTambahanService;
+	private PapKeluhanTambahanService<PapKeluhanTambahanVO> papKeluhanTambahanService;
 
 	@RequestMapping(value = "/save-keluhan-tambahan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanUtamaController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapKeluhanUtama;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapKeluhanUtamaService;
 import com.jasamedika.medifirst2000.util.DateUtil;
@@ -45,7 +44,7 @@ public class PapKeluhanUtamaController extends LocaleController<PapKeluhanUtamaV
 	private static final Logger LOGGER = getLogger(PapKeluhanUtamaController.class);
 
 	@Autowired
-	private PapKeluhanUtamaService<PapKeluhanUtama> papKeluhanUtamaService;
+	private PapKeluhanUtamaService<PapKeluhanUtamaVO> papKeluhanUtamaService;
 
 	@RequestMapping(value = "/save-keluhan-utama", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapKeluhanUtamaVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMataController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapMata;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapMataService;
 import com.jasamedika.medifirst2000.vo.PapMataVO;
@@ -41,7 +40,7 @@ public class PapMataController extends LocaleController<PapMataVO> {
 	private static final Logger LOGGER = getLogger(PapMataController.class);
 
 	@Autowired
-	private PapMataService<PapMata> papMataService;
+	private PapMataService<PapMataVO> papMataService;
 
 	@RequestMapping(value = "/save-mata", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> saveProgramPengajaran(@Valid @RequestBody PapMataVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMuskuloskeletalController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapMuskuloskeletal;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapMuskuloskeletalService;
 import com.jasamedika.medifirst2000.vo.PapMuskuloskeletalVO;
@@ -41,7 +40,7 @@ public class PapMuskuloskeletalController extends LocaleController<PapMuskuloske
 	private static final Logger LOGGER = getLogger(PapMuskuloskeletalController.class);
 
 	@Autowired
-	private PapMuskuloskeletalService<PapMuskuloskeletal> papMuskuloskeletalService;
+	private PapMuskuloskeletalService<PapMuskuloskeletalVO> papMuskuloskeletalService;
 
 	@RequestMapping(value = "/save-muskuloskeletal", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapMuskuloskeletalVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapNeurologiController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapNeurologi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapNeurologiService;
 import com.jasamedika.medifirst2000.vo.PapNeurologiVO;
@@ -41,7 +40,7 @@ public class PapNeurologiController extends LocaleController<PapNeurologiVO> {
 	private static final Logger LOGGER = getLogger(PapNeurologiController.class);
 
 	@Autowired
-	private PapNeurologiService<PapNeurologi> papNeurologiService;
+	private PapNeurologiService<PapNeurologiVO> papNeurologiService;
 
 	@RequestMapping(value = "/save-neurologi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapNeurologiVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPernapasanController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapPernapasan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapPernapasanService;
 import com.jasamedika.medifirst2000.vo.PapPernapasanVO;
@@ -41,7 +40,7 @@ public class PapPernapasanController extends LocaleController<PapPernapasanVO> {
 	private static final Logger LOGGER = getLogger(PapPernapasanController.class);
 
 	@Autowired
-	private PapPernapasanService<PapPernapasan> papPernapasanService;
+	private PapPernapasanService<PapPernapasanVO> papPernapasanService;
 
 	@RequestMapping(value = "/save-pernapasan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapPernapasanVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatImunisasiController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapRiwayatImunisasi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapRiwayatImunisasiService;
 import com.jasamedika.medifirst2000.vo.PapRiwayatImunisasiVO;
@@ -41,7 +40,7 @@ public class PapRiwayatImunisasiController extends LocaleController<PapRiwayatIm
 	private static final Logger LOGGER = getLogger(PapRiwayatImunisasiController.class);
 
 	@Autowired
-	private PapRiwayatImunisasiService<PapRiwayatImunisasi> papRiwayatImunisasiService;
+	private PapRiwayatImunisasiService<PapRiwayatImunisasiVO> papRiwayatImunisasiService;
 
 	@RequestMapping(value = "/save-riwayat-imunisasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapRiwayatImunisasiVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatPsikososialController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapRiwayatPsikososial;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapRiwayatPsikososialService;
 import com.jasamedika.medifirst2000.vo.PapRiwayatPsikososialVO;
@@ -41,7 +40,7 @@ public class PapRiwayatPsikososialController extends LocaleController<PapRiwayat
 	private static final Logger LOGGER = getLogger(PapRiwayatPsikososialController.class);
 
 	@Autowired
-	private PapRiwayatPsikososialService<PapRiwayatPsikososial> papRiwayatPsikososialService;
+	private PapRiwayatPsikososialService<PapRiwayatPsikososialVO> papRiwayatPsikososialService;
 
 	@RequestMapping(value = "/save-riwayat-psikososial", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapRiwayatPsikososialVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatTumbuhKembangController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapRiwayatTumbuhKembang;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapRiwayatTumbuhKembangService;
 import com.jasamedika.medifirst2000.vo.PapRiwayatTumbuhKembangVO;
@@ -42,7 +41,7 @@ public class PapRiwayatTumbuhKembangController extends LocaleController<PapRiway
 	private static final Logger LOGGER = getLogger(PapRiwayatTumbuhKembangController.class);
 
 	@Autowired
-	private PapRiwayatTumbuhKembangService<PapRiwayatTumbuhKembang> papRiwayatTumbuhKembangService;
+	private PapRiwayatTumbuhKembangService<PapRiwayatTumbuhKembangVO> papRiwayatTumbuhKembangService;
 
 	@RequestMapping(value = "/save-riwayat-tumbuh-kembang", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapRiwayatTumbuhKembangVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSirkulasiController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapSirkulasi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapSirkulasiService;
 import com.jasamedika.medifirst2000.vo.PapSirkulasiVO;
@@ -41,7 +40,7 @@ public class PapSirkulasiController extends LocaleController<PapSirkulasiVO> {
 	private static final Logger LOGGER = getLogger(PapSirkulasiController.class);
 
 	@Autowired
-	private PapSirkulasiService<PapSirkulasi> papSirkulasiService;
+	private PapSirkulasiService<PapSirkulasiVO> papSirkulasiService;
 
 	@RequestMapping(value = "/save-sirkulasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapSirkulasiVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningGiziController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapSkriningGizi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapSkriningGiziService;
 import com.jasamedika.medifirst2000.vo.PapSkriningGiziVO;
@@ -44,7 +43,7 @@ public class PapSkriningGiziController extends LocaleController<PapSkriningGiziV
 	private static final Logger LOGGER = getLogger(PapSkriningGiziController.class);
 
 	@Autowired
-	private PapSkriningGiziService<PapSkriningGizi> papSkriningGiziService;
+	private PapSkriningGiziService<PapSkriningGiziVO> papSkriningGiziService;
 
 	@RequestMapping(value = "/save-skrining-gizi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> savePasien(@Valid @RequestBody PapSkriningGiziVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningNyeriController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapSkriningNyeri;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapSkriningNyeriService;
 import com.jasamedika.medifirst2000.vo.PapSkriningNyeriVO;
@@ -41,7 +40,7 @@ public class PapSkriningNyeriController extends LocaleController<PapSkriningNyer
 	private static final Logger LOGGER = getLogger(PapSkriningNyeriController.class);
 
 	@Autowired
-	private PapSkriningNyeriService<PapSkriningNyeri> papSkriningNyeriService;
+	private PapSkriningNyeriService<PapSkriningNyeriVO> papSkriningNyeriService;
 
 	@RequestMapping(value = "/save-skrining-nyeri", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PapSkriningNyeriVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSmearController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapSmear;
 import com.jasamedika.medifirst2000.service.PapSmearService;
 import com.jasamedika.medifirst2000.vo.PapSmearVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +27,7 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET;
 public class PapSmearController extends LocaleController<PapSmearVO> {
 
 	@Autowired
-	private PapSmearService<PapSmear> papSmearService;
+	private PapSmearService<PapSmearVO> papSmearService;
 
 	@RequestMapping(value = "/find-by-pegawai-id/", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> findByPegawaiId(

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapThtController.java

@@ -3,8 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PapTht;
-import com.jasamedika.medifirst2000.entities.Tht;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PapThtService;
 import com.jasamedika.medifirst2000.service.ThtService;
@@ -49,10 +47,10 @@ public class PapThtController extends LocaleController<PapThtVO> {
 	private static final Logger LOGGER = getLogger(PapThtController.class);
 
 	@Autowired
-	private PapThtService<PapTht> papThtService;
+	private PapThtService<PapThtVO> papThtService;
 
 	@Autowired
-	private ThtService<Tht> thtService;
+	private ThtService<ThtVO> thtService;
 
 	@RequestMapping(value = "/save-tht", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save2(@Valid @RequestBody List<ThtVO> vos, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienPulangController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.Pasien;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PasienPulangService;
 import com.jasamedika.medifirst2000.vo.PasienPulangVO;
@@ -41,7 +40,7 @@ public class PasienPulangController extends LocaleController<PasienPulangVO> {
 	private static final Logger LOGGER = getLogger(PasienPulangController.class);
 
 	@Autowired
-	private PasienPulangService<Pasien> pasienPulangService;
+	private PasienPulangService<PasienPulangVO> pasienPulangService;
 
 	@RequestMapping(value = "/save-pasien-pulang", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> savePasienPulang(@Valid @RequestBody PasienPulangVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananTpnController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PelayananTpn;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PelayananTpnService;
 import com.jasamedika.medifirst2000.vo.PelayananProduksiVO;
@@ -42,7 +41,7 @@ public class PelayananTpnController extends LocaleController<PelayananTpnVO> {
 	private static final Logger LOGGER = getLogger(PelayananTpnController.class);
 
 	@Autowired
-	private PelayananTpnService<PelayananTpn> pelayananTpnService;
+	private PelayananTpnService<PelayananTpnVO> pelayananTpnService;
 
 	@RequestMapping(value = "/save-pelayanan-tpn", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PelayananProduksiVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianAirBersihController.java

@@ -37,7 +37,7 @@ public class PemakaianAirBersihController extends LocaleController<PemakaianAirB
 	private static final Logger LOGGER = getLogger(PemakaianAirBersihController.class);
 
 	@Autowired
-	private PemakaianAirBersihService<PemakaianAirBersih> pemakaianAirBersihService;
+	private PemakaianAirBersihService<PemakaianAirBersihVO> pemakaianAirBersihService;
 
 	@RequestMapping(value = "/save-pemakaian-air-bersih/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody PemakaianAirBersihVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianBarangHabisPakaiController.java

@@ -2,10 +2,10 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.StrukPelayanan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.StrukPelayananService;
 import com.jasamedika.medifirst2000.vo.PemakaianBarangHabisPakaiVO;
+import com.jasamedika.medifirst2000.vo.StrukPelayananVO;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -32,7 +32,7 @@ public class PemakaianBarangHabisPakaiController extends LocaleController<Pemaka
 	private static final Logger LOGGER = getLogger(PemakaianBarangHabisPakaiController.class);
 
 	@Autowired
-	private StrukPelayananService<StrukPelayanan> strukPelayananService;
+	private StrukPelayananService<StrukPelayananVO> strukPelayananService;
 
 	@RequestMapping(value = "/save-pemakaian-barang", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> saveReturRuangan(@Valid @RequestBody PemakaianBarangHabisPakaiVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianMesinController.java

@@ -37,7 +37,7 @@ public class PemakaianMesinController extends LocaleController<PemakaianMesinVO>
 	private static final Logger LOGGER = getLogger(PemakaianMesinController.class);
 
 	@Autowired
-	private PemakaianMesinService<PemakaianMesin> pemakaianMesinService;
+	private PemakaianMesinService<PemakaianMesinVO> pemakaianMesinService;
 
 	@RequestMapping(value = "/save-pemakaian-mesin/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody PemakaianMesinVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PembedahanDanInstruksiController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PembedahanDanInstruksi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PembedahanDanInstruksiService;
 import com.jasamedika.medifirst2000.vo.PembedahanDanInstruksiVO;
@@ -41,7 +40,7 @@ public class PembedahanDanInstruksiController extends LocaleController<Pembedaha
 	private static final Logger LOGGER = getLogger(PembedahanDanInstruksiController.class);
 
 	@Autowired
-	private PembedahanDanInstruksiService<PembedahanDanInstruksi> pembedahanDanInstruksiService;
+	private PembedahanDanInstruksiService<PembedahanDanInstruksiVO> pembedahanDanInstruksiService;
 
 	@RequestMapping(value = "/save-laporan-pembedahan-instruksi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PembedahanDanInstruksiVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PencatatanSuhuMesinController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PencatatanSuhuMesin;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PencatatanSuhuMesinService;
 import com.jasamedika.medifirst2000.vo.PencatatanSuhuMesinVO;
@@ -35,7 +34,7 @@ public class PencatatanSuhuMesinController extends LocaleController<PencatatanSu
 	private static final Logger LOGGER = getLogger(PencatatanSuhuMesinController.class);
 
 	@Autowired
-	private PencatatanSuhuMesinService<PencatatanSuhuMesin> pencatatanSuhuMesinService;
+	private PencatatanSuhuMesinService<PencatatanSuhuMesinVO> pencatatanSuhuMesinService;
 
 	@RequestMapping(value = "/save-pencatatan-suhu-mesin/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody PencatatanSuhuMesinVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenerimaanBarangController.java

@@ -2,12 +2,12 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.StrukPelayanan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.StrukPelayananDetailService;
 import com.jasamedika.medifirst2000.service.StrukPelayananService;
 import com.jasamedika.medifirst2000.vo.PenerimaanBarangDetailVO;
 import com.jasamedika.medifirst2000.vo.PenerimaanBarangVO;
+import com.jasamedika.medifirst2000.vo.StrukPelayananVO;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -36,7 +36,7 @@ public class PenerimaanBarangController extends LocaleController<PenerimaanBaran
 	private static final Logger LOGGER = getLogger(PenerimaanBarangController.class);
 
 	@Autowired
-	private StrukPelayananService<StrukPelayanan> strukPelayananService;
+	private StrukPelayananService<StrukPelayananVO> strukPelayananService;
 
 	@Autowired
 	private StrukPelayananDetailService strukPelayananDetailService;

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PenghitunganKassaDanAlatOperasiController.java

@@ -7,10 +7,12 @@ import com.jasamedika.medifirst2000.service.PenghitunganKassaDanAlatOperasiServi
 import com.jasamedika.medifirst2000.vo.PenghitunganKassaDanAlatOperasiVO;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -49,14 +51,14 @@ public class PenghitunganKassaDanAlatOperasiController extends LocaleController<
 			return getJsonHttpStatus(INTERNAL_SERVER_ERROR, mapHeaderMessage);
 		} catch (JpaSystemException e) {
 			LOGGER.error("Got JpaSystemException {} when penghitunganKassaDanAlatOperasiService.save", e.getMessage());
-			addHeaderMessage(ERROR_MESSAGE, jse.getMessage());
+			addHeaderMessage(ERROR_MESSAGE, e.getMessage());
 			return getJsonHttpStatus(CONFLICT, mapHeaderMessage);
 		}
 	}
 
 	@RequestMapping(value = "/get-hit-kassa-by-norec", method = GET, produces = APPLICATION_JSON_VALUE)
-	public ResponseEntity<Map<String, Object>> getHitKassaByNoRec(
+	public ResponseEntity<Map<String, Object>> getHitKassaByNoRec(@RequestParam(value = "noRec") String noRec,
-            @RequestParam(value = "noRec") String noRec, HttpServletRequest request) {
+			HttpServletRequest request) {
 		try {
 			Map<String, Object> result = this.penghitunganKassaDanAlatOperasiService.getHitKassaByNoRec(noRec);
 			if (null != result) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PeranHubunganController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PeranHubungan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PeranHubunganService;
 import com.jasamedika.medifirst2000.vo.PeranHubunganVO;
@@ -42,7 +41,7 @@ public class PeranHubunganController extends LocaleController<PeranHubunganVO> {
 	private static final Logger LOGGER = getLogger(PeranHubunganController.class);
 
 	@Autowired
-	private PeranHubunganService<PeranHubungan> peranHubunganService;
+	private PeranHubunganService<PeranHubunganVO> peranHubunganService;
 
 	@RequestMapping(value = "/save-peran-hubungan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PeranHubunganVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiKognisiController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PersepsiKognisi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PersepsiKognisiService;
 import com.jasamedika.medifirst2000.vo.PersepsiKognisiVO;
@@ -42,7 +41,7 @@ public class PersepsiKognisiController extends LocaleController<PersepsiKognisiV
 	private static final Logger LOGGER = getLogger(PersepsiKognisiController.class);
 
 	@Autowired
-	private PersepsiKognisiService<PersepsiKognisi> persepsiKognisiService;
+	private PersepsiKognisiService<PersepsiKognisiVO> persepsiKognisiService;
 
 	@RequestMapping(value = "/save-persepsi-kognisi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PersepsiKognisiVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PersepsiPasienController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.PersepsiPasien;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PersepsiPasienService;
 import com.jasamedika.medifirst2000.vo.PersepsiPasienVO;
@@ -42,7 +41,7 @@ public class PersepsiPasienController extends LocaleController<PersepsiPasienVO>
 	private static final Logger LOGGER = getLogger(PersepsiPasienController.class);
 
 	@Autowired
-	private PersepsiPasienService<PersepsiPasien> persepsiPasienService;
+	private PersepsiPasienService<PersepsiPasienVO> persepsiPasienService;
 
 	@RequestMapping(value = "/save-persepsi-pasien", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody PersepsiPasienVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PioController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.Pio;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.PioService;
 import com.jasamedika.medifirst2000.vo.PioVO;
@@ -34,7 +33,7 @@ public class PioController extends LocaleController<PioVO> {
 	private static final Logger LOGGER = getLogger(PioController.class);
 
 	@Autowired
-	private PioService<Pio> pioService;
+	private PioService<PioVO> pioService;
 
 	@RequestMapping(value = "/save-pio/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<String> addVO(@Valid @RequestBody PioVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProdukDetailLabAnatomiController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.ProdukDetailLabAnatomi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.ProdukDetailLabAnatomiService;
 import com.jasamedika.medifirst2000.vo.ProdukDetailLabAnatomiVO;
@@ -43,7 +42,7 @@ public class ProdukDetailLabAnatomiController extends LocaleController<ProdukDet
 	private static final Logger LOGGER = getLogger(ProdukDetailLabAnatomiController.class);
 
 	@Autowired
-	private ProdukDetailLabAnatomiService<ProdukDetailLabAnatomi> produkDetailLabAnatomiService;
+	private ProdukDetailLabAnatomiService<ProdukDetailLabAnatomiVO> produkDetailLabAnatomiService;
 
 	@RequestMapping(value = "/save-laboratorium-anatomi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody List<ProdukDetailLabAnatomiVO> vos,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ProgramController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.Program;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.ProgramService;
 import com.jasamedika.medifirst2000.vo.ProgramVO;
@@ -36,7 +35,7 @@ public class ProgramController extends LocaleController<ProgramVO> {
 	private static final Logger LOGGER = getLogger(ProgramController.class);
 
 	@Autowired
-	private ProgramService<Program> programService;
+	private ProgramService<ProgramVO> programService;
 
 	@RequestMapping(value = "/save-program", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> addVO(@Valid @RequestBody ProgramVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiAsetController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.RegistrasiAset;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RegistrasiAsetService;
 import com.jasamedika.medifirst2000.vo.DistribusiBarangInvestasiVO;
@@ -40,7 +39,7 @@ public class RegistrasiAsetController extends LocaleController<RegistrasiAsetVO>
 	private static final Logger LOGGER = getLogger(RegistrasiAsetController.class);
 
 	@Autowired
-	private RegistrasiAsetService<RegistrasiAset> registrasiAsetService;
+	private RegistrasiAsetService<RegistrasiAsetVO> registrasiAsetService;
 
 	@RequestMapping(value = "/save-distribusi-barang/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> saveDistribusiBarang(@Valid @RequestBody DistribusiBarangInvestasiVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RegistrasiPasienOnlineController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.AntrianPasienRegistrasi;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RegistrasiPasienOnlineService;
 import com.jasamedika.medifirst2000.util.CommonUtil;
@@ -43,7 +42,7 @@ public class RegistrasiPasienOnlineController extends LocaleController<AntrianPa
 	private static final Logger LOGGER = getLogger(RegistrasiPasienOnlineController.class);
 
 	@Autowired
-	private RegistrasiPasienOnlineService<AntrianPasienRegistrasi> registrasiPasienOnlineService;
+	private RegistrasiPasienOnlineService<AntrianPasienRegistrasiVO> registrasiPasienOnlineService;
 
 	@RequestMapping(value = "/get-pasien", method = GET, produces = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> getPasien(@RequestParam(value = "id", required = false) String id) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/ReturSupplierController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.StrukRetur;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.StrukPelayananService;
 import com.jasamedika.medifirst2000.vo.ReturSupplierVO;
@@ -34,7 +33,7 @@ public class ReturSupplierController extends LocaleController<StrukReturVO> {
 	private static final Logger LOGGER = getLogger(ReturSupplierController.class);
 
 	@Autowired
-	private StrukPelayananService<StrukRetur> returRuanganService;
+	private StrukPelayananService<StrukReturVO> returRuanganService;
 
 	@RequestMapping(value = "/save-retur-supplier", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> saveReturRuangan(@Valid @RequestBody ReturSupplierVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RisikoKerjaRuanganController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.RisikoKerjaRuangan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RisikoKerjaRuanganService;
 import com.jasamedika.medifirst2000.vo.RisikoKerjaRuanganVO;
@@ -40,7 +39,7 @@ public class RisikoKerjaRuanganController extends LocaleController<RisikoKerjaRu
 	private static final Logger LOGGER = getLogger(RisikoKerjaRuanganController.class);
 
 	@Autowired
-	private RisikoKerjaRuanganService<RisikoKerjaRuangan> risikoKerjaRuanganService;
+	private RisikoKerjaRuanganService<RisikoKerjaRuanganVO> risikoKerjaRuanganService;
 
 	@RequestMapping(value = "/save-risiko-kerja-ruangan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody RisikoKerjaRuanganVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKehamilanPersalinanNifasYangLaluController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.RiwayatKehamilanPersalinanNifasYangLalu;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RiwayatKehamilanPersalinanNifasYangLaluService;
 import com.jasamedika.medifirst2000.vo.RiwayatKehamilanPersalinanNifasYangLaluVO;
@@ -44,7 +43,7 @@ public class RiwayatKehamilanPersalinanNifasYangLaluController
 	private static final Logger LOGGER = getLogger(RiwayatKehamilanPersalinanNifasYangLaluController.class);
 
 	@Autowired
-	private RiwayatKehamilanPersalinanNifasYangLaluService<RiwayatKehamilanPersalinanNifasYangLalu> riwayatKehamilanPersalinanNifasYangLaluService;
+	private RiwayatKehamilanPersalinanNifasYangLaluService<RiwayatKehamilanPersalinanNifasYangLaluVO> riwayatKehamilanPersalinanNifasYangLaluService;
 
 	@RequestMapping(value = "/save-riwayat-kehamilan-persalinan-nifas-yang-lalu", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RiwayatKesehatanController.java

@@ -48,7 +48,7 @@ public class RiwayatKesehatanController extends LocaleController<RiwayatKesehata
 			if (null != result)
 				mapHeaderMessage.put(LABEL_SUCCESS, getMessage(MessageResource.LABEL_SUCCESS, request));
 			getJsonHttpStatus(CREATED);
-			SaveLog("Riwayat Kesehatan", "Pemeriksaan", request);
+			SaveLog("Riwayat Kesehatan", "Pemeriksaan");
 			return getJsonResponse("Status Sukses", CREATED, mapHeaderMessage);
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when saveRiwayatKesehatanService", e.getMessage());

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/RuanganController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.Ruangan;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.RuanganService;
 import com.jasamedika.medifirst2000.vo.RuanganVO;
@@ -37,7 +36,7 @@ public class RuanganController extends LocaleController<RuanganVO> {
 	private static final Logger LOGGER = getLogger(RuanganController.class);
 
 	@Autowired
-	private RuanganService<Ruangan> ruanganService;
+	private RuanganService<RuanganVO> ruanganService;
 
 	@RequestMapping(value = "/save-ruangan/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<String> addVO(@Valid @RequestBody RuanganVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SignInOperationController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.SignInOperation;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.SignInOperationService;
 import com.jasamedika.medifirst2000.vo.SignInOperationVO;
@@ -41,7 +40,7 @@ public class SignInOperationController extends LocaleController<SignInOperationV
 	private static final Logger LOGGER = getLogger(SignInOperationController.class);
 
 	@Autowired
-	private SignInOperationService<SignInOperation> signInOperationService;
+	private SignInOperationService<SignInOperationVO> signInOperationService;
 
 	@RequestMapping(value = "/save-signin-operation/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<String> saveSignInOperation(@Valid @RequestBody SignInOperationVO vo,

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SoapController.java

@@ -6,7 +6,7 @@ import com.jasamedika.medifirst2000.controller.base.LocaleController;
 import com.jasamedika.medifirst2000.entities.*;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.*;
-import com.jasamedika.medifirst2000.vo.SoapVO;
+import com.jasamedika.medifirst2000.vo.*;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -46,55 +46,55 @@ public class SoapController extends LocaleController<SoapVO> {
 	private static final Logger LOGGER = getLogger(SoapController.class);
 
 	@Autowired
-	private SoapService<Soap> soapService;
+	private SoapService<SoapVO> soapService;
 
 	@Autowired
-	private PapKeluhanUtamaService<PapKeluhanUtama> papkeluhanUtamaService;
+	private PapKeluhanUtamaService<PapKeluhanUtamaVO> papkeluhanUtamaService;
 
 	@Autowired
 	private AnamnesisService anamansisService;
 
 	@Autowired
-	private PapAnamesisService<PapAnamesis> papAnamesisService;
+	private PapAnamesisService<PapAnamesisVO> papAnamesisService;
 
 	@Autowired
-	private PapPernapasanService<PapPernapasan> papPernapasanService;
+	private PapPernapasanService<PapPernapasanVO> papPernapasanService;
 
 	@Autowired
-	private PapSirkulasiService<PapSirkulasi> papSirkulasiService;
+	private PapSirkulasiService<PapSirkulasiVO> papSirkulasiService;
 
 	@Autowired
-	private PapNeurologiService<PapNeurologi> papNeurologiService;
+	private PapNeurologiService<PapNeurologiVO> papNeurologiService;
 
 	@Autowired
-	private PapGastrointestinalService<PapGastrointestinal> papGastrointestinalService;
+	private PapGastrointestinalService<PapGastrointestinalVO> papGastrointestinalService;
 
 	@Autowired
-	private PapEliminasiService<PapEliminasi> papEliminasiService;
+	private PapEliminasiService<PapEliminasiVO> papEliminasiService;
 
 	@Autowired
-	private PapIntegumenService<PapIntegumen> papIntegumenService;
+	private PapIntegumenService<PapIntegumenVO> papIntegumenService;
 
 	@Autowired
-	private PapMuskuloskeletalService<PapMuskuloskeletal> papMuskuloskeletalService;
+	private PapMuskuloskeletalService<PapMuskuloskeletalVO> papMuskuloskeletalService;
 
 	@Autowired
-	private PapGenataliaService<PapGenatalia> papGenataliaService;
+	private PapGenataliaService<PapGenataliaVO> papGenataliaService;
 
 	@Autowired
-	private PapGinekologiService<PapGinekologi> papGinekologiService;
+	private PapGinekologiService<PapGinekologiVO> papGinekologiService;
 
 	@Autowired
-	private PapRehabilitasiService<PapRehabilitasi> papRehabilitasiService;
+	private PapRehabilitasiService<PapRehabilitasiVO> papRehabilitasiService;
 
 	@Autowired
-	private PapBedahService<PapBedah> papBedahService;
+	private PapBedahService<PapBedahVO> papBedahService;
 
 	@Autowired
-	private PapGigiMulutService<PapGigiMulut> papGigiMulutService;
+	private PapGigiMulutService<PapGigiMulutVO> papGigiMulutService;
 
 	@Autowired
-	private PapMataService<PapMata> papMataService;
+	private PapMataService<PapMataVO> papMataService;
 
 	@Autowired
 	private DiagnosaPasienService diagnosaPasienService;
@@ -103,7 +103,7 @@ public class SoapController extends LocaleController<SoapVO> {
 	private DiagnosaTindakanPasienService diagnosaTindakanPasienService;
 
 	@Autowired
-	private LembarKonsultasiService<LembarKonsultasi> lembarKonsultasiService;
+	private LembarKonsultasiService<LembarKonsultasiVO> lembarKonsultasiService;
 
 	@RequestMapping(value = "/save-soap", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody SoapVO vo, HttpServletRequest request) {

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/StrukPelayananController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.LimbahB3Masuk;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.DaftarStrukPenjualanService;
 import com.jasamedika.medifirst2000.service.InputKantongDarahService;
@@ -46,7 +45,7 @@ public class StrukPelayananController extends LocaleController<StrukPelayananVO>
 	private InputKantongDarahService inputKantongDarahService;
 
 	@Autowired
-	private LimbahB3MasukService<LimbahB3Masuk> limbahB3MasukService;
+	private LimbahB3MasukService<LimbahB3MasukVO> limbahB3MasukService;
 
 	@Autowired
 	private DaftarStrukPenjualanService service;

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/SurveiController.java

@@ -9,6 +9,7 @@ import com.jasamedika.medifirst2000.entities.Survei;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.SurveiService;
 import com.jasamedika.medifirst2000.vo.ResultSurveiVO;
+import com.jasamedika.medifirst2000.vo.SurveiVO;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -46,7 +47,7 @@ public class SurveiController extends LocaleController<ResultSurveiVO> {
 	private static final Logger LOGGER = getLogger(SurveiController.class);
 
 	@Autowired
-	private SurveiService<Survei> surveiService;
+	private SurveiService<SurveiVO> surveiService;
 
 	@Autowired
 	private SurveiDao surveiDao;

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TidurIstirahatController.java

@@ -3,7 +3,6 @@ package com.jasamedika.medifirst2000.controller;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.TidurIstirahat;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.TidurIstirahatService;
 import com.jasamedika.medifirst2000.vo.TidurIstirahatVO;
@@ -42,7 +41,7 @@ public class TidurIstirahatController extends LocaleController<TidurIstirahatVO>
 	private static final Logger LOGGER = getLogger(TidurIstirahatController.class);
 
 	@Autowired
-	private TidurIstirahatService<TidurIstirahat> tidurIstirahatService;
+	private TidurIstirahatService<TidurIstirahatVO> tidurIstirahatService;
 
 	@RequestMapping(value = "/save-tidur-istirahat", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<Map<String, Object>> save(@Valid @RequestBody TidurIstirahatVO vo,
@@ -54,7 +53,7 @@ public class TidurIstirahatController extends LocaleController<TidurIstirahatVO>
 			} else {
 				mapHeaderMessage.put(LABEL_ERROR, getMessage(MessageResource.LABEL_ERROR, request));
 			}
-			SaveLog("Tidur Istirahat", "Pemeriksaan", request);
+			SaveLog("Tidur Istirahat", "Pemeriksaan");
 			return getJsonResponse(result, CREATED, mapHeaderMessage);
 		} catch (ServiceVOException e) {
 			LOGGER.error("Got ServiceVOException {} when addTidurIstirahat", e.getMessage());

jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/TorController.java

@@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.controller;
 
 import com.jasamedika.medifirst2000.constants.MessageResource;
 import com.jasamedika.medifirst2000.controller.base.LocaleController;
-import com.jasamedika.medifirst2000.entities.Tor;
 import com.jasamedika.medifirst2000.exception.ServiceVOException;
 import com.jasamedika.medifirst2000.service.TorService;
 import com.jasamedika.medifirst2000.vo.TorVO;
@@ -33,7 +32,7 @@ public class TorController extends LocaleController<TorVO> {
 	private static final Logger LOGGER = getLogger(TorController.class);
 
 	@Autowired
-	private TorService<Tor> torService;
+	private TorService<TorVO> torService;
 
 	@RequestMapping(value = "/save-tor/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
 	public ResponseEntity<String> addVO(@Valid @RequestBody TorVO vo, HttpServletRequest request) {