From c863267faa1703ccacfa9a5d1fa4b75ee7d3f521 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Fri, 11 Jan 2019 21:50:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=88=86=E5=A8=A9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/controller/MatDeliverController.java  | 6 +++++-
 .../com/lyms/platform/operate/web/worker/MaterDeliverWorker.java    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
index 4b31529..0629134 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
@@ -312,7 +312,11 @@ public class MatDeliverController extends BaseController{
                 map.put("num",num);
                 map.put("dueDate",queryModel.getDueDate());
                 map.put("fmTime",queryModel.getFmTime());
-                map.put("zyNo",queryModel.getBhnum());
+                if(StringUtils.isNotEmpty(queryModel.getBhnum())){
+                    map.put("zyNo",queryModel.getBhnum().toString());
+                }else {
+                    map.put("zyNo", "-");
+                }
                 map.put("name",queryModel.getName());
                 map.put("age", queryModel.getAge());
                 //居住地
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
index 765f640..28e3866 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java
@@ -500,7 +500,7 @@ public class MaterDeliverWorker implements Callable<List<ChildbirthManagerQueryM
                 childbirthManagerQueryModel.setZypbfm(maternalDeliverModel.getZypbfm());//专业陪伴分娩(0:未选择；1:已选择)
                 childbirthManagerQueryModel.setDueCount(maternalDeliverModel.getDueCount());//产次
                 childbirthManagerQueryModel.setMyzd(maternalDeliverModel.getMyzd());//母婴阻断
-                childbirthManagerQueryModel.setBhnum(maternalDeliverModel.getBhNum().toString());//住院号
+                childbirthManagerQueryModel.setBhnum(maternalDeliverModel.getBhNum());//住院号
 
                 childbirthManagerQueryModelList.add(childbirthManagerQueryModel);
 
-- 
1.8.3.1