diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
index d1816d9..35bcfb9 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
@@ -1076,4 +1076,12 @@ public class DateUtil {
         return calendar.get(Calendar.YEAR);
     }
 
+    /**
+     * 获取从现在到xx月之后的时间
+     * @param currentMonthStart
+     * @return
+     */
+    public static Date getMonthDate(Integer currentMonthStart) {
+        return null;
+    }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
index c2bb048..e95f207 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
@@ -75,7 +75,7 @@ public class BabyEyeCheckController extends BaseController {
      * @param endDate
      * @param doctor
      * @param key 姓名/联系方式/就诊卡
-     * @param currentMonth 当前月龄
+     * @param currentMonthStart/currentMonthEnd 当前月龄范围
      * @param chechMonth 检查月龄
      * @param positive  是否是阳性
      * @param page
@@ -86,8 +86,8 @@ public class BabyEyeCheckController extends BaseController {
     @ResponseBody
     @TokenRequired
     @RequestMapping(method = RequestMethod.GET)
-    public BaseResponse list(Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request) {
-        return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, currentMonth, chechMonth, positive, positiveIds, page, limit);
+    public BaseResponse list(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request) {
+        return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit);
     }
 
     @ResponseBody
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java
index d5d6b1e..ddd3ec8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java
@@ -21,7 +21,7 @@ public interface BabyEyeCheckService extends IBaseService {
 
     BaseResponse delete(String id);
 
-    BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit);
+    BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit);
 
     BaseResponse query(Integer userId, String babyId);
 
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 98a7354..99d4d00 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
@@ -135,7 +135,7 @@ public class BabyEyeCheckServiceImpl  extends BaseServiceImpl implements BabyEye
             if(refractometer.length() != 0) {
                 refractometer.append(" ");
             }
-            refractometer.append("R:DC( ").append(babyEyeCheck.getR2()).append(  " )");
+            refractometer.append("R:DC( ").append(babyEyeCheck.getR2()).append(  " ) D");
         }
         boolean flag = false;
         if(StringUtils.isNotEmpty(babyEyeCheck.getL1())) {
@@ -151,7 +151,7 @@ public class BabyEyeCheckServiceImpl  extends BaseServiceImpl implements BabyEye
                     refractometer.append(", ");
                 }
             }
-            refractometer.append("L:DC( ").append(babyEyeCheck.getL2()).append(  " )");
+            refractometer.append("L:DC( ").append(babyEyeCheck.getL2()).append(  " ) D");
         }
         map.put("refractometer", refractometer.toString());
 
@@ -163,7 +163,7 @@ public class BabyEyeCheckServiceImpl  extends BaseServiceImpl implements BabyEye
             if(refraction.length() != 0) {
                 refraction.append(" ");
             }
-            refraction.append("R:DC( ").append(babyEyeCheck.getRefractionR2()).append(  " )");
+            refraction.append("R:DC( ").append(babyEyeCheck.getRefractionR2()).append(  " ) D");
         }
         boolean flag2 = false;
         if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionL1())) {
@@ -179,7 +179,7 @@ public class BabyEyeCheckServiceImpl  extends BaseServiceImpl implements BabyEye
                     refraction.append(", ");
                 }
             }
-            refraction.append("L:DC( ").append(babyEyeCheck.getRefractionL2()).append(  " )");
+            refraction.append("L:DC( ").append(babyEyeCheck.getRefractionL2()).append(  " ) D");
         }
         map.put("refraction", refraction.toString());
 
@@ -195,7 +195,7 @@ public class BabyEyeCheckServiceImpl  extends BaseServiceImpl implements BabyEye
         map.put("pupillaryRightReflex", parseYinYang(babyEyeCheck.getPupillaryRightReflex()));
         map.put("pupillaryLeftReflex", parseYinYang(babyEyeCheck.getPupillaryLeftReflex()));
         map.put("redRightReflex", parseYinYang(babyEyeCheck.getRedRightReflex()));
-        map.put("eyePositionId", EyePositionEnums.getName(babyEyeCheck.getEyePositionId()) + (StringUtils.isNotEmpty(babyEyeCheck.getEyePositionOther()) ? "：" + babyEyeCheck.getEyePositionOther() : ""));
+        map.put("eyePositionId", StringUtils.isNotEmpty(EyePositionEnums.getName(babyEyeCheck.getEyePositionId())) ? EyePositionEnums.getName(babyEyeCheck.getEyePositionId()) : "" + (StringUtils.isNotEmpty(babyEyeCheck.getEyePositionOther()) ? "：" + babyEyeCheck.getEyePositionOther() : ""));
         map.put("redLeftReflex", parseYinYang(babyEyeCheck.getRedLeftReflex()));
         map.put("redReflex", parseYinYang(babyEyeCheck.getRedReflex(), babyEyeCheck.getRedReflexOther()));
         map.put("conjunctiva", parseYinYang(babyEyeCheck.getConjunctiva(), babyEyeCheck.getConjunctivaOther()));
@@ -261,7 +261,7 @@ public class BabyEyeCheckServiceImpl  extends BaseServiceImpl implements BabyEye
     }
 
     @Override
-    public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit) {
+    public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit) {
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
         if(startDate != null && endDate != null) {
@@ -273,10 +273,10 @@ public class BabyEyeCheckServiceImpl  extends BaseServiceImpl implements BabyEye
         if(StringUtils.isNotEmpty(chechMonth)) {
             criteria.and("checkMonthId").is(chechMonth);
         }
-        if(StringUtils.isNotEmpty(currentMonth)) {
-//            Date start = DateUtil.getBeforMonth()
-
-//            criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1));
+        if(currentMonthStart != null && currentMonthEnd != null) {
+            Date start = DateUtil.getMonthDate(currentMonthStart);
+            Date end = DateUtil.getMonthDate(currentMonthEnd);
+            criteria.and("birth").gte(start).lt(DateUtil.addDay(end, 1));
         }
 
         if(org.apache.commons.lang.StringUtils.isNotBlank(key)) {