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 9c889fd..5b6be1f 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
@@ -8,6 +8,7 @@ import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.BeanUtils;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.ExceptionUtils;
+import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.operate.web.request.ChildbirthManagerRequest;
 import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
 import com.lyms.platform.operate.web.request.MatDeliverQueryRequest;
@@ -984,6 +985,55 @@ public class MatDeliverFacade {
                     } catch (Exception e) {
                         // 什么都不干
                     }
+
+                    // 开始拼装自定义查询结果
+                    // 胎方位，胎心率，胎先露
+                    // 这个泛型不会出错，传入的就是这个
+                    @SuppressWarnings("unchecked")
+                    List<MatDeliverAddRequest.Placenta> placentaList = maternalDeliverModel.getPlacentas();
+                    if (placentaList != null && placentaList.size() > 0) {
+                        String fetalPosition = "";
+                        String heartRate = "";
+                        String fetalPresentation = "";
+                        for (MatDeliverAddRequest.Placenta placenta : placentaList) {
+                            fetalPosition += placenta.getFetalPosition() + ",";
+                            heartRate += placenta.getHeartRate().toString() + ",";
+                            fetalPresentation += placenta.getFetalPresentation() + ",";
+                        }
+                        childbirthManagerQueryModel.setFetalPosition(fetalPosition.length() == 0 ? "" : fetalPosition.substring(0, fetalPosition.length() - 1));
+                        childbirthManagerQueryModel.setHeartRate(heartRate.length() == 0 ? "" : heartRate.substring(0, heartRate.length() - 1));
+                        childbirthManagerQueryModel.setFetalPresentation(fetalPresentation.length() == 0 ? "" : fetalPresentation.substring(0, fetalPresentation.length() - 1));
+                    }
+                    // 第一产程，第二产程，第三产程
+                    Map<String, Map<String, String>> prodprocessMap = JsonUtil.getDoubleMap(maternalDeliverModel.getProdprocess());
+                    if (prodprocessMap != null && prodprocessMap.size() > 0) {
+                        Map<String, String> prodprocessOne = prodprocessMap.get("one");
+                        if (prodprocessOne != null && prodprocessOne.size() > 0) {
+                            childbirthManagerQueryModel.setProdprocessOne("h:" + prodprocessOne.get("h") + "," + "m:" + prodprocessOne.get("m"));
+                        }
+                        Map<String, String> prodprocessTwo = prodprocessMap.get("two");
+                        if (prodprocessTwo != null && prodprocessTwo.size() > 0) {
+                            childbirthManagerQueryModel.setProdprocessTwo("h:" + prodprocessTwo.get("h") + "," + "m:" + prodprocessTwo.get("m"));
+                        }
+                        Map<String, String> prodprocessThree = prodprocessMap.get("three");
+                        if (prodprocessThree != null && prodprocessThree.size() > 0) {
+                            childbirthManagerQueryModel.setProdprocessThree("h:" + prodprocessThree.get("h") + "," + "m:" + prodprocessThree.get("m"));
+                        }
+                    }
+                    // 总产程
+                    Map<String, String> totalprocessMap = JsonUtil.getMap(maternalDeliverModel.getTotalprocess());
+                    if (totalprocessMap != null && totalprocessMap.size() > 0) {
+                        childbirthManagerQueryModel.setTotalprocess("h:" + totalprocessMap.get("h") + "," + "m:" + totalprocessMap.get("m"));
+                    }
+                    // 收缩压，舒张压
+                    Map<String, String> chBpMap = JsonUtil.getMap(maternalDeliverModel.getChBp());
+                    if (chBpMap != null && chBpMap.size() > 0) {
+                        childbirthManagerQueryModel.setChBpSsy1(chBpMap.get("ssy"));
+                        childbirthManagerQueryModel.setChBpSzy1(chBpMap.get("szy"));
+                    }
+
+                    // 拼装自定义查询结果结束
+
                     childbirthManagerQueryModelList.add(childbirthManagerQueryModel);
                 }
             }
@@ -1002,9 +1052,7 @@ public class MatDeliverFacade {
 
         BabyModelQuery babyModelQuery = new BabyModelQuery();
         babyModelQuery.setYn(YnEnums.YES.getId());
-        babyModelQuery.setMname(newBabyManagerRequest.getMname());
-        babyModelQuery.setMcertNo(newBabyManagerRequest.getMcertNo());
-        babyModelQuery.setMphone(newBabyManagerRequest.getMphone());
+        babyModelQuery.setQueryNo(newBabyManagerRequest.getQueryNo());
         babyModelQuery.setBirthStart(DateUtil.parseYMD(newBabyManagerRequest.getBirthStartDate()));
         babyModelQuery.setBirthEnd(DateUtil.parseYMD(newBabyManagerRequest.getBirthEndDate()));
         babyModelQuery.setDueType(newBabyManagerRequest.getDueType());