diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
index 748feca..b260c31 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
@@ -53,6 +53,7 @@ public class BabyEyeCheck {
      * 外眼观察(右)
      */
     private String extRightEyelook;
+    private String extRightEyelookOther;
 
     /**
      * 瞬目反射(右)
@@ -74,6 +75,7 @@ public class BabyEyeCheck {
      * 外眼观察(左)
      */
     private String extLeftEyelook;
+    private String extLeftEyelookOther;
 
     /**
      * 瞬目反射(左)
@@ -214,6 +216,22 @@ public class BabyEyeCheck {
      */
     private String fixationCard;
 
+    public String getExtLeftEyelookOther() {
+        return extLeftEyelookOther;
+    }
+
+    public void setExtLeftEyelookOther(String extLeftEyelookOther) {
+        this.extLeftEyelookOther = extLeftEyelookOther;
+    }
+
+    public String getExtRightEyelookOther() {
+        return extRightEyelookOther;
+    }
+
+    public void setExtRightEyelookOther(String extRightEyelookOther) {
+        this.extRightEyelookOther = extRightEyelookOther;
+    }
+
     public String getOptometry() {
         return optometry;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
index 4eb680d..5482d38 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
@@ -88,10 +88,47 @@ public class BabyEyeCheckServiceImpl  extends BaseServiceImpl implements BabyEye
         Map<String, Object> map = ReflectionUtils.beanToMap(babyEyeCheck);
         map.put("handleOpinionsId", HandleOpinionsEnums.getName(babyEyeCheck.getHandleOpinionsId()));
         map.put("riskFactorId", EyeHighRiskEnums.getName(babyEyeCheck.getRiskFactorId()));
+        map.put("checkMonthId", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId()));
+        map.put("nextCheckMonthId", babyEyeCheck.getNextCheckMonthId());
+        map.put("extRightEyelook", parseYinYang(babyEyeCheck.getExtRightEyelook(), babyEyeCheck.getExtEyelookOther()));
+        map.put("extLeftEyelook", parseYinYang(babyEyeCheck.getExtLeftEyelook(), babyEyeCheck.getExtLeftEyelookOther()));
+        map.put("blinkRightReflex", parseYinYang(babyEyeCheck.getBlinkRightReflex()));
+        map.put("blinkLefttReflex", parseYinYang(babyEyeCheck.getBlinkLefttReflex()));
+        map.put("pupillaryRightReflex", parseYinYang(babyEyeCheck.getPupillaryRightReflex()));
+        map.put("pupillaryLeftReflex", parseYinYang(babyEyeCheck.getPupillaryLeftReflex()));
+        map.put("redRightReflex", parseYinYang(babyEyeCheck.getRedRightReflex()));
+        map.put("redLeftReflex", parseYinYang(babyEyeCheck.getRedLeftReflex()));
+        map.put("redReflex", parseYinYang(babyEyeCheck.getRedReflex(), babyEyeCheck.getRedReflexOther()));
+        map.put("conjunctiva", parseYinYang(babyEyeCheck.getConjunctiva(), babyEyeCheck.getConjunctivaOther()));
+        map.put("corneal", parseYinYang(babyEyeCheck.getCorneal(), babyEyeCheck.getCornealOther()));
+        map.put("lacrimalApparatus", parseYinYang(babyEyeCheck.getLacrimalApparatus(), babyEyeCheck.getLacrimalApparatusOther()));
         CollectionUtils.removeNullValue(map);
         return RespBuilder.buildSuccess(map);
     }
 
+    private String parseYinYang(String s) {
+        return parseYinYang(s, null);
+    }
+
+    private String parseYinYang(String s, String other) {
+        if(StringUtils.isNotEmpty(s)) {
+            if(StringUtils.isNotEmpty(other)) {
+                if("yin".equals(s)) {
+                    return "阴 （" + other + "）";
+                } else if("yang".equals(s)) {
+                    return "阳 （" + other + "）";
+                }
+            } else {
+                if("yin".equals(s)) {
+                    return "阴";
+                } else if("yang".equals(s)) {
+                    return "阳";
+                }
+            }
+        }
+        return "";
+    }
+
     @Override
     public BaseResponse edit(String id) {
         BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class);
@@ -127,9 +164,19 @@ public class BabyEyeCheckServiceImpl  extends BaseServiceImpl implements BabyEye
             Query query = new Query(criteria);
             query.with(new Sort(Sort.Direction.DESC, "checkTime"));
             List<BabyEyeCheck> babyEyeChecks = mongoTemplate.find(query, BabyEyeCheck.class);
+            Integer count = babyEyeChecks.size();
+            doFilter(babyEyeChecks);
+
+            List<BabyEyeCheck> datas = CollectionUtils.getPageIds(babyEyeChecks, page, limit);
+            return RespBuilder.buildSuccess(count, page, limit, setDatas(datas));
         }
         PageResult pageResult = findMongoPage(BabyEyeCheck.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "checkTime")), page, limit);
         List<BabyEyeCheck> babyEyeChecks = (List<BabyEyeCheck>) pageResult.getGrid();
+        pageResult.setGrid(setDatas(babyEyeChecks));
+        return RespBuilder.buildSuccess(pageResult);
+    }
+
+    private List<Map<String, Object>> setDatas(List<BabyEyeCheck> babyEyeChecks) {
         List<Map<String, Object>> restMap = new ArrayList<>();
         for (BabyEyeCheck babyEyeCheck : babyEyeChecks) {
             Map<String, Object> temp = new HashMap<>();
@@ -153,10 +200,28 @@ public class BabyEyeCheckServiceImpl  extends BaseServiceImpl implements BabyEye
                 temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); /** 检查月龄 */;
             }
             CollectionUtils.removeNullValue(temp);
-             restMap.add(temp);
+            restMap.add(temp);
+        }
+        return null;
+    }
+
+    private void doFilter(List<BabyEyeCheck> babyEyeChecks) {
+        for (BabyEyeCheck babyEyeCheck : babyEyeChecks) {
+            if(!"yang".equals(babyEyeCheck.getExtRightEyelook())
+                    || !"yang".equals(babyEyeCheck.getExtLeftEyelook())
+                    || !"yang".equals(babyEyeCheck.getBlinkRightReflex())
+                    || !"yang".equals(babyEyeCheck.getBlinkLefttReflex())
+                    || !"yang".equals(babyEyeCheck.getPupillaryRightReflex())
+                    || !"yang".equals(babyEyeCheck.getPupillaryLeftReflex())
+                    || !"yang".equals(babyEyeCheck.getRedRightReflex())
+                    || !"yang".equals(babyEyeCheck.getRedLeftReflex())
+                    || !"yang".equals(babyEyeCheck.getRedReflex())
+                    || !"yang".equals(babyEyeCheck.getConjunctiva())
+                    || !"yang".equals(babyEyeCheck.getCorneal())
+                    || !"yang".equals(babyEyeCheck.getLacrimalApparatus())) {
+                babyEyeChecks.remove(babyEyeCheck);
+            }
         }
-        pageResult.setGrid(restMap);
-        return RespBuilder.buildSuccess(pageResult);
     }
 
     @Override
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java
index 87c12ff..cfb3bc0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.operate.web.utils;
 
 import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.util.Assert;
 
@@ -36,7 +37,8 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt
             while (iterator.hasNext()) {
                 Map.Entry<String, Object> set = iterator.next();
                 if(set.getValue() == null) {
-                    iterator.remove();
+//                    iterator.remove();
+                    set.setValue("");
                 }
             }
         }