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