diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java
index 0b0797d..d6e67bb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java
@@ -1,25 +1,19 @@
 package com.lyms.platform.operate.web.request;
 
-import java.util.Date;
-import java.util.Map;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
-import com.lyms.platform.pojo.Patients;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.lyms.platform.common.core.annotation.form.Form;
 import com.lyms.platform.common.core.annotation.form.FormParam;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
+import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.PuerperaModel;
 import com.lyms.platform.pojo.VisitModel;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import java.util.Date;
+import java.util.Map;
 
 /**
  * 访视记录请求
- * 
+ *
  * @author Administrator
  */
 //@Form
@@ -41,10 +35,7 @@ public class VisitAddRequest {
     /**
      * 产妇年龄
      */
-    @NotNull(message = "年龄不能为空")
-    @Min(value = 1, message = "年龄不能小于1")
-    @Max(value = 50, message = "年龄不能大于50")
-    private int age;
+    private String age;
 
     /**
      * 产妇身份证号码
@@ -76,7 +67,7 @@ public class VisitAddRequest {
      */
     private String address;
 
-    private int  provinceId;
+    private int provinceId;
     private int cityId;
     private int areaId;
 
@@ -181,6 +172,16 @@ public class VisitAddRequest {
      */
     private String other;
 
+    private String phone;
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
     /**
      * 指导
      */
@@ -216,11 +217,11 @@ public class VisitAddRequest {
         this.name = name;
     }
 
-    public int getAge() {
+    public String getAge() {
         return age;
     }
 
-    public void setAge(int age) {
+    public void setAge(String age) {
         this.age = age;
     }
 
@@ -265,7 +266,6 @@ public class VisitAddRequest {
     }*/
 
 
-
     public String getNumOfLive() {
         return numOfLive;
     }
@@ -465,21 +465,34 @@ public class VisitAddRequest {
         puerperaModel.setProvinceId(provinceId);
         puerperaModel.setId(parentId);
         puerperaModel.setName(name);
-        puerperaModel.setAge(age);
+        try {
+            Date date = DateUtil.parseYMD(age);
+            puerperaModel.setAge(DateUtil.getAge(date));
+        }catch (Exception e){}
+
+
         puerperaModel.setCardno(cardNo);
         puerperaModel.setDueDate(dueDate);
         puerperaModel.setDeliverOrg(deliverOrg);
         puerperaModel.setDueType(dueType);
         puerperaModel.setAddress(address);
+        puerperaModel.setPhone(phone);
         return puerperaModel;
     }
+
     public Patients getPatients() {
         Patients patients = new Patients();
         patients.setId(parentId);
         patients.setUsername(name);
-        patients.setAge(age);
+        try {
+            Date date = DateUtil.parseYMD(age);
+            patients.setAge(DateUtil.getAge(date));
+            patients.setBirth(date);
+        } catch (Exception e) {
+
+        }
         patients.setCardNo(cardNo);
-        patients.setPhone(cardNo);
+        patients.setPhone(phone);
         patients.setDueDate(new Date());
         patients.setDeliverOrg(deliverOrg);
         patients.setDueType(dueType);
@@ -487,7 +500,7 @@ public class VisitAddRequest {
         patients.setAreaId(areaId);
         patients.setCityId(cityId);
         patients.setProvinceId(provinceId);
-        return  patients;
+        return patients;
     }
 
     public VisitModel getRequestVisit() {
@@ -502,7 +515,7 @@ public class VisitAddRequest {
 
         visit.setBreast(breast);
         visit.setChecktime(checktime);
-        visit.setDays((DateUtil.getDays(DateUtil.parseYMD(dueDate), DateUtil.parseYMD(checktime))+1) + "");
+        visit.setDays((DateUtil.getDays(DateUtil.parseYMD(dueDate), DateUtil.parseYMD(checktime)) + 1) + "");
         visit.setDoctorsign(doctorsign);
         visit.setDue(due);
         visit.setHealth(health);
@@ -525,10 +538,10 @@ public class VisitAddRequest {
      * 详细描述
      * <p>
      * 示例代码
-     * 
+     * <p>
      * <pre>
      * </pre>
-     * 
+     *
      * @author In_Home
      * @version BME V100R001 2016-3-21
      * @since BME V100R001C40B104
@@ -550,10 +563,20 @@ public class VisitAddRequest {
 
         private String address;
 
-        private int  provinceId;
+        private int provinceId;
         private int cityId;
         private int areaId;
 
+        private String phone;
+
+        public String getPhone() {
+            return phone;
+        }
+
+        public void setPhone(String phone) {
+            this.phone = phone;
+        }
+
         public int getAreaId() {
             return areaId;
         }
@@ -581,33 +604,35 @@ public class VisitAddRequest {
         public SimpleVisitPuerpera() {
         }
 
-        public SimpleVisitPuerpera(PuerperaModel model) {
+   /*     public SimpleVisitPuerpera(PuerperaModel model) {
             id = model.getId();
             name = model.getName();
-            age = model.getAge();
+//            age = model.getAge();
             cardno = model.getCardNo();
             dueDate = DateUtil.getyyyy_MM_dd(model.getDueDate());
             deliverOrg = model.getDeliverOrg();
             dueType = model.getDueType();
             address = model.getAddress();
 //            cityId =model.getc
-        }
+        }*/
+
         public SimpleVisitPuerpera(Patients model) {
             id = model.getId();
             name = model.getUsername();
             try {
                 age = model.getAge();
-            }catch (Exception e){
+            } catch (Exception e) {
             }
+            phone = model.getPhone();
             cardno = model.getCardNo();
             dueDate = DateUtil.getyyyy_MM_dd(model.getDueDate());
             deliverOrg = model.getDeliverOrg();
             dueType = model.getDueType();
             address = model.getAddress();
-            cityId=model
+            cityId = model
                     .getCityId();
-            areaId=model.getAreaId();
-            provinceId=model.getProvinceId();
+            areaId = model.getAreaId();
+            provinceId = model.getProvinceId();
         }
 
         public String getId() {
@@ -733,47 +758,16 @@ public class VisitAddRequest {
             if (name == null) {
                 if (other.name != null) return false;
             } else if (!name.equals(other.name)) return false;
-            if(((SimpleVisitPuerpera) obj).provinceId !=provinceId){
-                return  false;
+            if (((SimpleVisitPuerpera) obj).provinceId != provinceId) {
+                return false;
             }
-            if(((SimpleVisitPuerpera) obj).cityId !=cityId){
-                return  false;
+            if (((SimpleVisitPuerpera) obj).cityId != cityId) {
+                return false;
             }
-            if(((SimpleVisitPuerpera) obj).areaId !=areaId){
-                return  false;
+            if (((SimpleVisitPuerpera) obj).areaId != areaId) {
+                return false;
             }
             return true;
         }
     }
-
-    public static void main(String[] args) {
-        SimpleVisitPuerpera puerpera = new VisitAddRequest().new SimpleVisitPuerpera();
-        puerpera.setAddress("天府2街");
-        puerpera.setAge(1);
-        puerpera.setCardno("500311932121545");
-        puerpera.setDeliverOrg("西财华西");
-        puerpera.setDueDate("2015-05-06");
-        puerpera.setDueType("剖腹");
-        puerpera.setId("11");
-        puerpera.setName("查房");
-
-        PuerperaModel model = new PuerperaModel();
-        model.setAddress("天府2街");
-        model.setAge(1);
-        model.setCardNo("500311932121545");
-        model.setDeliverOrg("西财华西");
-        model.setDueDate(DateUtil.parseYMD("2015-05-07"));
-        model.setDueType("剖腹");
-        model.setId("11");
-        model.setName("查房1");
-        System.out.println(puerpera.equals(new VisitAddRequest().new SimpleVisitPuerpera(model)));
-
-        VisitAddRequest visitAddRequest = new VisitAddRequest();
-//        visitAddRequest.setAddress("测试");
-        visitAddRequest.setAge(1);
-//        visitAddRequest.setBp("{}");
-        visitAddRequest.setCardNo("454646465456465456");
-        visitAddRequest.setBreast("fafffaffaffa");
-        System.out.print(JsonUtil.obj2JsonString(visitAddRequest));
-    }
 }
\ No newline at end of file