From a61d6d4928e2220947d3f2ee079ab53c700e1ea6 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 19 Jul 2018 15:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/query/PostVisitHospitalModelQuery.java   | 12 ++++++++++++
 .../web/facade/ModularFunctionConfigFacde.java        | 19 +++++++++++++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostVisitHospitalModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostVisitHospitalModelQuery.java
index 97c23fc..753d08c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PostVisitHospitalModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PostVisitHospitalModelQuery.java
@@ -29,6 +29,7 @@ public class PostVisitHospitalModelQuery extends BaseQuery implements IConvertTo
      * 产后修养医院id
      */
     private  String postHosptial;
+    private  String noPostHosptial;
     /**
      * 地址id集合
      */
@@ -51,6 +52,14 @@ public class PostVisitHospitalModelQuery extends BaseQuery implements IConvertTo
      */
     private String createUser;
 
+    public String getNoPostHosptial() {
+        return noPostHosptial;
+    }
+
+    public void setNoPostHosptial(String noPostHosptial) {
+        this.noPostHosptial = noPostHosptial;
+    }
+
     public String getId() {
         return id;
     }
@@ -127,6 +136,9 @@ public class PostVisitHospitalModelQuery extends BaseQuery implements IConvertTo
         if(null!=postHosptial){
             mongoCondition= mongoCondition.and("postHosptial",postHosptial, MongoOper.IS);
         }
+        if(null!=noPostHosptial){
+            mongoCondition= mongoCondition.and("postHosptial",noPostHosptial, MongoOper.NE);
+        }
         if(CollectionUtils.isNotEmpty(areaTiters)){
             mongoCondition= mongoCondition.and("areaTiters",areaTiters, MongoOper.IN);
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java
index 7ff2fae..77aebe0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ModularFunctionConfigFacde.java
@@ -212,7 +212,7 @@ public class ModularFunctionConfigFacde {
             postVisitHospitalService.updatePostVisitHospitalModel(oldPostModel);
             return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return new BaseResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
         }
@@ -223,9 +223,20 @@ public class ModularFunctionConfigFacde {
         postQuery.setHosptialId(hospitalId);
 
         List<PostVisitHospitalModel> postVisitHospitalModels = postVisitHospitalService.queryPostVisitHospitalModel(postQuery);
-        if (CollectionUtils.isNotEmpty(postVisitHospitalModels)) {
-            return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(postVisitHospitalModels);
+
+        postQuery.setNoPostHosptial(postQuery.getPostHosptial());
+        postQuery.setPostHosptial(null);
+        List<PostVisitHospitalModel> postVisitHospitalModel = postVisitHospitalService.queryPostVisitHospitalModel(postQuery);
+        List<String> excData = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(postVisitHospitalModel)) {
+            for (PostVisitHospitalModel phm : postVisitHospitalModel) {
+                excData.addAll(phm.getAreaTiters());
+            }
         }
-        return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有数据");
+
+        Map dataMap = new HashMap();
+        dataMap.put("data", postVisitHospitalModels);
+        dataMap.put("excData", excData);
+        return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(dataMap);
     }
 }
-- 
1.8.3.1