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 0419fd7..a3e8920 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
@@ -155,21 +155,6 @@ public class BabyEyeCheckController extends BaseController {
                 currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit,
                 bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin,noPassIds);
     }
-    /**
-     *   儿童眼保健管理,检查次数展示也就是以前的“眼保健管理”
-     *
-     * @Author: 武涛涛
-     * @Date: 2020/8/3 14:09
-     */
-    @ResponseBody
-    @TokenRequired
-    @RequestMapping(value = "/checkList", method = RequestMethod.GET)
-    public BaseResponse checkList(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request,
-                             Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds) {
-        return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key,
-                currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit,
-                bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin,noPassIds);
-    }
 
     /**
      * 眼保健管理,按照儿童档案次数展示
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 4969053..9fcb9ed 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
@@ -925,33 +925,11 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC
         }
 
         /**
-         * 新加的 不通过查询条件
+         * 新加的 不通过查询条件和阳性项目处理
          * @Author: 武涛涛
-         * @Date: 2020/7/21 21:56
+         * @Date: 2020/8/05 21:56
          */
-        if (StringUtils.isNotEmpty(noPassIds)) {
-            List<String> ids = CollectionUtils.asList(noPassIds, String.class);
-            for (String id : ids) {
-                if ("eyeAppearance".equals(id)) {
-                    criteria.and("eyeAppearance").is("2");
-                } else if ("redReflexQhd".equals(id)) {
-                    criteria.and("redReflexQhd").is("2");
-                } else if ("blinkReflex".equals(id)) {
-                    criteria.and("blinkReflex").is("2");
-                } else if ("redBallTest".equals(id)) {
-                    criteria.and("redBallTest").is("2");
-                } else if ("behaviorObservation".equals(id)) {
-                    criteria.and("behaviorObservation").is("2");
-                } else if ("refractiveScreening".equals(id)) {
-                    criteria.and("refractiveScreening").is("2");
-                } else if ("eyePositionExamination".equals(id)) {
-                    criteria.and("eyePositionExamination").is("2");
-                } else if ("eyeMovement".equals(id)) {
-                    criteria.and("eyeMovement").is("2");
-                }
-            }
-        }
-
+        yangXingTongGuo(positiveIds, noPassIds, criteria);
         /*end */
         List<String> babyIds = new ArrayList<>();
         //存放，没有在眼保健建档或在眼保健建档，做个眼保健检查的档案。
@@ -1054,6 +1032,78 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC
         return objectResponse;
     }
 
+    private void yangXingTongGuo(String positiveIds, String noPassIds, Criteria criteria) {
+        if (StringUtils.isNotEmpty(noPassIds)) {
+            List<String> ids = CollectionUtils.asList(noPassIds, String.class);
+            for (String id : ids) {
+                if ("eyeAppearance".equals(id)) {
+                    criteria.and("eyeAppearance").is("2");
+                } else if ("redReflexQhd".equals(id)) {
+                    criteria.and("redReflexQhd").is("2");
+                } else if ("blinkReflex".equals(id)) {
+                    criteria.and("blinkReflex").is("2");
+                } else if ("redBallTest".equals(id)) {
+                    criteria.and("redBallTest").is("2");
+                } else if ("behaviorObservation".equals(id)) {
+                    criteria.and("behaviorObservation").is("2");
+                } else if ("refractiveScreening".equals(id)) {
+                    criteria.and("refractiveScreening").is("2");
+                } else if ("eyePositionExamination".equals(id)) {
+                    criteria.and("eyePositionExamination").is("2");
+                } else if ("eyeMovement".equals(id)) {
+                    criteria.and("eyeMovement").is("2");
+                }
+            }
+        }
+        if (StringUtils.isNotEmpty(positiveIds)) {
+            List<String> ids = CollectionUtils.asList(positiveIds, String.class);
+            if (CollectionUtils.isNotEmpty(ids)) {
+                for (String id : ids) {
+                    if ("extEyelook".equals(id)) {
+                        criteria.and("extEyelook").is("yang");
+                    } else if ("nystagmus".equals(id)) {
+                        criteria.and("nystagmus").is("yang");
+                    } else if ("extRightEyelook".equals(id)) {
+                        criteria.and("extRightEyelook").is("yang");
+                    } else if ("extLeftEyelook".equals(id)) {
+                        criteria.and("extLeftEyelook").is("yang");
+                    } else if ("blinkRightReflex".equals(id)) {
+                        criteria.and("blinkRightReflex").is("yang");
+                    } else if ("blinkLefttReflex".equals(id)) {
+                        criteria.and("blinkLefttReflex").is("yang");
+                    } else if ("pupillaryRightReflex".equals(id)) {
+                        criteria.and("pupillaryRightReflex").is("yang");
+                    } else if ("pupillaryLeftReflex".equals(id)) {
+                        criteria.and("pupillaryLeftReflex").is("yang");
+                    }else if ("redRightReflex".equals(id)) {
+                        criteria.and("redRightReflex").is("yang");
+                    }else if ("redLeftReflex".equals(id)) {
+                        criteria.and("redLeftReflex").is("yang");
+                    }else if ("redReflex".equals(id)) {
+                        criteria.and("redReflex").is("yang");
+                    }else if ("conjunctiva".equals(id)) {
+                        criteria.and("conjunctiva").is("yang");
+                    }else if ("corneal".equals(id)) {
+                        criteria.and("corneal").is("yang");
+                    }else if ("lacrimalApparatus".equals(id)) {
+                        criteria.and("lacrimalApparatus").is("yang");
+                    }else if ("eyePositionId2".equals(id)) {
+                        criteria.and("eyePositionId2").is("yang");
+                    }else if ("redLeft2".equals(id)) {
+                        criteria.and("redLeft2").is("yang");
+                    }else if ("vision2".equals(id)) {
+                        criteria.and("vision2").is("yang");
+                    }else if ("y2".equals(id)) {
+                        criteria.and("y2").is("yang");
+                    }else if ("refraction2".equals(id)) {
+                        criteria.and("ss").is("refraction2");
+                    }
+
+                }
+            }
+        }
+    }
+
     private void doFilter(List<BabyEyeCheck> babyEyeChecks, List<String> ids) {
         List<BabyEyeCheck> deleteList = new ArrayList<>();
         for (BabyEyeCheck babyEyeCheck : babyEyeChecks) {