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 c244855..ffdb2c8 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
@@ -377,11 +377,11 @@ public class ResidentsArchiveFacade{
         result.setStreetRegisterId(model.getStreetRegisterId());
         result.setAddressRegister(model.getAddressRegister());
 
-        result.setPastHistory(JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class));
-        result.setFamilyHistory(JsonUtil.jkstr2Obj(model.getFamilyHistory(), Map.class));
-        result.setPersonalHistory(JsonUtil.jkstr2Obj(model.getPresentHistory(), Map.class));
-        result.setYwgmHistory(JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class));
-        result.setPresentHistory(JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class));
+        result.setPastHistory(model.getPastHistory()==null ? null :JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class));
+        result.setFamilyHistory(model.getFamilyHistory() == null ? null : JsonUtil.jkstr2Obj(model.getFamilyHistory(), Map.class));
+        result.setPersonalHistory(model.getPresentHistory() == null ? null :JsonUtil.jkstr2Obj(model.getPresentHistory(), Map.class));
+        result.setYwgmHistory(model.getYwgmHistory() == null ? null :JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class));
+        result.setPresentHistory(model.getPresentHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class));
 
         result.setVcCardNo(model.getVcCardNo());
         result.setBuildDoctor(model.getBuildDoctor());