diff --git a/jasamedika-bridging/src/main/resources/hibernate.cfg.xml b/jasamedika-bridging/src/main/resources/hibernate.cfg.xml
index 3ef2c10c..24c73c7e 100644
--- a/jasamedika-bridging/src/main/resources/hibernate.cfg.xml
+++ b/jasamedika-bridging/src/main/resources/hibernate.cfg.xml
@@ -2,306 +2,2137 @@
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HistoriAbsensiDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HistoriAbsensiDao.java
deleted file mode 100644
index 0558bcde..00000000
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/HistoriAbsensiDao.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.jasamedika.medifirst2000.dao;
-
-import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.stereotype.Repository;
-
-import com.jasamedika.medifirst2000.entities.HistoriAbsensi;
-
-@Repository("HistoriAbsensiDao")
-public interface HistoriAbsensiDao extends PagingAndSortingRepository {
-
-}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
index 737e3672..7904a4f1 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/dao/PelayananPasienDao.java
@@ -201,7 +201,8 @@ public interface PelayananPasienDao extends JpaRepository extends BaseVoService {
-
+public interface AlamatService extends BaseVoService {
+
List getAllAlamatForContoh();
+
AlamatVO add(AlamatVO vo);
+
AlamatVO update(AlamatVO vo);
+
AlamatVO findById(Integer key);
+
AlamatVO findByPasienId(Integer key);
+
Alamat findByPasienId2(Integer key);
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SurveiService.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SurveiService.java
index 4ffc9e47..ef706b1f 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SurveiService.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/SurveiService.java
@@ -1,27 +1,21 @@
package com.jasamedika.medifirst2000.service;
+import com.jasamedika.medifirst2000.entities.ResultSurvei;
+import com.jasamedika.medifirst2000.vo.ResultSurveiVO;
+
import java.util.Date;
import java.util.List;
import java.util.Map;
-import com.jasamedika.medifirst2000.entities.Pasien;
-import com.jasamedika.medifirst2000.vo.ModelVO;
-import com.jasamedika.medifirst2000.vo.ModelVO;
-import com.jasamedika.medifirst2000.entities.PurchasedTest;
-import com.jasamedika.medifirst2000.entities.ResultSurvei;
-import com.jasamedika.medifirst2000.vo.PasienVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPasienGawatDaruratVO;
-import com.jasamedika.medifirst2000.vo.ResultSurveiVO;
-
/**
* Pasien Service
*
* @author Roberto
*/
-public interface SurveiService extends BaseVoService {
-
+public interface SurveiService extends BaseVoService {
+
Map Save(List vo);
Map getRekap(Date start, Date until, String group);
-
+
}
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketToProdukServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketToProdukServiceImpl.java
index fdf30761..61f163f5 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/MapProdukPaketToProdukServiceImpl.java
+++ b/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;
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
index 7a162ad8..27b4cda7 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/RemunerasiServiceImpl.java
@@ -403,10 +403,10 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
d.put("isTermasukProporsi", true);
double hargaJual = Double.parseDouble(d.get("hargaJual").toString());
if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRemunDokterUmumHD / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRemunDokterUmumHD / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
} else if (terapisRehabMedik.contains(idPegawai)) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRemunTerapis / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRemunTerapis / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")))
d.put("isTermasukProporsi", false);
@@ -416,7 +416,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
double persenJasa = persenOperator / 100;
- RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
@@ -424,7 +424,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
double persenJasa = persenAsistenIBS / 100;
- RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
@@ -432,72 +432,69 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
double persenJasa = persenAnestesi / 100;
- RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
} else if (RADIOLOGI.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")))
d.put("isTermasukProporsi", false);
} else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")))
d.put("isTermasukProporsi", false);
} else if (KONSULTASI.equals(d.get("idGolonganProduk"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")))
d.put("isTermasukProporsi", false);
} else if (VISIT.equals(d.get("idGolonganProduk"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")))
d.put("isTermasukProporsi", false);
} else if (drAnastesiList.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drAnastesiList.contains(idPegawai) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drKkGenetika.contains(idPegawai)
&& idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString()))
@@ -505,32 +502,32 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
/*
* A rule for claimed <= Jul 31th 2023
*/
- RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")))
d.put("isTermasukProporsi", false);
} else if (Arrays.asList(GENETIKA).contains(Integer.parseInt(d.get("idRuangan").toString()))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")))
d.put("isTermasukProporsi", false);
} else if (drKkPatologiAnatomiList.contains(idPegawai)) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRemunDokterPA / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRemunDokterPA / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")))
d.put("isTermasukProporsi", false);
} else if (LABORATORIUM.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
if (!DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana")))
d.put("isTermasukProporsi", false);
} else if (CommonUtil.isNotNullOrEmpty(d.get("idRuangan"))
&& Arrays.asList(ICU_NICU).contains(Integer.parseInt(d.get("idRuangan").toString()))) {
double persenJasa = persenTindakan / 100;
- RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifICU, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifICU, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
} else {
- RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
d.put("hargaJasa", hargaJasa.getNilai());
}
}
@@ -2034,12 +2031,12 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
for (Map d : listData) {
double hargaJual = Double.parseDouble(d.get("hargaJual").toString());
if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRemunDokterUmumHD / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRemunDokterUmumHD / 100, hargaJual, d);
d.put("persenJasa", persenRemunDokterUmumHD + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (terapisRehabMedik.contains(idPegawai)) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRemunTerapis / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRemunTerapis / 100, hargaJual, d);
d.put("persenJasa", persenRemunTerapis + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
@@ -2049,7 +2046,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
double persenJasa = persenOperator / 100;
- RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d);
d.put("persenJasa", persenOperator + "%");
d.put("keterangan", "Tarif Jasa Bedah (" + persenTarifJasaBedah + "%)" + hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
@@ -2059,7 +2056,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
double persenJasa = persenAsistenIBS / 100;
- RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d);
d.put("persenJasa", persenAsistenIBS + "%");
d.put("keterangan", "Tarif Jasa Bedah (" + persenTarifJasaBedah + "%)" + hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
@@ -2069,7 +2066,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
double persenJasa = persenAnestesi / 100;
- RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifIBS, hargaJual, d);
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", "Tarif Jasa Bedah (" + persenTarifJasaBedah + "%)" + hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
@@ -2078,131 +2075,110 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("persenJasa", persenOperator + "%");
- if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan"))
- && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) {
- d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan());
- } else {
- d.put("keterangan", hargaJasa.getKeterangan());
- }
+ d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("persenJasa", persenAsistenIBS + "%");
- if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan"))
- && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) {
- d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan());
- } else {
- d.put("keterangan", hargaJasa.getKeterangan());
- }
+ d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("persenJasa", persenAnestesi + "%");
- if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan"))
- && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) {
- d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan());
- } else {
- d.put("keterangan", hargaJasa.getKeterangan());
- }
+ d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, hargaJual, d);
d.put("persenJasa", persenOperator + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d);
d.put("persenJasa", persenAsistenIBS + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d);
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (RADIOLOGI.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d);
d.put("persenJasa", persenRadiologi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d);
d.put("persenJasa", persenRehabMedik + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (KONSULTASI.equals(d.get("idGolonganProduk"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d);
d.put("persenJasa", persenKonsultasi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (VISIT.equals(d.get("idGolonganProduk"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d);
d.put("persenJasa", persenVisite + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drAnastesiList.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
d.put("persenJasa", persenTindakan + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drAnastesiList.contains(idPegawai) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d);
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drKkGenetika.contains(idPegawai)
&& idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString()))
&& (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d);
d.put("persenJasa", persenRemunLabGenetika + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (Arrays.asList(GENETIKA).contains(Integer.parseInt(d.get("idRuangan").toString()))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRemunLabGenetika / 100, hargaJual, d);
d.put("persenJasa", persenRemunLabGenetika + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drKkPatologiAnatomiList.contains(idPegawai)) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRemunDokterPA / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRemunDokterPA / 100, hargaJual, d);
d.put("persenJasa", persenRemunDokterPA + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (LABORATORIUM.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d);
d.put("persenJasa", persenLaboratorium + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (CommonUtil.isNotNullOrEmpty(d.get("idRuangan"))
&& Arrays.asList(ICU_NICU).contains(Integer.parseInt(d.get("idRuangan").toString()))) {
double persenJasa = persenTindakan / 100;
- RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifICU, hargaJual, d, false);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasa * persenTarifICU, hargaJual, d);
d.put("persenJasa", persenTindakan + "%");
d.put("keterangan", "Tarif Jasa ICU (" + persenTarifJasaICU + "%)" + hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else {
- RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
d.put("persenJasa", persenTindakan + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
@@ -2423,7 +2399,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double hargaJual = Double.parseDouble(d.get("hargaJual").toString());
if (CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenBPJS / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenBPJS / 100, hargaJual, d);
/*
* Set persen jasa dokter luar yang klaim ffs dengan persen jasa
* dari tarif total
@@ -2436,7 +2412,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
*/
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterUmumHD / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterUmumHD / 100, hargaJual, d);
d.put("persenJasa", persenJasaDokterUmumHD + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
@@ -2445,10 +2421,10 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
.atZone(ZoneId.systemDefault()).toLocalDateTime();
RemunHargaJasa hargaJasa;
if (tglJamPelayanan.isBefore(tmtJasaTerapis24)) {
- hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d, true);
+ hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d);
d.put("persenJasa", persenJasaTerapis + "%");
} else {
- hargaJasa = hargaJasa(persenJasaTerapis24 / 100, hargaJual, d, true);
+ hargaJasa = hargaJasa(persenJasaTerapis24 / 100, hargaJual, d);
d.put("persenJasa", persenJasaTerapis24 + "%");
}
d.put("keterangan", hargaJasa.getKeterangan());
@@ -2458,124 +2434,103 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("persenJasa", persenOperator + "%");
- if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan"))
- && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) {
- d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan());
- } else {
- d.put("keterangan", hargaJasa.getKeterangan());
- }
+ d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("persenJasa", persenAsistenIBS + "%");
- if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan"))
- && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) {
- d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan());
- } else {
- d.put("keterangan", hargaJasa.getKeterangan());
- }
+ d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("persenJasa", persenAnestesi + "%");
- if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan"))
- && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) {
- d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan());
- } else {
- d.put("keterangan", hargaJasa.getKeterangan());
- }
+ d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, hargaJual, d);
d.put("persenJasa", persenOperator + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d);
d.put("persenJasa", persenAsistenIBS + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d);
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (RADIOLOGI.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d);
d.put("persenJasa", persenRadiologi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d);
d.put("persenJasa", persenRehabMedik + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (KONSULTASI.equals(d.get("idGolonganProduk"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d);
d.put("persenJasa", persenKonsultasi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (VISIT.equals(d.get("idGolonganProduk"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d);
d.put("persenJasa", persenVisite + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drAnastesiList.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
d.put("persenJasa", persenTindakan + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drAnastesiList.contains(idPegawai) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d);
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drKkGenetika.contains(idPegawai)
&& idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString()))
&& (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d);
d.put("persenJasa", persenJasaLabGenetika + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (Arrays.asList(GENETIKA).contains(Integer.parseInt(d.get("idRuangan").toString()))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d);
d.put("persenJasa", persenJasaLabGenetika + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drKkPatologiAnatomiList.contains(idPegawai)) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterPA / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterPA / 100, hargaJual, d);
d.put("persenJasa", persenJasaDokterPA + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (LABORATORIUM.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d);
d.put("persenJasa", persenLaboratorium + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else {
- RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
d.put("persenJasa", persenTindakan + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
@@ -2803,7 +2758,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double hargaJual = Double.parseDouble(d.get("hargaJual").toString());
if (CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenBPJS / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenBPJS / 100, hargaJual, d);
/*
* Set persen jasa dokter luar yang klaim ffs dengan persen jasa
* dari tarif total
@@ -2816,13 +2771,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
*/
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterUmumHD / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterUmumHD / 100, hargaJual, d);
d.put("persenJasa", persenJasaDokterUmumHD + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (terapisRehabMedik.contains(idPegawai) && REHAB_MEDIK.equals(d.get("idDepartemen"))
&& "Eksekutif".equals(d.get("jenisRuangan"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaLuarTerapis / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaLuarTerapis / 100, hargaJual, d);
d.put("persenJasa", persenJasaLuarTerapis + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
@@ -2831,10 +2786,10 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
.atZone(ZoneId.systemDefault()).toLocalDateTime();
RemunHargaJasa hargaJasa;
if (tglJamPelayanan.isBefore(tmtJasaTerapis24)) {
- hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d, true);
+ hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d);
d.put("persenJasa", persenJasaTerapis + "%");
} else {
- hargaJasa = hargaJasa(persenJasaTerapis24 / 100, hargaJual, d, true);
+ hargaJasa = hargaJasa(persenJasaTerapis24 / 100, hargaJual, d);
d.put("persenJasa", persenJasaTerapis24 + "%");
}
d.put("keterangan", hargaJasa.getKeterangan());
@@ -2844,124 +2799,103 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("persenJasa", persenOperator + "%");
- if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan"))
- && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) {
- d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan());
- } else {
- d.put("keterangan", hargaJasa.getKeterangan());
- }
+ d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("persenJasa", persenAsistenIBS + "%");
- if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan"))
- && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) {
- d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan());
- } else {
- d.put("keterangan", hargaJasa.getKeterangan());
- }
+ d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("persenJasa", persenAnestesi + "%");
- if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan"))
- && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) {
- d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan());
- } else {
- d.put("keterangan", hargaJasa.getKeterangan());
- }
+ d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenOperator / 100, hargaJual, d);
d.put("persenJasa", persenOperator + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d);
d.put("persenJasa", persenAsistenIBS + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d);
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (RADIOLOGI.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d);
d.put("persenJasa", persenRadiologi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d);
d.put("persenJasa", persenRehabMedik + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (KONSULTASI.equals(d.get("idGolonganProduk"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d);
d.put("persenJasa", persenKonsultasi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (VISIT.equals(d.get("idGolonganProduk"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d);
d.put("persenJasa", persenVisite + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drAnastesiList.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
d.put("persenJasa", persenTindakan + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drAnastesiList.contains(idPegawai) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d);
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drKkGenetika.contains(idPegawai)
&& idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString()))
&& (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d);
d.put("persenJasa", persenJasaLabGenetika + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (Arrays.asList(GENETIKA).contains(Integer.parseInt(d.get("idRuangan").toString()))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d);
d.put("persenJasa", persenJasaLabGenetika + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drKkPatologiAnatomiList.contains(idPegawai)) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterPA / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterPA / 100, hargaJual, d);
d.put("persenJasa", persenJasaDokterPA + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (LABORATORIUM.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d);
d.put("persenJasa", persenLaboratorium + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else {
- RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
d.put("persenJasa", persenTindakan + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
@@ -3085,7 +3019,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
double hargaJual = Double.parseDouble(d.get("hargaJual").toString());
if (CommonUtil.isNotNullOrEmpty(d.get("idKelompokPasien"))
&& Arrays.asList(KELOMPOK_BPJS).contains(Integer.parseInt(d.get("idKelompokPasien").toString()))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenBPJS / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenBPJS / 100, hargaJual, d);
/*
* Set persen jasa dokter luar yang klaim ffs dengan persen jasa
* dari tarif total
@@ -3098,7 +3032,7 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
*/
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drKsmUmumList.contains(idPegawai) && ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterUmumHD / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterUmumHD / 100, hargaJual, d);
d.put("persenJasa", persenJasaDokterUmumHD + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
@@ -3107,72 +3041,51 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenOperatorIBS / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("persenJasa", persenOperatorIBS + "%");
- if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan"))
- && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) {
- d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan());
- } else {
- d.put("keterangan", hargaJasa.getKeterangan());
- }
+ d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("persenJasa", persenAsistenIBS + "%");
- if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan"))
- && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) {
- d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan());
- } else {
- d.put("keterangan", hargaJasa.getKeterangan());
- }
+ d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))
&& CommonUtil.isNotNullOrEmpty(d.get("idSayatan"))) {
RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100,
- (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d,
- false);
+ (hargaJual - (Double.parseDouble(d.get("persenSayatan").toString()) / 100 * hargaJual)), d);
d.put("persenJasa", persenAnestesi + "%");
- if (CommonUtil.isNotNullOrEmpty(d.get("urutanSayatan"))
- && Integer.parseInt(d.get("urutanSayatan").toString()) != 1) {
- d.put("keterangan", "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString()) + "%)" + hargaJasa.getKeterangan());
- } else {
- d.put("keterangan", hargaJasa.getKeterangan());
- }
+ d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenOperatorIBS / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenOperatorIBS / 100, hargaJual, d);
d.put("persenJasa", persenOperatorIBS + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& ASISTEN_SPESIALIS.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAsistenIBS / 100, hargaJual, d);
d.put("persenJasa", persenAsistenIBS + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if ((BEDAH_SENTRAL.equals(d.get("idDepartemen"))
|| (RADIOLOGI.equals(d.get("idDepartemen")) && CATHLAB.equals(d.get("idRuangan"))))
&& DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d);
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (RADIOLOGI.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRadiologi / 100, hargaJual, d);
d.put("persenJasa", persenRadiologi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
@@ -3182,63 +3095,63 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
.atZone(ZoneId.systemDefault()).toLocalDateTime();
RemunHargaJasa hargaJasa;
if (tglJamPelayanan.isBefore(tmtJasaTerapis24)) {
- hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d, true);
+ hargaJasa = hargaJasa(persenJasaTerapis / 100, hargaJual, d);
d.put("persenJasa", persenJasaTerapis + "%");
} else {
- hargaJasa = hargaJasa(persenJasaTerapis24 / 100, hargaJual, d, true);
+ hargaJasa = hargaJasa(persenJasaTerapis24 / 100, hargaJual, d);
d.put("persenJasa", persenJasaTerapis24 + "%");
}
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (REHAB_MEDIK.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenRehabMedik / 100, hargaJual, d);
d.put("persenJasa", persenRehabMedik + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (KONSULTASI.equals(d.get("idGolonganProduk"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenKonsultasi / 100, hargaJual, d);
d.put("persenJasa", persenKonsultasi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (VISIT.equals(d.get("idGolonganProduk"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenVisite / 100, hargaJual, d);
d.put("persenJasa", persenVisite + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drAnastesiList.contains(idPegawai) && DOKTER_PEMERIKSA.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
d.put("persenJasa", persenTindakan + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drAnastesiList.contains(idPegawai) && DOKTER_ANASTESI.equals(d.get("idJenisPelaksana"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenAnestesi / 100, hargaJual, d);
d.put("persenJasa", persenAnestesi + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drKkGenetika.contains(idPegawai)
&& idProdukLabGenetikaLuarRuangan.contains(Integer.parseInt(d.get("idProduk").toString()))
&& (date.before(new Date(1690822799000L)) || date.equals(new Date(1690822799000L)))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d);
d.put("persenJasa", persenJasaLabGenetika + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (Arrays.asList(GENETIKA).contains(Integer.parseInt(d.get("idRuangan").toString()))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaLabGenetika / 100, hargaJual, d);
d.put("persenJasa", persenJasaLabGenetika + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (drKkPatologiAnatomiList.contains(idPegawai)) {
- RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterPA / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenJasaDokterPA / 100, hargaJual, d);
d.put("persenJasa", persenJasaDokterPA + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else if (LABORATORIUM.equals(d.get("idDepartemen"))) {
- RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenLaboratorium / 100, hargaJual, d);
d.put("persenJasa", persenLaboratorium + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
} else {
- RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d, true);
+ RemunHargaJasa hargaJasa = hargaJasa(persenTindakan / 100, hargaJual, d);
d.put("persenJasa", persenTindakan + "%");
d.put("keterangan", hargaJasa.getKeterangan());
d.put("hargaJasa", hargaJasa.getNilai());
@@ -3338,16 +3251,12 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
return result;
}
- private RemunHargaJasa hargaJasa(double persenRemunerasi, double hargaJual, Map d,
- boolean isFrontNote) {
+ private RemunHargaJasa hargaJasa(double persenRemunerasi, double hargaJual, Map d) {
+ String keterangan = "";
RemunHargaJasa.RemunHargaJasaBuilder builder = RemunHargaJasa.builder();
if (KLINIK_KARYAWAN.equals(d.get("idRuangan")) || KLINIK_GIGI_KARYAWAN.equals(d.get("idRuangan"))) {
builder.nilai(0.0);
- if (isFrontNote) {
- builder.keterangan("Diskon Klinik Karyawan (100%)");
- } else {
- builder.keterangan(" + Diskon Klinik Karyawan (100%)");
- }
+ builder.keterangan("Diskon Klinik Karyawan (100%)");
return builder.build();
}
double hargaDiskon = Double.parseDouble(d.get("hargaDiskon").toString());
@@ -3370,53 +3279,61 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
builder.nilai(
persenRemunerasi * hargaJual * (1 - persenDiskonPegawai / 100) * (1 - persenDiskonJasa / 100));
}
+ if (Boolean.parseBoolean(d.get("isCito").toString())) {
+ keterangan = keterangan + "Cito (+" + Double.parseDouble(d.get("persenCito").toString()) + "%)";
+ }
+ if (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")) && CommonUtil.isNotNullOrEmpty("urutanSayatan")
+ && Integer.parseInt(d.get("urutanSayatan").toString()) != 1)
+ keterangan = keterangan + "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
+ + Double.parseDouble(d.get("persenSayatan").toString()) + "%)";
if (Boolean.parseBoolean(d.get("isSelisihPaket").toString())) {
if (persenDiskonPegawai > 0.0 && persenDiskonJasa > 0.0) {
- if (isFrontNote) {
+ if (keterangan.isEmpty()) {
builder.keterangan("Selisih Paket + Diskon Pegawai (" + persenDiskonPegawai
+ "%) + Diskon Jasa Medis Dokter (" + persenDiskonJasa + "%)");
} else {
- builder.keterangan(" + Selisih Paket + Diskon Pegawai (" + persenDiskonPegawai
+ builder.keterangan(keterangan + " + Selisih Paket + Diskon Pegawai (" + persenDiskonPegawai
+ "%) + Diskon Jasa Medis Dokter (" + persenDiskonJasa + "%)");
}
} else if (persenDiskonPegawai > 0.0 && persenDiskonJasa <= 0.0) {
- if (isFrontNote) {
+ if (keterangan.isEmpty()) {
builder.keterangan("Selisih Paket + Diskon Pegawai (" + persenDiskonPegawai + "%)");
} else {
- builder.keterangan(" + Selisih Paket + Diskon Pegawai (" + persenDiskonPegawai + "%)");
+ builder.keterangan(keterangan + " + Selisih Paket + Diskon Pegawai (" + persenDiskonPegawai + "%)");
}
} else if (persenDiskonPegawai <= 0.0 && persenDiskonJasa > 0.0) {
- if (isFrontNote) {
+ if (keterangan.isEmpty()) {
builder.keterangan("Selisih Paket + Diskon Jasa Medis Dokter (" + persenDiskonJasa + "%)");
} else {
- builder.keterangan(" + Selisih Paket + Diskon Jasa Medis Dokter (" + persenDiskonJasa + "%)");
+ builder.keterangan(
+ keterangan + " + Selisih Paket + Diskon Jasa Medis Dokter (" + persenDiskonJasa + "%)");
}
} else {
builder.keterangan("");
}
} else {
if (persenDiskonPegawai > 0.0 && persenDiskonJasa > 0.0) {
- if (isFrontNote) {
+ if (keterangan.isEmpty()) {
builder.keterangan("Diskon Pegawai (" + persenDiskonPegawai + "%) + Diskon Jasa Medis Dokter ("
+ persenDiskonJasa + "%)");
} else {
- builder.keterangan(" + Diskon Pegawai (" + persenDiskonPegawai + "%) + Diskon Jasa Medis Dokter ("
- + persenDiskonJasa + "%)");
+ builder.keterangan(keterangan + " + Diskon Pegawai (" + persenDiskonPegawai
+ + "%) + Diskon Jasa Medis Dokter (" + persenDiskonJasa + "%)");
}
} else if (persenDiskonPegawai > 0.0 && persenDiskonJasa <= 0.0) {
- if (isFrontNote) {
+ if (keterangan.isEmpty()) {
builder.keterangan("Diskon Pegawai (" + persenDiskonPegawai + "%)");
} else {
- builder.keterangan(" + Diskon Pegawai (" + persenDiskonPegawai + "%)");
+ builder.keterangan(keterangan + " + Diskon Pegawai (" + persenDiskonPegawai + "%)");
}
} else if (persenDiskonPegawai <= 0.0 && persenDiskonJasa > 0.0) {
- if (isFrontNote) {
+ if (keterangan.isEmpty()) {
builder.keterangan("Diskon Jasa Medis Dokter (" + persenDiskonJasa + "%)");
} else {
- builder.keterangan(" + Diskon Jasa Medis Dokter (" + persenDiskonJasa + "%)");
+ builder.keterangan(keterangan + " + Diskon Jasa Medis Dokter (" + persenDiskonJasa + "%)");
}
} else {
- builder.keterangan("");
+ builder.keterangan(keterangan);
}
}
return builder.build();
@@ -3452,10 +3369,13 @@ public class RemunerasiServiceImpl extends BaseVoServiceImpl implements Remunera
} else {
builder.nilai(hargaJasa * (1 - persenDiskonPegawai / 100) * (1 - persenDiskonJasa / 100));
}
+ if (Boolean.parseBoolean(d.get("isCito").toString())) {
+ keterangan = keterangan + "Cito (+" + Double.parseDouble(d.get("persenCito").toString()) + "%)";
+ }
if (CommonUtil.isNotNullOrEmpty(d.get("idSayatan")) && CommonUtil.isNotNullOrEmpty("urutanSayatan")
&& Integer.parseInt(d.get("urutanSayatan").toString()) != 1)
keterangan = keterangan + "Diskon Sayatan ke-" + d.get("urutanSayatan").toString() + " ("
- + Double.parseDouble(d.get("persenSayatan").toString() + "%");
+ + Double.parseDouble(d.get("persenSayatan").toString()) + "%)";
if (Boolean.parseBoolean(d.get("isSelisihPaket").toString())) {
if (persenDiskonPegawai > 0.0 && persenDiskonJasa > 0.0) {
if (keterangan.isEmpty()) {
diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SurveiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SurveiServiceImpl.java
index d0503a05..d52a9a11 100644
--- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SurveiServiceImpl.java
+++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/SurveiServiceImpl.java
@@ -1,40 +1,21 @@
package com.jasamedika.medifirst2000.service.impl;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.apache.commons.collections.IteratorUtils;
-import org.hibernate.Hibernate;
-import org.hibernate.proxy.HibernateProxy;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.orm.jpa.JpaSystemException;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
import com.jasamedika.medifirst2000.converter.BaseConverterImpl;
import com.jasamedika.medifirst2000.dao.ResultSurveiDao;
import com.jasamedika.medifirst2000.dao.ResultSurveiDetailDao;
-import com.jasamedika.medifirst2000.entities.Pasien;
-import com.jasamedika.medifirst2000.vo.ModelVO;
-import com.jasamedika.medifirst2000.vo.ModelVO;
-import com.jasamedika.medifirst2000.entities.PurchasedTest;
import com.jasamedika.medifirst2000.entities.ResultSurvei;
import com.jasamedika.medifirst2000.entities.ResultSurveiDetail;
import com.jasamedika.medifirst2000.entities.SurveiDetail;
import com.jasamedika.medifirst2000.exception.ServiceVOException;
import com.jasamedika.medifirst2000.service.SurveiService;
-import com.jasamedika.medifirst2000.vo.PasienVO;
-import com.jasamedika.medifirst2000.vo.RegistrasiPasienGawatDaruratVO;
import com.jasamedika.medifirst2000.vo.ResultSurveiVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.jpa.JpaSystemException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
/**
* Implement class for PasienService
*
@@ -80,53 +61,51 @@ public class SurveiServiceImpl extends BaseVoServiceImpl implements SurveiServic
String dir) {
return null;
}
+
@Autowired
private BaseConverterImpl resultSurveiConverter;
+
@Override
- @Transactional(readOnly=false)
+ @Transactional(readOnly = false)
public Map Save(List vo) {
- Map hasil = new HashMap<>();
+ Map hasil = new HashMap<>();
UUID idOne = UUID.randomUUID();
- List items = (List)vo;
+ List items = (List) vo;
for (ResultSurveiVO resultSurveiVO : items) {
resultSurveiConverter.setUseGson(true);
ResultSurvei model = resultSurveiConverter.transferVOToModel(resultSurveiVO, new ResultSurvei());
- model =resultSurveiDao.save(model);
+ model = resultSurveiDao.save(model);
ResultSurveiDetail subModel = new ResultSurveiDetail();
model.setGroupNo(String.valueOf(idOne));
subModel.setResultSurvei(model);
- SurveiDetail surveiDetail= new SurveiDetail();
- if(resultSurveiVO.getAnswer()!=null)
- {
- surveiDetail.setId(resultSurveiVO.getAnswer().getId());
- subModel.setSurveiDetail(surveiDetail);
- }
- subModel =resultSurveiDetailDao.save(subModel);
+ SurveiDetail surveiDetail = new SurveiDetail();
+ if (resultSurveiVO.getAnswer() != null) {
+ surveiDetail.setId(resultSurveiVO.getAnswer().getId());
+ subModel.setSurveiDetail(surveiDetail);
+ }
+ subModel = resultSurveiDetailDao.save(subModel);
}
hasil.put("message", "Data Berhasil di simpan");
return hasil;
}
@Override
- public Map getRekap(Date start, Date until, String group) {
+ public Map getRekap(Date start, Date until, String group) {
start.setHours(0);
start.setMinutes(0);
start.setSeconds(0);
until.setHours(23);
until.setMinutes(59);
until.setSeconds(59);
- Map hasil = new HashMap<>();
- if(group ==null)
- hasil.put("items", resultSurveiDetailDao.findByTglInputAndKelompok(start,until));
- else if(group.equals(""))
- hasil.put("items", resultSurveiDetailDao.findByTglInputAndKelompok(start,until));
- else
- hasil.put("items", resultSurveiDetailDao.findByTglInputAndKelompok(start,until,group));
-
+ Map hasil = new HashMap<>();
+ if (group == null)
+ hasil.put("items", resultSurveiDetailDao.findByTglInputAndKelompok(start, until));
+ else if (group.equals(""))
+ hasil.put("items", resultSurveiDetailDao.findByTglInputAndKelompok(start, until));
+ else
+ hasil.put("items", resultSurveiDetailDao.findByTglInputAndKelompok(start, until, group));
+
return hasil;
}
-
-
-
}
diff --git a/jasamedika-config/src/main/resources/com/jasamedika/medifirst2000/purchasedTest.hbm.xml b/jasamedika-config/src/main/resources/com/jasamedika/medifirst2000/purchasedTest.hbm.xml
deleted file mode 100644
index 9b87039c..00000000
--- a/jasamedika-config/src/main/resources/com/jasamedika/medifirst2000/purchasedTest.hbm.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ProdukDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/ProdukDto.java
similarity index 56%
rename from jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ProdukDto.java
rename to jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/ProdukDto.java
index 3189998b..6e6f4994 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ProdukDto.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/ProdukDto.java
@@ -1,4 +1,4 @@
-package com.jasamedika.medifirst2000.entities;
+package com.jasamedika.medifirst2000.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -6,7 +6,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
- * DTO for {@link Produk}
+ * DTO for {@link com.jasamedika.medifirst2000.entities.Produk}
*/
@Data
@Builder
@@ -14,8 +14,8 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
public class ProdukDto {
- private Integer id;
+ private Integer id;
- private String namaProduk;
+ private String namaProduk;
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/ProdukPaketDto.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/ProdukPaketDto.java
index 23a5328c..0c00ba63 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/dto/ProdukPaketDto.java
+++ b/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;
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/GiziProdukFormula.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/GiziProdukFormula.java
deleted file mode 100644
index a31c03d3..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/GiziProdukFormula.java
+++ /dev/null
@@ -1,21 +0,0 @@
-//package com.jasamedika.medifirst2000.entities;
-//
-//import javax.persistence.Column;
-//import javax.persistence.JoinColumn;
-//import javax.persistence.ManyToOne;
-//import javax.validation.constraints.NotNull;
-//
-//import com.jasamedika.medifirst2000.base.BaseTransaction;
-//import com.jasamedika.medifirst2000.helper.Caption;
-//
-//public class GiziProdukFormula extends BaseTransaction{
-//
-// @ManyToOne
-// @JoinColumn(name = "ObjectProdukHasilFK")
-// @NotNull(message="Produk Hasil tidak boleh kosong")
-// @Caption(value="Produk Hasil")
-// private Produk produkHasil;
-//
-// @Column(name = "ObjectProdukHasilFK", insertable=false,updatable=false, nullable = false)
-// private Integer produkHasilId;
-//}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/HistoriAbsensi.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/HistoriAbsensi.java
deleted file mode 100644
index 19a082a7..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/HistoriAbsensi.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;
-
-public class HistoriAbsensi extends BaseTransaction {
-
- @Column(name = "NoHistori", length = 10, nullable = false)
- @Caption("Nomor Histori")
- private String noHistori;
-
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "PegawaiFk")
- @NotNull(message = "Pegawai Harus Diisi")
- @Caption(value = "Pegawai")
- private Pegawai pegawai;
-
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "StatusAbsensiFk")
- @NotNull(message = "Status Absensi Harus Diisi")
- @Caption(value = "Status Absensi")
- private StatusAbsensi statusAbsensi;
-
- @Column(name = "TglMasuk")
- @Caption("Tanggal Masuk")
- private Date tglMasuk;
-
- @Column(name = "TglKeluar")
- @Caption("Tanggal Keluar")
- private Date tglKeluar;
-
- @Column(name = "TglIstirahatAwal")
- @Caption("Tanggal Istirahat Awal")
- private Date tglIstirahatAwal;
-
- @Column(name = "TglIstirahatAkhir")
- @Caption("Tanggal Istirahat Akhir")
- private Date tglIstirahatAkhir;
-
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "PegawaiPJawabFk")
- @NotNull(message = "Kode Pegawai Penanggungjawab Harus Diisi")
- @Caption(value = "Pegawai Penanggungjawab")
- private Pegawai pJawab;
-
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "RuanganFk")
- @NotNull(message = "Ruangan Harus Diisi")
- @Caption(value = "Ruangan")
- private Ruangan ruangan;
-
- @Column(name = "KeteranganAlasan")
- @Caption("Keterangan Alasan")
- private String keteranganAlasan;
-
- @Column(name = "AlasanLain")
- @Caption("Alasan Lain")
- private String alasanLain;
-
- @Column(name = "FingerPrintID")
- @Caption("Finger Print ID")
- private String fingerPrintId;
-
- @Column(name = "NoVerifikasi")
- @Caption("Nomor Verifikasi")
- private String noVerifikasi;
-
- @Column(name = "NoClosing")
- @Caption("Nomor Closing")
- private String noClosing;
-
- public final String getNoHistori() {
- return noHistori;
- }
-
- public final void setNoHistori(String noHistori) {
- this.noHistori = noHistori;
- }
-
- public final Pegawai getPegawai() {
- return pegawai;
- }
-
- public final void setPegawai(Pegawai pegawai) {
- this.pegawai = pegawai;
- }
-
- public final StatusAbsensi getStatusAbsensi() {
- return statusAbsensi;
- }
-
- public final void setStatusAbsensi(StatusAbsensi statusAbsensi) {
- this.statusAbsensi = statusAbsensi;
- }
-
- public final Date getTglMasuk() {
- return tglMasuk;
- }
-
- public final void setTglMasuk(Date tglMasuk) {
- this.tglMasuk = tglMasuk;
- }
-
- public final Date getTglKeluar() {
- return tglKeluar;
- }
-
- public final void setTglKeluar(Date tglKeluar) {
- this.tglKeluar = tglKeluar;
- }
-
- public final Date getTglIstirahatAwal() {
- return tglIstirahatAwal;
- }
-
- public final void setTglIstirahatAwal(Date tglIstirahatAwal) {
- this.tglIstirahatAwal = tglIstirahatAwal;
- }
-
- public final Date getTglIstirahatAkhir() {
- return tglIstirahatAkhir;
- }
-
- public final void setTglIstirahatAkhir(Date tglIstirahatAkhir) {
- this.tglIstirahatAkhir = tglIstirahatAkhir;
- }
-
- public final Pegawai getpJawab() {
- return pJawab;
- }
-
- public final void setpJawab(Pegawai pJawab) {
- this.pJawab = pJawab;
- }
-
- public final Ruangan getRuangan() {
- return ruangan;
- }
-
- public final void setRuangan(Ruangan ruangan) {
- this.ruangan = ruangan;
- }
-
- public final String getKeteranganAlasan() {
- return keteranganAlasan;
- }
-
- public final void setKeteranganAlasan(String keteranganAlasan) {
- this.keteranganAlasan = keteranganAlasan;
- }
-
- public final String getAlasanLain() {
- return alasanLain;
- }
-
- public final void setAlasanLain(String alasanLain) {
- this.alasanLain = alasanLain;
- }
-
- public final String getFingerPrintId() {
- return fingerPrintId;
- }
-
- public final void setFingerPrintId(String fingerPrintId) {
- this.fingerPrintId = fingerPrintId;
- }
-
- public final String getNoVerifikasi() {
- return noVerifikasi;
- }
-
- public final void setNoVerifikasi(String noVerifikasi) {
- this.noVerifikasi = noVerifikasi;
- }
-
- public final String getNoClosing() {
- return noClosing;
- }
-
- public final void setNoClosing(String noClosing) {
- this.noClosing = noClosing;
- }
-
-}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ListPemeriksaan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ListPemeriksaan.java
deleted file mode 100644
index b749cb01..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ListPemeriksaan.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-public class ListPemeriksaan {
-
-}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapLoginUserToRuanganS.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapLoginUserToRuanganS.java
deleted file mode 100644
index edce6866..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapLoginUserToRuanganS.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-
-//@Entity
-//@Table(name = "MapLoginUserToRuangan_S_Sample")
-public class MapLoginUserToRuanganS extends BaseMaster {
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.maploginusertoruangan_m_id_seq")
- @javax.persistence.SequenceGenerator(name = "public.maploginusertoruangan_m_id_seq", sequenceName = "public.maploginusertoruangan_m_id_seq", allocationSize = 1)
- @Column(name = "id")
- protected Integer id;
-
- private String KdPegawai;
-
- private String KdRuangan;
-
- private LoginUser loginUser;
-
-
-}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/OrderBean.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/OrderBean.java
deleted file mode 100644
index bfe29ad4..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/OrderBean.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-
-import java.util.Date;
-import java.util.List;
-
-public class OrderBean{
- /**
- *This class describes master records.
- */
- private String nDoc; //Document number
- private Date date; //Document date
- private List orderDetails;
-
- public Date getDate() {
- return date;
- }
- public void setDate(Date date) {
- this.date = date;
- }
- public String getNDoc() {
- return nDoc;
- }
- public void setNDoc(String nDoc) {
- this.nDoc = nDoc;
- }
- public List getOrderDetails() {
- return orderDetails;
- }
- public void setOrderDetails(List orderDetails) {
- this.orderDetails = orderDetails;
- }
-}
-//File: OrderBean.java ends here.
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/OrderDetailBean.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/OrderDetailBean.java
deleted file mode 100644
index 872b793f..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/OrderDetailBean.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-
-public class OrderDetailBean{
- /**
- * This class describes detail records for OrderBean.
- */
- private String name;
- private int quantity;
- private Double price;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getQuantity() {
- return quantity;
- }
-
- public void setQuantity(int quantity) {
- this.quantity = quantity;
- }
-
- public Double getPrice() {
- return price;
- }
-
- public void setPrice(Double price) {
- this.price = price;
- }
-
-}
-//File: OrderDetailBean.java ends here.
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PapGangguan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PapGangguan.java
deleted file mode 100644
index 489ddaaa..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PapGangguan.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-
-public class PapGangguan extends BaseTransaction{
- private Boolean isMental;
- private Boolean isPendengaran;
- private Boolean isSensasi;
- private Boolean isBicara;
- private Boolean isPenglihatan;
-
- public Boolean getIsMental() {
- return isMental;
- }
- public void setIsMental(Boolean isMental) {
- this.isMental = isMental;
- }
- public Boolean getIsPendengaran() {
- return isPendengaran;
- }
- public void setIsPendengaran(Boolean isPendengaran) {
- this.isPendengaran = isPendengaran;
- }
- public Boolean getIsSensasi() {
- return isSensasi;
- }
- public void setIsSensasi(Boolean isSensasi) {
- this.isSensasi = isSensasi;
- }
- public Boolean getIsBicara() {
- return isBicara;
- }
- public void setIsBicara(Boolean isBicara) {
- this.isBicara = isBicara;
- }
- public Boolean getIsPenglihatan() {
- return isPenglihatan;
- }
- public void setIsPenglihatan(Boolean isPenglihatan) {
- this.isPenglihatan = isPenglihatan;
- }
-
-
-}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasien.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasien.java
index 8252b653..e32e2c63 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasien.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasien.java
@@ -294,4 +294,11 @@ public class PelayananPasien extends MedicalRecordTransaction {
@Column(name = "persendiskonpegawai")
@Caption(value = "Persentase Diskon Pegawai")
private Double persenDiskonPegawai;
+
+ @Column(name = "iscito")
+ private Boolean isCito;
+
+ @Column(name = "persencito")
+ private Double persenCito;
+
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PeriodeAccountSaldo.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PeriodeAccountSaldo.java
deleted file mode 100644
index 5feb9b3a..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PeriodeAccountSaldo.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*package com.jasamedika.medifirst2000.entities;
-
-import java.io.Serializable;
-import javax.persistence.*;
-import org.joda.time.DateTime;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;
-
-*//**
- * class PeriodeAccountSaldo
- *
- * @author Generator
- *//*
-@Entity
-@Table(name = "PeriodeAccountSaldo_T")
-public class PeriodeAccountSaldo extends BaseTransaction {
- @ManyToOne
- @JoinColumn(name = "ObjectAccountFk")
- @NotNull(message="Object Account Harus Diisi")
- @Caption(value="Object Account")
- private ChartOfAccount kdaccount;
-
- public void setObjectAccount(ChartOfAccount kdaccount) {
- this.kdaccount = kdaccount;
- }
-
- @Column(name = "KdAccount", nullable = false )
- public ChartOfAccount getObjectAccount(){
- return this.kdaccount;
- }
-
- @Column(name = "ObjectAccountFk", insertable=false,updatable=false)
- private Integer ObjectAccountId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectHistoryLoginDFk")
- @Caption(value="Object History Login D")
- private HistoryLoginModulAplikasi kdhistorylogind;
-
- public void setObjectHistoryLoginD(HistoryLoginModulAplikasi kdhistorylogind) {
- this.kdhistorylogind = kdhistorylogind;
- }
-
- @Column(name = "KdHistoryLoginD", nullable = true )
- public HistoryLoginModulAplikasi getObjectHistoryLoginD(){
- return this.kdhistorylogind;
- }
-
- @Column(name = "ObjectHistoryLoginDFk", insertable=false,updatable=false)
- private Integer ObjectHistoryLoginDId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectHistoryLoginIFk")
- @NotNull(message="Object History Login I Harus Diisi")
- @Caption(value="Object History Login I")
- private HistoryLoginModulAplikasi kdhistorylogini;
-
- public void setObjectHistoryLoginI(HistoryLoginModulAplikasi kdhistorylogini) {
- this.kdhistorylogini = kdhistorylogini;
- }
-
- @Column(name = "KdHistoryLoginI", nullable = false )
- public HistoryLoginModulAplikasi getObjectHistoryLoginI(){
- return this.kdhistorylogini;
- }
-
- @Column(name = "ObjectHistoryLoginIFk", insertable=false,updatable=false)
- private Integer ObjectHistoryLoginIId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectHistoryLoginSFk")
- @Caption(value="Object History Login S")
- private HistoryLoginModulAplikasi kdhistorylogins;
-
- public void setObjectHistoryLoginS(HistoryLoginModulAplikasi kdhistorylogins) {
- this.kdhistorylogins = kdhistorylogins;
- }
-
- @Column(name = "KdHistoryLoginS", nullable = true )
- public HistoryLoginModulAplikasi getObjectHistoryLoginS(){
- return this.kdhistorylogins;
- }
-
- @Column(name = "ObjectHistoryLoginSFk", insertable=false,updatable=false)
- private Integer ObjectHistoryLoginSId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectHistoryLoginUFk")
- @Caption(value="Object History Login U")
- private HistoryLoginModulAplikasi kdhistoryloginu;
-
- public void setObjectHistoryLoginU(HistoryLoginModulAplikasi kdhistoryloginu) {
- this.kdhistoryloginu = kdhistoryloginu;
- }
-
- @Column(name = "KdHistoryLoginU", nullable = true )
- public HistoryLoginModulAplikasi getObjectHistoryLoginU(){
- return this.kdhistoryloginu;
- }
-
- @Column(name = "ObjectHistoryLoginUFk", insertable=false,updatable=false)
- private Integer ObjectHistoryLoginUId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectPeriodeAccountFk")
- @NotNull(message="Object Periode Account Harus Diisi")
- @Caption(value="Object Periode Account")
- private PeriodeAccount kdperiodeaccount;
-
- public void setObjectPeriodeAccount(PeriodeAccount kdperiodeaccount) {
- this.kdperiodeaccount = kdperiodeaccount;
- }
-
- @Column(name = "KdPeriodeAccount", nullable = false )
- public PeriodeAccount getObjectPeriodeAccount(){
- return this.kdperiodeaccount;
- }
-
- @Column(name = "ObjectPeriodeAccountFk", insertable=false,updatable=false)
- private Integer ObjectPeriodeAccountId;
-
- @Caption(value="Keterangan Lainnya")
- private String keteranganlainnya;
-
- public void setKeteranganLainnya(String keteranganlainnya) {
- this.keteranganlainnya = keteranganlainnya;
- }
-
- @Column(name = "KeteranganLainnya", nullable = true , length = 150)
- public String getKeteranganLainnya(){
- return this.keteranganlainnya;
- }
-
- @ManyToOne
- @JoinColumn(name = "NoVerifikasiFk")
- @Caption(value="No Verifikasi")
- private StrukVerifikasi noverifikasi;
-
- public void setNoVerifikasi(StrukVerifikasi noverifikasi) {
- this.noverifikasi = noverifikasi;
- }
-
- @Column(name = "NoVerifikasi", nullable = true , length = 10)
- public StrukVerifikasi getNoVerifikasi(){
- return this.noverifikasi;
- }
-
- @Column(name = "NoVerifikasiFk", insertable=false,updatable=false)
- private Integer NoVerifikasiId;
-
- @Caption(value="Saldo Akhir D Periode")
- private Double saldoakhirdperiode;
-
- public void setSaldoAkhirDPeriode(Double saldoakhirdperiode) {
- this.saldoakhirdperiode = saldoakhirdperiode;
- }
-
- @Column(name = "SaldoAkhirDPeriode", nullable = false )
- public Double getSaldoAkhirDPeriode(){
- return this.saldoakhirdperiode;
- }
-
- @Caption(value="Saldo Akhir K Periode")
- private Double saldoakhirkperiode;
-
- public void setSaldoAkhirKPeriode(Double saldoakhirkperiode) {
- this.saldoakhirkperiode = saldoakhirkperiode;
- }
-
- @Column(name = "SaldoAkhirKPeriode", nullable = false )
- public Double getSaldoAkhirKPeriode(){
- return this.saldoakhirkperiode;
- }
-
- @Caption(value="Saldo Awal D Periode")
- private Double saldoawaldperiode;
-
- public void setSaldoAwalDPeriode(Double saldoawaldperiode) {
- this.saldoawaldperiode = saldoawaldperiode;
- }
-
- @Column(name = "SaldoAwalDPeriode", nullable = false )
- public Double getSaldoAwalDPeriode(){
- return this.saldoawaldperiode;
- }
-
- @Caption(value="Saldo Awal K Periode")
- private Double saldoawalkperiode;
-
- public void setSaldoAwalKPeriode(Double saldoawalkperiode) {
- this.saldoawalkperiode = saldoawalkperiode;
- }
-
- @Column(name = "SaldoAwalKPeriode", nullable = false )
- public Double getSaldoAwalKPeriode(){
- return this.saldoawalkperiode;
- }
-
-
-}
-
-*/
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ProfileM.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ProfileM.java
deleted file mode 100644
index 7ee12680..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ProfileM.java
+++ /dev/null
@@ -1,497 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseModel;
-
-public class ProfileM extends BaseModel {
-
- /**
- *
- */
- private static final long serialVersionUID = 6980399585889512198L;
-
- @NotNull(message="Kd Profile tidak boleh kosong")
- @Column(name = "KdProfile", unique = true, nullable = false)
- private short kdProfile;
-
- @NotNull(message="Nama Lengkap tidak boleh kosong")
- @Column(name = "NamaLengkap", nullable = false, length = 100)
- private String namaLengkap;
-
- @NotNull(message="Report Display tidak boleh kosong")
- @Column(name = "ReportDisplay", nullable = false, length = 100)
- private String reportDisplay;
-
- @Column(name = "KdKelasLevel", length = 2)
- private String kdKelasLevel;
-
- @Column(name = "KdTahapanAkreditasiLast")
- private Byte kdTahapanAkreditasiLast;
-
- @Column(name = "KdStatusAkreditasiLast")
- private Byte kdStatusAkreditasiLast;
-
- @Column(name = "AlamatLengkap", length = 200)
- private String alamatLengkap;
-
- @Column(name = "KdDesaKelurahan")
- private Integer kdDesaKelurahan;
-
- @Column(name = "RTRW", length = 7)
- private String rtrw;
-
- @Column(name = "KdKecamatan")
- private Integer kdKecamatan;
-
- @Column(name = "KdKotaKabupaten")
- private Short kdKotaKabupaten;
-
- @Column(name = "KdPropinsi")
- private Byte kdPropinsi;
- @Column(name = "KodePos", length = 10)
-
- private String kodePos;
- @Column(name = "FixedPhone", length = 30)
-
- private String fixedPhone;
- @Column(name = "MobilePhone", length = 30)
-
- private String mobilePhone;
- @Column(name = "Faksimile", length = 30)
-
- private String faksimile;
- @Column(name = "MottoSemboyan", length = 100)
-
- private String mottoSemboyan;
- @Column(name = "AlamatEmail", length = 50)
-
- private String alamatEmail;
- @Column(name = "Website", length = 80)
-
- private String website;
- @Column(name = "KdPegawaiKepala", length = 5)
-
- private String kdPegawaiKepala;
- @NotNull(message="Message To Pasien tidak boleh kosong")
- @Column(name = "MessageToPasien", nullable = false, length = 150)
-
- private String messageToPasien;
- @Column(name = "GambarLogo", length = 100)
-
- private String gambarLogo;
- @Column(name = "KdDepartemen", length = 1)
-
- private Character kdDepartemen;
- @Column(name = "NPWP", length = 30)
-
- private String npwp;
- @Column(name = "NoPKP", length = 40)
-
- private String noPkp;
- @Column(name = "KdAccount")
-
- private Integer kdAccount;
- @NotNull(message="Kd Jenis Profile tidak boleh kosong")
- @Column(name = "KdJenisProfile", nullable = false)
-
- private byte kdJenisProfile;
- @Column(name = "KdPemilikProfile")
-
- private Byte kdPemilikProfile;
- @Column(name = "NoSuratIjinLast", length = 20)
-
- private String noSuratIjinLast;
- @Temporal(TemporalType.TIMESTAMP)
- @Column(name = "TglSuratIjinLast", length = 16)
-
- private Date tglSuratIjinLast;
- @Column(name = "SignatureByLast", length = 30)
-
- private String signatureByLast;
- @Column(name = "KdStatusSuratIjinLast")
-
- private Byte kdStatusSuratIjinLast;
- @Temporal(TemporalType.TIMESTAMP)
- @Column(name = "TglSuratIjinExpiredLast", length = 16)
-
- private Date tglSuratIjinExpiredLast;
- @NotNull(message="Kd Satuan Kerja tidak boleh kosong")
- @Column(name = "KdSatuanKerja", nullable = false)
-
- private byte kdSatuanKerja;
- @Column(name = "KdJenisTarif")
-
- private Byte kdJenisTarif;
- @NotNull(message="QProfile tidak boleh kosong")
- @Column(name = "QProfile", nullable = false)
-
- private byte qprofile;
- @Column(name = "KodeExternal", length = 15)
-
- private String kodeExternal;
- @Column(name = "NamaExternal", length = 100)
-
- private String namaExternal;
- @NotNull(message="Status Enabled tidak boleh kosong")
- @Column(name = "StatusEnabled", nullable = false)
-
- private byte statusEnabled;
- @NotNull(message="Kd History Login I tidak boleh kosong")
- @Column(name = "KdHistoryLoginI", nullable = false)
-
- private int kdHistoryLoginI;
- @Column(name = "KdHistoryLoginU")
-
- private Integer kdHistoryLoginU;
- public short getKdProfile() {
- return kdProfile;
- }
-
- public void setKdProfile(short kdProfile) {
- this.kdProfile = kdProfile;
- }
-
- public String getNamaLengkap() {
- return namaLengkap;
- }
-
- public void setNamaLengkap(String namaLengkap) {
- this.namaLengkap = namaLengkap;
- }
-
- public String getReportDisplay() {
- return reportDisplay;
- }
-
- public void setReportDisplay(String reportDisplay) {
- this.reportDisplay = reportDisplay;
- }
-
- public String getKdKelasLevel() {
- return kdKelasLevel;
- }
-
- public void setKdKelasLevel(String kdKelasLevel) {
- this.kdKelasLevel = kdKelasLevel;
- }
-
- public Byte getKdTahapanAkreditasiLast() {
- return kdTahapanAkreditasiLast;
- }
-
- public void setKdTahapanAkreditasiLast(Byte kdTahapanAkreditasiLast) {
- this.kdTahapanAkreditasiLast = kdTahapanAkreditasiLast;
- }
-
- public Byte getKdStatusAkreditasiLast() {
- return kdStatusAkreditasiLast;
- }
-
- public void setKdStatusAkreditasiLast(Byte kdStatusAkreditasiLast) {
- this.kdStatusAkreditasiLast = kdStatusAkreditasiLast;
- }
-
- public String getAlamatLengkap() {
- return alamatLengkap;
- }
-
- public void setAlamatLengkap(String alamatLengkap) {
- this.alamatLengkap = alamatLengkap;
- }
-
- public Integer getKdDesaKelurahan() {
- return kdDesaKelurahan;
- }
-
- public void setKdDesaKelurahan(Integer kdDesaKelurahan) {
- this.kdDesaKelurahan = kdDesaKelurahan;
- }
-
- public String getRtrw() {
- return rtrw;
- }
-
- public void setRtrw(String rtrw) {
- this.rtrw = rtrw;
- }
-
- public Integer getKdKecamatan() {
- return kdKecamatan;
- }
-
- public void setKdKecamatan(Integer kdKecamatan) {
- this.kdKecamatan = kdKecamatan;
- }
-
- public Short getKdKotaKabupaten() {
- return kdKotaKabupaten;
- }
-
- public void setKdKotaKabupaten(Short kdKotaKabupaten) {
- this.kdKotaKabupaten = kdKotaKabupaten;
- }
-
- public Byte getKdPropinsi() {
- return kdPropinsi;
- }
-
- public void setKdPropinsi(Byte kdPropinsi) {
- this.kdPropinsi = kdPropinsi;
- }
-
- public String getKdPos() {
- return kodePos;
- }
-
- public void setKdPos(String kodePos) {
- this.kodePos = kodePos;
- }
-
- public String getFixedPhone() {
- return fixedPhone;
- }
-
- public void setFixedPhone(String fixedPhone) {
- this.fixedPhone = fixedPhone;
- }
-
- public String getMobilePhone() {
- return mobilePhone;
- }
-
- public void setMobilePhone(String mobilePhone) {
- this.mobilePhone = mobilePhone;
- }
-
- public String getFaksimile() {
- return faksimile;
- }
-
- public void setFaksimile(String faksimile) {
- this.faksimile = faksimile;
- }
-
- public String getMottoSemboyan() {
- return mottoSemboyan;
- }
-
- public void setMottoSemboyan(String mottoSemboyan) {
- this.mottoSemboyan = mottoSemboyan;
- }
-
- public String getAlamatEmail() {
- return alamatEmail;
- }
-
- public void setAlamatEmail(String alamatEmail) {
- this.alamatEmail = alamatEmail;
- }
-
- public String getWebsite() {
- return website;
- }
-
- public void setWebsite(String website) {
- this.website = website;
- }
-
- public String getKdPegawaiKepala() {
- return kdPegawaiKepala;
- }
-
- public void setKdPegawaiKepala(String kdPegawaiKepala) {
- this.kdPegawaiKepala = kdPegawaiKepala;
- }
-
- public String getMessageToPasien() {
- return messageToPasien;
- }
-
- public void setMessageToPasien(String messageToPasien) {
- this.messageToPasien = messageToPasien;
- }
-
- public String getGambarLogo() {
- return gambarLogo;
- }
-
- public void setGambarLogo(String gambarLogo) {
- this.gambarLogo = gambarLogo;
- }
-
- public Character getKdDepartemen() {
- return kdDepartemen;
- }
-
- public void setKdDepartemen(Character kdDepartemen) {
- this.kdDepartemen = kdDepartemen;
- }
-
- public String getNpwp() {
- return npwp;
- }
-
- public void setNpwp(String npwp) {
- this.npwp = npwp;
- }
-
- public String getNoPkp() {
- return noPkp;
- }
-
- public void setNoPkp(String noPkp) {
- this.noPkp = noPkp;
- }
-
- public Integer getKdAccount() {
- return kdAccount;
- }
-
- public void setKdAccount(Integer kdAccount) {
- this.kdAccount = kdAccount;
- }
-
- public byte getKdJenisProfile() {
- return kdJenisProfile;
- }
-
- public void setKdJenisProfile(byte kdJenisProfile) {
- this.kdJenisProfile = kdJenisProfile;
- }
-
- public Byte getKdPemilikProfile() {
- return kdPemilikProfile;
- }
-
- public void setKdPemilikProfile(Byte kdPemilikProfile) {
- this.kdPemilikProfile = kdPemilikProfile;
- }
-
- public String getNoSuratIjinLast() {
- return noSuratIjinLast;
- }
-
- public void setNoSuratIjinLast(String noSuratIjinLast) {
- this.noSuratIjinLast = noSuratIjinLast;
- }
-
- public Date getTglSuratIjinLast() {
- return tglSuratIjinLast;
- }
-
- public void setTglSuratIjinLast(Date tglSuratIjinLast) {
- this.tglSuratIjinLast = tglSuratIjinLast;
- }
-
- public String getSignatureByLast() {
- return signatureByLast;
- }
-
- public void setSignatureByLast(String signatureByLast) {
- this.signatureByLast = signatureByLast;
- }
-
- public Byte getKdStatusSuratIjinLast() {
- return kdStatusSuratIjinLast;
- }
-
- public void setKdStatusSuratIjinLast(Byte kdStatusSuratIjinLast) {
- this.kdStatusSuratIjinLast = kdStatusSuratIjinLast;
- }
-
- public Date getTglSuratIjinExpiredLast() {
- return tglSuratIjinExpiredLast;
- }
-
- public void setTglSuratIjinExpiredLast(Date tglSuratIjinExpiredLast) {
- this.tglSuratIjinExpiredLast = tglSuratIjinExpiredLast;
- }
-
- public byte getKdSatuanKerja() {
- return kdSatuanKerja;
- }
-
- public void setKdSatuanKerja(byte kdSatuanKerja) {
- this.kdSatuanKerja = kdSatuanKerja;
- }
-
- public Byte getKdJenisTarif() {
- return kdJenisTarif;
- }
-
- public void setKdJenisTarif(Byte kdJenisTarif) {
- this.kdJenisTarif = kdJenisTarif;
- }
-
- public byte getqprofile() {
- return qprofile;
- }
-
- public void setqprofile(byte qprofile) {
- this.qprofile = qprofile;
- }
-
- public String getKdExternal() {
- return kodeExternal;
- }
-
- public void setKdExternal(String kodeExternal) {
- this.kodeExternal = kodeExternal;
- }
-
- public String getNamaExternal() {
- return namaExternal;
- }
-
- public void setNamaExternal(String namaExternal) {
- this.namaExternal = namaExternal;
- }
-
- public byte getStatusEnabled() {
- return statusEnabled;
- }
-
- public void setStatusEnabled(byte statusEnabled) {
- this.statusEnabled = statusEnabled;
- }
-
- public int getKdHistoryLoginI() {
- return kdHistoryLoginI;
- }
-
- public void setKdHistoryLoginI(int kdHistoryLoginI) {
- this.kdHistoryLoginI = kdHistoryLoginI;
- }
-
- public Integer getKdHistoryLoginU() {
- return kdHistoryLoginU;
- }
-
- public void setKdHistoryLoginU(Integer kdHistoryLoginU) {
- this.kdHistoryLoginU = kdHistoryLoginU;
- }
-
- public Integer getKdHistoryLoginS() {
- return kdHistoryLoginS;
- }
-
- public void setKdHistoryLoginS(Integer kdHistoryLoginS) {
- this.kdHistoryLoginS = kdHistoryLoginS;
- }
-
- @Column(name = "KdHistoryLoginS")
-
- private Integer kdHistoryLoginS;
-
- public ProfileM() {
- }
-
- // @Id
-
-}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PurchaseParent.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PurchaseParent.java
deleted file mode 100644
index 0b6fbfea..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PurchaseParent.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-import java.io.Serializable;import org.hibernate.envers.Audited;
-
-public class PurchaseParent implements Serializable {
-
-}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PurchasedTest.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PurchasedTest.java
deleted file mode 100644
index adf043e7..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PurchasedTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-import java.io.Serializable;import org.hibernate.envers.Audited;
-import java.util.Date;
-
-public class PurchasedTest extends PurchaseParent {
-
- private Long testId;
- public Long getTestId() {
- return testId;
- }
-
- public void setTestId(Long testId) {
- this.testId = testId;
- }
-
- private Long customerId;
-
- // an easy initializing constructor
- public PurchasedTest() {
-
- }
-
- public Long getCustomerId() {
- return customerId;
- }
-
- public void setCustomerId(Long customerId) {
- this.customerId = customerId;
- }
-
-
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- PurchasedTest other = (PurchasedTest) obj;
- if (customerId == null) {
- if (other.customerId != null)
- return false;
- } else if (!customerId.equals(other.customerId))
- return false;
- if (purchaseDate == null) {
- if (other.purchaseDate != null)
- return false;
- } else if (!purchaseDate.equals(other.purchaseDate))
- return false;
- return true;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((customerId == null) ? 0 : customerId.hashCode());
- result = prime * result + ((purchaseDate == null) ? 0 : purchaseDate.hashCode());
- return result;
- }
-
- Date purchaseDate;
-
-
-
- public Date getPurchaseDate() {
- return purchaseDate;
- }
-
- public void setPurchaseDate(Date purchaseDate) {
- this.purchaseDate = purchaseDate;
- }
-
-
-
-}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ReturProduk.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ReturProduk.java
deleted file mode 100644
index 1b4e849d..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/ReturProduk.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.jasamedika.medifirst2000.entities;
-
-public class ReturProduk {
-
-}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/StrukPelayananDetailK.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/StrukPelayananDetailK.java
deleted file mode 100644
index 39757886..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/StrukPelayananDetailK.java
+++ /dev/null
@@ -1,732 +0,0 @@
-/*package com.jasamedika.medifirst2000.entities;
-
-import java.io.Serializable;
-import javax.persistence.*;
-import org.joda.time.DateTime;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import javax.validation.constraints.NotNull;
-import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.internal.util.logging.Messages;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.helper.Caption;
-
-*//**
- * class StrukPelayananDetailK
- *
- * @author Generator
- *//*
-@Entity
-@Table(name = "StrukPelayananDetailK_T")
-public class StrukPelayananDetailK extends BaseTransaction {
- @Caption(value="Harga Discount")
- private Double hargadiscount;
-
- public void setHargaDiscount(Double hargadiscount) {
- this.hargadiscount = hargadiscount;
- }
-
- @Column(name = "HargaDiscount", nullable = false )
- public Double getHargaDiscount(){
- return this.hargadiscount;
- }
-
- @Caption(value="Harga Netto")
- private Double harganetto;
-
- public void setHargaNetto(Double harganetto) {
- this.harganetto = harganetto;
- }
-
- @Column(name = "HargaNetto", nullable = false )
- public Double getHargaNetto(){
- return this.harganetto;
- }
-
- @Caption(value="Harga P P H")
- private Double hargapph;
-
- public void setHargaPPH(Double hargapph) {
- this.hargapph = hargapph;
- }
-
- @Column(name = "HargaPPH", nullable = false )
- public Double getHargaPPH(){
- return this.hargapph;
- }
-
- @Caption(value="Harga P P N")
- private Double hargappn;
-
- public void setHargaPPN(Double hargappn) {
- this.hargappn = hargappn;
- }
-
- @Column(name = "HargaPPN", nullable = false )
- public Double getHargaPPN(){
- return this.hargappn;
- }
-
- @Caption(value="Harga Satuan")
- private Double hargasatuan;
-
- public void setHargaSatuan(Double hargasatuan) {
- this.hargasatuan = hargasatuan;
- }
-
- @Column(name = "HargaSatuan", nullable = false )
- public Double getHargaSatuan(){
- return this.hargasatuan;
- }
-
- @Caption(value="Harga Satuan Di Jamin")
- private Double hargasatuandijamin;
-
- public void setHargaSatuanDiJamin(Double hargasatuandijamin) {
- this.hargasatuandijamin = hargasatuandijamin;
- }
-
- @Column(name = "HargaSatuanDiJamin", nullable = false )
- public Double getHargaSatuanDiJamin(){
- return this.hargasatuandijamin;
- }
-
- @Caption(value="Harga Satuan P Penjamin")
- private Double hargasatuanppenjamin;
-
- public void setHargaSatuanPPenjamin(Double hargasatuanppenjamin) {
- this.hargasatuanppenjamin = hargasatuanppenjamin;
- }
-
- @Column(name = "HargaSatuanPPenjamin", nullable = false )
- public Double getHargaSatuanPPenjamin(){
- return this.hargasatuanppenjamin;
- }
-
- @Caption(value="Harga Satuan P Profile")
- private Double hargasatuanpprofile;
-
- public void setHargaSatuanPProfile(Double hargasatuanpprofile) {
- this.hargasatuanpprofile = hargasatuanpprofile;
- }
-
- @Column(name = "HargaSatuanPProfile", nullable = false )
- public Double getHargaSatuanPProfile(){
- return this.hargasatuanpprofile;
- }
-
- @Caption(value="Harga Tambahan")
- private Double hargatambahan;
-
- public void setHargaTambahan(Double hargatambahan) {
- this.hargatambahan = hargatambahan;
- }
-
- @Column(name = "HargaTambahan", nullable = false )
- public Double getHargaTambahan(){
- return this.hargatambahan;
- }
-
- @ManyToOne
- @JoinColumn(name = "ObjectAsalProdukFk")
- @NotNull(message="Object Asal Produk Harus Diisi")
- @Caption(value="Object Asal Produk")
- private AsalProduk kdasalproduk;
-
- public void setObjectAsalProduk(AsalProduk kdasalproduk) {
- this.kdasalproduk = kdasalproduk;
- }
-
- @Column(name = "KdAsalProduk", nullable = false )
- public AsalProduk getObjectAsalProduk(){
- return this.kdasalproduk;
- }
-
- @Column(name = "ObjectAsalProdukFk", insertable=false,updatable=false)
- private Integer ObjectAsalProdukId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectHistoryLoginDFk")
- @Caption(value="Object History Login D")
- private HistoryLoginModulAplikasi kdhistorylogind;
-
- public void setObjectHistoryLoginD(HistoryLoginModulAplikasi kdhistorylogind) {
- this.kdhistorylogind = kdhistorylogind;
- }
-
- @Column(name = "KdHistoryLoginD", nullable = true )
- public HistoryLoginModulAplikasi getObjectHistoryLoginD(){
- return this.kdhistorylogind;
- }
-
- @Column(name = "ObjectHistoryLoginDFk", insertable=false,updatable=false)
- private Integer ObjectHistoryLoginDId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectHistoryLoginIFk")
- @NotNull(message="Object History Login I Harus Diisi")
- @Caption(value="Object History Login I")
- private HistoryLoginModulAplikasi kdhistorylogini;
-
- public void setObjectHistoryLoginI(HistoryLoginModulAplikasi kdhistorylogini) {
- this.kdhistorylogini = kdhistorylogini;
- }
-
- @Column(name = "KdHistoryLoginI", nullable = false )
- public HistoryLoginModulAplikasi getObjectHistoryLoginI(){
- return this.kdhistorylogini;
- }
-
- @Column(name = "ObjectHistoryLoginIFk", insertable=false,updatable=false)
- private Integer ObjectHistoryLoginIId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectHistoryLoginSFk")
- @Caption(value="Object History Login S")
- private HistoryLoginModulAplikasi kdhistorylogins;
-
- public void setObjectHistoryLoginS(HistoryLoginModulAplikasi kdhistorylogins) {
- this.kdhistorylogins = kdhistorylogins;
- }
-
- @Column(name = "KdHistoryLoginS", nullable = true )
- public HistoryLoginModulAplikasi getObjectHistoryLoginS(){
- return this.kdhistorylogins;
- }
-
- @Column(name = "ObjectHistoryLoginSFk", insertable=false,updatable=false)
- private Integer ObjectHistoryLoginSId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectHistoryLoginUFk")
- @Caption(value="Object History Login U")
- private HistoryLoginModulAplikasi kdhistoryloginu;
-
- public void setObjectHistoryLoginU(HistoryLoginModulAplikasi kdhistoryloginu) {
- this.kdhistoryloginu = kdhistoryloginu;
- }
-
- @Column(name = "KdHistoryLoginU", nullable = true )
- public HistoryLoginModulAplikasi getObjectHistoryLoginU(){
- return this.kdhistoryloginu;
- }
-
- @Column(name = "ObjectHistoryLoginUFk", insertable=false,updatable=false)
- private Integer ObjectHistoryLoginUId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectJenisKemasanFk")
- @Caption(value="Object Jenis Kemasan")
- private JenisKemasan kdjeniskemasan;
-
- public void setObjectJenisKemasan(JenisKemasan kdjeniskemasan) {
- this.kdjeniskemasan = kdjeniskemasan;
- }
-
- @Column(name = "KdJenisKemasan", nullable = true )
- public JenisKemasan getObjectJenisKemasan(){
- return this.kdjeniskemasan;
- }
-
- @Column(name = "ObjectJenisKemasanFk", insertable=false,updatable=false)
- private Integer ObjectJenisKemasanId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectJenisTarifFk")
- @Caption(value="Object Jenis Tarif")
- private JenisTarif kdjenistarif;
-
- public void setObjectJenisTarif(JenisTarif kdjenistarif) {
- this.kdjenistarif = kdjenistarif;
- }
-
- @Column(name = "KdJenisTarif", nullable = true )
- public JenisTarif getObjectJenisTarif(){
- return this.kdjenistarif;
- }
-
- @Column(name = "ObjectJenisTarifFk", insertable=false,updatable=false)
- private Integer ObjectJenisTarifId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectKasusPenyakitFk")
- @Caption(value="Object Kasus Penyakit")
- private KasusPenyakit kdkasuspenyakit;
-
- public void setObjectKasusPenyakit(KasusPenyakit kdkasuspenyakit) {
- this.kdkasuspenyakit = kdkasuspenyakit;
- }
-
- @Column(name = "KdKasusPenyakit", nullable = true )
- public KasusPenyakit getObjectKasusPenyakit(){
- return this.kdkasuspenyakit;
- }
-
- @Column(name = "ObjectKasusPenyakitFk", insertable=false,updatable=false)
- private Integer ObjectKasusPenyakitId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectKelasFk")
- @Caption(value="Object Kelas")
- private DetailKamar kdkelas;
-
- public void setObjectKelas(DetailKamar kdkelas) {
- this.kdkelas = kdkelas;
- }
-
- @Column(name = "KdKelas", nullable = true , length = 2)
- public DetailKamar getObjectKelas(){
- return this.kdkelas;
- }
-
- @Column(name = "ObjectKelasFk", insertable=false,updatable=false)
- private Integer ObjectKelasId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectKelasDiJaminFk")
- @Caption(value="Object Kelas Di Jamin")
- private DetailKamar kdkelasdijamin;
-
- public void setObjectKelasDiJamin(DetailKamar kdkelasdijamin) {
- this.kdkelasdijamin = kdkelasdijamin;
- }
-
- @Column(name = "KdKelasDiJamin", nullable = true , length = 2)
- public DetailKamar getObjectKelasDiJamin(){
- return this.kdkelasdijamin;
- }
-
- @Column(name = "ObjectKelasDiJaminFk", insertable=false,updatable=false)
- private Integer ObjectKelasDiJaminId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectKelompokPasienFk")
- @Caption(value="Object Kelompok Pasien")
- private KelompokPasien kdkelompokpasien;
-
- public void setObjectKelompokPasien(KelompokPasien kdkelompokpasien) {
- this.kdkelompokpasien = kdkelompokpasien;
- }
-
- @Column(name = "KdKelompokPasien", nullable = true )
- public KelompokPasien getObjectKelompokPasien(){
- return this.kdkelompokpasien;
- }
-
- @Column(name = "ObjectKelompokPasienFk", insertable=false,updatable=false)
- private Integer ObjectKelompokPasienId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectKomponenHargaFk")
- @NotNull(message="Object Komponen Harga Harus Diisi")
- @Caption(value="Object Komponen Harga")
- private KomponenHarga kdkomponenharga;
-
- public void setObjectKomponenHarga(KomponenHarga kdkomponenharga) {
- this.kdkomponenharga = kdkomponenharga;
- }
-
- @Column(name = "KdKomponenHarga", nullable = false )
- public KomponenHarga getObjectKomponenHarga(){
- return this.kdkomponenharga;
- }
-
- @Column(name = "ObjectKomponenHargaFk", insertable=false,updatable=false)
- private Integer ObjectKomponenHargaId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectPaketFk")
- @Caption(value="Object Paket")
- private Paket kdpaket;
-
- public void setObjectPaket(Paket kdpaket) {
- this.kdpaket = kdpaket;
- }
-
- @Column(name = "KdPaket", nullable = true )
- public Paket getObjectPaket(){
- return this.kdpaket;
- }
-
- @Column(name = "ObjectPaketFk", insertable=false,updatable=false)
- private Integer ObjectPaketId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectPegawaiAsistenPJFk")
- @Caption(value="Object Pegawai Asisten P J")
- private LoginUser kdpegawaiasistenpj;
-
- public void setObjectPegawaiAsistenPJ(LoginUser kdpegawaiasistenpj) {
- this.kdpegawaiasistenpj = kdpegawaiasistenpj;
- }
-
- @Column(name = "KdPegawaiAsistenPJ", nullable = true , length = 5)
- public LoginUser getObjectPegawaiAsistenPJ(){
- return this.kdpegawaiasistenpj;
- }
-
- @Column(name = "ObjectPegawaiAsistenPJFk", insertable=false,updatable=false)
- private Integer ObjectPegawaiAsistenPJId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectPegawaiPJawabFk")
- @Caption(value="Object Pegawai P Jawab")
- private LoginUser kdpegawaipjawab;
-
- public void setObjectPegawaiPJawab(LoginUser kdpegawaipjawab) {
- this.kdpegawaipjawab = kdpegawaipjawab;
- }
-
- @Column(name = "KdPegawaiPJawab", nullable = true , length = 5)
- public LoginUser getObjectPegawaiPJawab(){
- return this.kdpegawaipjawab;
- }
-
- @Column(name = "ObjectPegawaiPJawabFk", insertable=false,updatable=false)
- private Integer ObjectPegawaiPJawabId;
-
- @Caption(value="Kode Penjamin Pasien")
- private short kdpenjaminpasien;
-
- public void setKodePenjaminPasien(short kdpenjaminpasien) {
- this.kdpenjaminpasien = kdpenjaminpasien;
- }
-
- @Column(name = "KdPenjaminPasien", nullable = true )
- public short getKodePenjaminPasien(){
- return this.kdpenjaminpasien;
- }
-
- @ManyToOne
- @JoinColumn(name = "ObjectProdukFk")
- @NotNull(message="Object Produk Harus Diisi")
- @Caption(value="Object Produk")
- private Produk kdproduk;
-
- public void setObjectProduk(Produk kdproduk) {
- this.kdproduk = kdproduk;
- }
-
- @Column(name = "KdProduk", nullable = false , length = 6)
- public Produk getObjectProduk(){
- return this.kdproduk;
- }
-
- @Column(name = "ObjectProdukFk", insertable=false,updatable=false)
- private Integer ObjectProdukId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectProduk4UsedFk")
- @Caption(value="Object Produk4 Used")
- private Produk kdproduk4used;
-
- public void setObjectProduk4Used(Produk kdproduk4used) {
- this.kdproduk4used = kdproduk4used;
- }
-
- @Column(name = "KdProduk4Used", nullable = true , length = 6)
- public Produk getObjectProduk4Used(){
- return this.kdproduk4used;
- }
-
- @Column(name = "ObjectProduk4UsedFk", insertable=false,updatable=false)
- private Integer ObjectProduk4UsedId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectProdukTriggerFk")
- @Caption(value="Object Produk Trigger")
- private Produk kdproduktrigger;
-
- public void setObjectProdukTrigger(Produk kdproduktrigger) {
- this.kdproduktrigger = kdproduktrigger;
- }
-
- @Column(name = "KdProdukTrigger", nullable = true , length = 6)
- public Produk getObjectProdukTrigger(){
- return this.kdproduktrigger;
- }
-
- @Column(name = "ObjectProdukTriggerFk", insertable=false,updatable=false)
- private Integer ObjectProdukTriggerId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectRekananRujukanFk")
- @Caption(value="Object Rekanan Rujukan")
- private Rekanan kdrekananrujukan;
-
- public void setObjectRekananRujukan(Rekanan kdrekananrujukan) {
- this.kdrekananrujukan = kdrekananrujukan;
- }
-
- @Column(name = "KdRekananRujukan", nullable = true )
- public Rekanan getObjectRekananRujukan(){
- return this.kdrekananrujukan;
- }
-
- @Column(name = "ObjectRekananRujukanFk", insertable=false,updatable=false)
- private Integer ObjectRekananRujukanId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectRuanganFk")
- @NotNull(message="Object Ruangan Harus Diisi")
- @Caption(value="Object Ruangan")
- private Ruangan kdruangan;
-
- public void setObjectRuangan(Ruangan kdruangan) {
- this.kdruangan = kdruangan;
- }
-
- @Column(name = "KdRuangan", nullable = false , length = 3)
- public Ruangan getObjectRuangan(){
- return this.kdruangan;
- }
-
- @Column(name = "ObjectRuanganFk", insertable=false,updatable=false)
- private Integer ObjectRuanganId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectRuanganAsalFk")
- @NotNull(message="Object Ruangan Asal Harus Diisi")
- @Caption(value="Object Ruangan Asal")
- private Ruangan kdruanganasal;
-
- public void setObjectRuanganAsal(Ruangan kdruanganasal) {
- this.kdruanganasal = kdruanganasal;
- }
-
- @Column(name = "KdRuanganAsal", nullable = false , length = 3)
- public Ruangan getObjectRuanganAsal(){
- return this.kdruanganasal;
- }
-
- @Column(name = "ObjectRuanganAsalFk", insertable=false,updatable=false)
- private Integer ObjectRuanganAsalId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectRuanganStokFk")
- @Caption(value="Object Ruangan Stok")
- private Ruangan kdruanganstok;
-
- public void setObjectRuanganStok(Ruangan kdruanganstok) {
- this.kdruanganstok = kdruanganstok;
- }
-
- @Column(name = "KdRuanganStok", nullable = true , length = 3)
- public Ruangan getObjectRuanganStok(){
- return this.kdruanganstok;
- }
-
- @Column(name = "ObjectRuanganStokFk", insertable=false,updatable=false)
- private Integer ObjectRuanganStokId;
-
- @ManyToOne
- @JoinColumn(name = "NoResepFk")
- @Caption(value="No Resep")
- private StrukResep noresep;
-
- public void setNoResep(StrukResep noresep) {
- this.noresep = noresep;
- }
-
- @Column(name = "NoResep", nullable = true , length = 10)
- public StrukResep getNoResep(){
- return this.noresep;
- }
-
- @Column(name = "NoResepFk", insertable=false,updatable=false)
- private Integer NoResepId;
-
- @ManyToOne
- @JoinColumn(name = "NoSBKtoExtFk")
- @Caption(value="No S B Kto Ext")
- private StrukBuktiPengeluaran nosbktoext;
-
- public void setNoSBKtoExt(StrukBuktiPengeluaran nosbktoext) {
- this.nosbktoext = nosbktoext;
- }
-
- @Column(name = "NoSBKtoExt", nullable = true , length = 10)
- public StrukBuktiPengeluaran getNoSBKtoExt(){
- return this.nosbktoext;
- }
-
- @Column(name = "NoSBKtoExtFk", insertable=false,updatable=false)
- private Integer NoSBKtoExtId;
-
- @ManyToOne
- @JoinColumn(name = "NoSBMtoIntFk")
- @Caption(value="No S B Mto Int")
- private StrukBuktiPenerimaan nosbmtoint;
-
- public void setNoSBMtoInt(StrukBuktiPenerimaan nosbmtoint) {
- this.nosbmtoint = nosbmtoint;
- }
-
- @Column(name = "NoSBMtoInt", nullable = true , length = 10)
- public StrukBuktiPenerimaan getNoSBMtoInt(){
- return this.nosbmtoint;
- }
-
- @Column(name = "NoSBMtoIntFk", insertable=false,updatable=false)
- private Integer NoSBMtoIntId;
-
- @ManyToOne
- @JoinColumn(name = "NoSJPFk")
- @Caption(value="No S J P")
- private PemakaianAsuransi nosjp;
-
- public void setNoSJP(PemakaianAsuransi nosjp) {
- this.nosjp = nosjp;
- }
-
- @Column(name = "NoSJP", nullable = true , length = 10)
- public PemakaianAsuransi getNoSJP(){
- return this.nosjp;
- }
-
- @Column(name = "NoSJPFk", insertable=false,updatable=false)
- private String NoSJPId;
-
- @ManyToOne
- @JoinColumn(name = "NoStrukFk")
- @NotNull(message="No Struk Harus Diisi")
- @Caption(value="No Struk")
- private StrukPelayanan nostruk;
-
- public void setNoStruk(StrukPelayanan nostruk) {
- this.nostruk = nostruk;
- }
-
- @Column(name = "NoStruk", nullable = false , length = 10)
- public StrukPelayanan getNoStruk(){
- return this.nostruk;
- }
-
- @Column(name = "NoStrukFk", insertable=false,updatable=false)
- private Integer NoStrukId;
-
- @ManyToOne
- @JoinColumn(name = "NoStrukTerimaFk")
- @Caption(value="No Struk Terima")
- private StrukPelayanan nostrukterima;
-
- public void setNoStrukTerima(StrukPelayanan nostrukterima) {
- this.nostrukterima = nostrukterima;
- }
-
- @Column(name = "NoStrukTerima", nullable = true , length = 10)
- public StrukPelayanan getNoStrukTerima(){
- return this.nostrukterima;
- }
-
- @Column(name = "NoStrukTerimaFk", insertable=false,updatable=false)
- private Integer NoStrukTerimaId;
-
- @ManyToOne
- @JoinColumn(name = "NoVerifikasiFk")
- @Caption(value="No Verifikasi")
- private StrukVerifikasi noverifikasi;
-
- public void setNoVerifikasi(StrukVerifikasi noverifikasi) {
- this.noverifikasi = noverifikasi;
- }
-
- @Column(name = "NoVerifikasi", nullable = true , length = 10)
- public StrukVerifikasi getNoVerifikasi(){
- return this.noverifikasi;
- }
-
- @Column(name = "NoVerifikasiFk", insertable=false,updatable=false)
- private Integer NoVerifikasiId;
-
- @Caption(value="Persen Discount")
- private Double persendiscount;
-
- public void setPersenDiscount(Double persendiscount) {
- this.persendiscount = persendiscount;
- }
-
- @Column(name = "PersenDiscount", nullable = false )
- public Double getPersenDiscount(){
- return this.persendiscount;
- }
-
- @Caption(value="Qty Produk")
- private Double qtyproduk;
-
- public void setQtyProduk(Double qtyproduk) {
- this.qtyproduk = qtyproduk;
- }
-
- @Column(name = "QtyProduk", nullable = false )
- public Double getQtyProduk(){
- return this.qtyproduk;
- }
-
- @Caption(value="Qty Produk Retur")
- private Double qtyprodukretur;
-
- public void setQtyProdukRetur(Double qtyprodukretur) {
- this.qtyprodukretur = qtyprodukretur;
- }
-
- @Column(name = "QtyProdukRetur", nullable = false )
- public Double getQtyProdukRetur(){
- return this.qtyprodukretur;
- }
-
- @Caption(value="Resep Ke")
- private Byte resepke;
-
- public void setResepKe(Byte resepke) {
- this.resepke = resepke;
- }
-
- @Column(name = "ResepKe", nullable = true )
- public Byte getResepKe(){
- return this.resepke;
- }
-
- @Caption(value="Satuan")
- private String satuan;
-
- public void setSatuan(String satuan) {
- this.satuan = satuan;
- }
-
- @Column(name = "Satuan", nullable = false , length = 1)
- public String getSatuan(){
- return this.satuan;
- }
-
- @Caption(value="Tanggal Berlaku")
- private DateTime tglberlaku;
-
- public void setTanggalBerlaku(DateTime tglberlaku) {
- this.tglberlaku = tglberlaku;
- }
-
- @Column(name = "TglBerlaku", nullable = true )
- public DateTime getTanggalBerlaku(){
- return this.tglberlaku;
- }
-
- @Caption(value="Tanggal Pelayanan")
- private DateTime tglpelayanan;
-
- public void setTanggalPelayanan(DateTime tglpelayanan) {
- this.tglpelayanan = tglpelayanan;
- }
-
- @Column(name = "TglPelayanan", nullable = false )
- public DateTime getTanggalPelayanan(){
- return this.tglpelayanan;
- }
-
-
-}
-
-*/
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AntrianPasienRegistrasiDetailVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AntrianPasienRegistrasiDetailVO.java
index 761fc7ce..77b1af66 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AntrianPasienRegistrasiDetailVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AntrianPasienRegistrasiDetailVO.java
@@ -1,77 +1,59 @@
package com.jasamedika.medifirst2000.vo;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.entities.JenisKartuDetail;
import com.jasamedika.medifirst2000.helper.Caption;
-@Entity
-@Table(name = "AntrianPasienRegistrasiDetail_T")
-public class AntrianPasienRegistrasiDetailVO extends BaseTransactionVO{
- @Column(name = "merchantInvoiceNo",length=20)
- @Caption(value="Merchant Invoice No")
+public class AntrianPasienRegistrasiDetailVO extends BaseTransactionVO {
+
+ @Caption(value = "Merchant Invoice No")
private String merchantInvoiceNo;
-
- @Column(name = "amount")
- @Caption(value="Amount")
+
+ @Caption(value = "Amount")
private Long amount;
-
- @ManyToOne
- @JoinColumn(name = "ObjectJenisKartuFk")
- @Caption(value="Object Jenis Kartu")
+
+ @Caption(value = "Object Jenis Kartu")
private JenisKartuVO jenisKartu;
-
- @Column(name = "ObjectKartuKreditFk", insertable=false,updatable=false)
+
private Integer jenisKartuId;
- @ManyToOne
- @JoinColumn(name = "ObjectCaraBayarFk")
- @Caption(value="Object Cara Bayar")
+ @Caption(value = "Object Cara Bayar")
private CaraBayarVO caraBayar;
-
- @Column(name = "ObjectKartuKreditFk", insertable=false,updatable=false)
+
private Integer caraBayarId;
public String getMerchantInvoiceNo() {
return merchantInvoiceNo;
}
+
public void setMerchantInvoiceNo(String merchantInvoiceNo) {
this.merchantInvoiceNo = merchantInvoiceNo;
}
+
public Long getAmount() {
return amount;
}
+
public void setAmount(Long amount) {
this.amount = amount;
}
+
public JenisKartuVO getJenisKartu() {
return jenisKartu;
}
+
public void setJenisKartu(JenisKartuVO jenisKartu) {
this.jenisKartu = jenisKartu;
}
+
public CaraBayarVO getCaraBayar() {
return caraBayar;
}
+
public void setCaraBayar(CaraBayarVO caraBayar) {
this.caraBayar = caraBayar;
}
- @OneToOne
- @JoinColumn(name = "ObjectAntrianPasienRegistrasiFK")
- @Caption(value="AntrianPasienRegistrasi")
+ @Caption(value = "AntrianPasienRegistrasi")
private AntrianPasienRegistrasiVO antrianPasienRegistrasi;
public AntrianPasienRegistrasiVO getAntrianPasienRegistrasi() {
@@ -82,20 +64,17 @@ 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")
+ @Caption(value = "Object AntrianPasienRegistrasiDetail")
private JenisKartuDetailVO jenisKartuDetail;
-
- @Column(name = "ObjectJenisKartuDetailFk", insertable=false,updatable=false)
+
private Integer jenisKartuDetailId;
public JenisKartuDetailVO getJenisKartuDetail() {
return jenisKartuDetail;
}
+
public void setJenisKartuDetail(JenisKartuDetailVO jenisKartuDetail) {
this.jenisKartuDetail = jenisKartuDetail;
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AsesmenGiziAwalVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AsesmenGiziAwalVO.java
index 345270a6..e4bb13cb 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AsesmenGiziAwalVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/AsesmenGiziAwalVO.java
@@ -1,65 +1,44 @@
package com.jasamedika.medifirst2000.vo;
+import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+
+import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.entities.RisikoGizi;
-import com.jasamedika.medifirst2000.helper.Caption;
-
/**
- * class PosisiRahim
+ * class PosisiRahim
*
* @author Generator
*/
-@Entity
-@Table(name = "AsesmenGiziAwal_T")
public class AsesmenGiziAwalVO extends BaseTransactionVO {
-
- @ManyToOne(cascade=CascadeType.REFRESH)
- @JoinColumn(name = "RisikoFk")
-
- @Caption(value="Risiko")
- private RisikoGizi risiko;
- @Column(name = "RisikoFk", insertable=false,updatable=false,nullable = true)
+
+ @Caption(value = "Risiko")
+ private RisikoGiziVO risiko;
+
private Integer risikoId;
-
-
- public RisikoGizi getRisiko() {
+
+ public RisikoGiziVO getRisiko() {
return risiko;
}
- public void setRisiko(RisikoGizi risiko) {
+ public void setRisiko(RisikoGiziVO risiko) {
this.risiko = risiko;
}
- @ManyToOne
- @NotNull(message="No C M Harus Diisi")
- @Caption(value="No C M")
+
+ @NotNull(message = "No C M Harus Diisi")
+ @Caption(value = "No C M")
private AntrianPasienDiPeriksaVO pasienDaftar;
- @NotNull(message="Tgl Pendaftaran tidak boleh kosong")
- @Column(name = "TanggalPendaftaran", nullable = false )
- @Caption(value="Tanggal Registrasi")
+ @NotNull(message = "Tgl Pendaftaran tidak boleh kosong")
+ @Caption(value = "Tanggal Registrasi")
private Date tanggalPendaftaran;
-
- @OneToMany
- private Set preskripsiDiet=new HashSet();
-
- @OneToMany
- private Set tindakLanjutGizi=new HashSet();
+
+ private Set preskripsiDiet = new HashSet();
+
+ private Set tindakLanjutGizi = new HashSet();
public AntrianPasienDiPeriksaVO getPasien() {
return pasienDaftar;
@@ -93,7 +72,4 @@ public class AsesmenGiziAwalVO extends BaseTransactionVO {
this.tindakLanjutGizi = tindakLanjutGizi;
}
-
-
}
-
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DetailJenisLimbahVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DetailJenisLimbahVO.java
index 62e7c632..a3679469 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DetailJenisLimbahVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DetailJenisLimbahVO.java
@@ -1,23 +1,14 @@
package com.jasamedika.medifirst2000.vo;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-@Entity
-@Table(name = "DetailJenisLimbah_T")
+import javax.validation.constraints.NotNull;
+
public class DetailJenisLimbahVO extends BaseTransactionVO {
-
- @ManyToOne
- @JoinColumn(name = "ObjectjenisLimbahB3MasukFk",nullable=false)
+
@NotNull(message = "Jenis Limbah tidak boleh kosong")
private JenisLimbahB3MasukVO jenisLimbahB3Masuk;
- @Column(name="jenisLimbahYangDikelola")
private Double jumlah;
public JenisLimbahB3MasukVO getJenisLimbahB3Masuk() {
@@ -36,5 +27,4 @@ public class DetailJenisLimbahVO extends BaseTransactionVO {
this.jumlah = jumlah;
}
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DetailPioVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DetailPioVO.java
index 6760f037..4da1bd35 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DetailPioVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DetailPioVO.java
@@ -1,38 +1,23 @@
package com.jasamedika.medifirst2000.vo;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
import com.jasamedika.medifirst2000.helper.Caption;
/**
- * class Agama
+ * class Agama
*
* @author Generator
*/
-@Entity
-@Table(name = "DetailPio_T")
public class DetailPioVO extends BaseTransactionVO {
-
- @Column(name = "pertanyaan")
+
private String pertanyaan;
-
- @Column(name = "pemberiInformasi")
+
private String pemberiInformasi;
-
- @Column(name = "jawaban")
+
private String jawaban;
-
- @ManyToOne
- @JoinColumn(name = "objectPioFk")
- @Caption(value="Pio")
- //@JsonBackReference
+
+ @Caption(value = "Pio")
+ // @JsonBackReference
private PioVO pio;
public String getPertanyaan() {
@@ -67,8 +52,4 @@ public class DetailPioVO extends BaseTransactionVO {
this.pio = pio;
}
-
-
-
}
-
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DisposisiJabatanVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DisposisiJabatanVO.java
index 2e535e25..d121f156 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DisposisiJabatanVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DisposisiJabatanVO.java
@@ -1,31 +1,17 @@
package com.jasamedika.medifirst2000.vo;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
import com.jasamedika.medifirst2000.helper.Caption;
-@Entity
-@Table(name = "DisposisiJabatan_T")
public class DisposisiJabatanVO extends BaseTransactionVO {
-
- @ManyToOne(fetch = FetchType.LAZY)
- @Caption(value="disposisi")
+
+ @Caption(value = "disposisi")
private DisposisiVO disposisi;
-
- @ManyToOne(fetch = FetchType.LAZY)
- @Caption(value="jabatan")
+
+ @Caption(value = "jabatan")
private JabatanVO jabatan;
-
- @ManyToOne(fetch = FetchType.LAZY)
- @Caption(value="pegawai")
+
+ @Caption(value = "pegawai")
private PegawaiVO pegawai;
public DisposisiVO getDisposisi() {
@@ -51,8 +37,5 @@ public class DisposisiJabatanVO extends BaseTransactionVO {
public void setPegawai(PegawaiVO pegawai) {
this.pegawai = pegawai;
}
-
-
-
-
+
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DisposisiTanggapanVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DisposisiTanggapanVO.java
index eb16d340..7b8c8081 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DisposisiTanggapanVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DisposisiTanggapanVO.java
@@ -1,27 +1,14 @@
package com.jasamedika.medifirst2000.vo;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import com.fasterxml.jackson.annotation.JsonBackReference;
import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.helper.Caption;
-@Entity
-@Table(name = "DisposisiTanggapan_T")
public class DisposisiTanggapanVO extends BaseTransaction {
-
- //@JsonBackReference
- @ManyToOne(fetch = FetchType.LAZY)
- @Caption(value="disposisi")
+
+ @Caption(value = "disposisi")
private DisposisiVO disposisi;
-
- @ManyToOne(fetch = FetchType.LAZY)
- @Caption(value="tanggapan")
+
+ @Caption(value = "tanggapan")
private TanggapanVO tanggapan;
public DisposisiVO getDisposisi() {
@@ -39,9 +26,5 @@ public class DisposisiTanggapanVO extends BaseTransaction {
public void setTanggapan(TanggapanVO tanggapan) {
this.tanggapan = tanggapan;
}
-
-
-
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DokumenKeluarVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DokumenKeluarVO.java
index bce18993..37520971 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DokumenKeluarVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/DokumenKeluarVO.java
@@ -1,144 +1,94 @@
package com.jasamedika.medifirst2000.vo;
+import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+
+import javax.validation.constraints.NotNull;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.*;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.entities.JenisArsip;
-
-import javax.validation.constraints.NotNull;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.helper.Caption;
-
/**
- * class DokumenKeluar
+ * class DokumenKeluar
*
* @author Generator
*/
-@Entity
-@Table(name = "DokumenKeluar_T")
public class DokumenKeluarVO extends BaseTransactionVO {
- @Caption(value="Institusi Nama Tujuan")
- @Column(name = "InstitusiNamaTujuan", nullable = false , length = 75)
+ @Caption(value = "Institusi Nama Tujuan")
private String institusinamatujuan;
- @Caption(value="Jabatan Penerima Tujuan")
- @Column(name = "JabatanPenerimaTujuan", nullable = true , length = 50)
+ @Caption(value = "Jabatan Penerima Tujuan")
private String jabatanpenerimatujuan;
- @ManyToOne
- @JoinColumn(name = "ObjectDokumenFk")
- @NotNull(message="Object Dokumen Harus Diisi")
- @Caption(value="Object Dokumen")
+ @NotNull(message = "Object Dokumen Harus Diisi")
+ @Caption(value = "Object Dokumen")
private DokumenVO kddokumen;
- @ManyToOne
- @JoinColumn(name = "ObjectPegawaiTandaTanganFk")
- @Caption(value="Object Pegawai Tanda Tangan")
+ @Caption(value = "Object Pegawai Tanda Tangan")
private LoginUserVO kdpegawaitandatangan;
- @Caption(value="Keterangan Lainnya")
- @Column(name = "KeteranganLainnya", nullable = true , length = 15)
+ @Caption(value = "Keterangan Lainnya")
private String keteranganlainnya;
- @Caption(value="Nama Penerima Tujuan")
- @Column(name = "NamaPenerimaTujuan", nullable = false , length = 40)
+ @Caption(value = "Nama Penerima Tujuan")
private String namapenerimatujuan;
- @Caption(value="No Dokumen_ Intern")
- @Column(name = "NoDokumen_Intern", nullable = true , length = 30)
+ @Caption(value = "No Dokumen_ Intern")
private String nodokumen_intern;
- @ManyToOne
- @JoinColumn(name = "NoKirimFk")
- @Caption(value="No Kirim")
+ @Caption(value = "No Kirim")
private StrukKirimVO nokirim;
- @ManyToOne
- @JoinColumn(name = "NoStrukFk")
- @Caption(value="No Struk")
+ @Caption(value = "No Struk")
private StrukPelayananVO nostruk;
- @ManyToOne
- @JoinColumn(name = "NoStruk_T_ReplyFk")
- @Caption(value="No Struk_ T_ Reply")
+ @Caption(value = "No Struk_ T_ Reply")
private StrukPelayananVO nostruk_t_reply;
- @Caption(value="Unit Bagian Tujuan")
- @Column(name = "UnitBagianTujuan", nullable = true , length = 75)
+ @Caption(value = "Unit Bagian Tujuan")
private String unitbagiantujuan;
-
- @Caption(value="No Surat")
- @Column(name = "NoSurat", nullable = true)
+
+ @Caption(value = "No Surat")
private String noSurat;
-
- @ManyToOne
- @JoinColumn(name = "ObjectSifatSuratFk")
- @Caption(value="Sifat Surat")
+
+ @Caption(value = "Sifat Surat")
private SifatSuratVO sifatSurat;
- @ManyToOne
- @JoinColumn(name = "ObjectStatusBerkasFk")
- @Caption(value="Status Berkas")
+ @Caption(value = "Status Berkas")
private StatusBerkasVO statusBerkas;
- @ManyToOne
- @JoinColumn(name = "ObjectJenisSuratFk")
- @Caption(value="Jenis Surat")
+ @Caption(value = "Jenis Surat")
private JenisSuratVO jenisSurat;
- @Caption(value="lampiran")
- @Column(name = "lampiran", nullable = true)
+ @Caption(value = "lampiran")
private Integer lampiran;
-
- @Caption(value="perihal")
- @Column(name = "perihal", nullable = true)
+
+ @Caption(value = "perihal")
private String perihal;
-
- @ManyToOne
- @JoinColumn(name = "ObjectKlasifikasiArsipFk")
- @Caption(value="Klasifikasi Arsip")
+
+ @Caption(value = "Klasifikasi Arsip")
private KlasifikasiArsipVO klasifikasiArsip;
- @ManyToOne
- @JoinColumn(name = "ObjectSubKlasifikasiArsipFk")
- @Caption(value="Sub Klasifikasi Arsip")
+ @Caption(value = "Sub Klasifikasi Arsip")
private SubKlasifikasiArsipVO subKlasifikasiArsip;
- @ManyToOne
- @JoinColumn(name = "ObjectPegawaiAtasNamaFk")
- @Caption(value="pegawaiAtasNama")
+ @Caption(value = "pegawaiAtasNama")
private PegawaiVO pegawaiAtasNama;
- @ManyToOne
- @JoinColumn(name = "ObjectPegawaiPenandaTanganFk")
- @Caption(value="pegawaiPenandaTangan")
+ @Caption(value = "pegawaiPenandaTangan")
private PegawaiVO pegawaiPenandaTangan;
- @ManyToOne
- @JoinColumn(name = "ObjectMetodeKirimFk")
- @Caption(value="Metode Kirim")
+ @Caption(value = "Metode Kirim")
private MetodeKirimVO metodeKirim;
-
- @ManyToOne
- @JoinColumn(name = "ObjectPegawaiPengirimFk")
- @Caption(value="pegawaiPengirim")
+
+ @Caption(value = "pegawaiPengirim")
private PegawaiVO pegawaiPengirim;
- @ManyToOne
- @JoinColumn(name = "ObjectJenisArsipFk")
- @Caption(value="JenisArsip")
+ @Caption(value = "JenisArsip")
private JenisArsipVO jenisArsip;
-
- //
- @OneToMany(cascade=CascadeType.ALL,fetch = FetchType.LAZY, mappedBy = "dokumenKeluar")
+
@Caption(value = "dokumenKeluarSet")
- private Set konseptorPemeriksaSuratSet=new HashSet();
-
+ private Set konseptorPemeriksaSuratSet = new HashSet();
+
public String getNoSurat() {
return noSurat;
}
@@ -338,8 +288,5 @@ public class DokumenKeluarVO extends BaseTransactionVO {
public void setJenisArsip(JenisArsipVO jenisArsip) {
this.jenisArsip = jenisArsip;
}
-
-
-
-}
+}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/GambarMukaKepuasanVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/GambarMukaKepuasanVO.java
index 94c67bfa..00aefcbd 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/GambarMukaKepuasanVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/GambarMukaKepuasanVO.java
@@ -1,19 +1,11 @@
package com.jasamedika.medifirst2000.vo;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
import com.jasamedika.medifirst2000.helper.Caption;
-@Entity
-@Table(name = "GambarMukaKepuasan_M")
public class GambarMukaKepuasanVO extends BaseMasterVO {
-
- @Column(name = "nama", nullable = true , length = 200)
- @Caption(value="nama")
+
+ @Caption(value = "nama")
private String nama;
public String getNama() {
@@ -23,7 +15,5 @@ public class GambarMukaKepuasanVO extends BaseMasterVO {
public void setNama(String nama) {
this.nama = nama;
}
-
-
-
+
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HasilPemeriksaanSwaDetailVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HasilPemeriksaanSwaDetailVO.java
index 125c737b..e1cdbdb0 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HasilPemeriksaanSwaDetailVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HasilPemeriksaanSwaDetailVO.java
@@ -1,36 +1,20 @@
package com.jasamedika.medifirst2000.vo;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.helper.Caption;
-@Entity
-@Table(name = "HasilPemeriksaanSwaDetail_T")
+import javax.validation.constraints.NotNull;
+
public class HasilPemeriksaanSwaDetailVO extends BaseTransaction {
-
- @ManyToOne
- @JoinColumn(name = "ObjectParameterFk")
- @NotNull(message = "Parameter tidak boleh kosong")
- @Caption(value="Object Parameter")
+
+ @NotNull(message = "Parameter tidak boleh kosong")
+ @Caption(value = "Object Parameter")
private ParameterVO parameter;
-
- @ManyToOne
- @JoinColumn(name = "ObjectSatuanStandarFk")
- @Caption(value="Satuan")
+
+ @Caption(value = "Satuan")
private SatuanStandarVO satuanStandar;
- @Column(name = "Nilai")
- @Caption(value="nilai")
+ @Caption(value = "nilai")
private Double nilai;
public ParameterVO getParameter() {
@@ -57,8 +41,4 @@ public class HasilPemeriksaanSwaDetailVO extends BaseTransaction {
this.nilai = nilai;
}
-
-
-
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HasilPemeriksaanSwaPantauLimbahCairVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HasilPemeriksaanSwaPantauLimbahCairVO.java
index 8a14b26a..3cd27796 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HasilPemeriksaanSwaPantauLimbahCairVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/HasilPemeriksaanSwaPantauLimbahCairVO.java
@@ -1,60 +1,38 @@
package com.jasamedika.medifirst2000.vo;
+import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.helper.Caption;
-
-@Entity
-@Table(name = "HasilPemeriksaanSwaPantauLimbahCair_T")
public class HasilPemeriksaanSwaPantauLimbahCairVO extends BaseTransactionVO {
-
- @Column(name = "Tanggal", nullable = true)
+
@Caption(value = "Tanggal")
private Date tanggal;
-
- @Column(name = "InletMeterAirLalu", nullable = true)
+
@Caption(value = "Inlet Meter Air Lalu")
private Double inletMeterAirLalu;
-
- @Column(name = "InletMeterAirSekarang", nullable = true)
+
@Caption(value = "Inlet Meter Air Sekarang")
private Double inletMeterAirSekarang;
-
- @Column(name = "InletDebit", nullable = true)
+
@Caption(value = "Inlet Debit")
private Double inletDebit;
-
- @Column(name = "OutletMeterAirSekarang", nullable = true)
+
@Caption(value = "Tutlet Meter Air Sekarang")
private Double outletMeterAirSekarang;
-
- @Column(name = "OutletMeterAirLalu", nullable = true)
+
@Caption(value = "Tutlet Meter Air Lalu")
private Double outletMeterAirLalu;
-
- @Column(name = "OutletDebit", nullable = true)
+
@Caption(value = "Outlet Debit")
private Double outletDebit;
-
- @Column(name = "Keterangan", nullable = true, length = 50)
- @Caption(value="Keterangan")
+
+ @Caption(value = "Keterangan")
private String keterangan;
-
- @OneToMany
+
private Set hasilPemeriksaanSwaDetailVO = new HashSet();
public Date getTanggal() {
@@ -129,7 +107,4 @@ public class HasilPemeriksaanSwaPantauLimbahCairVO extends BaseTransactionVO {
this.hasilPemeriksaanSwaDetailVO = hasilPemeriksaanSwaDetailVO;
}
-
-
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketToProdukVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketToProdukVO.java
index b31477e1..0e71aeb8 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketToProdukVO.java
+++ b/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;
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketVO.java
index c1c56efd..5af1beca 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapProdukPaketVO.java
+++ b/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;
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NeracaLimbahVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NeracaLimbahVO.java
index 8f7998c5..4387f6c3 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NeracaLimbahVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NeracaLimbahVO.java
@@ -1,53 +1,43 @@
package com.jasamedika.medifirst2000.vo;
+import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+
+import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.Entity;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.entities.DetailJenisLimbah;
-import com.jasamedika.medifirst2000.entities.DetailPerlakuan;
-import com.jasamedika.medifirst2000.helper.Caption;
-
-@Entity
-@Table(name = "NeracaLimbah_T")
public class NeracaLimbahVO extends BaseTransactionVO {
-
+
@Caption(value = "Periode Awal")
- @NotNull(message="Periode Awal harus Disi")
+ @NotNull(message = "Periode Awal harus Disi")
private Date periodeAwal;
-
+
@Caption(value = "Periode Ahir")
- @NotNull(message="Periode Ahir harus Disi")
+ @NotNull(message = "Periode Ahir harus Disi")
private Date periodeAhir;
-
+
@Caption(value = "Residu")
- @NotNull(message="residu Harus Diisi")
+ @NotNull(message = "residu Harus Diisi")
private Double residu;
-
+
@Caption(value = "Jumlah Yang Belum terkelola")
- @NotNull(message="Jumlah Yang Belum terkelola harus diisi")
+ @NotNull(message = "Jumlah Yang Belum terkelola harus diisi")
private Double jumlahYangBelumTerkelola;
-
+
@Caption(value = "kinerja Pengelolaan")
- @NotNull(message="kinerja Pengelolaan harus diisi")
+ @NotNull(message = "kinerja Pengelolaan harus diisi")
private Double kinerjaPengelolaan;
-
+
@Caption(value = "kinerja Pengelolaan")
private String Catatan;
-
+
private Double totalLimbahMasuk;
-
- @OneToMany
+
private Set detailPerlakuan = new HashSet();
-
- @NotNull(message="Silahkan Pilih Periode Detail Jenis Limbah")
- @OneToMany
+
+ @NotNull(message = "Silahkan Pilih Periode Detail Jenis Limbah")
private Set detailJenisLimbah = new HashSet();
public Date getPeriodeAwal() {
@@ -122,5 +112,4 @@ public class NeracaLimbahVO extends BaseTransactionVO {
this.totalLimbahMasuk = totalLimbahMasuk;
}
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotaDinasJabatanVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotaDinasJabatanVO.java
index b129d6d0..16f05caa 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotaDinasJabatanVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/NotaDinasJabatanVO.java
@@ -1,30 +1,22 @@
package com.jasamedika.medifirst2000.vo;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
import com.jasamedika.medifirst2000.helper.Caption;
-@Entity
-@Table(name = "NotaDinasJabatan_T")
public class NotaDinasJabatanVO extends BaseTransactionVO {
-
-
- @Caption(value="NotaDinas")
+
+ @Caption(value = "NotaDinas")
private NotaDinasVO notaDinas;
-
-
- @Caption(value="jabatan")
+
+ @Caption(value = "jabatan")
private JabatanVO jabatan;
-
-
- @Caption(value="pegawai")
+
+ @Caption(value = "pegawai")
private PegawaiVO pegawai;
-
+
@Caption("Is Nota Dinas/ Disposisi was read")
public Boolean isRead;
+
public NotaDinasVO getNotaDinas() {
return notaDinas;
}
@@ -56,8 +48,5 @@ public class NotaDinasJabatanVO extends BaseTransactionVO {
public void setIsRead(Boolean isRead) {
this.isRead = isRead;
}
-
-
-
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapPengkajianVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapPengkajianVO.java
index 1329d884..4cc16bee 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapPengkajianVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapPengkajianVO.java
@@ -1,54 +1,34 @@
package com.jasamedika.medifirst2000.vo;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
import com.jasamedika.medifirst2000.helper.Caption;
-@Entity
-@Table(name = "PAPpengkajian_T")
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
public class PapPengkajianVO extends BaseTransactionVO {
@NotNull(message = "tanggalMasuk tidak boleh kosong")
- @Column(name = "tanggalMasuk", nullable = false)
@Caption(value = "tanggalMasuk")
private Date tanggalMasuk;
@NotNull(message = "waktuPemeriksaan tidak boleh kosong")
- @Column(name = "waktuPemeriksaan", nullable = false)
@Caption(value = "waktuPemeriksaan")
private String waktuPemeriksaan;
- // @NotNull(message = "keluhanUtama tidak boleh kosong")
- @Column(name = "keluhanUtama", nullable = true)
@Caption(value = "keluhanUtama")
private String keluhanUtama;
- @ManyToOne
- @JoinColumn(name = "ObjectPasienFk")
@NotNull(message = "no CM pasien tidak boleh kosong")
-
@Caption(value = "Object pasien")
private PasienVO pasien;
- @Column(name = "ObjectPasienFk", insertable = false, updatable = false, nullable = false)
private String pasienId;
- @ManyToOne
- @JoinColumn(name = "ObjectPegawaiFk")
@NotNull(message = "Kd Ruangan tidak boleh kosong")
-
@Caption(value = "Object ruangan")
private RuanganVO ruangan;
- @Column(name = "ObjectRuanganFk", insertable = false, updatable = false, nullable = false)
private Integer ruanganId;
public Date getTanggalMasuk() {
@@ -75,7 +55,6 @@ public class PapPengkajianVO extends BaseTransactionVO {
this.keluhanUtama = keluhanUtama;
}
-
public String getPasienId() {
return pasienId;
}
@@ -83,7 +62,6 @@ public class PapPengkajianVO extends BaseTransactionVO {
public void setPasienId(String pasienId) {
this.pasienId = pasienId;
}
-
public PasienVO getPasien() {
return pasien;
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapStatusKemandirianVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapStatusKemandirianVO.java
index c7f90092..8d1042ed 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapStatusKemandirianVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PapStatusKemandirianVO.java
@@ -1,80 +1,56 @@
package com.jasamedika.medifirst2000.vo;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
import com.jasamedika.medifirst2000.helper.Caption;
-@Entity
-@Table(name="PapStatusKemandirian_T")
-public class PapStatusKemandirianVO extends BaseTransactionVO{
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+public class PapStatusKemandirianVO extends BaseTransactionVO {
- @ManyToOne
@NotNull(message = "RegistrasiPelayananPasien tidak boleh kosong")
- private RegistrasiPelayananPasienVO registrasiPelayananPasien;
-
- @ManyToOne
+ private RegistrasiPelayananPasienVO registrasiPelayananPasien;
+
@NotNull(message = "Pasien tidak boleh kosong")
- private PasienVO pasien;
-
+ private PasienVO pasien;
+
@NotNull(message = "Tgl Input tidak boleh kosong")
- @Column(name = "tglInput", nullable = false)
@Caption(value = "Tgl Input")
private Date tglInput;
- @ManyToOne
@NotNull(message = "ekstremitasAtas tidak boleh kosong")
private GenericViewVO ekstremitasAtas;
- @ManyToOne
- @NotNull(message = "ekstremitasBawah tidak boleh kosong")
+ @NotNull(message = "ekstremitasBawah tidak boleh kosong")
private GenericViewVO ekstremitasBawah;
-
- @ManyToOne
+
@NotNull(message = "batangTumbuh tidak boleh kosong")
private GenericViewVO batangTumbuh;
- @ManyToOne
@NotNull(message = "Makanan tidak boleh kosong")
private GenericViewVO makanan;
- @ManyToOne
@NotNull(message = "jalanKaki tidak boleh kosong")
private GenericViewVO jalanKaki;
- @ManyToOne
@NotNull(message = "kursiRoda tidak boleh kosong")
private GenericViewVO kursiRoda;
- @ManyToOne
@NotNull(message = "kursiRoda tidak boleh kosong")
private GenericViewVO berguling;
- @ManyToOne
@NotNull(message = "duduk tidak boleh kosong")
private GenericViewVO duduk;
- @ManyToOne
@NotNull(message = "wajahRambutTangan tidak boleh kosong")
private GenericViewVO wajahRambutTangan;
- @ManyToOne
@NotNull(message = "batangTumbuhDanPerineum tidak boleh kosong")
private GenericViewVO batangTumbuhDanPerineum;
- @ManyToOne
@NotNull(message = "traktusDigestivus tidak boleh kosong")
private GenericViewVO traktusDigestivus;
- @ManyToOne
@NotNull(message = "urinarius tidak boleh kosong")
private GenericViewVO urinarius;
@@ -197,5 +173,5 @@ public class PapStatusKemandirianVO extends BaseTransactionVO{
public void setUrinarius(GenericViewVO urinarius) {
this.urinarius = urinarius;
}
-
+
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiHistoriRekapVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiHistoriRekapVO.java
index 46255328..d137a937 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiHistoriRekapVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PegawaiHistoriRekapVO.java
@@ -1,64 +1,42 @@
package com.jasamedika.medifirst2000.vo;
-import java.math.BigDecimal;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
import com.jasamedika.medifirst2000.helper.Caption;
-@Entity
-@Table(name="PegawaiHistoriRekap_T")
-public class PegawaiHistoriRekapVO extends BaseTransactionVO{
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+public class PegawaiHistoriRekapVO extends BaseTransactionVO {
- @ManyToOne
- @JoinColumn(name = "noHistoriFK")
@NotNull(message = "noHistori Harus Diisi")
@Caption(value = "noHistori")
private StrukHistoriVO strukHistory;
-
- @Column(name = "noHistoriFK", insertable = false, updatable = false,nullable = false)
+
private String strukHistoryId;
-
- @ManyToOne(fetch=FetchType.LAZY)
- @JoinColumn(name = "ObjectPegawaiFk")
- @Caption(value="Object Pegawai")
+
+ @Caption(value = "Object Pegawai")
private PegawaiVO pegawai;
- @Column(name = "ObjectPegawaiFk", insertable=false,updatable=false)
private Integer pegawaiId;
-
- @Column(name = "TotalNilaiIndex")
- @Caption(value="Total Nilai Index")
+
+ @Caption(value = "Total Nilai Index")
private Double totalNilaiIndex;
-
- @Column(name = "TotalHargaIndex")
- @Caption(value="Total Harga Index")
+
+ @Caption(value = "Total Harga Index")
private Double totalHargaIndex;
-
- @ManyToOne
- @JoinColumn(name = "strukVerifikasiFK")
+
@Caption(value = "strukVerifikasi")
private StrukVerifikasiVO strukVerifikasi;
-
- @Column(name = "strukVerifikasiFK", insertable = false, updatable = false,nullable = true)
- private String strukVerifikasiId;
-
- @Column(name = "TotalHargaGajiAdd", updatable = false)
+
+ private String strukVerifikasiId;
+
private BigDecimal totalHargaGajiAdd = new BigDecimal(0);
-
- @Column(name = "TotalHargaGajiMin", updatable = false)
+
private BigDecimal totalHargaGajiMin = new BigDecimal(0);
-
+
@Caption(value = "noStrukPelayanan")
private StrukPelayananVO noStrukPelayanan;
-
+
public StrukHistoriVO getStrukHistory() {
return strukHistory;
}
@@ -115,7 +93,6 @@ public class PegawaiHistoriRekapVO extends BaseTransactionVO{
this.totalHargaIndex = totalHargaIndex;
}
-
public PegawaiVO getPegawai() {
return pegawai;
}
@@ -123,6 +100,7 @@ public class PegawaiHistoriRekapVO extends BaseTransactionVO{
public void setPegawai(PegawaiVO pegawai) {
this.pegawai = pegawai;
}
+
public StrukPelayananVO getNoStrukPelayanan() {
return noStrukPelayanan;
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienVO.java
index 4684dbc4..6d383bf5 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PelayananPasienVO.java
@@ -165,4 +165,9 @@ public class PelayananPasienVO extends MedicalRecordTransactionVO {
@Caption(value = "Persentase Diskon Pegawai")
private Double persenDiskonPegawai;
+
+ private Boolean isCito;
+
+ private Double persenCito;
+
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemeriksaanTumbuhKembangVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemeriksaanTumbuhKembangVO.java
index f51f36df..c5c6fb55 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemeriksaanTumbuhKembangVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PemeriksaanTumbuhKembangVO.java
@@ -1,133 +1,100 @@
package com.jasamedika.medifirst2000.vo;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.entities.KontakInterpersonal;
import com.jasamedika.medifirst2000.helper.Caption;
+import javax.validation.constraints.NotNull;
+
/**
- * class PemeriksaanTumbuhKembang
+ * class PemeriksaanTumbuhKembang
*
* @author Generator
*/
-@Entity //@Audited
-@Table(name = "PemeriksaanTumbuhKembang_M")
public class PemeriksaanTumbuhKembangVO extends BaseTransactionVO {
-
- @ManyToOne
- @JoinColumn(name = "ObjectKondisiUmumFk")
+
@NotNull(message = "kondisi Umum harus diisi")
private KondisiUmumVO kondisiUmum;
- @Column(name = "ObjectKondisiUmumFk", insertable = false, updatable = false, nullable = false)
private Integer kondisiUmumId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectKontakInterpersonalFk")
+
@NotNull(message = "Kontak Interpersonal harus diisi")
private KontakInterpersonalVO kontakInterpersonal;
- @Column(name = "ObjectKontakInterpersonalFk", insertable = false, updatable = false, nullable = false)
private Integer kontakInterpersonalId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectKeaktifanFk")
+
@NotNull(message = "Keaktifan harus diisi")
private KeaktifanVO keaktifan;
- @Column(name = "ObjectKeaktifanFk", insertable = false, updatable = false, nullable = false)
private Integer keaktifanId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectKepalaUbunUbunFk")
+
@NotNull(message = "Kepala ubun Ubun harus Diisi")
private KepalaUbunUbunBesarVO kepalaUbunUbunBesar;
- @Column(name = "ObjectKepalaUbunUbunFk", insertable = false, updatable = false, nullable = false)
private Integer kepalaUbunUbunBesarId;
-
- @ManyToOne
- @JoinColumn(name = "wajahFk")
+
@NotNull(message = "Wajah")
private WajahVO wajah;
- @Column(name = "wajahFk", insertable = false, updatable = false, nullable = false)
private Integer wajahId;
-
- @Caption(value="Kelainan Tingkah Laku")
- @Column(name = "kelainanTingkahLaku")
+
+ @Caption(value = "Kelainan Tingkah Laku")
private String kelainanTingkahLaku;
-
- @Caption(value="Motorik Kasar")
- @Column(name = "motorikKasar")
+
+ @Caption(value = "Motorik Kasar")
private String motorikKasar;
-
- @Caption(value="Motorik Kasar Umur")
- @Column(name = "motorikKasarUmur")
+
+ @Caption(value = "Motorik Kasar Umur")
private String motorikKasarUmur;
-
- @Caption(value="Motorik Halus")
- @Column(name = "motorikHalus")
+
+ @Caption(value = "Motorik Halus")
private String motorikHalus;
-
- @Caption(value="Motorik hasil Umur")
+
+ @Caption(value = "Motorik hasil Umur")
private String motorikHalusUmur;
-
- @Caption(value="Bicara Exspresif")
- @Column(name = "bicaraExspresif")
+
+ @Caption(value = "Bicara Exspresif")
private String bicaraExspresif;
-
- @Caption(value="bicara Exspresif Umur")
+
+ @Caption(value = "bicara Exspresif Umur")
private String bicaraExspresifUmur;
-
- @Caption(value="reseptif")
- @Column(name = "reseptif")
+
+ @Caption(value = "reseptif")
private String reseptif;
-
- @Caption(value="reseptif umur")
+
+ @Caption(value = "reseptif umur")
private String reseptifUmur;
-
- @Caption(value="kognisis")
- @Column(name = "kognisis")
+
+ @Caption(value = "kognisis")
private String kognisis;
-
- @Caption(value="kognisis umur")
+
+ @Caption(value = "kognisis umur")
private String kognisisUmur;
-
- @Caption(value="sosialisasi")
- @Column(name = "sosialisasi")
+
+ @Caption(value = "sosialisasi")
private String sosialisasi;
-
- @Caption(value="sosialisasi umur")
+
+ @Caption(value = "sosialisasi umur")
private String sosialisasiUmur;
-
- @Caption(value="perilaku")
- @Column(name = "perilaku")
+
+ @Caption(value = "perilaku")
private String perilaku;
-
- @Caption(value="perilaku umur")
+
+ @Caption(value = "perilaku umur")
private String perilakuUmur;
-
- @Caption(value="Organ Artikulasi Bibir")
+
+ @Caption(value = "Organ Artikulasi Bibir")
private String organArtikulasiBibir;
-
- @Caption(value="Organ Artikulasi lidah")
+
+ @Caption(value = "Organ Artikulasi lidah")
private String organArtikulasiLidah;
-
- @Caption(value="Organ Artikulasi Pelatum")
+
+ @Caption(value = "Organ Artikulasi Pelatum")
private String organArtikulasiPelatum;
-
- @Caption(value="Gigi Geligi")
+
+ @Caption(value = "Gigi Geligi")
private String gigiGeligi;
-
- @Caption(value="Keterangan Wajah")
+
+ @Caption(value = "Keterangan Wajah")
private String keteranganWajah;
public KondisiUmumVO getKondisiUmum() {
@@ -361,14 +328,13 @@ public class PemeriksaanTumbuhKembangVO extends BaseTransactionVO {
public void setGigiGeligi(String gigiGeligi) {
this.gigiGeligi = gigiGeligi;
}
-
+
public String getKeteranganWajah() {
return keteranganWajah;
}
public void setKeteranganWajah(String keteranganWajah) {
this.keteranganWajah = keteranganWajah;
- }
-
-}
+ }
+}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PenangananKeluhanPelangganVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PenangananKeluhanPelangganVO.java
index 065adf96..c2407b3e 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PenangananKeluhanPelangganVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PenangananKeluhanPelangganVO.java
@@ -1,44 +1,27 @@
package com.jasamedika.medifirst2000.vo;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
import com.jasamedika.medifirst2000.helper.Caption;
-@Entity
-@Table(name = "PenangananKeluhanPelanggan_T")
public class PenangananKeluhanPelangganVO extends BaseTransactionVO {
-
- @ManyToOne(fetch= FetchType.LAZY)
- @JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
- @JoinColumn(name = "ObjectPegawaiFk")
- @Caption(value="Pegawai")
+
+ @JsonIgnoreProperties({ "hibernateLazyInitializer", "handler" })
+ @Caption(value = "Pegawai")
private PegawaiVO pegawai;
- @Column(name = "NamaPetugas", nullable = true , length = 200)
- @Caption(value="Nama Petugas")
+ @Caption(value = "Nama Petugas")
private String namaPetugas;
-
- @Column(name = "Email", nullable = true , length = 200)
- @Caption(value="Email")
+
+ @Caption(value = "Email")
private String email;
-
- @Column(name = "Reply", nullable = true)
- @Caption(value="Reply")
+
+ @Caption(value = "Reply")
private String reply;
-
- @Column(name = "EmailPelanggan", nullable = true)
+
@Caption(value = "Email Pelanggan")
private String emailPelanggan;
-
-
+
public String getNamaPetugas() {
return namaPetugas;
}
@@ -54,7 +37,7 @@ public class PenangananKeluhanPelangganVO extends BaseTransactionVO {
public void setEmailPelanggan(String emailPelanggan) {
this.emailPelanggan = emailPelanggan;
}
-
+
public PegawaiVO getPegawai() {
return pegawai;
}
@@ -78,6 +61,5 @@ public class PenangananKeluhanPelangganVO extends BaseTransactionVO {
public void setReply(String reply) {
this.reply = reply;
}
-
-
+
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PenghitunganKassaDanAlatOperasiVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PenghitunganKassaDanAlatOperasiVO.java
index 9e1af865..a153ea03 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PenghitunganKassaDanAlatOperasiVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/PenghitunganKassaDanAlatOperasiVO.java
@@ -1,37 +1,23 @@
package com.jasamedika.medifirst2000.vo;
+import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
+
+import javax.validation.constraints.NotNull;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.jasamedika.medifirst2000.base.BaseTransaction;
-import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-
/**
- * class PosisiRahim
+ * class PosisiRahim
*
* @author Generator
*/
-@Entity //@Audited
-@Table(name = "PenghitunganKassaDanAlatOperasi_T")
public class PenghitunganKassaDanAlatOperasiVO extends BaseTransactionVO {
- @ManyToOne
@NotNull(message = "Pasien tidak boleh kosong")
private AntrianPasienDiPeriksaVO pasienDaftar;
-
- @OneToMany
- private Set detailAlatYangDigunakan=new HashSet();
-
- @OneToMany
- private Set detailDokterOperasi=new HashSet();
+
+ private Set detailAlatYangDigunakan = new HashSet();
+
+ private Set detailDokterOperasi = new HashSet();
public Set getDetailAlatYangDigunakan() {
return detailAlatYangDigunakan;
@@ -56,7 +42,5 @@ public class PenghitunganKassaDanAlatOperasiVO extends BaseTransactionVO {
public void setPasienDaftar(AntrianPasienDiPeriksaVO pasienDaftar) {
this.pasienDaftar = pasienDaftar;
}
-
-
-}
+}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekananSkKontrakDetailVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekananSkKontrakDetailVO.java
index abb53ebc..bac85710 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekananSkKontrakDetailVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RekananSkKontrakDetailVO.java
@@ -1,49 +1,36 @@
package com.jasamedika.medifirst2000.vo;
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
-import com.jasamedika.medifirst2000.base.BaseTransaction;
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
-import com.jasamedika.medifirst2000.entities.Jabatan;
-import com.jasamedika.medifirst2000.entities.Pegawai;
-import com.jasamedika.medifirst2000.helper.Caption;
+
+import java.util.Date;
/**
* class Agama
*
* @author Generator
*/
-@Entity // @Audited
-@Table(name = "RekananSkKontrakDetail_T")
public class RekananSkKontrakDetailVO extends BaseTransactionVO {
-
+
private RekananSkKontrakVO rekananSkKontrak;
-
+
private Double qtyProduk;
-
+
private String detailPekerjaan;
-
+
private SatuanStandarVO satuanStandar;
-
+
private String keteranganLainnya;
-
+
private PegawaiVO pegawaiRekanan;
-
+
private JabatanVO jabatanPegawaiRekanan;
-
+
private Double nilaiKontrak;
-
+
private Date tanggalAwalKontrak;
-
+
private Date tanggalAhirKontrak;
-
+
private String selisihKontrak;
public RekananSkKontrakVO getRekananSkKontrak() {
@@ -133,9 +120,5 @@ public class RekananSkKontrakDetailVO extends BaseTransactionVO {
public void setSelisihKontrak(String selisihKontrak) {
this.selisihKontrak = selisihKontrak;
}
-
-
-
-
}
\ No newline at end of file
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RisikoGiziVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RisikoGiziVO.java
new file mode 100644
index 00000000..9e24f882
--- /dev/null
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RisikoGiziVO.java
@@ -0,0 +1,38 @@
+package com.jasamedika.medifirst2000.vo;
+
+import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author Salman
+ * @version 1.0.0
+ * @since 2/4/2025
+ */
+public class RisikoGiziVO extends BaseMasterVO {
+
+ @NotNull(message = "Name tidak boleh kosong")
+ @Caption(value = "Name")
+ private String name;
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ protected Integer id;
+
+ public Integer getId() {
+
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RiwayatMasaKehamilanVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RiwayatMasaKehamilanVO.java
index 1cd955ed..e8490a02 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RiwayatMasaKehamilanVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/RiwayatMasaKehamilanVO.java
@@ -1,65 +1,42 @@
package com.jasamedika.medifirst2000.vo;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.helper.Caption;
-@Entity
-@Table(name = "RiwayatMasaKehamilan_T")
-public class RiwayatMasaKehamilanVO extends MedicalRecordTransactionVO{
-
- @ManyToOne
- @JoinColumn(name = "ObjectSifatKehamilanFk")
- @NotNull(message="Sifat Kehamilan tidak boleh kosong")
- @Caption(value="Sifat Kehamilan")
+import javax.validation.constraints.NotNull;
+
+public class RiwayatMasaKehamilanVO extends MedicalRecordTransactionVO {
+
+ @NotNull(message = "Sifat Kehamilan tidak boleh kosong")
+ @Caption(value = "Sifat Kehamilan")
private SifatKehamilanVO sifatKehamilan;
-
- @Column(name = "ObjectSifatKehamilanFk", insertable=false,updatable=false, nullable = false)
+
private Integer sifatKehamilanId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectStatusPemeriksaanKehamilanFk")
- @NotNull(message="Status Pemeriksaan Kehamilan tidak boleh kosong")
- @Caption(value="Status Pemeriksaan Kehamilan")
+
+ @NotNull(message = "Status Pemeriksaan Kehamilan tidak boleh kosong")
+ @Caption(value = "Status Pemeriksaan Kehamilan")
private StatusTeraturTidakVO statusPemeriksaanKehamilan;
-
- @Column(name = "ObjectStatusPemeriksaanKehamilanFk", insertable=false,updatable=false, nullable = false)
+
private Integer statusPemeriksaanKehamilanId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectPemeriksaKehamilanFk")
- @NotNull(message="Pemeriksa Kehamilan tidak boleh kosong")
- @Caption(value="Pemeriksa Kehamilan")
+
+ @NotNull(message = "Pemeriksa Kehamilan tidak boleh kosong")
+ @Caption(value = "Pemeriksa Kehamilan")
private PemeriksaanKehamilanVO pemeriksaKehamilan;
-
- @Column(name = "ObjectStatusPemeriksaanKehamilanFk", insertable=false,updatable=false, nullable = false)
+
private Integer pemeriksaKehamilanId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectPenyakitIbuHamilFk")
- @NotNull(message="Penyakit Ibu Hamil tidak boleh kosong")
- @Caption(value="Penyakit Ibu Hamil")
+
+ @NotNull(message = "Penyakit Ibu Hamil tidak boleh kosong")
+ @Caption(value = "Penyakit Ibu Hamil")
private PenyakitIbuHamilVO penyakitIbuHamil;
-
- @Column(name = "ObjectPenyakitIbuHamilFk", insertable=false,updatable=false, nullable = false)
+
private Integer penyakitIbuHamilId;
-
- @ManyToOne
- @JoinColumn(name = "ObjectKbSebelumHamilFk")
- @NotNull(message="KB Sebelum Hamil tidak boleh kosong")
- @Caption(value="KB Sebelum Hamil")
+
+ @NotNull(message = "KB Sebelum Hamil tidak boleh kosong")
+ @Caption(value = "KB Sebelum Hamil")
private KbSebelumHamilVO kbSebelumHamil;
-
- @Column(name = "ObjectKbSebelumHamilFk", insertable=false,updatable=false, nullable = false)
+
private Integer kbSebelumHamilId;
-
- @Column(name = "MasalahSaatHamil", nullable = true)
- @Caption(value="Masalah Saat Hamil")
+
+ @Caption(value = "Masalah Saat Hamil")
private String masalahSaatHamil;
public PemeriksaanKehamilanVO getPemeriksaKehamilan() {
@@ -109,6 +86,5 @@ public class RiwayatMasaKehamilanVO extends MedicalRecordTransactionVO{
public void setStatusPemeriksaanKehamilan(StatusTeraturTidakVO statusPemeriksaanKehamilan) {
this.statusPemeriksaanKehamilan = statusPemeriksaanKehamilan;
}
-
-
+
}
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/TindakLanjutGiziVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/TindakLanjutGiziVO.java
index 0b9defca..7abc19c9 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/TindakLanjutGiziVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/TindakLanjutGiziVO.java
@@ -1,51 +1,38 @@
package com.jasamedika.medifirst2000.vo;
-import javax.persistence.Entity;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
-
import com.jasamedika.medifirst2000.base.vo.BaseTransactionVO;
import com.jasamedika.medifirst2000.helper.Caption;
+import javax.validation.constraints.NotNull;
+
/**
- * class PosisiRahim
+ * class PosisiRahim
*
* @author Generator
*/
-@Entity
-@Table(name = "TindakLanjutGizi_T")
public class TindakLanjutGiziVO extends BaseTransactionVO {
-
- @ManyToOne
- @NotNull(message="Asesmen Gizi Awal Harus Diisi")
- @Caption(value="Asesen Gizi Awal")
- private AsesmenGiziAwalVO asesmenGiziAwal;
-
-
- @Caption(value="value")
- private String value;
+ @NotNull(message = "Asesmen Gizi Awal Harus Diisi")
+ @Caption(value = "Asesen Gizi Awal")
+ private AsesmenGiziAwalVO asesmenGiziAwal;
+
+ @Caption(value = "value")
+ private String value;
public AsesmenGiziAwalVO getAsesmenGiziAwal() {
return asesmenGiziAwal;
}
-
public void setAsesmenGiziAwal(AsesmenGiziAwalVO asesmenGiziAwal) {
this.asesmenGiziAwal = asesmenGiziAwal;
}
-
public String getValue() {
return value;
}
-
public void setValue(String value) {
this.value = value;
}
-
}
-
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/TorVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/TorVO.java
index ebb0799b..1166de06 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/TorVO.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/TorVO.java
@@ -1,69 +1,46 @@
package com.jasamedika.medifirst2000.vo;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
+import com.jasamedika.medifirst2000.helper.Caption;
+
import javax.validation.constraints.NotNull;
-import org.hibernate.envers.Audited;
-
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.base.vo.BaseMasterVO;
-import com.jasamedika.medifirst2000.entities.Jabatan;
-import com.jasamedika.medifirst2000.helper.Caption;import org.hibernate.envers.Audited;
-
/**
- * class Tor
+ * class Tor
*
* @author Generator
*/
-@Entity //@Audited
-@Table(name = "Tor_M")
public class TorVO extends BaseMasterVO {
- @NotNull(message="No Rab TIdak Boleh Kosong")
- @Column(name = "noRab", nullable = false )
- @Caption(value="No Rab")
+ @NotNull(message = "No Rab TIdak Boleh Kosong")
+ @Caption(value = "No Rab")
private String noRab;
- @Column(name = "title1", nullable = true )
- @Caption(value="Title 1")
+ @Caption(value = "Title 1")
private String title1;
-
- @Column(name = "title2", nullable = true )
- @Caption(value="Title 2")
+
+ @Caption(value = "Title 2")
private String title2;
-
- @Column(name = "title3", nullable = true )
- @Caption(value="Title 3")
+
+ @Caption(value = "Title 3")
private String title3;
-
- @Column(name = "latarBelakang", nullable = true )
- @Caption(value="latarBelakang")
+
+ @Caption(value = "latarBelakang")
private String latarBelakang;
-
- @Column(name = "penerimaManfaat", nullable = true )
- @Caption(value="Penerima Manfaat")
+
+ @Caption(value = "Penerima Manfaat")
private String penerimaManfaat;
-
- @Column(name = "strategiPencapaiKeluaran", nullable = true )
- @Caption(value="Strategi Pencapai Keluaran")
+
+ @Caption(value = "Strategi Pencapai Keluaran")
private String strategiPencapaiKeluaran;
-
- @Column(name = "kurunWaktuPencapaiKeluaran", nullable = true )
- @Caption(value="Kurun Waktu Pencapai Keluaran")
+ @Caption(value = "Kurun Waktu Pencapai Keluaran")
private String kurunWaktuPencapaiKeluaran;
-
- @Column(name = "biayaYangDikeluarkan", nullable = true )
- @Caption(value="Biaya Yang Dikeluarkan")
+ @Caption(value = "Biaya Yang Dikeluarkan")
private String biayaYangDikeluarkan;
- @ManyToOne
- @Caption(value=" Jabatan")
+ @Caption(value = " Jabatan")
private JabatanVO jabatan;
public String getNoRab() {
@@ -146,10 +123,4 @@ public class TorVO extends BaseMasterVO {
this.jabatan = jabatan;
}
-
-
-
-
-
}
-
diff --git a/jasamedika-domain/src/main/resources/hibernate.cfg.xml b/jasamedika-domain/src/main/resources/hibernate.cfg.xml
index 458f3d27..26c96ea2 100644
--- a/jasamedika-domain/src/main/resources/hibernate.cfg.xml
+++ b/jasamedika-domain/src/main/resources/hibernate.cfg.xml
@@ -3,238 +3,733 @@
"https://hibernate.org/dtd/hibernate-configuration-3.0.dtd">
-
-
-
-
-
+
+
+
-
+ class="com.jasamedika.medifirst2000.entities.AdmisiRencanaPindahRuangan" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ class="com.jasamedika.medifirst2000.entities.AdvokasiHukumMedicolegal" />
-
-
-
+
+
+
+
+
-
-
+ class="com.jasamedika.medifirst2000.entities.AlasanPemindahanPasien" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
+ class="com.jasamedika.medifirst2000.entities.BaseFilePemantauanKinerjaPihakKetiga" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
-
-
+ class="com.jasamedika.medifirst2000.entities.CatatanPerkembanganPasienTerintegrasi" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -243,17 +738,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -297,85 +889,617 @@
class="com.jasamedika.medifirst2000.entities.MapDiagnosaKepToAsKepKajian" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -383,509 +1507,633 @@
class="com.jasamedika.medifirst2000.entities.PersenTanggunganPenjamin" />
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+ class="com.jasamedika.medifirst2000.entities.PersiapanPraAnestesiDetail" />
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ class="com.jasamedika.medifirst2000.entities.PetugasPendampingDetail" />
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ class="com.jasamedika.medifirst2000.entities.PlanningDiklatHumasMarket" />
-
-
-
-
-
-
-
-
-
-
-
-
+ class="com.jasamedika.medifirst2000.entities.PlanningHistoriPelayananCs" />
+
-
-
-
-
-
-
-
+ class="com.jasamedika.medifirst2000.entities.PlanningPelayananDetail" />
-
-
-
-
-
-
+ class="com.jasamedika.medifirst2000.entities.PlanningPelayananPetugas" />
-
-
-
-
-
-
+ class="com.jasamedika.medifirst2000.entities.PlanningPelayananSistem" />
+ class="com.jasamedika.medifirst2000.entities.PlanningPelayananSistemPetugas" />
-
-
+ class="com.jasamedika.medifirst2000.entities.PlanningRekrutmenSeleksi" />
-
-
-
+ class="com.jasamedika.medifirst2000.entities.PlanningRekrutmenSeleksiD" />
+
+
+
+
-
-
-
-
-
+ class="com.jasamedika.medifirst2000.entities.PostingJurnalTransaksi" />
+ class="com.jasamedika.medifirst2000.entities.PostingJurnalTransaksiD" />
-
-
-
-
-
-
+ class="com.jasamedika.medifirst2000.entities.PostOperasiPerawatBedah" />
+
+
-
-
+ class="com.jasamedika.medifirst2000.entities.PraAnestesiDokterBedah" />
-
-
+ class="com.jasamedika.medifirst2000.entities.PraAnestesiDokterBedahHeader" />
+
+ class="com.jasamedika.medifirst2000.entities.PraAnestesiPasienBedah" />
+
+
+
+
+
+
+
+
+
+
-
-
+ class="com.jasamedika.medifirst2000.entities.produkfastslowmoving_v" />
+
+ class="com.jasamedika.medifirst2000.entities.ProdukKeslingNilaiNormal" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
+ class="com.jasamedika.medifirst2000.entities.ResepRacikanOrderDetail" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+ class="com.jasamedika.medifirst2000.entities.StandarPelayananMakanan" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/constants/Constants.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/constants/Constants.java
index 568fc300..7f6b0058 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/constants/Constants.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/constants/Constants.java
@@ -9,70 +9,56 @@ import java.text.SimpleDateFormat;
* @author Roberto
*/
public class Constants {
+
public static final String JASAMEDIKA = "SkFTQU1FRElLQQ==";
+
public static final String APP_VERSION = "APP_VERSION";
-
+
public static final String AUTH_HEADER_NAME = "X-AUTH-TOKEN";
-
- //for example
+
public static final String IDR = "IDR";
+
public static final String RP = "RP";
-
+
public static final String COMMA = ",";
public static final DecimalFormat ONE_COMA_FORMAT = new DecimalFormat("#.#");
- public static final DecimalFormat TWO_COMA_FORMAT = new DecimalFormat(
- "#.##");
- public static final DecimalFormat MONEY_FORMAT_WITHOUT_COMMA = new DecimalFormat(
- "###,###");
+ public static final DecimalFormat TWO_COMA_FORMAT = new DecimalFormat("#.##");
+
+ public static final DecimalFormat MONEY_FORMAT_WITHOUT_COMMA = new DecimalFormat("###,###");
public static final class DateFormat {
- public static final SimpleDateFormat yyyyMMdd = new SimpleDateFormat(
- "yyyyMMdd");
- public static final SimpleDateFormat dd_MMM_yyyy = new SimpleDateFormat(
- "dd MMM yyyy");
- public static final SimpleDateFormat yyyy_MM_dd_HH_mm_ss = new SimpleDateFormat(
- "yyyy-MM-dd HH:mm:ss");
- public static final SimpleDateFormat yyyy_MM_dd_T_HH_mm_ss = new SimpleDateFormat(
- "yyyy-MM-dd'T'HH:mm:ss");
- public static final SimpleDateFormat yyyyMMdd_HH_mm_ss = new SimpleDateFormat(
- "yyyyMMdd HH:mm:ss");
+ public static final SimpleDateFormat yyyyMMdd = new SimpleDateFormat("yyyyMMdd");
+ public static final SimpleDateFormat dd_MMM_yyyy = new SimpleDateFormat("dd MMM yyyy");
+ public static final SimpleDateFormat yyyy_MM_dd_HH_mm_ss = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ public static final SimpleDateFormat yyyy_MM_dd_T_HH_mm_ss = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+ public static final SimpleDateFormat yyyyMMdd_HH_mm_ss = new SimpleDateFormat("yyyyMMdd HH:mm:ss");
}
- /* message */
public static final class MessageInfo {
public static final String INFO_MESSAGE = "INFO_MESSAGE";
public static final String WARNING_MESSAGE = "WARNING_MESSAGE";
public static final String ERROR_MESSAGE = "ERROR_MESSAGE";
public static final String EXCEPTION_MESSAGE = "EXCEPTION_MESSAGE";
-
}
-
- /* locale id (indonesia / default) and en (english) */
+
public static final class Locale {
public static final String INA = "ina";
public static final String EN = "en";
-
}
- //Update perubahan di sini, harus disamakan dengan package yang ada di jasamedika-bussiness
- //com.jasamedika.medifirst2000.logging.hibernate.async
+
public static final class HttpHeader {
public static final String SUPERVISING = "Supervising";
public static final String MODULE = "Module";
public static final String FORM = "Form";
public static final String ACTION = "Action";
-
- public static final String URL_FORM = "AlamatUrlForm"; // syamsu
- public static final String KD_RUANGAN = "KdRuangan"; // syamsu
- public static final String KD_RUANGAN_T = "KdRuanganT"; // syamsu
- public static final String KD_RUANGAN_A = "KdRuanganA"; // syamsu
- public static final String TGL_KIRIM = "tglKirim"; // syamsu
-// public static final String RUANGAN_TUJUAN = "ruanganTujuan"; // syamsu
-// public static final String ID_RUANGAN_TUJUAN_ALT = "ruanganTujuanAlt"; // syamsu
- public static final String KD_USER = "KdUser"; // syamsu
-
-
+ public static final String URL_FORM = "AlamatUrlForm";
+ public static final String KD_RUANGAN = "KdRuangan";
+ public static final String KD_RUANGAN_T = "KdRuanganT";
+ public static final String KD_RUANGAN_A = "KdRuanganA";
+ public static final String TGL_KIRIM = "tglKirim";
+ public static final String KD_USER = "KdUser";
}
}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/constants/MessageResource.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/constants/MessageResource.java
index 65b55e6b..ac9f1e91 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/constants/MessageResource.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/constants/MessageResource.java
@@ -7,9 +7,15 @@ package com.jasamedika.medifirst2000.constants;
* @author Roberto
*/
public final class MessageResource {
+
public static final String LABEL_SUCCESS = "label.success";
+
public static final String LABEL_ERROR = "label.error";
+
public static final String LABEL_TRY_AGAIN = "label.try_again";
+
public static final String LABEL_SUCCESS_CREATED = "label.success.created";
+
public static final String LABEL_SUCCESS_OK = "label.success.ok";
+
}
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AgamaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AgamaController.java
index ed6d9947..64cc0e6e 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AgamaController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(AgamaController.class);
@Autowired
- private AgamaService agamaService;
+ private AgamaService agamaService;
@RequestMapping(value = "/save-agama/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity addVO(@Valid @RequestBody AgamaVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java
index 41904fd3..eacbe82a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/AlatController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(AlatController.class);
@Autowired
- private AlatService alatService;
+ private AlatService alatService;
@RequestMapping(value = "/find-all-alat/", method = GET, produces = APPLICATION_JSON_VALUE)
public ResponseEntity> getAllVO(HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BakuMutuController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BakuMutuController.java
index 8fb703ec..5bcb246b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/BakuMutuController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(BakuMutuController.class);
@Autowired
- private BakuMutuService bakuMutuService;
+ private BakuMutuService bakuMutuService;
@RequestMapping(value = "/save-baku-mutu/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> addVO(@Valid @RequestBody BakuMutuVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CheckInController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CheckInController.java
index 70727ead..5e60fb31 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/CheckInController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(CheckInController.class);
@Autowired
- private CheckInService checkInService;
+ private CheckInService checkInService;
@RequestMapping(value = "/save-check-in/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> addVO(@Valid @RequestBody CheckInVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java
index 6f4058dd..60bd63d3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DaftarKegiatanController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(DaftarKegiatanController.class);
@Autowired
- private UnitCostService unitCostService;
+ private UnitCostService unitCostService;
@RequestMapping(value = "/detail-unit-cost", method = GET)
public ResponseEntity> findAllDepartemenById5And6(
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DepartemenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DepartemenController.java
index 00781a80..ae6efe0a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/DepartemenController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(DepartemenController.class);
@Autowired
- private DepartemenService departemenService;
+ private DepartemenService departemenService;
@RequestMapping(value = "/save-departemen/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity addVO(@Valid @RequestBody DepartemenVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FisisPemeriksaanDokterController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FisisPemeriksaanDokterController.java
index e0dbf8da..23e5b659 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/FisisPemeriksaanDokterController.java
+++ b/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 fisisPemeriksaanDokterService;
+ private FisisPemeriksaanDokterService fisisPemeriksaanDokterService;
@RequestMapping(value = "/save-fisis-dokter", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody FisisPemeriksaanDokterVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GeneralCheckUpController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GeneralCheckUpController.java
index a5dee539..69b112d4 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GeneralCheckUpController.java
+++ b/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 {
@Autowired
- private GeneralCheckUpService generalCheckUpService;
+ private GeneralCheckUpService generalCheckUpService;
@RequestMapping(value = "/find-by-pegawai-id/", method = GET, produces = APPLICATION_JSON_VALUE)
public ResponseEntity> findByPegawaiId(
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GenericViewController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GenericViewController.java
index 4a12afc1..31e058cf 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GenericViewController.java
+++ b/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 {
@Autowired
- private GenericViewService papGenericViewService;
+ private GenericViewService papGenericViewService;
@RequestMapping(value = "/StatusAdaTidakAda", method = GET, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> findAdaTidakAda(HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GolonganDarahRhesusController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GolonganDarahRhesusController.java
index 3a040b87..a720fa39 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/GolonganDarahRhesusController.java
+++ b/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 {
@Autowired
- private GolonganDarahRhesusService golonganDarahRhesusService;
+ private GolonganDarahRhesusService golonganDarahRhesusService;
@RequestMapping(value = "/find-all/", method = GET, produces = APPLICATION_JSON_VALUE)
public ResponseEntity> findAll(HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanPraKerjaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanPraKerjaController.java
index 1257e5b2..24476617 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanPraKerjaController.java
+++ b/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 {
@Autowired
- private HasilPemeriksaanPraKerjaService hasilPemeriksaanPraKerjaService;
+ private HasilPemeriksaanPraKerjaService hasilPemeriksaanPraKerjaService;
@RequestMapping(value = "/find-by-pegawai-id/", method = GET, produces = APPLICATION_JSON_VALUE)
public ResponseEntity> findByPegawaiId(
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanSwaPantauLimbahCairController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanSwaPantauLimbahCairController.java
index 92bdac1b..bcd41d5c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/HasilPemeriksaanSwaPantauLimbahCairController.java
+++ b/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 hasilPemeriksaanSwaPantauLimbahCairService;
+ private HasilPemeriksaanSwaPantauLimbahCairService hasilPemeriksaanSwaPantauLimbahCairService;
@RequestMapping(value = "/save-hasil-pemeriksaan-swa-pantau-limbah-cair/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> addVO(@Valid @RequestBody HasilPemeriksaanSwaPantauLimbahCairVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLimbahB3MasukController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLimbahB3MasukController.java
index e22c4ae7..860b9d82 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/JenisLimbahB3MasukController.java
+++ b/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 jenisLimbahB3MasukService;
+ private JenisLimbahB3MasukService jenisLimbahB3MasukService;
@RequestMapping(value = "/save-jenis-limbah-b3-masuk/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> addVO(@Valid @RequestBody JenisLimbahB3MasukVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KebutuhanDasarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KebutuhanDasarController.java
index 3d3aa534..3b43ffe3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KebutuhanDasarController.java
+++ b/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
private static final Logger LOGGER = getLogger(KebutuhanDasarController.class);
@Autowired
- private KebutuhanDasarService kebutuhanDasarService;
+ private KebutuhanDasarService kebutuhanDasarService;
@RequestMapping(value = "/save-kebutuhan-dasar", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody KebutuhanDasarVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KelasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KelasController.java
index 41cfca11..ef362fbe 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KelasController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(KelasController.class);
@Autowired
- private KelasService kelasService;
+ private KelasService kelasService;
@RequestMapping(value = "/save-kelas/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity addVO(@Valid @RequestBody KelasVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsepDiriController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsepDiriController.java
index 4887cc42..b9ccee40 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsepDiriController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(KonsepDiriController.class);
@Autowired
- private KonsepDiriService konsepDiriService;
+ private KonsepDiriService konsepDiriService;
@RequestMapping(value = "/save-konsep-diri", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody KonsepDiriVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java
index 62bb83e8..9eef8ea2 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KonsultasiController.java
+++ b/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 konsultasiService;
+ private KonsultasiService konsultasiService;
@Autowired
- private RegistrasiPelayananService registrasiPelayananService;
+ private RegistrasiPelayananService registrasiPelayananService;
@RequestMapping(value = "/save-konsultasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody KonsultasiVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java
index d5585002..f879407a 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/KopingController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(KopingController.class);
@Autowired
- private KopingService kopingService;
+ private KopingService kopingService;
@RequestMapping(value = "/save-koping", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody KopingVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java
index a1720768..39186670 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LaporanUjiHasilController.java
+++ b/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 laporanUjiHasilService;
+ private LaporanUjiHasilService laporanUjiHasilService;
@RequestMapping(value = "/save-laporan-uji-hasil/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> addVO(@Valid @RequestBody LaporanUjiHasilVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java
index 7f3ae58e..d4e9f7a2 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/LimbahB3KeluarController.java
+++ b/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
private static final Logger LOGGER = getLogger(LimbahB3KeluarController.class);
@Autowired
- private LimbahB3KeluarService limbahB3KeluarService;
+ private LimbahB3KeluarService limbahB3KeluarService;
@Autowired
- private LimbahB3MasukService limbahB3MasukService;
+ private LimbahB3MasukService limbahB3MasukService;
@RequestMapping(value = "/save-limbah-b3-keluar/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> addVO(@Valid @RequestBody LimbahB3KeluarVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapRuanganToKelasController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapRuanganToKelasController.java
index aeaf749e..d79c46e5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MapRuanganToKelasController.java
+++ b/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 mapRuanganToKelasService;
+ private MapRuanganToKelasService mapRuanganToKelasService;
@RequestMapping(value = "/save-map-ruangan-to-kelas", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity addVO(@Valid @RequestBody MapRuanganToKelasVO_ vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingBmhpToSetAlatController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingBmhpToSetAlatController.java
index 01638ece..07580fc0 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/MappingBmhpToSetAlatController.java
+++ b/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 mappingBmhpToSetAlatService;
+ private MappingBmhpToSetAlatService mappingBmhpToSetAlatService;
@RequestMapping(value = "/save-all-mapping-bmhp-to-set-alat/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> addVOS(@Valid @RequestBody List vos,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java
index 716df09a..0d3063be 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NeracaLimbahController.java
@@ -56,7 +56,6 @@ public class NeracaLimbahController extends LocaleController {
}
}
- /* TODO: No service called */
@RequestMapping(value = "/update-neraca-limbah/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> updateVO(@Valid @RequestBody NeracaLimbahVO vo,
HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NilaiNilaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NilaiNilaiController.java
index a60bb1a2..1239b307 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/NilaiNilaiController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(NilaiNilaiController.class);
@Autowired
- private NilaiNilaiService nilaiNilaiService;
+ private NilaiNilaiService nilaiNilaiService;
@RequestMapping(value = "/save-nilai-nilai", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody NilaiNilaiVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAlergiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAlergiController.java
index a4f2ad52..790b8454 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAlergiController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapAlergiController.class);
@Autowired
- private PapAlergiService papAlergiService;
+ private PapAlergiService papAlergiService;
@RequestMapping(value = "/save-alergi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapAlergiVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAnamesisController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAnamesisController.java
index 524518b4..4eff3ec5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapAnamesisController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapAnamesisController.class);
@Autowired
- private PapAnamesisService papAnamesisService;
+ private PapAnamesisService papAnamesisService;
@RequestMapping(value = "/save-anamesis", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapAnamesisVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapBedahController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapBedahController.java
index 7cd7f89e..d62de9b1 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapBedahController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapBedahController.class);
@Autowired
- private PapBedahService papBedahService;
+ private PapBedahService papBedahService;
@RequestMapping(value = "/save-bedah", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapBedahVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapEliminasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapEliminasiController.java
index 12c8ec84..b9c2a12f 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapEliminasiController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapEliminasiController.class);
@Autowired
- private PapEliminasiService papEliminasiService;
+ private PapEliminasiService papEliminasiService;
@RequestMapping(value = "/save-eliminasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapEliminasiVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGastrointestinalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGastrointestinalController.java
index 07a06f35..0344531d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGastrointestinalController.java
+++ b/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 papGastrointestinalService;
+ private PapGastrointestinalService papGastrointestinalService;
@RequestMapping(value = "/save-gastrointestinal", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapGastrointestinalVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenataliaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenataliaController.java
index f36f7dfd..40b328d0 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenataliaController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapGenataliaController.class);
@Autowired
- private PapGenataliaService papGenataliaService;
+ private PapGenataliaService papGenataliaService;
@RequestMapping(value = "/save-genatalia", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapGenataliaVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenericController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenericController.java
index 8fc3154f..cc309c85 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGenericController.java
+++ b/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 {
@Autowired
- private GenericViewService genericViewService;
+ private GenericViewService genericViewService;
@RequestMapping(value = "/find-medical-record-noRec/", method = GET, produces = APPLICATION_JSON_VALUE)
public ResponseEntity> findMedicalRecordByNoRec(
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGigiMulutController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGigiMulutController.java
index 0cb2afee..933ca913 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGigiMulutController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapGigiMulutController.class);
@Autowired
- private PapGigiMulutService papGigiMulutService;
+ private PapGigiMulutService papGigiMulutService;
@RequestMapping(value = "/save-gigi-mulut", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapGigiMulutVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGinekologiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGinekologiController.java
index b8880eae..f8ce4b31 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapGinekologiController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapGinekologiController.class);
@Autowired
- private PapGinekologiService papGinekologiService;
+ private PapGinekologiService papGinekologiService;
@RequestMapping(value = "/save-ginekologi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapGinekologiVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapIntegumenController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapIntegumenController.java
index 75626677..9733f4d0 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapIntegumenController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapIntegumenController.class);
@Autowired
- private PapIntegumenService papIntegumenService;
+ private PapIntegumenService papIntegumenService;
@RequestMapping(value = "/save-integumen", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapIntegumenVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKebutuhanEdukasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKebutuhanEdukasiController.java
index 487f0949..6f767ea5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKebutuhanEdukasiController.java
+++ b/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 papKebutuhanEdukasiService;
+ private PapKebutuhanEdukasiService papKebutuhanEdukasiService;
@RequestMapping(value = "/save-kebutuhan-edukasi/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> addVO(@Valid @RequestBody PapKebutuhanEdukasiVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanTambahanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanTambahanController.java
index f2bb848e..086ac6ec 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanTambahanController.java
+++ b/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 papKeluhanTambahanService;
+ private PapKeluhanTambahanService papKeluhanTambahanService;
@RequestMapping(value = "/save-keluhan-tambahan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanUtamaController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanUtamaController.java
index 92512e63..685cca55 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapKeluhanUtamaController.java
+++ b/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 papKeluhanUtamaService;
+ private PapKeluhanUtamaService papKeluhanUtamaService;
@RequestMapping(value = "/save-keluhan-utama", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapKeluhanUtamaVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMataController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMataController.java
index 5ae9e618..f9f4f02b 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMataController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapMataController.class);
@Autowired
- private PapMataService papMataService;
+ private PapMataService papMataService;
@RequestMapping(value = "/save-mata", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> saveProgramPengajaran(@Valid @RequestBody PapMataVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMuskuloskeletalController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMuskuloskeletalController.java
index d70870ba..26399f47 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapMuskuloskeletalController.java
+++ b/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 papMuskuloskeletalService;
+ private PapMuskuloskeletalService papMuskuloskeletalService;
@RequestMapping(value = "/save-muskuloskeletal", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapMuskuloskeletalVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapNeurologiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapNeurologiController.java
index b8f38b6a..5b104b23 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapNeurologiController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapNeurologiController.class);
@Autowired
- private PapNeurologiService papNeurologiService;
+ private PapNeurologiService papNeurologiService;
@RequestMapping(value = "/save-neurologi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapNeurologiVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPernapasanController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPernapasanController.java
index adba24ff..ff077aba 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapPernapasanController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapPernapasanController.class);
@Autowired
- private PapPernapasanService papPernapasanService;
+ private PapPernapasanService papPernapasanService;
@RequestMapping(value = "/save-pernapasan", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapPernapasanVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatImunisasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatImunisasiController.java
index 9062d25f..a477515d 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatImunisasiController.java
+++ b/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 papRiwayatImunisasiService;
+ private PapRiwayatImunisasiService papRiwayatImunisasiService;
@RequestMapping(value = "/save-riwayat-imunisasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapRiwayatImunisasiVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatPsikososialController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatPsikososialController.java
index 3e196e2d..c2f9b5e3 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatPsikososialController.java
+++ b/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 papRiwayatPsikososialService;
+ private PapRiwayatPsikososialService papRiwayatPsikososialService;
@RequestMapping(value = "/save-riwayat-psikososial", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapRiwayatPsikososialVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatTumbuhKembangController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatTumbuhKembangController.java
index 32abeb7f..685d5380 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapRiwayatTumbuhKembangController.java
+++ b/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 papRiwayatTumbuhKembangService;
+ private PapRiwayatTumbuhKembangService papRiwayatTumbuhKembangService;
@RequestMapping(value = "/save-riwayat-tumbuh-kembang", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapRiwayatTumbuhKembangVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSirkulasiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSirkulasiController.java
index 58023d39..5a41b2e6 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSirkulasiController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapSirkulasiController.class);
@Autowired
- private PapSirkulasiService papSirkulasiService;
+ private PapSirkulasiService papSirkulasiService;
@RequestMapping(value = "/save-sirkulasi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapSirkulasiVO vo, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningGiziController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningGiziController.java
index a0218535..4b45ccaf 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningGiziController.java
+++ b/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 papSkriningGiziService;
+ private PapSkriningGiziService papSkriningGiziService;
@RequestMapping(value = "/save-skrining-gizi", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> savePasien(@Valid @RequestBody PapSkriningGiziVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningNyeriController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningNyeriController.java
index 8fd65d49..24dcf3ef 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSkriningNyeriController.java
+++ b/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 papSkriningNyeriService;
+ private PapSkriningNyeriService papSkriningNyeriService;
@RequestMapping(value = "/save-skrining-nyeri", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PapSkriningNyeriVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSmearController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSmearController.java
index 1c0909bd..8a0df9bb 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapSmearController.java
+++ b/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 {
@Autowired
- private PapSmearService papSmearService;
+ private PapSmearService papSmearService;
@RequestMapping(value = "/find-by-pegawai-id/", method = GET, produces = APPLICATION_JSON_VALUE)
public ResponseEntity> findByPegawaiId(
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapThtController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapThtController.java
index ad5a48ac..d6019c6c 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PapThtController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PapThtController.class);
@Autowired
- private PapThtService papThtService;
+ private PapThtService papThtService;
@Autowired
- private ThtService thtService;
+ private ThtService thtService;
@RequestMapping(value = "/save-tht", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save2(@Valid @RequestBody List vos, HttpServletRequest request) {
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienPulangController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienPulangController.java
index 68c6917f..8f714fc5 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PasienPulangController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PasienPulangController.class);
@Autowired
- private PasienPulangService pasienPulangService;
+ private PasienPulangService pasienPulangService;
@RequestMapping(value = "/save-pasien-pulang", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> savePasienPulang(@Valid @RequestBody PasienPulangVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananTpnController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananTpnController.java
index 95e161d4..30ea34e0 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PelayananTpnController.java
+++ b/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 {
private static final Logger LOGGER = getLogger(PelayananTpnController.class);
@Autowired
- private PelayananTpnService pelayananTpnService;
+ private PelayananTpnService pelayananTpnService;
@RequestMapping(value = "/save-pelayanan-tpn", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> save(@Valid @RequestBody PelayananProduksiVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianAirBersihController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianAirBersihController.java
index 29f0d701..330b9a25 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianAirBersihController.java
+++ b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianAirBersihController.java
@@ -37,7 +37,7 @@ public class PemakaianAirBersihController extends LocaleController pemakaianAirBersihService;
+ private PemakaianAirBersihService pemakaianAirBersihService;
@RequestMapping(value = "/save-pemakaian-air-bersih/", method = POST, produces = APPLICATION_JSON_VALUE, consumes = APPLICATION_JSON_VALUE)
public ResponseEntity> addVO(@Valid @RequestBody PemakaianAirBersihVO vo,
diff --git a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianBarangHabisPakaiController.java b/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianBarangHabisPakaiController.java
index e30bee54..7b24c1af 100644
--- a/jasamedika-web/src/main/java/com/jasamedika/medifirst2000/controller/PemakaianBarangHabisPakaiController.java
+++ b/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