diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/RincianKegiatan.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/RincianKegiatan.java
index ed6299f5..7160413a 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/RincianKegiatan.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/RincianKegiatan.java
@@ -12,43 +12,43 @@ import javax.persistence.Table;
 import com.jasamedika.medifirst2000.base.BaseMaster;
 import com.jasamedika.medifirst2000.helper.Caption;
 
-@Entity //@Audited
+@Entity // @Audited
 @Table(name = "sdm_RincianKegiatan_M")
 public class RincianKegiatan extends BaseMaster {
-	
-	@Column(name = "RincianKegiatan", nullable = true , length = 8000)
-	@Caption(value="Rincian Kegiatan")
-	private String rincianKegiatan;	
+
+	@Column(name = "RincianKegiatan", nullable = true, length = 8000)
+	@Caption(value = "Rincian Kegiatan")
+	private String rincianKegiatan;
 
 	@Caption(value = "satuan")
 	@Column(name = "satuan", nullable = true)
 	private String satuan;
-	
+
 	@ManyToOne
 	@JoinColumn(name = "ObjectSatuanIndikatorFk")
 	@Caption(value = "Object Satuan Indikator")
 	private SatuanIndikator satuanIndikator;
-	
+
 	@Column(name = "ObjectSatuanIndikatorFk", insertable = false, updatable = false, nullable = true)
 	private Integer satuanIndikatorId;
-	
+
 	@Column(name = "statusVerifikasi", nullable = true)
 	@Caption(value = "statusVerifikasi")
 	private Integer statusVerifikasi;
 
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.sdm_RincianKegiatan_M_id_seq")
+	@javax.persistence.SequenceGenerator(name = "public.sdm_RincianKegiatan_M_id_seq", sequenceName = "public.sdm_RincianKegiatan_M_id_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Integer id;
+
 	public String getRincianKegiatan() {
 		return rincianKegiatan;
 	}
 
 	public void setRincianKegiatan(String rincianKegiatan) {
 		this.rincianKegiatan = rincianKegiatan;
-	}	
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.sdm_RincianKegiatan_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.sdm_RincianKegiatan_M_id_seq", sequenceName = "public.sdm_RincianKegiatan_M_id_seq", allocationSize = 1)
-	@Column(name = "id")
-	protected Integer id;
+	}
 
 	public Integer getId() {
 		return id;
diff --git a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UraianTugasM.java b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UraianTugasM.java
index d0b8b8a7..8d0eb0a2 100644
--- a/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UraianTugasM.java
+++ b/jasamedika-domain/src/main/java/com/jasamedika/medifirst2000/entities/UraianTugasM.java
@@ -56,6 +56,12 @@ public class UraianTugasM extends BaseMaster {
 	// @Column(name = "LamaKegiatan", nullable = true)
 	// private Integer lamaKegiatan;
 
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.sdm_UraianTugas_M_id_seq")
+	@javax.persistence.SequenceGenerator(name = "public.sdm_UraianTugas_M_id_seq", sequenceName = "public.sdm_UraianTugas_M_id_seq", allocationSize = 1)
+	@Column(name = "id")
+	protected Integer id;
+
 	public String getPeriode() {
 		return periode;
 	}
@@ -128,12 +134,6 @@ public class UraianTugasM extends BaseMaster {
 		this.pelaksanaanTugasId = pelaksanaanTugasId;
 	}
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public.sdm_UraianTugas_M_id_seq")
-	@javax.persistence.SequenceGenerator(name = "public.sdm_UraianTugas_M_id_seq", sequenceName = "public.sdm_UraianTugas_M_id_seq", allocationSize = 1)
-	@Column(name = "id")
-	protected Integer id;
-
 	public Integer getId() {
 		return id;
 	}