diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
index e6253d1..a60c16a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
@@ -19,6 +19,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import sun.jdbc.odbc.OdbcDef;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -253,13 +254,18 @@ public class AntenatalExaminationController extends BaseController {
 
     //查询初诊接口
 
-    //查询复诊接口
+    /**
+     * 查询复诊接口
+     * @param id
+     * @param request
+     * @return
+     */
     @RequestMapping(method = RequestMethod.GET, value = "/findAntenatalExamination")
-//    @TokenRequired
+    @TokenRequired
     public BaseResponse findAntenatalExamination(@RequestParam("id")String id,
                                                  HttpServletRequest request){
 
-        return null;
+        return antExRecordFacade.findAntenatalExamination(id);
     }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
index a7d0df9..ab27943 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
@@ -17,6 +17,7 @@ import com.lyms.platform.operate.web.result.HighScoreResult;
 import com.lyms.platform.operate.web.utils.CommonsHelper;
 import com.lyms.platform.operate.web.utils.FunvCommonUtil;
 import com.lyms.platform.operate.web.utils.UnitConstants;
+import com.lyms.platform.operate.web.utils.UnitUtils;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.model.OrganizationQuery;
 import com.lyms.platform.permission.model.Users;
@@ -26,10 +27,8 @@ import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.*;
 import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletResponse;
@@ -635,7 +634,7 @@ public class AntExRecordFacade {
 
         /*  复诊信息  */
         map.put("chiefComplaint", data.getChiefComplaint());
-        map.put("weight", unitSplice(data.getWeight(),UnitConstants.KG));
+        map.put("weight", UnitUtils.unitSplice(data.getWeight(), UnitConstants.KG));
         // 血压
         String ssy = "";
         String szy = "";
@@ -644,10 +643,19 @@ public class AntExRecordFacade {
             ssy = chBpMap.get("ssy");
             szy = chBpMap.get("szy");
         }
-        map.put("bp", unitSplice(ssy + "/" + szy , UnitConstants.MMHG));
-        map.put("gongGao", unitSplice(data.getGongGao(),UnitConstants.CM));
-        map.put("abdominalCircumference", unitSplice(data.getAbdominalCircumference(),UnitConstants.CM));
-        map.put("edema","");
+        map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG));
+        map.put("gongGao", UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM));
+        map.put("abdominalCircumference", UnitUtils.unitSplice(data.getAbdominalCircumference(), UnitConstants.CM));
+        String edema = "";
+        if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())){
+            for (FuZhongEnums fuZhongEnums:FuZhongEnums.values()){
+                if (data.getEdema().equals(fuZhongEnums.getId())){
+                    edema = fuZhongEnums.getName();
+                }
+            }
+        }
+        map.put("edema",edema);
+
         map.put("tireNumber", TaiShuEnums.getTitle(data.getTireNumber()));
         //胎儿情况
         List<Map> tireList = new ArrayList<>();
@@ -660,7 +668,7 @@ public class AntExRecordFacade {
                 String join = tire.get("join");
 
                 Map<String,Object> tireMap = new HashMap<>();
-                tireMap.put("heartRate",unitSplice(heartRate,UnitConstants.CIFEN));
+                tireMap.put("heartRate",UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN));
                 tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition));
                 tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation));
                 tireMap.put("join", JoinEnums.getTitle(join));
@@ -670,10 +678,10 @@ public class AntExRecordFacade {
         map.put("tireData",tireList);
 
         /*  辅助信息  */
-        map.put("hemoglobin",unitSplice(data.getHemoglobin(),UnitConstants.GL));
+        map.put("hemoglobin", UnitUtils.unitSplice(data.getHemoglobin(), UnitConstants.GL));
         map.put("urineProtein",data.getUrineProtein());
-        map.put("bloodSugar",unitSplice(data.getUrineProtein(),UnitConstants.MMOLL));
-        map.put("bChao",data.getbChao());//TODO ?????
+        map.put("bloodSugar", UnitUtils.unitSplice(data.getUrineProtein(), UnitConstants.MMOLL));
+        map.put("bChao",data.getbChao());
 
         /*  诊断指导  */
         String diagnosis = "";
@@ -694,7 +702,8 @@ public class AntExRecordFacade {
             }
         }
         map.put("diagnosis",diagnosis);
-
+        map.put("treatmentOpinion",data.getTreatmentOpinion());
+        map.put("guide",data.getGuide());
 
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
@@ -702,13 +711,7 @@ public class AntExRecordFacade {
         return br;
     }
 
-    //拼接单位
-    public String unitSplice(Object data,String unit){
-        if (data==null){
-            return null;
-        }
-        return data.toString() + unit;
-    }
+
 
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitUtils.java
new file mode 100644
index 0000000..83389d9
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitUtils.java
@@ -0,0 +1,21 @@
+package com.lyms.platform.operate.web.utils;
+
+/**
+ * Created by Administrator on 2017/1/11 0011.
+ */
+public class UnitUtils {
+
+    /**
+     * 拼接单位
+     * @param data
+     * @param unit
+     * @return
+     */
+    public static String unitSplice(Object data,String unit){
+        if (data==null){
+            return null;
+        }
+        return data.toString() + unit;
+    }
+
+}