From b39ce108737f69930777f12a3905ff6c27444d8e Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Fri, 31 May 2019 13:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AreaCountFacade.java        | 29 ++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
index 21940ea..e980eef 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
@@ -1695,12 +1695,26 @@ public class AreaCountFacade {
      */
     private HashMap<String, Object> getStringObjectHashMap(HealthChargeModel model) {
         Date createDate = model.getCreated();
-        String babyForeignId = model.getBabyForeignId();
         String name = "", healthTypeName = "", typeName = "", sourceName = "", doctorName = "";
-        if (babyForeignId != null) {
-            BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyForeignId)), BabyModel.class);
-            if (babyModel != null) {
-                name = babyModel.getName();
+        Integer healthType = model.getHealthType();
+        if (5 == healthType){
+            //  儿童
+            String babyForeignId = model.getBabyForeignId();
+            if (babyForeignId != null) {
+                BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyForeignId)), BabyModel.class);
+                if (babyModel != null) {
+                    name = babyModel.getName();
+                }
+            }
+        } else {
+            //  孕妇
+            String yumForeignId = model.getForeignId();
+            if (yumForeignId != null){
+                Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(yumForeignId)), Patients.class);
+                if (patients != null) {
+                    name = patients.getUsername();
+
+                }
             }
         }
         healthTypeName = getHealthTypeName(model, healthTypeName);
@@ -1810,11 +1824,6 @@ public class AreaCountFacade {
         }
         return healthTypeName;
     }
-
-    public static void main(String[] args) {
-        Date date = new Date(1554048000000L);
-        System.out.println(DateUtil.getyyyy_MM_dd(date));
-    }
 }
 
 
-- 
1.8.3.1