From 4eb3337e39e5292b0706082b36a1119870d2a48c Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 27 Apr 2016 17:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A4=BE=E5=8C=BAid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/PatientFacade.java   | 15 ++++++++++++++-
 .../lyms/platform/operate/web/result/PuerperaResult.java  | 15 +++++++++++++--
 2 files changed, 27 insertions(+), 3 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 19c192a..c986008 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
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
+import com.lyms.platform.biz.service.CommunityConfigService;
 import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.YnEnums;
@@ -10,11 +11,13 @@ import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest;
 import com.lyms.platform.operate.web.request.PuerperaManagerUpdateRequest;
 import com.lyms.platform.operate.web.request.PuerperaMatcherCommunityRequest;
 import com.lyms.platform.operate.web.result.PuerperaResult;
+import com.lyms.platform.pojo.CommunityConfig;
 import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.PuerperaModel;
 import com.lyms.platform.query.PatientsQuery;
 import com.lyms.platform.query.PuerperaModelQuery;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -29,6 +32,8 @@ public class PatientFacade {
 
     @Autowired
     private PatientsService patientsService;
+    @Autowired
+    private CommunityConfigService communityConfigService;
 
 
     /**
@@ -85,7 +90,15 @@ public class PatientFacade {
 
             for (Patients model : puerperaList) {
                 PuerperaResult result = new PuerperaResult();
-                data.add(result.convertToResult(model));
+                String comm="未分配";
+                if(StringUtils.isNotEmpty(model.getCommunityId())){
+                    CommunityConfig communityConfig = communityConfigService.queryAreaById(model.getCommunityId());
+                    if(null!=communityConfig){
+                        comm= communityConfig.getName();
+                    }
+                }
+
+                data.add(result.convertToResult(model,comm));
             }
         }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java
index c456bb9..b79679b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java
@@ -26,6 +26,16 @@ public class PuerperaResult {
 
     private String community;
 
+    private String communityId;
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
     private String visit;
 
     private String phone;
@@ -117,7 +127,7 @@ public class PuerperaResult {
         return this;
     }
 
-    public PuerperaResult convertToResult(Patients model) {
+    public PuerperaResult convertToResult(Patients model,String  comm) {
         String addr = "";
         if (StringUtils.isNotEmpty(model.getAddress())) {
             try {
@@ -131,7 +141,8 @@ public class PuerperaResult {
         setId(model.getId());
         setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate()));
         setVisit(model.getIsVisit() == 0 ? "未访视" : "已访视");
-        setCommunity(StringUtils.isEmpty(model.getCommunityId()) ? "未分配" : model.getCommunityId());
+        setCommunityId(StringUtils.isEmpty(model.getCommunityId()) ? "" : model.getCommunityId());
+        setCommunity(comm);
         setPhone(model.getPhone());
         setAge(model.getAge());
         setName(model.getUsername());
-- 
1.8.3.1