diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java
index dc1707f..cc7bdbe 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java
@@ -106,14 +106,11 @@ public class QhdfyFmService {
         Date start = new Date(end.getTime()-1000*60*60);
         String startStr = fmt.format(start);
         String endStr = fmt.format(end);
-        System.out.println("start="+startStr+"end="+endStr);
-        ExceptionUtils.catchException("start="+startStr+"end="+endStr);
+        System.out.println("start=" + startStr + "end=" + endStr);
         queryFmPatient(startStr, endStr,null);
     }
 
     public void syncWorker(String startStr,String endStr)  {
-        System.out.println("sync start="+startStr+"end="+endStr);
-        ExceptionUtils.catchException("start="+startStr+"end="+endStr);
         queryFmPatient(startStr, endStr,null);
     }
 
@@ -173,10 +170,16 @@ public class QhdfyFmService {
     }
 
 
-    public void syncByCardNo(String startStr,String endStr,String syxh)  {
-        queryFmPatient(startStr, endStr, syxh);
+    public void syncByCardNo(String startStr,String endStr,String cardNo)  {
+        FmPatInfo patInfo =  getFmPatInfoByCardNo(cardNo);
+        if (patInfo != null && patInfo.getSyxh() != null)
+        {
+            System.out.println("cardNo=" + cardNo + ";syxh=" + patInfo.getSyxh());
+            queryFmPatient(startStr, endStr, patInfo.getSyxh());
+        }
     }
 
+
     public void syncByPhone(String startStr,String endStr,String syxh)  {
         queryFmPatient(startStr, endStr,syxh);
     }
@@ -868,12 +871,39 @@ public class QhdfyFmService {
                     patInfo =  list1.get(0);
                 }
             }
-            DbUtils.closeQuietly(conn);
             return patInfo;
 
+        }catch (SQLException e) {
+            System.out.println(e.getMessage());
+        }
+        finally {
+            DbUtils.closeQuietly(conn);
+        }
+        return null;
+    }
+
+    /**
+     * 分娩用户信息，通过身份证号码
+     * @param cardNo
+     * @return
+     */
+    public FmPatInfo getFmPatInfoByCardNo(String cardNo)
+    {
+        Connection conn = ConnTools.makeFmConnection();
+        QueryRunner queryRunner = new QueryRunner();
+        try {
+            FmPatInfo patInfo = null;
+
+            List<FmPatInfo> list = queryRunner.query(conn, "SELECT syxh,hzxm as name,sfzh as cardNo,sex as sex,birth,lxrdh as phone, blh FROM THIS4_BASY WHERE hzxm is not null and hzxm <> ''  and  sfzh = '"+cardNo+"'", new BeanListHandler<FmPatInfo>(FmPatInfo.class));
+            if (CollectionUtils.isNotEmpty(list)) {
+                patInfo = list.get(0);
+            }
+            return patInfo;
         } catch (SQLException e) {
+           System.out.println(e.getMessage());
+        }
+        finally {
             DbUtils.closeQuietly(conn);
-            e.printStackTrace();
         }
         return null;
     }
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 79bbb5a..4dbb02e 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
@@ -861,18 +861,12 @@ public class MatDeliverFacade {
         LcdcfHisModel lcdcfHisModel = null;
 
         //聊城东昌府分娩界面通过住院号从his中查询到孕妇的身份号码，然后用身份证号码作为院内系统的查询条件查询孕妇信息
-        if ("1000000116".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) {
-        //if ("2100001305".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) {
-//            lcdcfHisModel = lcdcfHisService.getHisPatientByZyh(deliverQueryRequest.getZhuYuanNo());
-//            if (lcdcfHisModel != null && StringUtils.isNotEmpty(lcdcfHisModel.getIdCard())) {
-//                //deliverQueryRequest.setCardNo(lcdcfHisModel.getIdCard());
-//
-//
-//            } else {
-//                return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA);
-//            }
+        if ("2100001305".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) {
+            lcdcfHisModel = lcdcfHisService.getHisPatientByZyh(deliverQueryRequest.getZhuYuanNo());
+            if (lcdcfHisModel != null && StringUtils.isNotEmpty(lcdcfHisModel.getIdCard())) {
+                deliverQueryRequest.setCardNo(lcdcfHisModel.getIdCard());
+            }
         }
-        deliverQueryRequest.setCardNo("63010419900906852X");
         //获取
        /* Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, -1);
         if (null == patients) {
@@ -1027,7 +1021,7 @@ public class MatDeliverFacade {
             {
                 matDeliverListResult.setDeliverData(lcdcfFmService.queryFmPatient(deliverQueryRequest.getZhuYuanNo()));
             }
-            matDeliverListResult.setDeliverData(lcdcfFmService.queryFmPatient(deliverQueryRequest.getZhuYuanNo()));
+
         } catch (Exception e) {
         }
         return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(matDeliverListResult);