From 59cc18e23f401e4185417146a3f1eb42192cd9d6 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 27 Jun 2016 10:05:34 +0800
Subject: [PATCH] 1

---
 .../com/lyms/platform/common/utils/JsonUtil.java   | 19 ++++++++++++---
 .../operate/web/result/MaternalDeliverResult.java  | 27 ++++++++++++++++++----
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java
index 06aacbe..290091b 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java
@@ -3,12 +3,25 @@ package com.lyms.platform.common.utils;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
+import org.codehaus.jackson.map.ObjectMapper;
 
+import java.io.IOException;
 import java.util.*;
 
 public class JsonUtil {
+    public static <T> T jkstr2Obj(String content,
+                                  Class<T> cls) {
+        ObjectMapper objectMapper = new ObjectMapper();
 
 
+        try {
+            return (T) objectMapper.readValue(content, cls);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     @SuppressWarnings("unchecked")
     public static <T> T str2Obj(String content,
                                 Class<T> cls) {
@@ -35,10 +48,10 @@ public class JsonUtil {
     public static String obj2JsonString(Object obj) {
         try {
             return JSONObject.fromObject(obj).toString();
-        }catch (Exception e){
-            ExceptionUtils.catchException(e,"obj2 json string error ."+e.getMessage());
+        } catch (Exception e) {
+            ExceptionUtils.catchException(e, "obj2 json string error ." + e.getMessage());
         }
-        return  null;
+        return null;
     }
 
     public static String array2JsonString(Object obj) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
index b221d82..2b74f5e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
@@ -4,7 +4,10 @@ import com.lyms.platform.common.enums.SexEnum;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.pojo.BabyModel;
 import com.lyms.platform.pojo.MaternalDeliverModel;
+import net.sf.ezmorph.bean.MorphDynaBean;
+import org.codehaus.jackson.map.ObjectMapper;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -33,7 +36,7 @@ public class MaternalDeliverResult  {
     //手术原因
     private String operationCause;
     //产程  h 小时  m 分
-    private Map prodprocess;
+    private Map<String,Map> prodprocess;
     //总产程
     private String totalprocess;
     //会阴情况
@@ -86,7 +89,7 @@ public class MaternalDeliverResult  {
         setDeliveryMode(JsonUtil.str2Obj(destModel.getDeliveryMode(),Map.class));
         setOperationCause(destModel.getOperationCause());
 
-        setProdprocess(JsonUtil.str2Obj(destModel.getProdprocess(),Map.class));
+        setProdprocess(JsonUtil.jkstr2Obj(destModel.getProdprocess(),Map.class));
         setTotalprocess(destModel.getTotalprocess());
         setPerinealCondition(destModel.getPerinealCondition());
         setSiLielevel(destModel.getSiLielevel());
@@ -545,11 +548,27 @@ public class MaternalDeliverResult  {
         this.ocs = ocs;
     }
 
-    public Map getProdprocess() {
+    public Map<String, Map> getProdprocess() {
         return prodprocess;
     }
 
-    public void setProdprocess(Map prodprocess) {
+    public void setProdprocess(Map<String, Map> prodprocess) {
         this.prodprocess = prodprocess;
     }
+    public static void main(String[] args){
+        Map b =
+                (Map)JsonUtil.str2Obj("{\"one\":{\"h\":\"123\",\"m\":\"234\"},\"two\":{\"h\":\"123\",\"m\":\"234\"},\"three\":{\"h\":\"123\",\"m\":\"234\"}}", Map.class);
+
+        ObjectMapper objectMapper =  new ObjectMapper();
+
+
+        Map acc = null;
+        try {
+            acc = objectMapper.readValue("{\"one\":{\"h\":\"123\",\"m\":\"234\"},\"two\":{\"h\":\"123\",\"m\":\"234\"},\"three\":{\"h\":\"123\",\"m\":\"234\"}}", Map.class);
+            System.out.println(acc);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.out.print(acc);
+    }
 }
-- 
1.8.3.1