From e69134eb3edece4366d69be9e27e2168659b0de2 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Fri, 2 Dec 2016 14:43:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BB=BA=E6=A1=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/ResidentsArchiveFacade.java | 25 ++++++++++++++++++----
 .../web/request/ResidentsArchiveAddRequest.java    | 10 ++++-----
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
index c491b10..72aa959 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
@@ -25,6 +25,7 @@ import com.lyms.platform.pojo.PremaritalCheckup;
 import com.lyms.platform.pojo.ResidentsArchiveModel;
 import com.lyms.platform.query.PremaritalCheckupQuery;
 import com.lyms.platform.query.ResidentsArchiveQuery;
+import net.sf.json.JSONObject;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -376,10 +377,10 @@ public class ResidentsArchiveFacade{
         result.setAddressRegister(model.getAddressRegister());
 
         result.setPastHistory(JsonUtil.str2Obj(model.getPastHistory(),Map.class));
-        result.setFamilyHistory(JsonUtil.str2Obj(model.getFamilyHistory(),Map.class));
-        result.setPersonalHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
-        result.setYwgmHistory(JsonUtil.str2Obj(model.getYwgmHistory(),Map.class));
-        result.setPresentHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
+//        result.setFamilyHistory(JsonUtil.str2Obj(model.getFamilyHistory(),Map.class));
+//        result.setPersonalHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
+//        result.setYwgmHistory(JsonUtil.str2Obj(model.getYwgmHistory(),Map.class));
+//        result.setPresentHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
 
         result.setVcCardNo(model.getVcCardNo());
         result.setBuildDoctor(model.getBuildDoctor());
@@ -394,6 +395,22 @@ public class ResidentsArchiveFacade{
         return result;
     }
 
+    /**
+     * 把json对象串转换成map对象
+     * @param jsonObjStr e.g. {'name':'get','int':1,'double',1.1,'null':null}
+     * @return Map
+     */
+    public static Map getMapFromJsonObjStr(String jsonObjStr) {
+        JSONObject jsonObject = JSONObject.fromObject(jsonObjStr);
+
+        Map map = new HashMap();
+        for (Iterator iter = jsonObject.keys(); iter.hasNext();) {
+            String key = (String) iter.next();
+            map.put(key, jsonObject.get(key));
+        }
+        return map;
+    }
+
 
     /**
      * 妇女健康管理
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
index 654b164..9bd22ac 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
@@ -126,19 +126,19 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert<Resident
         model.setAddressRegister(addressRegister);
 
         if (pastHistory!=null){
-            model.setPastHistory(JsonUtil.array2JsonString(pastHistory));
+            model.setPastHistory(JsonUtil.obj2JsonString(pastHistory));
         }
         if (familyHistory!=null){
-            model.setFamilyHistory(JsonUtil.array2JsonString(familyHistory));
+            model.setFamilyHistory(JsonUtil.obj2JsonString(familyHistory));
         }
         if (personalHistory!=null){
-            model.setPersonalHistory(JsonUtil.array2JsonString(personalHistory));
+            model.setPersonalHistory(JsonUtil.obj2JsonString(personalHistory));
         }
         if (ywgmHistory!=null){
-            model.setYwgmHistory(JsonUtil.array2JsonString(ywgmHistory));
+            model.setYwgmHistory(JsonUtil.obj2JsonString(ywgmHistory));
         }
         if (presentHistory!=null){
-            model.setPresentHistory(JsonUtil.array2JsonString(presentHistory));
+            model.setPresentHistory(JsonUtil.obj2JsonString(presentHistory));
         }
         model.setVcCardNo(vcCardNo);
         model.setBuildDoctor(buildDoctor);
-- 
1.8.3.1