diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
index c21a60b..a0efcbe 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
@@ -15,10 +15,10 @@ public class Patients extends BaseModel {
 
 
     /**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	/**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+    /**
      * 身份证号码
      */
     @Field("cardno")
@@ -33,29 +33,29 @@ public class Patients extends BaseModel {
      */
     @Field("duetype")
     private String dueType;
-    
+
     /******add by lqy begin*******/
     //孕妇国籍Id
     private String pcountryId;
-    
+
     //孕妇民族Id
     private String pnationId;
-    
+
     //孕妇职业类别Id
     private String pprofessionTypeId;
-    
+
     //户籍类型Id
     private String pcensusTypeId;
-    
+
     //工作单位
     private String pworkUnit;
 
     //居住类别Id
     private String pliveTypeId;
-    
+
     //证件类型Id
     private String pcerteTypeId;
-    
+
     //建档号
     private String fileCode;
     //建档医生
@@ -66,8 +66,8 @@ public class Patients extends BaseModel {
 
     //医院ID
     private Integer hospitalId;
-    
-    
+
+
     /***********丈夫信息***********/
 
     //证件号
@@ -82,7 +82,7 @@ public class Patients extends BaseModel {
     private String hworkUnit;
     //职业类别Id
     private String hprofessionTypeId;
-    
+
     //户籍地址
     private String haddressRegister;
     private String hprovinceRegisterId;
@@ -115,79 +115,7 @@ public class Patients extends BaseModel {
     private Integer dueStatus;
 
     //建档类型 0 未分娩建档 1儿童建档时建档
-    private Integer buildType;
-
-    public Integer getBuildType() {
-        return buildType;
-    }
-
-    public void setBuildType(Integer buildType) {
-        this.buildType = buildType;
-    }
-
-    public Integer getDueStatus() {
-        return dueStatus;
-    }
-
-    public void setDueStatus(Integer dueStatus) {
-        this.dueStatus = dueStatus;
-    }
-
-    public String getMremark() {
-        return mremark;
-    }
-
-    public void setMremark(String mremark) {
-        this.mremark = mremark;
-    }
-
-    public Integer getServiceStatus() {
-        return serviceStatus;
-    }
-
-    public void setServiceStatus(Integer serviceStatus) {
-        this.serviceStatus = serviceStatus;
-    }
-
-    public Integer getExpVip() {
-        return expVip;
-    }
-
-    public void setExpVip(Integer expVip) {
-        this.expVip = expVip;
-    }
-
-    public Date getVipEndTime() {
-        return vipEndTime;
-    }
-
-    public void setVipEndTime(Date vipEndTime) {
-        this.vipEndTime = vipEndTime;
-    }
-
-    public String getAreaId() {
-        return areaId;
-    }
-
-    public void setAreaId(String areaId) {
-        this.areaId = areaId;
-    }
-
-    public String getCityId() {
-        return cityId;
-    }
-
-    public void setCityId(String cityId) {
-        this.cityId = cityId;
-    }
-
-    public String getProvinceId() {
-        return provinceId;
-    }
-
-    public void setProvinceId(String provinceId) {
-        this.provinceId = provinceId;
-    }
+     private Integer buildType;
 
     /**
      * 产后休养地
@@ -198,37 +126,6 @@ public class Patients extends BaseModel {
     private String areaPostRestId;
     private String streetPostRestId;
 
-    public String getAddressPostRest() {
-        return addressPostRest;
-    }
-
-    public void setAddressPostRest(String addressPostRest) {
-        this.addressPostRest = addressPostRest;
-    }
-
-    public String getProvincePostRestId() {
-        return provincePostRestId;
-    }
-
-    public void setProvincePostRestId(String provincePostRestId) {
-        this.provincePostRestId = provincePostRestId;
-    }
-
-    public String getCityPostRestId() {
-        return cityPostRestId;
-    }
-
-    public void setCityPostRestId(String cityPostRestId) {
-        this.cityPostRestId = cityPostRestId;
-    }
-
-    public String getAreaPostRestId() {
-        return areaPostRestId;
-    }
-
-    public void setAreaPostRestId(String areaPostRestId) {
-        this.areaPostRestId = areaPostRestId;
-    }
 
     /**
      * 户籍
@@ -239,38 +136,6 @@ public class Patients extends BaseModel {
     private String areaRegisterId;
     private String streetRegisterId;
 
-    public String getAddressRegister() {
-        return addressRegister;
-    }
-
-    public void setAddressRegister(String addressRegister) {
-        this.addressRegister = addressRegister;
-    }
-
-    public String getProvinceRegisterId() {
-        return provinceRegisterId;
-    }
-
-    public void setProvinceRegisterId(String provinceRegisterId) {
-        this.provinceRegisterId = provinceRegisterId;
-    }
-
-    public String getCityRegisterId() {
-        return cityRegisterId;
-    }
-
-    public void setCityRegisterId(String cityRegisterId) {
-        this.cityRegisterId = cityRegisterId;
-    }
-
-    public String getAreaRegisterId() {
-        return areaRegisterId;
-    }
-
-    public void setAreaRegisterId(String areaRegisterId) {
-        this.areaRegisterId = areaRegisterId;
-    }
-
     /**
      * 社区id
      */
@@ -287,10 +152,12 @@ public class Patients extends BaseModel {
     private Integer crisis;
 
     private String avatar;
-
+    //预产期
     private Date dueDate;
-
+    //末次月经
     private Date lastMenses;
+    //分娩日期
+    private Date fmDate;
 
     @SuppressWarnings("unused")
     private Integer age;
@@ -322,7 +189,7 @@ public class Patients extends BaseModel {
     private Date nextCheckTime;
 
     private Integer patientLevel;
-
+    //最后一次产检医生职工ID
     private String lastCheckEmployeeId;
     //最后一次检查id
     private Integer lastReportId;
@@ -333,7 +200,7 @@ public class Patients extends BaseModel {
     //风险等级颜色
     private String riskLevelId;
     //高危评分值
-    private String riskScore;
+    private Integer riskScore;
     private Integer serviceType;
     private Integer vip;
     //最后一次检查医生名称
@@ -343,6 +210,14 @@ public class Patients extends BaseModel {
     private String husbandPhone;
     private String vcCardNo;
 
+    public Date getFmDate() {
+        return fmDate;
+    }
+
+    public void setFmDate(Date fmDate) {
+        this.fmDate = fmDate;
+    }
+
     public List<String> getFirstRiskFactorId() {
         return firstRiskFactorId;
     }
@@ -366,12 +241,42 @@ public class Patients extends BaseModel {
     public void setRiskLevelId(String riskLevelId) {
         this.riskLevelId = riskLevelId;
     }
+    public String getAddressPostRest() {
+        return addressPostRest;
+    }
+
+    public void setAddressPostRest(String addressPostRest) {
+        this.addressPostRest = addressPostRest;
+    }
 
-    public String getRiskScore() {
+    public String getProvincePostRestId() {
+        return provincePostRestId;
+    }
+
+    public void setProvincePostRestId(String provincePostRestId) {
+        this.provincePostRestId = provincePostRestId;
+    }
+
+    public String getCityPostRestId() {
+        return cityPostRestId;
+    }
+
+    public void setCityPostRestId(String cityPostRestId) {
+        this.cityPostRestId = cityPostRestId;
+    }
+
+    public String getAreaPostRestId() {
+        return areaPostRestId;
+    }
+
+    public void setAreaPostRestId(String areaPostRestId) {
+        this.areaPostRestId = areaPostRestId;
+    }
+    public Integer getRiskScore() {
         return riskScore;
     }
 
-    public void setRiskScore(String riskScore) {
+    public void setRiskScore(Integer riskScore) {
         this.riskScore = riskScore;
     }
 
@@ -395,6 +300,14 @@ public class Patients extends BaseModel {
         return husbandPhone;
     }
 
+    public Integer getBuildType() {
+        return buildType;
+    }
+
+    public void setBuildType(Integer buildType) {
+        this.buildType = buildType;
+    }
+
     public void setHusbandPhone(String husbandPhone) {
         this.husbandPhone = husbandPhone;
     }
@@ -423,6 +336,37 @@ public class Patients extends BaseModel {
         this.lastReportDoctorName = lastReportDoctorName;
     }
 
+    public String getAddressRegister() {
+        return addressRegister;
+    }
+
+    public void setAddressRegister(String addressRegister) {
+        this.addressRegister = addressRegister;
+    }
+
+    public String getProvinceRegisterId() {
+        return provinceRegisterId;
+    }
+
+    public void setProvinceRegisterId(String provinceRegisterId) {
+        this.provinceRegisterId = provinceRegisterId;
+    }
+
+    public String getCityRegisterId() {
+        return cityRegisterId;
+    }
+
+    public void setCityRegisterId(String cityRegisterId) {
+        this.cityRegisterId = cityRegisterId;
+    }
+
+    public String getAreaRegisterId() {
+        return areaRegisterId;
+    }
+
+    public void setAreaRegisterId(String areaRegisterId) {
+        this.areaRegisterId = areaRegisterId;
+    }
     public Integer getLastReportId() {
         return lastReportId;
     }
@@ -431,7 +375,69 @@ public class Patients extends BaseModel {
         this.lastReportId = lastReportId;
     }
 
+    public Integer getDueStatus() {
+        return dueStatus;
+    }
+
+    public void setDueStatus(Integer dueStatus) {
+        this.dueStatus = dueStatus;
+    }
+
+    public String getMremark() {
+        return mremark;
+    }
+
+    public void setMremark(String mremark) {
+        this.mremark = mremark;
+    }
+
+    public Integer getServiceStatus() {
+        return serviceStatus;
+    }
+
+    public void setServiceStatus(Integer serviceStatus) {
+        this.serviceStatus = serviceStatus;
+    }
+
+    public Integer getExpVip() {
+        return expVip;
+    }
 
+    public void setExpVip(Integer expVip) {
+        this.expVip = expVip;
+    }
+
+    public Date getVipEndTime() {
+        return vipEndTime;
+    }
+
+    public void setVipEndTime(Date vipEndTime) {
+        this.vipEndTime = vipEndTime;
+    }
+
+    public String getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(String areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(String cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(String provinceId) {
+        this.provinceId = provinceId;
+    }
 
     public Integer getServiceType() {
         return serviceType;
@@ -676,165 +682,165 @@ public class Patients extends BaseModel {
         this.isVisit = isVisit;
     }
 
-	public String getPcountryId() {
-		return pcountryId;
-	}
+    public String getPcountryId() {
+        return pcountryId;
+    }
 
-	public void setPcountryId(String pcountryId) {
-		this.pcountryId = pcountryId;
-	}
+    public void setPcountryId(String pcountryId) {
+        this.pcountryId = pcountryId;
+    }
 
-	public String getPnationId() {
-		return pnationId;
-	}
+    public String getPnationId() {
+        return pnationId;
+    }
 
-	public void setPnationId(String pnationId) {
-		this.pnationId = pnationId;
-	}
+    public void setPnationId(String pnationId) {
+        this.pnationId = pnationId;
+    }
 
-	public String getPprofessionTypeId() {
-		return pprofessionTypeId;
-	}
+    public String getPprofessionTypeId() {
+        return pprofessionTypeId;
+    }
 
-	public void setPprofessionTypeId(String pprofessionTypeId) {
-		this.pprofessionTypeId = pprofessionTypeId;
-	}
+    public void setPprofessionTypeId(String pprofessionTypeId) {
+        this.pprofessionTypeId = pprofessionTypeId;
+    }
 
-	public String getPcensusTypeId() {
-		return pcensusTypeId;
-	}
+    public String getPcensusTypeId() {
+        return pcensusTypeId;
+    }
 
-	public void setPcensusTypeId(String pcensusTypeId) {
-		this.pcensusTypeId = pcensusTypeId;
-	}
+    public void setPcensusTypeId(String pcensusTypeId) {
+        this.pcensusTypeId = pcensusTypeId;
+    }
 
-	public String getPworkUnit() {
-		return pworkUnit;
-	}
+    public String getPworkUnit() {
+        return pworkUnit;
+    }
 
-	public void setPworkUnit(String pworkUnit) {
-		this.pworkUnit = pworkUnit;
-	}
+    public void setPworkUnit(String pworkUnit) {
+        this.pworkUnit = pworkUnit;
+    }
 
-	public String getPliveTypeId() {
-		return pliveTypeId;
-	}
+    public String getPliveTypeId() {
+        return pliveTypeId;
+    }
 
-	public void setPliveTypeId(String pliveTypeId) {
-		this.pliveTypeId = pliveTypeId;
-	}
+    public void setPliveTypeId(String pliveTypeId) {
+        this.pliveTypeId = pliveTypeId;
+    }
 
-	public String getPcerteTypeId() {
-		return pcerteTypeId;
-	}
+    public String getPcerteTypeId() {
+        return pcerteTypeId;
+    }
 
-	public void setPcerteTypeId(String pcerteTypeId) {
-		this.pcerteTypeId = pcerteTypeId;
-	}
+    public void setPcerteTypeId(String pcerteTypeId) {
+        this.pcerteTypeId = pcerteTypeId;
+    }
 
-	public String getFileCode() {
-		return fileCode;
-	}
+    public String getFileCode() {
+        return fileCode;
+    }
 
-	public void setFileCode(String fileCode) {
-		this.fileCode = fileCode;
-	}
+    public void setFileCode(String fileCode) {
+        this.fileCode = fileCode;
+    }
 
-	public String getBookbuildingDoctor() {
-		return bookbuildingDoctor;
-	}
+    public String getBookbuildingDoctor() {
+        return bookbuildingDoctor;
+    }
 
-	public void setBookbuildingDoctor(String bookbuildingDoctor) {
-		this.bookbuildingDoctor = bookbuildingDoctor;
-	}
+    public void setBookbuildingDoctor(String bookbuildingDoctor) {
+        this.bookbuildingDoctor = bookbuildingDoctor;
+    }
 
-	public Date getBookbuildingDate() {
-		return bookbuildingDate;
-	}
+    public Date getBookbuildingDate() {
+        return bookbuildingDate;
+    }
 
-	public void setBookbuildingDate(Date bookbuildingDate) {
-		this.bookbuildingDate = bookbuildingDate;
-	}
+    public void setBookbuildingDate(Date bookbuildingDate) {
+        this.bookbuildingDate = bookbuildingDate;
+    }
 
-	public String getHcertificateNum() {
-		return hcertificateNum;
-	}
+    public String getHcertificateNum() {
+        return hcertificateNum;
+    }
 
-	public void setHcertificateNum(String hcertificateNum) {
-		this.hcertificateNum = hcertificateNum;
-	}
+    public void setHcertificateNum(String hcertificateNum) {
+        this.hcertificateNum = hcertificateNum;
+    }
 
-	public String getHcertificateTypeId() {
-		return hcertificateTypeId;
-	}
+    public String getHcertificateTypeId() {
+        return hcertificateTypeId;
+    }
 
-	public void setHcertificateTypeId(String hcertificateTypeId) {
-		this.hcertificateTypeId = hcertificateTypeId;
-	}
+    public void setHcertificateTypeId(String hcertificateTypeId) {
+        this.hcertificateTypeId = hcertificateTypeId;
+    }
 
-	public String getHcountryId() {
-		return hcountryId;
-	}
+    public String getHcountryId() {
+        return hcountryId;
+    }
 
-	public void setHcountryId(String hcountryId) {
-		this.hcountryId = hcountryId;
-	}
+    public void setHcountryId(String hcountryId) {
+        this.hcountryId = hcountryId;
+    }
 
-	public String getHnationId() {
-		return hnationId;
-	}
+    public String getHnationId() {
+        return hnationId;
+    }
 
-	public void setHnationId(String hnationId) {
-		this.hnationId = hnationId;
-	}
+    public void setHnationId(String hnationId) {
+        this.hnationId = hnationId;
+    }
 
-	public String getHworkUnit() {
-		return hworkUnit;
-	}
+    public String getHworkUnit() {
+        return hworkUnit;
+    }
 
-	public void setHworkUnit(String hworkUnit) {
-		this.hworkUnit = hworkUnit;
-	}
+    public void setHworkUnit(String hworkUnit) {
+        this.hworkUnit = hworkUnit;
+    }
 
-	public String getHprofessionTypeId() {
-		return hprofessionTypeId;
-	}
+    public String getHprofessionTypeId() {
+        return hprofessionTypeId;
+    }
 
-	public void setHprofessionTypeId(String hprofessionTypeId) {
-		this.hprofessionTypeId = hprofessionTypeId;
-	}
+    public void setHprofessionTypeId(String hprofessionTypeId) {
+        this.hprofessionTypeId = hprofessionTypeId;
+    }
 
-	public String getHaddressRegister() {
-		return haddressRegister;
-	}
+    public String getHaddressRegister() {
+        return haddressRegister;
+    }
 
-	public void setHaddressRegister(String haddressRegister) {
-		this.haddressRegister = haddressRegister;
-	}
+    public void setHaddressRegister(String haddressRegister) {
+        this.haddressRegister = haddressRegister;
+    }
 
-	public String getHprovinceRegisterId() {
-		return hprovinceRegisterId;
-	}
+    public String getHprovinceRegisterId() {
+        return hprovinceRegisterId;
+    }
 
-	public void setHprovinceRegisterId(String hprovinceRegisterId) {
-		this.hprovinceRegisterId = hprovinceRegisterId;
-	}
+    public void setHprovinceRegisterId(String hprovinceRegisterId) {
+        this.hprovinceRegisterId = hprovinceRegisterId;
+    }
 
-	public String getHcityRegisterId() {
-		return hcityRegisterId;
-	}
+    public String getHcityRegisterId() {
+        return hcityRegisterId;
+    }
 
-	public void setHcityRegisterId(String hcityRegisterId) {
-		this.hcityRegisterId = hcityRegisterId;
-	}
+    public void setHcityRegisterId(String hcityRegisterId) {
+        this.hcityRegisterId = hcityRegisterId;
+    }
 
-	public String getHareaRegisterId() {
-		return hareaRegisterId;
-	}
+    public String getHareaRegisterId() {
+        return hareaRegisterId;
+    }
 
-	public void setHareaRegisterId(String hareaRegisterId) {
-		this.hareaRegisterId = hareaRegisterId;
-	}
+    public void setHareaRegisterId(String hareaRegisterId) {
+        this.hareaRegisterId = hareaRegisterId;
+    }
 
     public Integer getHospitalId() {
         return hospitalId;