diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
index c76dde4..092d9e6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
@@ -13,7 +13,7 @@ import java.util.Date;
  * Created by Administrator on 2016/6/23 0023.
  */
 public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patients> {
-    public static final String SPIT="-";
+    public static final String SPIT = "-";
     private String id;
     //名称
     private String name;
@@ -24,10 +24,10 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     //产后时间
     private String cTime;
     //产检次数
-    private int cTimes=0;
+    private int cTimes = 0;
 
     //产检次数
-    private int cHTimes=0;
+    private int cHTimes = 0;
 
     //产检医生
     private String checkDoctor;
@@ -68,6 +68,10 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     //建档号
     private String fileCode;
 
+    //建档孕周
+    private String createdWeek;
+
+
     /*********唐山滦县导出产妇健康管理增加字段********/
     private String lastMenses;
     private int cjTimes;
@@ -80,6 +84,14 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     private String chfs;
     private String chfc;
 
+    public String getCreatedWeek() {
+        return createdWeek;
+    }
+
+    public void setCreatedWeek(String createdWeek) {
+        this.createdWeek = createdWeek;
+    }
+
     public String getLastMenses() {
         return lastMenses;
     }
@@ -161,7 +173,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getFileCode() {
-        if(null==fileCode){
+        if (null == fileCode) {
             return SPIT;
         }
         return fileCode;
@@ -172,7 +184,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getTireNumber() {
-        if(StringUtils.isEmpty(tireNumber)){
+        if (StringUtils.isEmpty(tireNumber)) {
             return SPIT;
         }
         return tireNumber;
@@ -191,7 +203,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getbTime() {
-        if(StringUtils.isEmpty(bTime)){
+        if (StringUtils.isEmpty(bTime)) {
             return SPIT;
         }
 
@@ -203,7 +215,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getRegisterAddr() {
-        if(StringUtils.isEmpty(registerAddr)){
+        if (StringUtils.isEmpty(registerAddr)) {
             return SPIT;
         }
         return registerAddr;
@@ -214,7 +226,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getAddr() {
-        if(StringUtils.isEmpty(addr)){
+        if (StringUtils.isEmpty(addr)) {
             return SPIT;
         }
         return addr;
@@ -225,7 +237,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getFirstBH() {
-        if(StringUtils.isEmpty(firstBH)){
+        if (StringUtils.isEmpty(firstBH)) {
             return SPIT;
         }
         return firstBH;
@@ -236,7 +248,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getfCh() {
-        if(StringUtils.isEmpty(fCh)){
+        if (StringUtils.isEmpty(fCh)) {
             return SPIT;
         }
         return fCh;
@@ -296,7 +308,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
 
     public String getNextCheckTime() {
 
-        if(org.apache.commons.lang.StringUtils.isEmpty(nextCheckTime)){
+        if (org.apache.commons.lang.StringUtils.isEmpty(nextCheckTime)) {
             return SPIT;
         }
         return nextCheckTime;
@@ -315,7 +327,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getCheckDoctor() {
-        if(null==checkDoctor){
+        if (null == checkDoctor) {
             return SPIT;
         }
         return checkDoctor;
@@ -326,7 +338,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getcTime() {
-        if(org.apache.commons.lang.StringUtils.isEmpty(cTime)){
+        if (org.apache.commons.lang.StringUtils.isEmpty(cTime)) {
             return SPIT;
         }
         return cTime;
@@ -346,7 +358,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
 
 
     public String getDueWeek() {
-        if(null==dueWeek){
+        if (null == dueWeek) {
             return SPIT;
         }
         return dueWeek;
@@ -366,9 +378,10 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
 
     public String getlName() {
 
-        if(null==lName){
+        if (null == lName) {
             return SPIT;
-        }return lName;
+        }
+        return lName;
     }
 
     public void setlName(String lName) {
@@ -376,7 +389,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getName() {
-        if(null==name){
+        if (null == name) {
             return SPIT;
         }
         return name;
@@ -397,35 +410,36 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     @Override
     public QuanChanResult convertToResult(Patients destModel) {
         setId(destModel.getId());
-        setAge(DateUtil.getAge(destModel.getBirth(),destModel.getFmDate()));
+        setAge(DateUtil.getAge(destModel.getBirth(), destModel.getFmDate()));
         setName(destModel.getUsername());
         setRealPhone(destModel.getPhone());
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
+        setCreatedWeek(DateUtil.getWeek(destModel.getLastMenses(), destModel.getCreated()) + "周");
 
         setFileCode(destModel.getFileCode());
         if (null != destModel.getFmDate()) {
             Integer dueStatus = destModel.getDueStatus();
-            if(null==dueStatus){
+            if (null == dueStatus) {
                 setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate()));
-            }else if(1==dueStatus){
+            } else if (1 == dueStatus) {
                 setDueWeek("终止妊娠");
-            }else{
+            } else {
                 setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate()));
             }
-            if(null!=destModel.getDueStatus() &&1 ==destModel.getDueStatus()){
+            if (null != destModel.getDueStatus() && 1 == destModel.getDueStatus()) {
                 setcTime("终止妊娠");
-            }else{
+            } else {
                 setcTime(DateUtil.daysBetween(destModel.getFmDate(), new Date()) + "天");
             }
         }
 //        全部产妇管理-如果当前孕妇已终止妊娠则分娩日期显示为“终止妊娠” 2、全部产妇管理-如果当前孕妇自动分娩则分娩日期显示为“-”
-        if(null!=destModel.getBuildType() &&2==destModel.getBuildType()){
+        if (null != destModel.getBuildType() && 2 == destModel.getBuildType()) {
             setDueWeek("-");
         }
-        if(null!=destModel.getServiceType()){
+        if (null != destModel.getServiceType()) {
             setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
         }
-        if(null!=destModel.getServiceStatus()){
+        if (null != destModel.getServiceStatus()) {
             setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
         }
         setPid(destModel.getPid());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
index 6d5e238..3a54f0c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
@@ -14,11 +14,11 @@ import java.util.Map;
 
 /**
  * 全部孕妇管理
- *
+ * <p>
  * Created by Administrator on 2016/6/23 0023.
  */
-public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResult, Patients> {
-    public static final String SPIT="-";
+public class QuanPatientsResult implements IBasicResultConvert<QuanPatientsResult, Patients> {
+    public static final String SPIT = "-";
     private String id;
     //名称
     private String name;
@@ -72,6 +72,9 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     //建档号
     private String fileCode;
 
+    private String createdWeek;
+
+
     /******唐山滦县导出增加字段*******/
     private String lastMenses;//末次月经
     private String yi;
@@ -80,6 +83,13 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     private String si;
     private String wu;
 
+    public String getCreatedWeek() {
+        return createdWeek;
+    }
+
+    public void setCreatedWeek(String createdWeek) {
+        this.createdWeek = createdWeek;
+    }
 
     public String getLastMenses() {
         return lastMenses;
@@ -130,7 +140,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getFileCode() {
-        if(null==fileCode){
+        if (null == fileCode) {
             return SPIT;
         }
         return fileCode;
@@ -141,7 +151,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getbTime() {
-        if(StringUtils.isEmpty(bTime)){
+        if (StringUtils.isEmpty(bTime)) {
             return SPIT;
         }
 
@@ -153,7 +163,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getRegisterAddr() {
-        if(StringUtils.isEmpty(registerAddr)){
+        if (StringUtils.isEmpty(registerAddr)) {
             return SPIT;
         }
         return registerAddr;
@@ -165,7 +175,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
 
     public String getAddr() {
 
-        if(StringUtils.isEmpty(addr)){
+        if (StringUtils.isEmpty(addr)) {
             return SPIT;
         }
         return addr;
@@ -177,7 +187,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
 
     public String getFirstBH() {
 
-        if(StringUtils.isEmpty(firstBH)){
+        if (StringUtils.isEmpty(firstBH)) {
             return SPIT;
         }
         return firstBH;
@@ -188,7 +198,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getCurrentCh() {
-        if(StringUtils.isEmpty(currentCh)){
+        if (StringUtils.isEmpty(currentCh)) {
             return SPIT;
         }
         return currentCh;
@@ -255,9 +265,9 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getCheckDoctor() {
-            if(null==checkDoctor){
-                return SPIT;
-            }
+        if (null == checkDoctor) {
+            return SPIT;
+        }
         return checkDoctor;
     }
 
@@ -267,7 +277,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
 
     public String getcTime() {
 
-        if(org.apache.commons.lang.StringUtils.isEmpty(cTime)){
+        if (org.apache.commons.lang.StringUtils.isEmpty(cTime)) {
             return SPIT;
         }
         return cTime;
@@ -287,9 +297,10 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
 
     public String getDueDate() {
 
-        if(null==dueDate){
+        if (null == dueDate) {
             return SPIT;
-        }return dueDate;
+        }
+        return dueDate;
     }
 
     public void setDueDate(String dueDate) {
@@ -297,7 +308,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getDueWeek() {
-        if(null==dueWeek){
+        if (null == dueWeek) {
             return SPIT;
         }
         return dueWeek;
@@ -317,7 +328,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
 
     public String getlName() {
 
-        if(null==lName){
+        if (null == lName) {
             return SPIT;
         }
         return lName;
@@ -328,7 +339,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getName() {
-        if(null==name){
+        if (null == name) {
             return SPIT;
         }
         return name;
@@ -355,7 +366,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getServiceType() {
-        if(org.apache.commons.lang.StringUtils.isEmpty(serviceType)){
+        if (org.apache.commons.lang.StringUtils.isEmpty(serviceType)) {
             return SPIT;
         }
         return serviceType;
@@ -370,17 +381,18 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
         setId(destModel.getId());
         setName(destModel.getUsername());
         setAge(destModel.getAge());
-        if(null!=destModel.getLastMenses()){
-            int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date());
-            this.dueWeek=StringUtils.dueWeek(days);
+        setCreatedWeek(DateUtil.getWeek(destModel.getLastMenses(), destModel.getCreated()) + "周");
+        if (null != destModel.getLastMenses()) {
+            int days = DateUtil.daysBetween(destModel.getLastMenses(), new Date());
+            this.dueWeek = StringUtils.dueWeek(days);
             setLastMenses(DateUtil.getyyyy_MM_dd(destModel.getLastMenses()));
         }
         setRealPhone(destModel.getPhone());
 //        setrLevel(destModel.getRiskLevelId());
-        if(null!=destModel.getNextCheckTime()) {
+        if (null != destModel.getNextCheckTime()) {
             setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
         }
-        if(null!=destModel.getDueDate()){
+        if (null != destModel.getDueDate()) {
             setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
         }
         setFileCode(destModel.getFileCode());
@@ -388,10 +400,10 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
         setCheckDoctor(destModel.getLastReportDoctorName());
         setlName(destModel.getPublishName());
-        if(null!=destModel.getServiceType()){
+        if (null != destModel.getServiceType()) {
             setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
         }
-        if(null!=destModel.getServiceStatus()){
+        if (null != destModel.getServiceStatus()) {
             setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
         }
         return this;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
index 9b63617..4c5153c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
@@ -18,7 +18,7 @@ import java.util.Map;
  * Created by Administrator on 2016/6/22 0022.
  */
 public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResult, Patients> {
-    public static final String SPIT="-";
+    public static final String SPIT = "-";
 
     //孕妇
     private String id;
@@ -39,7 +39,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     //产检次数
     private int cTimes;
     //本院产检次数
-    private  int cHTimes;
+    private int cHTimes;
     //预产期
     private String dueDate;
     //产检医生
@@ -55,6 +55,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     public void setPid(String pid) {
         this.pid = pid;
     }
+
     @JsonIgnore
     private String realPhone;
     //联系方式
@@ -81,8 +82,19 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     //建档号
     private String fileCode;
 
+    //建档孕周
+    private String createdWeek;
+
+    public String getCreatedWeek() {
+        return createdWeek;
+    }
+
+    public void setCreatedWeek(String createdWeek) {
+        this.createdWeek = createdWeek;
+    }
+
     public String getScreenResult() {
-        if(org.apache.commons.lang.StringUtils.isEmpty(screenResult)){
+        if (org.apache.commons.lang.StringUtils.isEmpty(screenResult)) {
             return SPIT;
         }
         return screenResult;
@@ -93,7 +105,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getFileCode() {
-        if(null==fileCode){
+        if (null == fileCode) {
             return SPIT;
         }
         return fileCode;
@@ -102,8 +114,9 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     public void setFileCode(String fileCode) {
         this.fileCode = fileCode;
     }
+
     public String getbTime() {
-        if(StringUtils.isEmpty(bTime)){
+        if (StringUtils.isEmpty(bTime)) {
             return SPIT;
         }
         return bTime;
@@ -115,7 +128,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
 
     public String getRegisterAddr() {
 
-        if(StringUtils.isEmpty(registerAddr)){
+        if (StringUtils.isEmpty(registerAddr)) {
             return SPIT;
         }
         return registerAddr;
@@ -127,7 +140,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
 
     public String getAddr() {
 
-        if(StringUtils.isEmpty(addr)){
+        if (StringUtils.isEmpty(addr)) {
             return SPIT;
         }
         return addr;
@@ -139,7 +152,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
 
     public String getFirstBH() {
 
-        if(StringUtils.isEmpty(firstBH)){
+        if (StringUtils.isEmpty(firstBH)) {
             return SPIT;
         }
         return firstBH;
@@ -151,7 +164,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
 
     public String getCurrentCh() {
 
-        if(StringUtils.isEmpty(currentCh)){
+        if (StringUtils.isEmpty(currentCh)) {
             return SPIT;
         }
         return currentCh;
@@ -186,7 +199,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getAge() {
-        if(null==age){
+        if (null == age) {
             return SPIT;
         }
         return age;
@@ -213,7 +226,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getcTime() {
-        if(null==cTime){
+        if (null == cTime) {
             return SPIT;
         }
 
@@ -225,7 +238,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getDueWeek() {
-        if(null==dueWeek){
+        if (null == dueWeek) {
             return SPIT;
         }
         return dueWeek;
@@ -236,7 +249,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public Integer gethScore() {
-        if(null==hScore){
+        if (null == hScore) {
             return 0;
         }
         return hScore;
@@ -256,7 +269,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
 
     public String getPhone() {
 
-        if(null==phone){
+        if (null == phone) {
             return SPIT;
         }
         return phone;
@@ -267,7 +280,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getrFactor() {
-        if(org.apache.commons.lang.StringUtils.isEmpty(rFactor)){
+        if (org.apache.commons.lang.StringUtils.isEmpty(rFactor)) {
             return SPIT;
         }
         return rFactor;
@@ -287,7 +300,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
 
     public String getCheckDoctor() {
 
-        if(null==checkDoctor){
+        if (null == checkDoctor) {
             return SPIT;
         }
         return checkDoctor;
@@ -307,7 +320,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
 
     public String getDueDate() {
 
-        if(null==dueDate){
+        if (null == dueDate) {
             return SPIT;
         }
         return dueDate;
@@ -318,7 +331,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getlName() {
-        if(null==lName){
+        if (null == lName) {
             return SPIT;
         }
         return lName;
@@ -333,8 +346,8 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
         setId(destModel.getId());
         setName(destModel.getUsername());
         Integer age = destModel.getAge();
-        if(null!=age){
-            setAge(age+"");
+        if (null != age) {
+            setAge(age + "");
         }
         setFileCode(destModel.getFileCode());
         setRealPhone(destModel.getPhone());
@@ -343,23 +356,24 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
         setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
         setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
+        setCreatedWeek(DateUtil.getWeek(destModel.getLastMenses(), destModel.getCreated()) + "周");
         if (null != destModel.getDueStatus() && 1 == destModel.getDueStatus()) {
             this.dueWeek = "终止妊娠";
         } else if (3 == destModel.getType()) {
             this.dueWeek = "已分娩";
         } else {
-            if(null!=destModel.getLastMenses()){
-                int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date());
-                this.dueWeek=StringUtils.dueWeek(days);
+            if (null != destModel.getLastMenses()) {
+                int days = DateUtil.daysBetween(destModel.getLastMenses(), new Date());
+                this.dueWeek = StringUtils.dueWeek(days);
             }
         }
 
         setPid(destModel.getPid());
 
-        if(null!=destModel.getServiceType()){
+        if (null != destModel.getServiceType()) {
             setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
         }
-        if(null!=destModel.getServiceStatus()){
+        if (null != destModel.getServiceStatus()) {
             setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
         }
         return this;