From faaf4e9b54a8745bf56ad7535268ae9966ca87cd Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Sat, 1 Jun 2019 21:57:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=8D=E5=AD=90=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/PatientFacade.java | 35 +++++++++++++++-------
 .../web/result/HealthHandbookExcelModel.java       |  6 ++--
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 41ce325..f9d593b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -1517,16 +1517,31 @@ public class PatientFacade {
                 //发放机构：当前机构名称== 当前机构名称
                 String hospitalName = couponMapper.getHospitalName(patients.getHospitalId());
                 healthHandbookExcelModel.setOrganization(hospitalName == null ? "诸城市人民医院" : hospitalName);
-                //镇街、村居或单位：现住地址
-                Map<String, Object> map = viewFacade.getPatientViewData(patients, patients.getId());
-                healthHandbookExcelModel.setAddress(map.get("register").toString());
-                //孩次：分娩儿童数
-                AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录
-                antExChuQuery.setParentId(patients.getId());
-                List<AntExChuModel> antExChulist = antExService.queryAntExChu(antExChuQuery);
-
-                AntExChuModel data = antExService.findOne(antExChulist.get(0).getId());
-                healthHandbookExcelModel.setChildTime(data == null ? 0 : (data.getProdTime() == null ? 0 : data.getProdTime() + 1));
+
+                if(patients!=null && patients.getId()!=null){
+                    //镇街、村居或单位：现住地址
+                    Map<String, Object> map = viewFacade.getPatientViewData(patients, patients.getId());
+                    healthHandbookExcelModel.setAddress(map.get("register").toString());
+
+                    //孩次：分娩儿童数
+                    AntExChuQuery antExChuQuery = new AntExChuQuery();//获取初诊记录
+                    antExChuQuery.setParentId(patients.getId());
+                    List<AntExChuModel> antExChulist = antExService.queryAntExChu(antExChuQuery);
+                    if(antExChulist!=null){
+                        AntExChuModel data = antExService.findOne(antExChulist.get(0).getId());
+                        Integer prodTime= data.getProdTime()+ 1;
+                        healthHandbookExcelModel.setChildTime(data == null ? "" : (data.getProdTime() == null ? "" : prodTime.toString()));
+                    }else {
+                        healthHandbookExcelModel.setChildTime("");
+                    }
+                }else{
+                    healthHandbookExcelModel.setAddress("");
+                    healthHandbookExcelModel.setChildTime("");
+                }
+
+
+
+
                 //孕期：当前使用有孕== 有孕
                 healthHandbookExcelModel.setGestation(healthHandbookExcelModel.getGestation());
                 //发放日期：当前日期
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HealthHandbookExcelModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HealthHandbookExcelModel.java
index 89f29ac..eb372d7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HealthHandbookExcelModel.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HealthHandbookExcelModel.java
@@ -50,7 +50,7 @@ public class HealthHandbookExcelModel {
     /*
     孩次：分娩儿童数
      */
-    private Integer childTime;
+    private String childTime;
     /*
     孕期：当前使用有孕== 有孕
      */
@@ -141,11 +141,11 @@ public class HealthHandbookExcelModel {
         this.address = address;
     }
 
-    public Integer getChildTime() {
+    public String getChildTime() {
         return childTime;
     }
 
-    public void setChildTime(Integer childTime) {
+    public void setChildTime(String childTime) {
         this.childTime = childTime;
     }
 
-- 
1.8.3.1