diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 91ba0a5..3dc40aa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -6,7 +6,6 @@ import com.lyms.platform.common.enums.*;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.DateUtil;
-import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
 import com.lyms.platform.operate.web.request.MatDeliverQueryRequest;
 import com.lyms.platform.operate.web.result.HighScoreResult;
@@ -15,10 +14,7 @@ import com.lyms.platform.operate.web.result.MaternalDeliverResult;
 import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.pojo.*;
-import com.lyms.platform.query.AntExChuQuery;
-import com.lyms.platform.query.AntExQuery;
-import com.lyms.platform.query.MatDeliverQuery;
-import com.lyms.platform.query.PatientsQuery;
+import com.lyms.platform.query.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,11 +58,11 @@ public class MatDeliverFacade {
         List<MaternalDeliverModel.Baby> babyList = new ArrayList<>();
         //增加
         if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
-            MatDeliverQuery matDeliverQuery=new MatDeliverQuery();
+            MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
             matDeliverQuery.setParentId(deliverAddRequest.getParentId());
             matDeliverQuery.setYn(YnEnums.YES.getId());
-            List<MaternalDeliverModel> list2=   matDeliverService.query(matDeliverQuery);
-            if(CollectionUtils.isNotEmpty(list2)){
+            List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
+            if (CollectionUtils.isNotEmpty(list2)) {
                 return new BaseResponse().setErrormsg("您已分娩").setErrorcode(ErrorCodeConstants.DATA_EXIST);
             }
             MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
@@ -78,7 +74,7 @@ public class MatDeliverFacade {
             patientsQuery.setId(parentId);
             List<Patients> patients = patientsService.queryPatient(patientsQuery);
             Patients patients1 = null;
-            if (CollectionUtils.isNotEmpty(patients)){
+            if (CollectionUtils.isNotEmpty(patients)) {
                 maternalDeliverModel.setPid(patients.get(0).getPid());
             }
             if (CollectionUtils.isNotEmpty(list)) {
@@ -101,8 +97,17 @@ public class MatDeliverFacade {
                         }
                     }
                 }
-
-                handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName,patients1);
+                //先查询这个产妇分娩的小孩是否已建档
+                BabyModelQuery babyModelQuery = new BabyModelQuery();
+                babyModelQuery.setYn(YnEnums.YES.getId());
+                babyModelQuery.setMcertNo(patients1.getCardNo());
+                babyModelQuery.setParentId(patients1.getId());
+                babyModelQuery.setBirthEnd(patients1.getFmDate());
+                List<BabyModel> babyModels = babyService.queryBabyWithQuery(babyModelQuery);
+                if (CollectionUtils.isEmpty(babyModels)) {
+                    handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1);
+                }
+//                maternalDeliverModel.setBaby(babyModels);
             }
             List list1 = autoMatchFacade.matchOrgId(userId);
             if (CollectionUtils.isNotEmpty(list1)) {
@@ -144,9 +149,9 @@ public class MatDeliverFacade {
         return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
     }
 
-    private BabyModel fillBaby(Patients patients){
-        BabyModel babyModel=new BabyModel();
-        if(null!=patients){
+    private BabyModel fillBaby(Patients patients) {
+        BabyModel babyModel = new BabyModel();
+        if (null != patients) {
             babyModel.setAreaId(patients.getAreaId());
             babyModel.setProvinceId(patients.getProvinceId());
             babyModel.setCityId(patients.getCityId());
@@ -178,6 +183,7 @@ public class MatDeliverFacade {
 //        babyModel.setFbirth(patients.geth);
         return babyModel;
     }
+
     /**
      * 处理儿童
      *
@@ -189,7 +195,7 @@ public class MatDeliverFacade {
      * @param parentId
      * @param userName
      */
-    private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName,Patients patients) {
+    private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName, Patients patients) {
         for (MatDeliverAddRequest.Baby baby : list) {
             MaternalDeliverModel.Baby baby1 = baby.convertToDataModel();
             babyList.add(baby1);
@@ -201,7 +207,7 @@ public class MatDeliverFacade {
             babyModel.setYn(YnEnums.YES.getId());
             babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId());
             babyModel.setAsphyxiaM(baby1.getAsphyxiaM());
-            babyModel.setFetusCount(deliverAddRequest.getTireNumber()+"");
+            babyModel.setFetusCount(deliverAddRequest.getTireNumber() + "");
             if (null != baby1.getBabyGender()) {
                 babyModel.setSex(Integer.valueOf(baby1.getBabyGender()));
             }
@@ -226,8 +232,7 @@ public class MatDeliverFacade {
                         DateUtil.getYmd(DateUtil.parseYMD(deliverAddRequest.getDueDate()));
                 babyModel.setCardId(cardId + babyModel.getName());
             }
-            if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyModel.getMphone()))
-            {
+            if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyModel.getMphone())) {
                 String phoneId = babyModel.getMphone() +
                         DateUtil.getYmd(DateUtil.parseYMD(deliverAddRequest.getDueDate()));
                 babyModel.setPhoneId(phoneId + babyModel.getName());
@@ -257,14 +262,14 @@ public class MatDeliverFacade {
      * @param deliverQueryRequest
      * @return
      */
-    public BaseResponse queryMatDeliver(MatDeliverQueryRequest deliverQueryRequest,Integer userId) {
-        List<Integer> list1 =autoMatchFacade.matchOrgId(userId);
-        String hospital =null;
-        if(CollectionUtils.isNotEmpty(list1)){
-            hospital= list1.get(0) + "";
+    public BaseResponse queryMatDeliver(MatDeliverQueryRequest deliverQueryRequest, Integer userId) {
+        List<Integer> list1 = autoMatchFacade.matchOrgId(userId);
+        String hospital = null;
+        if (CollectionUtils.isNotEmpty(list1)) {
+            hospital = list1.get(0) + "";
         }
         //获取
-        Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null,hospital,null);
+        Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, -1);
         if (null == patients) {
             return new BaseResponse().setErrormsg("没有相关的产妇记录").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR);
         }
@@ -278,7 +283,7 @@ public class MatDeliverFacade {
         antExQuery.setParentId(patients.getId());
         antExQuery.setYn(YnEnums.YES.getId());
         List<AntenatalExaminationModel> examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
-       HighScoreResult highScoreResult =  antenatalExaminationFacade.findLastRisk(patients.getId());
+        HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId());
         try {
             String tTireNumber = "";
             List data = new ArrayList();
@@ -301,7 +306,7 @@ public class MatDeliverFacade {
             }
 
             matDeliverListResult.setRiskFactor(highScoreResult.getHighRisk());
-            matDeliverListResult.setRiskScore(highScoreResult.getScore()+"");
+            matDeliverListResult.setRiskScore(highScoreResult.getScore() + "");
             matDeliverListResult.setTireNumber1(tTireNumber);
         } catch (Exception e) {
         }