diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index 1238a02..2ceebea 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -192,6 +192,16 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
     //用来配合查询新筛实验室列表数据
     private List sieveStatusList2;
 
+    private Integer dueWeek;
+
+
+    public Integer getDueWeek() {
+        return dueWeek;
+    }
+
+    public void setDueWeek(Integer dueWeek) {
+        this.dueWeek = dueWeek;
+    }
 
     public List getSieveStatusList2() {
         return sieveStatusList2;
@@ -776,6 +786,12 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
     public MongoQuery convertToQuery() {
         MongoCondition condition = MongoCondition.newInstance();
 
+
+        if (null != dueWeek) {
+            condition = condition.and("dueWeek", dueWeek, MongoOper.LTE);
+        }
+
+
         if (-1 != visitstatus) {
             condition = condition.and("visitstatus", visitstatus, MongoOper.IS);
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java
index 45e7ff4..155daa9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java
@@ -17,6 +17,7 @@ import com.lyms.platform.permission.model.OrganizationQuery;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.pojo.*;
 import com.lyms.platform.query.*;
+import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -794,6 +795,9 @@ public class AnnualReportFacade {
                 BabyModelQuery babyModelQuery6 = new BabyModelQuery();
                 babyModelQuery6.setDataStatus(false);
                 babyModelQuery6.setHospitalIdList(entry.getValue());
+                // babyModelQuery6.setHospitalId("216");
+                babyModelQuery6.setBuildType(2);
+                babyModelQuery6.setPregnancyOut("0");
                 if (StringUtils.isNotEmpty(time)) {
                     babyModelQuery6.setBirthStart(DateUtil.getSNDate(time)[0]);
                     babyModelQuery6.setBirthEnd(DateUtil.addDay(DateUtil.getSNDate(time)[1], 1));
@@ -801,7 +805,12 @@ public class AnnualReportFacade {
                 babyModelQuery6.setBabyWeightStart("0");
                 babyModelQuery6.setBabyWeightEnd("2.49");
 
+
                 int lowWeightCount = babyService.queryBabyCount(babyModelQuery6);
+              /*  System.out.println("============" + lowWeightCount);
+                String mongosqlS = babyModelQuery6.convertToQuery().convertToMongoQuery().toString();
+                System.out.println("mongosql=" + mongosqlS);*/
+
                 //低出生体重数
                 map.put("lowWeightCount", String.valueOf(lowWeightCount));
 
@@ -809,6 +818,8 @@ public class AnnualReportFacade {
                 BabyModelQuery babyModelQuery5 = new BabyModelQuery();
                 babyModelQuery5.setDataStatus(false);
                 babyModelQuery5.setHospitalIdList(entry.getValue());
+                babyModelQuery5.setBuildType(2);
+                babyModelQuery5.setPregnancyOut("0");
                 if (StringUtils.isNotEmpty(time)) {
                     babyModelQuery5.setBirthStart(DateUtil.getSNDate(time)[0]);
                     babyModelQuery5.setBirthEnd(DateUtil.addDay(DateUtil.getSNDate(time)[1], 1));
@@ -816,6 +827,7 @@ public class AnnualReportFacade {
                 babyModelQuery5.setBabyWeightStart("4");
                 int bigBoyCount = babyService.queryBabyCount(babyModelQuery5);
 
+
                 //巨大儿数
                 map.put("bigBoyCount", String.valueOf(bigBoyCount));
                 map.put("bigBoyPervent", this.division(bigBoyCount, huoChanCount));
@@ -859,6 +871,26 @@ public class AnnualReportFacade {
                 //早产儿
                 map.put("zcBabyCount", String.valueOf(zcBabyCount));
                 map.put("zcBabyPervent", this.division(zcBabyCount, huoChanCount));
+
+
+              /*  //秦皇岛
+                BabyModelQuery babyModelQuery9 = new BabyModelQuery();
+                babyModelQuery9.setYn(YnEnums.YES.getId());
+                babyModelQuery9.setHospitalId("216");
+                babyModelQuery9.setPregnancyOut("0");
+                babyModelQuery9.setBuildType(2);
+                babyModelQuery9.setDueWeek(36);
+                if (StringUtils.isNotEmpty(time)) {
+                    babyModelQuery9.setBirthStart(DateUtil.getSNDate(time)[0]);
+                    babyModelQuery9.setBirthEnd(DateUtil.addDay(DateUtil.getSNDate(time)[1], 1));
+                }
+                System.out.println("=========>" + lowWeightCount);
+                int bigBoyCountS = babyService.queryBabyCount(babyModelQuery9);
+                System.out.println("============" + bigBoyCountS);
+                String mongosqlS = babyModelQuery9.convertToQuery().convertToMongoQuery().toString();
+                System.out.println("mongosql=" + mongosqlS);*/
+
+
                 MatDeliverQuery matDeliverQuery10 = new MatDeliverQuery();
                 matDeliverQuery10.setYn(YnEnums.YES.getId());
                 if (StringUtils.isNotEmpty(time)) {