diff --git a/pom.xml b/pom.xml
index a482f68..ac47258 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.dreamworks</groupId>
   <artifactId>boditech</artifactId>
-  <version>0.0.97</version>
+  <version>0.0.98</version>
   <name>boditech</name>
   <description>boditech</description>
 
diff --git a/src/main/java/com/dreamworks/boditech/entity/MdbEmergencyTestTask.java b/src/main/java/com/dreamworks/boditech/model/MdbEmergencyTestTask.java
similarity index 56%
rename from src/main/java/com/dreamworks/boditech/entity/MdbEmergencyTestTask.java
rename to src/main/java/com/dreamworks/boditech/model/MdbEmergencyTestTask.java
index 4b7e209..e8ad59f 100644
--- a/src/main/java/com/dreamworks/boditech/entity/MdbEmergencyTestTask.java
+++ b/src/main/java/com/dreamworks/boditech/model/MdbEmergencyTestTask.java
@@ -1,9 +1,9 @@
-package com.dreamworks.boditech.entity;
+package com.dreamworks.boditech.model;
 import com.dreamworks.boditech.utils.MyCommon;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.List;
-public class MdbEmergencyTestTask {
+public class MdbEmergencyTestTask extends MyActiveRecord {
     // project detect type : auto
     @JsonIgnore
     public static final String PROJECT_DETECT_TYPE_AUTO = "AUTO";
@@ -17,43 +17,68 @@ public class MdbEmergencyTestTask {
     @JsonIgnore
     public static final String STATUS_CANCELED = "CANCELED";
 
-    // id
-    public Integer id;
-    // index of slot
+    @MyActiveRecordField
+    public Long id;
+
+    @MyActiveRecordField
     public Integer index;
-    // enable
-    public Boolean enable;
-    // is slot locked
-    public Boolean isSlotLocked;
-    // status
+
+    @MyActiveRecordField
+    public Integer enable;
+
+    @MyActiveRecordField
+    public Integer isSlotLocked;
+
+    @MyActiveRecordField
     public String status;
-    // project detect type
+
+    @MyActiveRecordField
     public String projectDetectType;
-    // project ids
+
+    @MyActiveRecordField
     public String projectIds;
-    // sample type detect type
+
+    @MyActiveRecordField
     public String sampleTypeDetectType;
-    // sample type
+
+    @MyActiveRecordField
     public String sampleType;
-    // sample uid
+
+    @MyActiveRecordField
     public String sampleUid;
-    // bar code
+
+    @MyActiveRecordField
     public String barCode;
-    // preprocess
-    public Boolean attenuation;
-    // created at
+
+    @MyActiveRecordField
+    public Integer attenuation;
+
+    @MyActiveRecordField
     public Long createdAt;
-    // created by
+
+    @MyActiveRecordField
     public Integer createdBy;
-    // updated at
+
+    @MyActiveRecordField
     public Long updatedAt;
-    // updated by
+
+    @MyActiveRecordField
     public Integer updatedBy;
-    // exec started at
+
+    @MyActiveRecordField
     public Long execStartedAt;
-    // exec finished at
+
+    @MyActiveRecordField
     public Long execFinishedAt;
 
+    @MyActiveRecordField
+    public String testBatchId;
+
+    // get table name
+    public static String getTableName() {
+        return "bdt_emergency_test_tasks";
+    }
+
     // get project id list
     public List<Integer> getProjectIdList() {
         return MyCommon.jsonToObject(this.projectIds, List.class);
diff --git a/src/main/java/com/dreamworks/boditech/entity/MdbTest.java b/src/main/java/com/dreamworks/boditech/model/MdbTest.java
similarity index 79%
rename from src/main/java/com/dreamworks/boditech/entity/MdbTest.java
rename to src/main/java/com/dreamworks/boditech/model/MdbTest.java
index 90fec07..8004599 100644
--- a/src/main/java/com/dreamworks/boditech/entity/MdbTest.java
+++ b/src/main/java/com/dreamworks/boditech/model/MdbTest.java
@@ -1,7 +1,7 @@
-package com.dreamworks.boditech.entity;
-public class MdbTest {
+package com.dreamworks.boditech.model;
+public class MdbTest extends MyActiveRecord {
     // id
-    public Integer id;
+    public Long id;
     // batch id
     public Long batchId;
     // serial code
@@ -9,7 +9,7 @@ public class MdbTest {
     // task type
     public String taskType;
     // task id
-    public Integer taskId;
+    public Long taskId;
     // lot code
     public String lotCode;
     // bar code
@@ -40,4 +40,9 @@ public class MdbTest {
     public String status;
     // result
     public String result;
+
+    // get table name
+    public static String getTableName() {
+        return "bdt_tests";
+    }
 }