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 0927ea9..b114adb 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
@@ -69,10 +69,12 @@ public class ViewFacade {
         map.put("username", data.getUsername());
         map.put("pcerteType", getBasicConfig(data.getPcerteTypeId()));
         map.put("cardNo", data.getCardNo());
+        map.put("phone", data.getPhone());
+        map.put("pworkUnit", data.getPworkUnit());
         map.put("pcountry", getBasicConfig(data.getPcountryId()));
         map.put("pnation", getBasicConfig(data.getPnationId()));
         map.put("birth", DateUtil.getyyyy_MM_dd(data.getBirth()));
-        map.put("age", DateUtil.getAge(data.getBirth()));
+        map.put("age", UnitUtils.unitSplice(DateUtil.getAge(data.getBirth()),UnitConstants.SUI));
         map.put("pcensusType", getBasicConfig(data.getPcensusTypeId()));
         map.put("pliveType", getBasicConfig(data.getPliveTypeId()));
         map.put("pprofessionType", getBasicConfig(data.getPprofessionTypeId()));
@@ -84,8 +86,8 @@ public class ViewFacade {
                 data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService));
         map.put("register", CommonsHelper.getResidence(data.getProvinceRegisterId(), data.getCityRegisterId(),
                 data.getAreaRegisterId(), data.getStreetRegisterId(), data.getAddressRegister(), basicConfigService));
-        map.put("postRest", CommonsHelper.getResidence(data.getProvinceId(), data.getCityId(),
-                data.getAreaId(), data.getStreetId(), data.getAddress(), basicConfigService));
+        map.put("postRest", CommonsHelper.getResidence(data.getProvincePostRestId(), data.getCityPostRestId(),
+                data.getAreaPostRestId(), data.getStreetPostRestId(), data.getAddressPostRest(), basicConfigService));
 
         /* 丈夫信息 */
         map.put("husbandName", data.getHusbandName());
@@ -167,7 +169,7 @@ 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",DateUtil.getAge(patients.getBirth()));
+        map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI));
         map.put("phone",patients.getPhone());
         map.put("fmWeek",patients.getFmWeek());
         map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
@@ -986,7 +988,7 @@ 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",DateUtil.getAge(patients.getBirth()));
+        map.put("age",UnitUtils.unitSplice(DateUtil.getAge(patients.getBirth()),UnitConstants.SUI));
         map.put("phone",patients.getPhone());
         map.put("fmWeek",patients.getFmWeek());
         map.put("dueDate",DateUtil.getyyyy_MM_dd(patients.getDueDate()));
@@ -1016,13 +1018,69 @@ public class ViewFacade {
         }
 
         map.put("hospitalId", hospitalId);
+        map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(data.getNextCheckTime()));
+        map.put("healthStatus", data.getHealthStatus());
+        map.put("psychology", data.getPsychology());
 
-        String deliverDoctor = "";
+        map.put("weight", UnitUtils.unitSplice(data.getWeight(),UnitConstants.KG));
+        String ssy = "";
+        String szy = "";
+        Map<String, String> chBpMap = JsonUtil.getMap(data.getBp());
+        if (MapUtils.isNotEmpty(chBpMap)) {
+            ssy = chBpMap.get("ssy");
+            szy = chBpMap.get("szy");
+        }
+        map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy,UnitConstants.MMHG));
 
+        map.put("breast", data.getBreast());
+        map.put("lochia", data.getLochia());
+        map.put("vulva", data.getVulva());
+        map.put("vagina", data.getVagina());
+        map.put("cervixUteri", data.getCervixUteri());
+        map.put("matrix", data.getMatrix());
+        map.put("fujian", data.getFujian());
+        map.put("wound", data.getWound());
+        map.put("other", data.getOther());
+
+        map.put("basin", data.getBasin());
+        map.put("traceElement", data.getTraceElement());
+        map.put("boneDensity", data.getBoneDensity());
+        map.put("ultrasonicExamination", data.getUltrasonicExamination());
+
+
+        /*  诊断指导  */
+        String diagnosis = "";
+        if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getDiagnosis())){
+            List<String> temp = JsonUtil.toList(data.getDiagnosis(), String.class);
+            if (CollectionUtils.isNotEmpty(temp)){
 
+                StringBuilder sb = new StringBuilder();
+
+                for (String sId : temp){
+                    sb.append(FunvCommonUtil.getBaseicConfigByid(sId, basicConfigService)).append(",");
+                }
+                if (sb.toString().endsWith(",")) {
+                    diagnosis = sb.substring(0, sb.length() - 1);
+                }else {
+                    diagnosis = sb.toString();
+                }
+            }
+        }else {
+            diagnosis = "-";
+        }
+        map.put("diagnosis",diagnosis);
+        map.put("treatOpinion",data.getTreatOpinion());
+        map.put("dirOpinion",data.getDirOpinion());
+
+        br.setErrorcode(ErrorCodeConstants.SUCCESS);
+        br.setErrormsg("成功");
+        br.setData(map);
         return br;
     }
 
 
 
+
+
+
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java
index 0eb8225..9d97cd5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java
@@ -24,6 +24,7 @@ public class UnitConstants {
     public static final String FEN = " 分";
     public static final String FZ = " 分钟";
     public static final String GE = " 个";
+    public static final String SUI = " 岁";
 
 
 }