diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/mmbb21/MmbbService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/mmbb21/MmbbService.java
index 269c92f..a6bceff 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/mmbb21/MmbbService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/mmbb21/MmbbService.java
@@ -4,6 +4,7 @@ import com.lyms.hospitalapi.pojo.PregPatientinfo;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.common.utils.PropertiesUtils;
 import com.lyms.platform.common.utils.SystemConfig;
+import com.lyms.platform.pojo.BabyModel;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.dbutils.DbUtils;
@@ -14,6 +15,7 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.sql.Connection;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -60,18 +62,21 @@ public class MmbbService {
             Connection conn = ConnTools.makeHisConnection();
             QueryRunner queryRunner = new QueryRunner();
             try {
-                List<Map<String, Object>> list = queryRunner.query(conn, " select PI_ID,PI_NAME,PI_SEX,PI_KIDSTYPE,PI_BIRTHDAY,PI_MOTHERPHONE,PI_OPERUSER,PI_PLATPATIENTID,PI_ISDELETE,PI_SERVICETYPE,PI_ISVIP,PI_BOOKBUILDINGHOSPITALID" +
-                        " from MOMMY_PATIENTINFO where PI_BOOKBUILDINGHOSPITALID  = '"+hid+"'", new MapListHandler());
+                List<Map<String, Object>> list = queryRunner.query(conn, " select * from MOMMY_PATIENTINFO where PI_BOOKBUILDINGHOSPITALID  = '"+hid+"'", new MapListHandler());
                 DbUtils.closeQuietly(conn);
                 for (Map<String, Object> map:list) {
-                    for (String key:map.keySet()) {
-                        System.out.print(key);
-                        System.out.print(":");
-                        System.out.print(map.get(key));
-                        System.out.print(",");
-
-                    }
-                    System.out.println();
+                    BabyModel baby = new BabyModel();
+                    baby.setModified((Date)map.get("PI_OPERTIME"));
+                    baby.setCreated((Date)map.get("PI_CREATETIME"));
+                    baby.setBirth((Date)map.get("PI_BIRTHDAY"));
+                    baby.setId(map.get("PI_PLATPATIENTID").toString().replace("-", ""));
+                    baby.setMcertTypeId("PI_PLATPATIENTID");
+                    baby.setMcertNo(map.get("PI_MOTHERPHONE").toString());
+                    baby.setHospitalId("204");
+                    baby.setBuildType(1);
+                    baby.setVisitstatus(-1);
+                    baby.setYn(1);
+                    baby.setSex(Integer.valueOf(map.get("PI_SEX").toString()));
                 }
                 return ""+list.size();
             } catch (Exception e) {
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 c0359c3..fd18344 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
@@ -1,5 +1,7 @@
 package com.lyms.platform.operate.web.facade;
 
+import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService;
+import com.lyms.hospitalapi.v2.HisService;
 import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.*;
@@ -33,6 +35,15 @@ import java.util.*;
 @Component
 public class BabyBookbuildingFacade {
 
+    public static final String  HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
+
+    @Autowired
+    private HisService hisServiceV2;
+
+    @Autowired
+    private QingLongXianHisService qingLongXianHisService;
+
+
     @Autowired
     private BabyBookbuildingService babyBookbuildingService;
 
@@ -1315,6 +1326,14 @@ public class BabyBookbuildingFacade {
                 }
 
             }
+            // 如果为空，初次建档，根据就诊卡号从HIS库取患者信息
+            else {
+                if ("2".equals(HIS_VERSION)) {
+                    map.put("hisPatient", hisServiceV2.getPatientInfoList(param.getVcCardNo()));
+                } else if ("3".equals(HIS_VERSION)) {
+                    map.put("hisPatient", qingLongXianHisService.getPatientInfoList(param.getVcCardNo()));
+                }
+            }
         }
 
         Patients patients = patientsService.findOnePatientByCardNo(puerperaQuery);