diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
index 622b224..942105e 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
@@ -890,43 +890,55 @@ public class QhdfyHisService {
         List<Map<String, Object>> result = new ArrayList<>();
 
 
-        if (StringUtils.isNotBlank(cardNo)) {
-            long start = System.currentTimeMillis();
-
-            Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
-            QueryRunner queryRunner = new QueryRunner();
-
-            long end = System.currentTimeMillis();
 
-            System.out.println("times3 = " + (end - start));
-            try {
-                List<PregPatientinfo> list = queryRunner.query(conn, "select top 1 patid as P_ID,hzxm as P_NAME, sex as P_SEX, birth as BIRTH, sfzh as P_CARDNO, lxdh as P_MOBILEPHONE from SF_BRXXK where cardno= '" + cardNo + "'", new BeanListHandler<PregPatientinfo>(PregPatientinfo.class));
-                if (list.size() > 0) {
-                    for (PregPatientinfo info : list) {
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("bhnum", info.getP_BHNUM());
-                        if ("男".equals(info.getP_SEX())) {
-                            map.put("sex", "男");
-                        } else if ("女".equals(info.getP_SEX())) {
-                            map.put("sex", "女");
-                        }
-                        map.put("name", info.getP_NAME());
-                        map.put("idCardNo", info.getP_CARDNO()); //身份证号码
-                        map.put("cardNo", cardNo);//就诊卡号
-                        map.put("phone", info.getP_MOBILEPHONE());
-                        map.put("birth", DateUtil.getyyyy_MM_dd(parseYmd(info.getBIRTH())));
-                        result.add(map);
-                    }
-                }
-                long end1 = System.currentTimeMillis();
-                System.out.println("times4 = " + (end1 - end));
-                DbUtils.closeQuietly(conn);
-            } catch (SQLException e) {
-                DbUtils.closeQuietly(conn);
-                ExceptionUtils.catchException(e, "qhd his exception ");
-                e.printStackTrace();
-            }
-        }
+        Map<String, Object> map = new HashMap<>();
+        map.put("bhnum", "a");
+        map.put("sex", "男");
+        map.put("name", "张三");
+        map.put("idCardNo", ""); //身份证号码
+        map.put("cardNo", "147852");//就诊卡号
+        map.put("phone", "15777777777");
+        map.put("birth", "2020-08-10");
+        result.add(map);
+
+
+//        if (StringUtils.isNotBlank(cardNo)) {
+//            long start = System.currentTimeMillis();
+//
+//            Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection();
+//            QueryRunner queryRunner = new QueryRunner();
+//
+//            long end = System.currentTimeMillis();
+//
+//            System.out.println("times3 = " + (end - start));
+//            try {
+//                List<PregPatientinfo> list = queryRunner.query(conn, "select top 1 patid as P_ID,hzxm as P_NAME, sex as P_SEX, birth as BIRTH, sfzh as P_CARDNO, lxdh as P_MOBILEPHONE from SF_BRXXK where cardno= '" + cardNo + "'", new BeanListHandler<PregPatientinfo>(PregPatientinfo.class));
+//                if (list.size() > 0) {
+//                    for (PregPatientinfo info : list) {
+//                        Map<String, Object> map = new HashMap<>();
+//                        map.put("bhnum", info.getP_BHNUM());
+//                        if ("男".equals(info.getP_SEX())) {
+//                            map.put("sex", "男");
+//                        } else if ("女".equals(info.getP_SEX())) {
+//                            map.put("sex", "女");
+//                        }
+//                        map.put("name", info.getP_NAME());
+//                        map.put("idCardNo", info.getP_CARDNO()); //身份证号码
+//                        map.put("cardNo", cardNo);//就诊卡号
+//                        map.put("phone", info.getP_MOBILEPHONE());
+//                        map.put("birth", DateUtil.getyyyy_MM_dd(parseYmd(info.getBIRTH())));
+//                        result.add(map);
+//                    }
+//                }
+//                long end1 = System.currentTimeMillis();
+//                System.out.println("times4 = " + (end1 - end));
+//                DbUtils.closeQuietly(conn);
+//            } catch (SQLException e) {
+//                DbUtils.closeQuietly(conn);
+//                ExceptionUtils.catchException(e, "qhd his exception ");
+//                e.printStackTrace();
+//            }
+//        }
         return result;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index c7b4512..3023dfd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -2170,25 +2170,24 @@ public class BabyBookbuildingFacade {
                     map.put("hisPatient", qingLongXianHisService.getPatientInfoList(param.getVcCardNo()));
                 } else if ("5".equals(HIS_VERSION)) {
                     map.put("hisPatient", fnfyHisService.getPatientInfoList(param.getVcCardNo()));
-                } else if ("4".equals(HIS_VERSION)) {
+                } else if ("216".equals(param.getHospitalId())) {
 
                     List <Map <String, Object>> hisPatient = qhdfyHisService.getPatientInfoList(StringUtils.isNotEmpty(param.getVcCardNo()) ? param.getVcCardNo() : param.getsINCard());
                     if (CollectionUtils.isNotEmpty(hisPatient)) {
                         Map <String, Object> babyHis = hisPatient.get(0);
                         if (babyHis != null && babyHis.get("phone") != null && StringUtils.isNotEmpty(babyHis.get("phone").toString())) {
                             BabyModelQuery babyModelQuery = new BabyModelQuery();
-                            babyModelQuery.setYn(YnEnums.YES.getId());
-                            babyModelQuery.setMphone(babyHis.get("phone").toString());
-                            if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)))) {
-                                List list = new ArrayList();
-                                list.add("1");
-                                list.add("2");
-                                babyQuery.setEnableListNot(list);
-                            }
-
-                            babyQuery.setHospitalIdList(groupsFacade.findGroupHospital(userId, false));
+//                            babyModelQuery.setYn(YnEnums.YES.getId());
+                            babyModelQuery.setMphoneOrFphone(babyHis.get("phone").toString());
+//                            List list1 = new ArrayList();
+//                            list1.add("1");
+//                            list1.add("2");
+//                            babyQuery.setEnableListNot(list1);
+
+                            //babyQuery.setHospitalIdList(groupsFacade.findGroupHospital(userId, false));
 //
-                            List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
+                            System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString());
+                            List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
 
                             if (CollectionUtils.isNotEmpty(models)) {
                                 BabyModel model = models.get(0);
@@ -2208,23 +2207,30 @@ public class BabyBookbuildingFacade {
                                     }
 
                                     BabyModelQuery babyBuildQuery = new BabyModelQuery();
-                                    babyBuildQuery.setYn(YnEnums.YES.getId());
+                                   // babyBuildQuery.setYn(YnEnums.YES.getId());
                                     babyBuildQuery.setPid(model.getPid());
-                                    List <BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "buildDate", Sort.Direction.DESC);
+                                    List <BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyBuildQuery, "buildDate", Sort.Direction.DESC);
 
                                     List <Map <String, String>> list = new ArrayList <>();
                                     if (CollectionUtils.isNotEmpty(builds)) {
                                         for (BabyModel build : builds) {
 
-                                            if (build != null && StringUtils.isNotEmpty(build.getHospitalId()) && build.getHospitalId().equals(param.getHospitalId())) {
+                                            if (build == null || StringUtils.isEmpty(build.getHospitalId())) {
+                                                continue;
+                                            }
+                                            if (build.getHospitalId().equals(param.getHospitalId())) {
                                                 isCurrentHosp = true;
                                                 buildInfo = build;
                                             }
 
+                                            if (build != null && build.getYn() == YnEnums.YES.getId()) {
+                                                result.setIsBuild(true);
+                                            }
+
+
                                             Map <String, String> buildRecords = new HashMap <>();
                                             buildRecords.put("id", build.getId());
                                             buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate()));
-
                                             buildRecords.put("hospitalId", build.getHospitalId());
                                             //查询建档医院
                                             Organization org = organizationService.getOrganization(Integer.valueOf(build.getHospitalId()));