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 56745de..3fe2e16 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
@@ -21,6 +21,7 @@ public class DateUtil {
     public static SimpleDateFormat m_d = new SimpleDateFormat("MM/dd");
     public static SimpleDateFormat y_m_d_h_m_s = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     public static SimpleDateFormat y_m_d_h_m1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    public static SimpleDateFormat y_m_d_h = new SimpleDateFormat("yyyy-MM-dd HH");
     public static String[] parsePatterns = {"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss",
             "yyyy/MM/dd HH:mm"};
 
@@ -428,6 +429,34 @@ public class DateUtil {
         }
     }
 
+    public static Date paseYMDH(String s){
+        if(s == null){
+            return null;
+        }
+        try {
+            lock.lock();
+            return y_m_d_h.parse(s);
+        } catch (Exception e) {
+            return null;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    public static String getYMDH(Date d){
+        if(d == null){
+            return null;
+        }
+        try {
+            lock.lock();
+            return y_m_d_h.format(d);
+        } catch (Exception e) {
+            return null;
+        } finally {
+            lock.unlock();
+        }
+    }
+
 
     public static Date parseYYYYMMDD(String s) {
         if (s == null) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
index 755a49f..641ea8c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java
@@ -119,6 +119,14 @@ public class BabySieveFacede {
                         if(mList != null && mList.size() > 0){
                             maternalDeliverModel = mList.get(0);
                         }
+                        List<MaternalDeliverModel.Baby> babies = maternalDeliverModel.getBaby();
+                        for(MaternalDeliverModel.Baby baby : babies){
+                            if(baby.getId() != null && babyModel.getId().equals(baby.getId())){
+                                Date d = DateUtil.parseYMDHM(baby.getDueTime());
+                                data.setDueDate(DateUtil.getYMDH(d));
+                                break;
+                            }
+                        }
                         data.setMatdeliverId(maternalDeliverModel.getId());
                         //分娩方式
                         String deliveryMode = "";
@@ -156,7 +164,7 @@ public class BabySieveFacede {
                             data.setDueType(deliveryMode);
                             data.setOperationCause(maternalDeliverModel.getOperationCause() == null ? "--" : maternalDeliverModel.getOperationCause());
                         }
-                        data.setDueDate(maternalDeliverModel.getDueDate());
+                        //data.setDueDate(maternalDeliverModel.getDueDate());
                         data.setId(babyModel.getId());
                         data.setCardNo(pat.getCardNo());
                         data.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date()));
@@ -428,7 +436,31 @@ public class BabySieveFacede {
      */
     public BabySieveManagerResult getBabySieveLab(BabySieveAddRequest babySieveAddRequest){
         BabySieveManagerResult babySieveManagerResult = new BabySieveManagerResult();
+        BabySieveQuery babySieveQuery = new BabySieveQuery();
+        if(StringUtils.isNotEmpty(babySieveAddRequest.getCollectHospitalId())){
+            babySieveQuery.setCollectHospitalId(babySieveAddRequest.getCollectHospitalId());
+        }
+        if(StringUtils.isNotEmpty(babySieveAddRequest.getApplyDate())){
+            try {
+                babySieveQuery.setApplyDateStrat(DateUtil.getSNDate(babySieveAddRequest.getApplyDate())[0]);
+                babySieveQuery.setApplyDateEnd(DateUtil.getSNDate(babySieveAddRequest.getApplyDate())[1]);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        if(StringUtils.isNotEmpty(babySieveAddRequest.getTestNumber())){
+            babySieveQuery.setTestNumber(babySieveAddRequest.getTestNumber());
+        }
+        List<BabySieveModel> list = babySieveService.getBabySieveQuery(babySieveQuery);
+
+
+
         BabyModelQuery babyModelQuery = new BabyModelQuery();
+        if(StringUtils.isNotEmpty(babySieveAddRequest.getSieveStatus())){
+            babyModelQuery.setSieveStatus(babySieveAddRequest.getSieveStatus());
+        }
+
+
         //查询号
         babyModelQuery.setQueryNo(StringUtils.isEmpty(babySieveAddRequest.getQueryNo()) ? null : babySieveAddRequest.getQueryNo());
         babyModelQuery.setDataStatus(false);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java
index 4307c69..3673fdf 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabySieveAddRequest.java
@@ -358,7 +358,7 @@ public class BabySieveAddRequest implements IBasicRequestConvert<BabySieveModel>
         babySieveModel.setCurrentHospitalId(currentHospitalId);
         babySieveModel.setAddress(address);
         babySieveModel.setCollectHospitalId(collectHospitalId);
-        babySieveModel.setCollectDate(DateUtil.parseYMD(collectDate));
+        babySieveModel.setCollectDate(DateUtil.paseYMDH(collectDate));
         babySieveModel.setCollectDocterId(collectDocterId);
         babySieveModel.setTestNumber(testNumber);
         babySieveModel.setMontherName(montherName);
@@ -367,7 +367,7 @@ public class BabySieveAddRequest implements IBasicRequestConvert<BabySieveModel>
         babySieveModel.setMontherDisease(montherDisease);
         babySieveModel.setPhone(phone);
         babySieveModel.setAddress(address);
-        babySieveModel.setBabyBirth(DateUtil.parseYMD(babyBirth));
+        babySieveModel.setBabyBirth(DateUtil.paseYMDH(babyBirth));
         babySieveModel.setDueWeek(dueWeek);
         babySieveModel.setDueType(dueType);
         babySieveModel.setDuescfs(duescfs);