From 0cf0d1d16b25d6daef4fce4612252357f1ba7aa6 Mon Sep 17 00:00:00 2001
From: Administrator <184677810@qq.com>
Date: Tue, 17 Sep 2019 15:10:58 +0800
Subject: [PATCH] update12

---
 .../com/lyms/platform/query/BabyModelQuery.java    | 10 +++++-----
 .../platform/operate/web/facade/BabyEarFacade.java |  6 ++++++
 .../operate/web/result/EarScreenResult.java        | 23 +++++++++++++++++++++-
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index 14e96a0..e43a68d 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -903,19 +903,19 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
         if (null != buildType) {
             condition = condition.and("buildType", buildType, MongoOper.IS);
         }
-        if (null != provinceId) {
+        if (StringUtils.isNotEmpty(provinceId)) {
             condition = condition.and("provinceId", provinceId, MongoOper.IS);
         }
-        if (null != cityId) {
+        if (StringUtils.isNotEmpty(cityId)) {
             condition = condition.and("cityId", cityId, MongoOper.IS);
         }
-        if (null != areaId) {
+        if (StringUtils.isNotEmpty(areaId)) {
             condition = condition.and("areaId", areaId, MongoOper.IS);
         }
-        if (null != streetId) {
+        if (StringUtils.isNotEmpty(streetId)) {
             condition = condition.and("streetId", streetId, MongoOper.IS);
         }
-        if (null != address) {
+        if (StringUtils.isNotEmpty(address)) {
             condition = condition.and("address", address, MongoOper.IS);
         }
         if (null != enable) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
index 07fb044..97c0d4d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
@@ -2145,11 +2145,14 @@ public class BabyEarFacade {
 
         BabyModelQuery modelQuery = new BabyModelQuery();
         modelQuery.setProvinceId(earScreenListRequest.getProvinceId());
+        System.out.println(earScreenListRequest.getProvinceId());
         modelQuery.setCityId(earScreenListRequest.getCityId());
         modelQuery.setAreaId(earScreenListRequest.getAreaId());
         modelQuery.setStreetId(earScreenListRequest.getStreetId());
         modelQuery.setAreaId(earScreenListRequest.getAreaId());
         List<BabyModel> babyModels = babyService.queryBabyWithQuery(modelQuery);
+        System.out.println(modelQuery.convertToQuery().convertToMongoQuery());
+
         List<String> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(babyModels)) {
             for (BabyModel babyModel : babyModels) {
@@ -2191,6 +2194,9 @@ public class BabyEarFacade {
                 screenResult.setMonthAge(DateUtil.getBabyMonthAge(babyModel.getBirth(), earScreen.getScreenDate()));
                 screenResult.setBirthday(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
                 screenResult.setMommnyEncryptPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(babyModel.getMphone()));
+                screenResult.setHabitation(CommonsHelper.getResidence(babyModel.getProvinceId(), babyModel.getCityId(), babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService));
+                screenResult.setOrg(organizationService.getOrganization(Integer.valueOf(babyModel.getHospitalId())).getName());
+
             }
             if (StringUtils.isNotEmpty(earScreen.getHighRiskCause()))//听力高危因素文字 HighRiskEnum
             {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/EarScreenResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/EarScreenResult.java
index 881c7e5..695e0dd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/EarScreenResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/EarScreenResult.java
@@ -16,7 +16,7 @@ public class EarScreenResult {
     //月龄
     private String monthAge;
     //生日
-    private  String birthday;
+    private String birthday;
     //高危因素
     private String highRiskCause;
     //筛查时间
@@ -31,6 +31,27 @@ public class EarScreenResult {
     private String srcDoctor;
     //联系方式
     private String mommnyEncryptPhone;
+    //居住地
+    private String habitation;
+
+    //建档机构
+    private String org;
+
+    public String getOrg() {
+        return org;
+    }
+
+    public void setOrg(String org) {
+        this.org = org;
+    }
+
+    public String getHabitation() {
+        return habitation;
+    }
+
+    public void setHabitation(String habitation) {
+        this.habitation = habitation;
+    }
 
     public String getBabyId() {
         return babyId;
-- 
1.8.3.1