diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaket.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaket.java
index 28e654d5..1e759092 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaket.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/MapProdukPaket.java
@@ -1,18 +1,24 @@
 package com.jasamedika.medifirst2000.entities;
 
+import static javax.persistence.EnumType.STRING;
+import static javax.persistence.FetchType.LAZY;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Enumerated;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+import javax.validation.constraints.NotNull;
+
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.enums.JenisMappingProdukPaket;
 import com.jasamedika.medifirst2000.helper.Caption;
+
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-import static javax.persistence.EnumType.STRING;
-import static javax.persistence.FetchType.LAZY;
-
 /**
  * @author Salman Manoe
  * @version 1.0.0
@@ -23,9 +29,7 @@ import static javax.persistence.FetchType.LAZY;
 @Entity
 @Table(name = "mapprodukpaket_m", uniqueConstraints = {
 		@UniqueConstraint(columnNames = { "paketfk", "produkPaketfk" }), })
-public class MapProdukPaket extends BaseTransaction implements Serializable {
-	private static final long serialVersionUID = 8425001074293272466L;
-
+public class MapProdukPaket extends BaseTransaction {
 	@ManyToOne(fetch = LAZY)
 	@JoinColumn(name = "paketfk")
 	@NotNull(message = "Paket tidak boleh kosong")
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienPetugas.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienPetugas.java
index 51e258a9..749bef73 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienPetugas.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/PelayananPasienPetugas.java
@@ -1,16 +1,21 @@
 package com.jasamedika.medifirst2000.entities;
 
+import static javax.persistence.FetchType.LAZY;
+
+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 org.joda.time.DateTime;
+
 import com.jasamedika.medifirst2000.base.BaseTransaction;
 import com.jasamedika.medifirst2000.helper.Caption;
+
 import lombok.Getter;
 import lombok.Setter;
-import org.joda.time.DateTime;
-
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-import static javax.persistence.FetchType.LAZY;
 
 /**
  * class PelayananPasienPetugas
@@ -21,8 +26,8 @@ import static javax.persistence.FetchType.LAZY;
 @Setter
 @Entity
 @Table(name = "PelayananPasienPetugas_T")
-public class PelayananPasienPetugas extends BaseTransaction implements Serializable {
-	private static final long serialVersionUID = 5287492678191727584L;
+public class PelayananPasienPetugas extends BaseTransaction {
+	private static final long serialVersionUID = -2586717488353074662L;
 
 	@Caption(value = "Deskripsi Tugas Fungsi")
 	private String deskripsitugasfungsi;
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Sayatan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Sayatan.java
index 6c446078..7935acbf 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Sayatan.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/Sayatan.java
@@ -1,18 +1,25 @@
 package com.jasamedika.medifirst2000.entities;
 
-import com.jasamedika.medifirst2000.base.BaseMaster;
-import com.jasamedika.medifirst2000.helper.Caption;
-import lombok.Getter;
-import lombok.Setter;
-
-import javax.persistence.*;
-
-import java.io.Serializable;
-import java.util.Date;
-
 import static javax.persistence.FetchType.LAZY;
 import static javax.persistence.GenerationType.SEQUENCE;
 
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+import com.jasamedika.medifirst2000.base.BaseMaster;
+import com.jasamedika.medifirst2000.helper.Caption;
+
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * @author Salman Manoe
  * @version 1.0.0
@@ -22,7 +29,7 @@ import static javax.persistence.GenerationType.SEQUENCE;
 @Setter
 @Entity
 @Table(name = "sayatan_operasi_m")
-public class Sayatan extends BaseMaster implements Serializable {
+public class Sayatan extends BaseMaster {
 
 	@Id
 	@GeneratedValue(strategy = SEQUENCE, generator = "sayatan_operasi_t_pkey")
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapRuanganToKelasMVO.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapRuanganToKelasMVO.java
deleted file mode 100644
index d8b0ed93..00000000
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/vo/MapRuanganToKelasMVO.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*package com.jasamedika.medifirst2000.vo;
-
-import java.io.Serializable;
-
-import javax.persistence.AssociationOverride;
-import javax.persistence.AssociationOverrides;
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
-import com.jasamedika.medifirst2000.base.vo.BaseMapping;
-
-
-
-
-
-
-//@Entity
-//@Table(name = "MapRuanganToKelas_M_SAMPLE")
-@AssociationOverrides({
-	@AssociationOverride(name = "pk.ruanganM", joinColumns = @JoinColumn(name = "kdRuangan")),
-	@AssociationOverride(name = "pk.kelasM", joinColumns = @JoinColumn(name = "kdKelas"))
-})
-public class MapRuanganToKelasMVO extends BaseMapping implements Serializable{
-	
-	
-	private static final long serialVersionUID = 1L;
-	@EmbeddedId
-    protected MapRuanganToKelasMIdVO pk = new MapRuanganToKelasMId();
-	
-	
-	public MapRuanganToKelasMIdVO getPk() {
-		return pk;
-	}
-
-	public void setPk(MapRuanganToKelasMIdVO pk) {
-		this.pk = pk;
-	}
-
-	@Column(name = "kdRuangan", insertable = false, updatable = false)
-	private Integer kdRuangan;
-	
-	@Column(name = "kdKelas", insertable = false, updatable = false)
-	private Integer kdKelas;
-
-	
-	@Transient
-	public RuanganMVO getRuanganM() {
-		return getPk().getRuanganM();
-	}
-
-	public void setRuanganM(RuanganMVO ruanganM) {
-		getPk().setRuanganM(ruanganM);
-	}
-
-	@Transient
-	public KelasMVO getKelasM() {
-		return getPk().getKelasM();
-	}
-
-	public void setKelasM(KelasMVO kelasM) {
-		getPk().setKelasM(kelasM);
-	}
-
-	public Integer getKdRuangan() {
-		return kdRuangan;
-	}
-
-	public void setKdRuangan(Integer kdRuangan) {
-		this.kdRuangan = kdRuangan;
-	}
-
-	public Integer getKdKelas() {
-		return kdKelas;
-	}
-
-	public void setKdKelas(Integer kdKelas) {
-		this.kdKelas = kdKelas;
-	}
-
-
-	
-
-
-}
-*/
\ No newline at end of file