diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
index 9df273c..301a7f8 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java
@@ -6,33 +6,45 @@ package com.lyms.platform.common.utils;
  * 详细描述
  * <p>
  * 示例代码
- * 
+ * <p>
  * <pre>
  * </pre>
- * 
+ *
  * @author In_Home
  * @version BME V100R001 2016-3-21
  * @since BME V100R001C40B104
  */
 public final class StringUtils {
 
-
+    public static String dueWeek(int days) {
+        if (days >= 294) {
+            return "已分娩";
+        }
+        int week = (days / 7);
+        String str = "";
+//        if (week > 0) {
+            str = week + "周+";
+//        }
+        int day = (days % 7);
+        return "孕" + str + (day > 0 ? "" + day + "天" : "");
+    }
 
     //体重克算成千克
-    public static String cutBabyWeight(String babyWeight){
-        if(StringUtils.isEmpty(babyWeight)){
+    public static String cutBabyWeight(String babyWeight) {
+        if (StringUtils.isEmpty(babyWeight)) {
             return babyWeight;
         }
-        if(babyWeight.length()<=3){
-            babyWeight = org.apache.commons.lang.StringUtils.leftPad(babyWeight, 4,"0");
+        if (babyWeight.length() <= 3) {
+            babyWeight = org.apache.commons.lang.StringUtils.leftPad(babyWeight, 4, "0");
         }
-        StringBuilder stringBuilder=new StringBuilder(babyWeight);
-        if(babyWeight.length()>2){
-            stringBuilder.setLength(babyWeight.length()-1);
+        StringBuilder stringBuilder = new StringBuilder(babyWeight);
+        if (babyWeight.length() > 2) {
+            stringBuilder.setLength(babyWeight.length() - 1);
         }
-        stringBuilder.insert(stringBuilder.length() - 2,".");
-        return  stringBuilder.toString();
+        stringBuilder.insert(stringBuilder.length() - 2, ".");
+        return stringBuilder.toString();
     }
+
     public static Object isEmpty(Object obj, Object defaultVal) {
         if (null == obj) {
             return defaultVal;
@@ -40,19 +52,15 @@ public final class StringUtils {
         return obj;
     }
 
-    public static boolean isEmpty(String str)
-    {
-        if (str == null || "".equals(str))
-        {
+    public static boolean isEmpty(String str) {
+        if (str == null || "".equals(str)) {
             return true;
         }
         return false;
     }
 
-    public static boolean isNotEmpty(String str)
-    {
-        if (str != null && !"".equals(str))
-        {
+    public static boolean isNotEmpty(String str) {
+        if (str != null && !"".equals(str)) {
             return true;
         }
         return false;
@@ -60,33 +68,27 @@ public final class StringUtils {
 
     /**
      * //+表示1个或多个（如"3"或"225"），*表示0个或多个（[0-9]*）（如""或"1"或"22"），
-     *   ?表示0个或1个([0-9]?)(如""或"7")
+     * ?表示0个或1个([0-9]?)(如""或"7")
+     *
      * @param str
      * @return
      */
-    public static boolean isNum(String str){
-        if(!isEmpty(str)){
+    public static boolean isNum(String str) {
+        if (!isEmpty(str)) {
             return str.matches("[0-9]+");
         }
         return false;
     }
 
-    public static String encryPhone(String phone)
-    {
-        if (isNotEmpty(phone))
-        {
+    public static String encryPhone(String phone) {
+        if (isNotEmpty(phone)) {
             char[] res = new char[11];
-            char[] chars =phone.toCharArray();
-            if (chars != null && chars.length == 11)
-            {
-                for(int i = 0 ; i <chars.length ;i++ )
-                {
-                    if (2 < i && i < 7)
-                    {
+            char[] chars = phone.toCharArray();
+            if (chars != null && chars.length == 11) {
+                for (int i = 0; i < chars.length; i++) {
+                    if (2 < i && i < 7) {
                         res[i] = '*';
-                    }
-                    else
-                    {
+                    } else {
                         res[i] = chars[i];
                     }
                 }
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
index b640e4c..6a702ca 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
@@ -21,6 +21,7 @@ public class ReferralApplyOrderModel {
     private String mname;
     //患者年龄
     private Integer age;
+    private Integer sex;
     //联系方式
     private String phone;
     //生日
@@ -64,6 +65,14 @@ public class ReferralApplyOrderModel {
     //转诊类型   1 儿童 2 孕妇
     private Integer type;
 
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
     public String getMname() {
         return mname;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index 7e9a780..9b866eb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -5,6 +5,7 @@ import com.lyms.platform.biz.service.BabyService;
 import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.biz.service.SieveService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
+import com.lyms.platform.common.enums.SexEnum;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
@@ -87,6 +88,7 @@ public class ApplyOrderFacade {
                 referralApplyOrderModel.setDueDate(patients.getDueDate());
                 referralApplyOrderModel.setName(patients.getUsername());
                 referralApplyOrderModel.setPhone(patients.getPhone());
+                referralApplyOrderModel.setSex(SexEnum.WOMAN.getId());
             }
         }else{
             BabyModel babyModel= babyService.getOneBabyById(referralApplyOrderModel.getParentId());
@@ -102,6 +104,7 @@ public class ApplyOrderFacade {
                 referralApplyOrderModel.setDueDate(babyModel.getDueDate());
                 referralApplyOrderModel.setName(babyModel.getName());
                 referralApplyOrderModel.setPhone(patients.getPhone());
+                referralApplyOrderModel.setSex(babyModel.getSex());
             }
         }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
index 4c01060..07b87fc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
@@ -1,23 +1,21 @@
 package com.lyms.platform.operate.web.result;
 
-import com.lyms.platform.common.base.IBasicResultConvert;
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.AntExChuModel;
 import com.lyms.platform.pojo.AntenatalExaminationModel;
 import com.lyms.platform.pojo.Patients;
-import org.apache.commons.collections.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 /**
- *
  * 产前筛查列表返回对象
- *
+ * <p>
  * Created by Administrator on 2016/6/16 0016.
  */
-public class AntexListResult  {
+public class AntexListResult {
 
     private String id;
     //名字
@@ -147,7 +145,6 @@ public class AntexListResult  {
     }
 
 
-
     public String getRiskScore() {
         return riskScore;
     }
@@ -164,17 +161,17 @@ public class AntexListResult  {
         this.yChanQi = yChanQi;
     }
 
-    public AntexListResult convertToResult(List<AntenatalExaminationModel> destModel,Patients patients,List<AntExChuModel> antExChuModel) {
+    public AntexListResult convertToResult(List<AntenatalExaminationModel> destModel, Patients patients, List<AntExChuModel> antExChuModel) {
         setId(patients.getId());
         try {
-            if(null!=patients.getBirth()){
+            if (null != patients.getBirth()) {
                 setAge(DateUtil.getAge(patients.getBirth()));
                 setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth()));
             }
 
-        }catch (Exception e){
+        } catch (Exception e) {
         }
-        if(null!=patients.getDueDate()){
+        if (null != patients.getDueDate()) {
             setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
         }
         setBuildTime(DateUtil.getyyyy_MM_dd(patients.getCreated()));
@@ -184,14 +181,18 @@ public class AntexListResult  {
         setCardNo(patients.getCardNo());
 
         setVcCardNo(patients.getVcCardNo());
-        int days= DateUtil.daysBetween(patients.getLastMenses(),new Date());
-        String week= (days/7)+"";
-        int day = (days%7);
-        this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
-        if(null!=patients.getLastMenses()){
-            setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
+        if (3 == patients.getType()) {
+            this.dueWeek = "已分娩";
+        } else {
+            if (null != patients.getLastMenses()) {
+                int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
+                this.dueWeek= StringUtils.dueWeek(days);
+            }
         }
 
+        if (null != patients.getLastMenses()) {
+            setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
+        }
         return this;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java
index 0265e32..f495fc7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderInResult.java
@@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.result;
 import com.lyms.platform.common.base.IBasicResultConvert;
 import com.lyms.platform.common.enums.ApplyOrderStatusEnums;
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.ReferralApplyOrderModel;
 
 import java.util.Date;
@@ -178,9 +179,7 @@ public class ApplyOrderInResult implements IBasicResultConvert<ApplyOrderInResul
         setrLevel(destModel.getrLevel());
         if(null!=destModel.getDueDate()){
             int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
-            String week= (days/7)+"";
-            int day = (days%7);
-            this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+            this.dueWeek=StringUtils.dueWeek(days);
         }
         setrRisk(destModel.getrRisk());
         setDueDate(DateUtil.getYmd(destModel.getDueDate()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
index c615dcc..97d201a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
@@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.result;
 import com.lyms.platform.common.base.IBasicResultConvert;
 import com.lyms.platform.common.enums.ApplyOrderStatusEnums;
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.ReferralApplyOrderModel;
 
 import java.util.Date;
@@ -229,9 +230,7 @@ public class ApplyOrderOutResult {
         setrLevel(destModel.getrLevel());
         if(null!=destModel.getDueDate()){
             int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
-            String week= (days/7)+"";
-            int day = (days%7);
-            this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+            this.dueWeek= StringUtils.dueWeek(days);
         }
         setrRisk(destModel.getrRisk());
         setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java
index 2c0fa4a..4e0bd89 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyApplyOrderResult.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.result;
 
+import com.lyms.platform.common.enums.SexEnum;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.ReferralApplyOrderModel;
@@ -76,7 +77,7 @@ public class BabyApplyOrderResult {
         setName(referralApplyOrderModel.getName());
         setBabyId(referralApplyOrderModel.getParentId());
         setmName(referralApplyOrderModel.getMname());
-        setSex("女");
+        setSex(SexEnum.getTextById(referralApplyOrderModel.getSex()));
         setPhone(StringUtils.encryPhone(referralApplyOrderModel.getPhone()));
         setApplyDoctor(referralApplyOrderModel.getApplyDoctor());
         if (null != referralApplyOrderModel.getReceived()) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
index 6a4d9b2..d26bf78 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.operate.web.result;
 
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.AntExChuModel;
 import com.lyms.platform.pojo.AntenatalExaminationModel;
 import com.lyms.platform.pojo.Patients;
@@ -164,9 +165,7 @@ public class PostReviewListResult {
             setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
         }
         int days= DateUtil.daysBetween(patients.getLastMenses(),new Date());
-        String week= (days/7)+"";
-        int day = (days%7);
-        this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+        this.dueWeek= StringUtils.dueWeek(days);
         if(null!=patients.getLastMenses()){
             setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
         }
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 e4775da..6f0387b 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
@@ -153,9 +153,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
         setAge(destModel.getAge());
         if(null!=destModel.getLastMenses()){
             int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date());
-            String week= (days/7)+"";
-            int day = (days%7);
-            this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+            this.dueWeek=StringUtils.dueWeek(days);
         }
 
         setrLevel(destModel.getRiskLevelId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
index df53acd..f723811 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.operate.web.result;
 
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.ReferralApplyOrderModel;
 
@@ -232,9 +233,7 @@ public class ReferralApplyOrderResult {
         setAge(destModel.getAge());
         if(null!=destModel.getDueDate()){
             int days= DateUtil.daysBetween(new Date(),destModel.getDueDate());
-            String week= (days/7)+"";
-            int day = (days%7);
-            this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+            this.dueWeek=StringUtils.dueWeek(days);
         }
 
         setCardNo(destModel.getCardNo());
@@ -258,9 +257,7 @@ public class ReferralApplyOrderResult {
                 setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
             }
             int days= DateUtil.daysBetween(patients.getLastMenses(),new Date());
-            String week= (days/7)+"";
-            int day = (days%7);
-            this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+            this.dueWeek=StringUtils.dueWeek(days);
             if(null!=patients.getLastMenses()){
                 setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
             }
@@ -271,7 +268,6 @@ public class ReferralApplyOrderResult {
             }catch (Exception e){
             }
         }
-
         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 f2d9b40..a536b79 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
@@ -175,9 +175,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
         setCheckDoctor(destModel.getLastReportDoctorName());
         if(null!=destModel.getLastMenses()){
             int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date());
-            String week= (days/7)+"";
-            int day = (days%7);
-            this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+            this.dueWeek=StringUtils.dueWeek(days);
         }
         setlName(destModel.getPublishName());
         setPid(destModel.getPid());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java
index 1961841..8c37b1d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveApplyOrderResult.java
@@ -120,9 +120,7 @@ public class SieveApplyOrderResult  {
         setRiskScore("60");
 
         int days= DateUtil.daysBetween(patients.getLastMenses(),new Date());
-        String week= (days/7)+"";
-        int day = (days%7);
-        this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+        this.dueWeek= com.lyms.platform.common.utils.StringUtils.dueWeek(days);
         if(null!=patients.getLastMenses()){
             setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
index 6ba7004..c6d10f8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
@@ -6,6 +6,7 @@ import com.lyms.platform.common.enums.RenShenJieJuEnums;
 import com.lyms.platform.common.enums.SieveEnums;
 import com.lyms.platform.common.enums.TaiShuEnums;
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.SieveModel;
 
 import java.util.Date;
@@ -154,9 +155,7 @@ public class SieveListResult implements IBasicResultConvert<SieveListResult, Sie
         setName(destModel.getName());
         if(null!=destModel.getLastMenses()){
             int days= DateUtil.daysBetween(destModel.getLastMenses(), new Date());
-            String week= (days/7)+"";
-            int day = (days%7);
-            this.cDueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+            this.cDueWeek= StringUtils.dueWeek(days);
         }
         if(null!=destModel.getTireNumber()){
             setTireNumber(TaiShuEnums.getTitle(destModel.getTireNumber() + ""));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java
index d726d0c..ff645ad 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.operate.web.result;
 
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.SieveResultModel;
 
@@ -198,14 +199,10 @@ public class SieveResult {
         setRiskScore("60");
 
         int days= DateUtil.daysBetween(patients.getLastMenses(),new Date());
-        String week= (days/7)+"";
-        int day = (days%7);
-        this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":"");
+        this.dueWeek= StringUtils.dueWeek(days);
         if(null!=patients.getLastMenses()){
             setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
         }
-
-
         setParentId(sieveResultModel.getParentId());
         setId(sieveResultModel.getId());
         setCspj(sieveResultModel.getCspj());