fangcheng / regional-platform

Download as
Browse Code »

Commit 18e03283c051567f72ac9b168a9d33957aa608bf

Authored by hujiaqi
2 parents eba66cf1f1 e69134eb3e
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 18e0328
... ... @@ -25,6 +25,7 @@
25 25 import com.lyms.platform.pojo.ResidentsArchiveModel;
26 26 import com.lyms.platform.query.PremaritalCheckupQuery;
27 27 import com.lyms.platform.query.ResidentsArchiveQuery;
  28 +import net.sf.json.JSONObject;
28 29 import org.apache.commons.collections.CollectionUtils;
29 30 import org.apache.commons.lang.StringUtils;
30 31 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -376,10 +377,10 @@
376 377 result.setAddressRegister(model.getAddressRegister());
377 378  
378 379 result.setPastHistory(JsonUtil.str2Obj(model.getPastHistory(),Map.class));
379   - result.setFamilyHistory(JsonUtil.str2Obj(model.getFamilyHistory(),Map.class));
380   - result.setPersonalHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
381   - result.setYwgmHistory(JsonUtil.str2Obj(model.getYwgmHistory(),Map.class));
382   - result.setPresentHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
  380 +// result.setFamilyHistory(JsonUtil.str2Obj(model.getFamilyHistory(),Map.class));
  381 +// result.setPersonalHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
  382 +// result.setYwgmHistory(JsonUtil.str2Obj(model.getYwgmHistory(),Map.class));
  383 +// result.setPresentHistory(JsonUtil.str2Obj(model.getPresentHistory(),Map.class));
383 384  
384 385 result.setVcCardNo(model.getVcCardNo());
385 386 result.setBuildDoctor(model.getBuildDoctor());
... ... @@ -392,6 +393,22 @@
392 393 result.setPublishName(model.getPublishName());
393 394  
394 395 return result;
  396 + }
  397 +
  398 + /**
  399 + * 把json对象串转换成map对象
  400 + * @param jsonObjStr e.g. {'name':'get','int':1,'double',1.1,'null':null}
  401 + * @return Map
  402 + */
  403 + public static Map getMapFromJsonObjStr(String jsonObjStr) {
  404 + JSONObject jsonObject = JSONObject.fromObject(jsonObjStr);
  405 +
  406 + Map map = new HashMap();
  407 + for (Iterator iter = jsonObject.keys(); iter.hasNext();) {
  408 + String key = (String) iter.next();
  409 + map.put(key, jsonObject.get(key));
  410 + }
  411 + return map;
395 412 }
396 413  
397 414  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java View file @ 18e0328
... ... @@ -126,19 +126,19 @@
126 126 model.setAddressRegister(addressRegister);
127 127  
128 128 if (pastHistory!=null){
129   - model.setPastHistory(JsonUtil.array2JsonString(pastHistory));
  129 + model.setPastHistory(JsonUtil.obj2JsonString(pastHistory));
130 130 }
131 131 if (familyHistory!=null){
132   - model.setFamilyHistory(JsonUtil.array2JsonString(familyHistory));
  132 + model.setFamilyHistory(JsonUtil.obj2JsonString(familyHistory));
133 133 }
134 134 if (personalHistory!=null){
135   - model.setPersonalHistory(JsonUtil.array2JsonString(personalHistory));
  135 + model.setPersonalHistory(JsonUtil.obj2JsonString(personalHistory));
136 136 }
137 137 if (ywgmHistory!=null){
138   - model.setYwgmHistory(JsonUtil.array2JsonString(ywgmHistory));
  138 + model.setYwgmHistory(JsonUtil.obj2JsonString(ywgmHistory));
139 139 }
140 140 if (presentHistory!=null){
141   - model.setPresentHistory(JsonUtil.array2JsonString(presentHistory));
  141 + model.setPresentHistory(JsonUtil.obj2JsonString(presentHistory));
142 142 }
143 143 model.setVcCardNo(vcCardNo);
144 144 model.setBuildDoctor(buildDoctor);