diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 8712e2b..0ba7c94 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -364,7 +364,15 @@ public class ViewFacade {
         map.put("prodTime", UnitUtils.unitSplice(data.getProdTime(),UnitConstants.CI));
         map.put("delivery", UnitUtils.unitSplice(data.getDelivery(),UnitConstants.CI));
         map.put("planedProd", UnitUtils.unitSplice(data.getPlanedProd(),UnitConstants.CI));
-        map.put("abortion", UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI));
+        //流产
+        String abortion = "";
+        abortion = UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) == null ? "" : (UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) + "  (自然:" + data.getAbortionZR() + UnitConstants.CI + "  人工:" +
+                data.getAbortionRG() + UnitConstants.CI + ")");
+        map.put("abortion", abortion);
+
+        /*map.put("abortion", UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) + "  (自然:" + data.getAbortionZR() + UnitConstants.CI + "  人工:" +
+        data.getAbortionRG() + UnitConstants.CI);*/
+
         map.put("stillbirth", UnitUtils.unitSplice(data.getStillbirth(),UnitConstants.CI));
         map.put("stillChan", UnitUtils.unitSplice(data.getStillChan(),UnitConstants.CI));
         map.put("neoDeath", UnitUtils.unitSplice(data.getNeoDeath(),UnitConstants.CI));
@@ -579,13 +587,15 @@ public class ViewFacade {
         map.put("id",data.getId());
         map.put("username",patients.getUsername());
         map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth()));
-        map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI));
+        map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()), UnitConstants.SUI));
         map.put("phone",patients.getPhone());
-        map.put("fmWeek",patients.getFmWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(patients.getFmWeek()));
+        map.put("fmWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(), new Date()));
         map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
         map.put("mremark",patients.getMremark());
 
-        getRisk(data.getRiskFactor(),data.getOtherRisk(),map);
+        map.put("barCode",data.getBarCode());
+
+        getRisk(data.getRiskFactor(), data.getOtherRisk(), map);
 
         //产检基本信息
         map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckDate()));
@@ -610,7 +620,8 @@ public class ViewFacade {
         }
         map.put("hospital", hospital);
         map.put("nextCheckTime",DateUtil.getyyyy_MM_dd(data.getNextCheckTime()));
-        map.put("cDueWeek", data.getcDueWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(Integer.parseInt(data.getcDueWeek())));
+        map.put("cDueWeek",ResolveUtils.getPregnancyWeek(patients.getLastMenses(),data.getCheckDate()));
+//        map.put("cDueWeek", data.getcDueWeek()==null ? "": com.lyms.platform.common.utils.StringUtils.dueWeek(Integer.parseInt(data.getcDueWeek())));
 
         /*  复诊信息  */
         map.put("chiefComplaint", data.getChiefComplaint());
@@ -660,7 +671,7 @@ public class ViewFacade {
         /*  辅助信息  */
         map.put("hemoglobin", UnitUtils.unitSplice(data.getHemoglobin(), UnitConstants.GL));
         map.put("urineProtein",data.getUrineProtein());
-        map.put("bloodSugar", UnitUtils.unitSplice(data.getUrineProtein(), UnitConstants.MMOLL));
+        map.put("bloodSugar", UnitUtils.unitSplice(data.getBloodSugar(), UnitConstants.MMOLL));
         map.put("bChao",data.getbChao());
 
         /*  诊断指导  */
@@ -1361,6 +1372,4 @@ public class ViewFacade {
         return br;
     }
 
-
-
 }