From 44745da82c6e890b2f5afa76d12946c7b21e4c2d Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 4 May 2016 09:46:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=80=E5=87=BA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/utils/CommonsHelper.java  | 71 ++++++++++++----------
 1 file changed, 40 insertions(+), 31 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java
index da96f82..3f6c296 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java
@@ -14,64 +14,73 @@ import java.util.Map;
 /**
  * Created by Administrator on 2016/5/1 0001.
  */
-public  final class CommonsHelper {
+public final class CommonsHelper {
 
 
-
-
-    public static Object convterToMap(BasicConfig basicConfig,boolean sample){
-        if(sample&&null!=basicConfig){
-            Map<String,Object> map =  new HashMap<>();
-            map.put("id",basicConfig.getId());
-            map.put("name",basicConfig.getName());
-            map.put("code",basicConfig.getCode());
+    public static Object convterToMap(BasicConfig basicConfig, boolean sample) {
+        if (sample && null != basicConfig) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", basicConfig.getId());
+            map.put("name", basicConfig.getName());
+            map.put("code", basicConfig.getCode());
             return map;
         }
-        return  basicConfig;
+        return basicConfig;
     }
 
-    public static  String getFullAddress(String provinceId,
-                                         String cityId,
-                                         String areaId,
-                                         String address,BasicConfigService basicConfigService){
-        StringBuilder sb= new StringBuilder();
-        if(StringUtils.isNotEmpty(provinceId)){
-            sb.append(basicConfigService.getOneBasicConfigById(provinceId).getName());
+    public static String getFullAddress(String provinceId,
+                                        String cityId,
+                                        String areaId,
+                                        String address, BasicConfigService basicConfigService) {
+        StringBuilder sb = new StringBuilder();
+        if (StringUtils.isNotEmpty(provinceId)) {
+            sb.append(getName1(provinceId,basicConfigService));
         }
-        if(StringUtils.isNotEmpty(cityId)){
-            sb.append(basicConfigService.getOneBasicConfigById(cityId).getName());
+        if (StringUtils.isNotEmpty(cityId)) {
+            sb.append(getName1(cityId,basicConfigService));
         }
-        if(StringUtils.isNotEmpty(areaId)){
-            sb.append(basicConfigService.getOneBasicConfigById(areaId).getName());
+        if (StringUtils.isNotEmpty(areaId)) {
+            sb.append(getName1(areaId,basicConfigService));
+        }
+        if (StringUtils.isNotEmpty(address)) {
+            sb.append(address);
         }
-        sb.append(address);
         return sb.toString();
     }
 
+    private static String getName1(String id, BasicConfigService basicConfigService) {
+        BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id);
+        if (basicConfig != null) {
+            return basicConfig.getName();
+        }
+        return "";
+    }
+
     /**
      * 填充地址信息
      *
      * @param puerperaModel
      * @return
      */
-    public static Address fullAddress(Patients puerperaModel,BasicConfigService basicConfigService) {
+    public static Address fullAddress(Patients puerperaModel, BasicConfigService basicConfigService) {
         Address address = new Address();
-        address.setArea(getName(puerperaModel.getAreaId(),basicConfigService));
-        address.setCity(getName(puerperaModel.getCityId(),basicConfigService));
-        address.setProvince(getName(puerperaModel.getProvinceId(),basicConfigService));
+        address.setArea(getName(puerperaModel.getAreaId(), basicConfigService));
+        address.setCity(getName(puerperaModel.getCityId(), basicConfigService));
+        address.setProvince(getName(puerperaModel.getProvinceId(), basicConfigService));
         address.setAddress(puerperaModel.getAddress());
         return address;
     }
 
-    public static Address fullAddress(BabyModel puerperaModel,BasicConfigService basicConfigService) {
+    public static Address fullAddress(BabyModel puerperaModel, BasicConfigService basicConfigService) {
         Address address = new Address();
-        address.setArea(getName(puerperaModel.getAreaId(),basicConfigService));
-        address.setCity(getName(puerperaModel.getCityId(),basicConfigService));
-        address.setProvince(getName(puerperaModel.getProvinceId(),basicConfigService));
+        address.setArea(getName(puerperaModel.getAreaId(), basicConfigService));
+        address.setCity(getName(puerperaModel.getCityId(), basicConfigService));
+        address.setProvince(getName(puerperaModel.getProvinceId(), basicConfigService));
         address.setAddress(puerperaModel.getAddress());
         return address;
     }
-    private static AddressInner getName(String id,BasicConfigService basicConfigService) {
+
+    private static AddressInner getName(String id, BasicConfigService basicConfigService) {
         AddressInner addressInner = new AddressInner();
         addressInner.setId(id);
         BasicConfig config = basicConfigService.getOneBasicConfigById(id);
-- 
1.8.3.1