From f8985f78166298399dec7fb760ac4c709bed6059 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Sun, 9 Jun 2019 20:36:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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 d33b198..aa05ae0 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
@@ -2085,7 +2085,9 @@ public class MatDeliverFacade {
     public String getAddressNameById(String id) {
         if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id)) {
             BasicConfig oneBasicConfigById = basicConfigService.getOneBasicConfigById(id);
-            return oneBasicConfigById.getName();
+            if (oneBasicConfigById != null) {
+                return oneBasicConfigById.getName();
+            }
         }
         return "";
     }
@@ -2942,7 +2944,7 @@ public class MatDeliverFacade {
                     System.out.println("证件号为空");
                     continue;
                 }
-                Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pregnantCertificateNum").is(pCardno)), Patients.class);
+                Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(pCardno)), Patients.class);
                 if (patients == null) {
                     System.out.println("没有建档数据");
                     continue;
@@ -2989,6 +2991,7 @@ public class MatDeliverFacade {
                 matDeliverAddRequest.setFmHospital("216");
                 //  TODO 2019/6/9 14:55 dongqing 接生者
                 matDeliverAddRequest.setDeliverDoctor("");
+                matDeliverAddRequest.setDeliveryMode(new HashedMap());
                 list.add(matDeliverAddRequest);
             }
 
-- 
1.8.3.1