diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
index ba084b1..7c45bbf 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
@@ -40,6 +40,7 @@ import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
+import org.aspectj.weaver.ast.Or;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.domain.Sort;
@@ -5354,103 +5355,116 @@ public class TestController extends BaseController {
             e.printStackTrace();
         }
     }
+    private static List<Integer> allMonths = new LinkedList();
+    static
+    {
+        allMonths.add(1);
+        allMonths.add(3);
+        allMonths.add(6);
+        allMonths.add(8);
+        allMonths.add(12);
+        allMonths.add(18);
+        allMonths.add(24);
+        allMonths.add(30);
+        allMonths.add(36);
+        allMonths.add(48);
+        allMonths.add(60);
+        allMonths.add(72);
+    }
 
 
+    /**
+     * 更新儿童是否按照 月龄检查套餐完成检查
+     * @param hid
+     * @param cityId
+     * @param areaId
+     * @param streetId
+     * @return
+     */
     @RequestMapping(value = "/updateBabyCompleteCheck", method = RequestMethod.GET)
     @ResponseBody
-    public String updateBabyCompleteCheck(@RequestParam(required = true) String hid) {
-
-
-        BabyModelQuery babyModelQuery = new BabyModelQuery();
-        babyModelQuery.setYn(YnEnums.YES.getId());
-        babyModelQuery.setId(hid);
-        babyModelQuery.setLastCheckDoctor2(true);
+    public String updateBabyCompleteCheck(@RequestParam(required = false) Integer hid,
+                                          @RequestParam(required = false) String cityId,
+                                          @RequestParam(required = false) String areaId,
+                                          @RequestParam(required = false) String streetId
+                                          ) {
+        OrganizationQuery organizationQuery = new OrganizationQuery();
+        organizationQuery.setCityId(cityId);
+        organizationQuery.setAreaId(areaId);
+        organizationQuery.setStreetId(streetId);
+        organizationQuery.setId(hid);
+        List<Organization> organizations = organizationService.queryHospitals(organizationQuery);
+        if (CollectionUtils.isNotEmpty(organizations))
+        {
+            for (Organization org :  organizations)
+            {
 
-        final List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
-        if (CollectionUtils.isNotEmpty(models)) {
-            int batchSize = 200;
-            int end = 0;
-            for (int i = 0; i < models.size(); i += batchSize) {
-                end = (end + batchSize);
-                if (end > models.size()) {
-                    end = models.size();
-                }
-                System.out.println("start:" + i + ",end:" + end);
-                final List<BabyModel> tempList = models.subList(i, end);
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (CollectionUtils.isNotEmpty(tempList)) {
-                            for (BabyModel babyModel : tempList) {
-                                if (babyModel != null) {
-                                    BabyCheckModelQuery query = new BabyCheckModelQuery();
-                                    query.setYn(YnEnums.YES.getId());
-                                    query.setBuildId(babyModel.getId());
-                                    List<Integer> allMonths = new LinkedList();
-                                    allMonths.add(1);
-                                    allMonths.add(3);
-                                    allMonths.add(6);
-                                    allMonths.add(8);
-                                    allMonths.add(12);
-                                    allMonths.add(18);
-                                    allMonths.add(24);
-                                    allMonths.add(30);
-                                    allMonths.add(36);
-                                    allMonths.add(48);
-                                    allMonths.add(60);
-                                    allMonths.add(72);
-
-                                    List<Integer> checkMonths = new LinkedList();
-
-                                    int checkMonth = DateUtil.getBabyAgeMonth(babyModel.getBirth(),new Date());
-
-                                    for (Integer month : allMonths)
+                BabyModelQuery babyModelQuery = new BabyModelQuery();
+                babyModelQuery.setYn(YnEnums.YES.getId());
+                babyModelQuery.setId(org.getId()+"");
+                babyModelQuery.setLastCheckDoctor2(true);
+
+                List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
+                System.out.println("updateBabyCompleteCheck="+org.getName()+"; babysize = "+models.size());
+                if (CollectionUtils.isNotEmpty(models)) {
+                    for (BabyModel babyModel : models) {
+                        if (babyModel != null) {
+                            BabyCheckModelQuery query = new BabyCheckModelQuery();
+                            query.setYn(YnEnums.YES.getId());
+                            query.setBuildId(babyModel.getId());
+
+                            List<Integer> checkMonths = new LinkedList();
+                            //当前月龄
+                            int currentMonth = DateUtil.getBabyAgeMonth(babyModel.getBirth(),new Date());
+
+                            //获取比当前月龄小于等于的套餐
+                            for (Integer month : allMonths)
+                            {
+                                if (month <= currentMonth)
+                                {
+                                    checkMonths.add(month);
+                                }
+                            }
+                            //获取实际完成的套餐月龄
+                            List<Integer> completeCheckMonths = new LinkedList();
+                            List<BabyCheckModel> checkModels = babyCheckService.queryBabyCheckListRecord(query);
+                            if (CollectionUtils.isNotEmpty(checkModels)) {
+                                for (BabyCheckModel checkModel : checkModels) {
+                                    if (checkModel.getTcType() != null)
                                     {
-                                        if (month <= checkMonth)
-                                        {
-                                            checkMonths.add(month);
-                                        }
-                                    }
-                                    List<Integer> completeCheckMonths = new LinkedList();
-                                    List<BabyCheckModel> checkModels = babyCheckService.queryBabyCheckListRecord(query);
-                                    if (CollectionUtils.isNotEmpty(checkModels)) {
-                                        for (BabyCheckModel checkModel : checkModels) {
-                                            if (checkModel.getTcType() != null)
-                                            {
-                                                completeCheckMonths.add(checkModel.getTcType());
-                                            }
-                                        }
+                                        completeCheckMonths.add(checkModel.getTcType());
                                     }
-                                    if (completeCheckMonths.size() == checkMonths.size())
+                                }
+                            }
+
+                            int complete = 2; //表示完成
+                            if (completeCheckMonths.size() == checkMonths.size())
+                            {
+                                //比对每一个月龄套餐，如果有一个不相等 就不算完成
+                                for (int i = 0;i<completeCheckMonths.size();i++)
+                                {
+                                    if (completeCheckMonths.get(i) != checkMonths.get(i))
                                     {
-                                        int complete = 2;
-                                        for (int i = 0;i<completeCheckMonths.size();i++)
-                                        {
-                                            if (completeCheckMonths.get(i) != checkMonths.get(i))
-                                            {
-                                                complete = 1;
-                                                break;
-                                            }
-                                        }
-                                        if (complete == 2)
-                                        {
-                                            babyModel.setCompleteCheck(complete);
-                                            System.out.println("complete"+babyModel.getId());
-                                            babyBookbuildingService.updateBabyBuild(babyModel,babyModel.getId());
-                                        }
+                                        complete = 1;
+                                        break;
                                     }
                                 }
                             }
+                            else
+                            {
+                                complete = 1;
+                            }
+                            babyModel.setCompleteCheck(complete);
+                            if (complete == 2)
+                            {
+                                System.out.println("complete"+babyModel.getId());
+                            }
+                            babyBookbuildingService.updateBabyBuild(babyModel,babyModel.getId());
                         }
                     }
-                }).start();
+                }
             }
-
         }
-
-
-        return "updateBabyGrowth finish";
+        return "updateBabyCompleteCheck finish";
     }
-
-
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
index 7cd6ac4..0f49582 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
@@ -3425,16 +3425,13 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl {
         patientsQuery.setBuildTypeNot(1);
         patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20));
         patientsQuery.setBookbuildingDateEnd(endDate);
+        patientsQuery.setType(3); //产妇
         int data15 = patientsService.queryPatientCount(patientsQuery);
         int lastDate15= null==hospitalDate.get("data15")?0:Integer.parseInt(hospitalDate.get("data15").toString());
         hospitalDate.put("data15",data15+lastDate15);
 
-        //早孕建册率%
-        patientsQuery.setBuildDaysStart(null);
-        patientsQuery.setBuildDaysEnd(null);
 
-        patientsQuery.setBookbuildingDateEnd(endDate);
-        int buildCount = patientsService.queryPatientCount(patientsQuery);
+        int buildCount =  data2;
         int allBuildCount = null==hospitalDate.get("allBuildCount")?0:Integer.parseInt(hospitalDate.get("allBuildCount").toString());
         hospitalDate.put("allBuildCount",buildCount+allBuildCount);
         String data15_data2="0.00";
@@ -3906,6 +3903,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl {
             patientsQuery.setBuildTypeNot(1);
             patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20));
             patientsQuery.setBookbuildingDateEnd(endDate);
+            patientsQuery.setType(3);
             patientsQuery.setPage(page);
             patientsQuery.setLimit(limit);
             patientsQuery.setNeed("Need");