From 7dff416a1cfb05f354bd0def3b59b375ccd6a9a5 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Fri, 2 Dec 2016 15:42:44 +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        | 15 ++++++++-------
 .../operate/web/request/ResidentsArchiveAddRequest.java   |  2 +-
 .../operate/web/result/ResidentsArchiveResult.java        | 10 +++++-----
 3 files changed, 14 insertions(+), 13 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 72aa959..c1f06fa 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 com.mongodb.util.JSON;
 import net.sf.json.JSONObject;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -328,13 +329,13 @@ public class ResidentsArchiveFacade{
 
         ResidentsArchiveResult result = new ResidentsArchiveResult();
 
+
         ResidentsArchiveQuery query = new ResidentsArchiveQuery();
         query.setYn(YnEnums.YES.getId());
         query.setId(id);
         List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
         if (CollectionUtils.isNotEmpty(modelList)){
             ResidentsArchiveModel model = modelList.get(0);
-
             result = getResult(model);
         }
 
@@ -350,7 +351,7 @@ public class ResidentsArchiveFacade{
         result.setId(model.getId());
         result.setUsername(model.getUsername());
         result.setSex(model.getSex());
-        result.setBrithDay(model.getBuildDay());
+        result.setBirthDay(model.getBuildDay());
         result.setCountryId(model.getCountryId());
         result.setNationId(model.getNationId());
         result.setMarriageId(model.getMarriageId());
@@ -376,11 +377,11 @@ public class ResidentsArchiveFacade{
         result.setStreetRegisterId(model.getStreetRegisterId());
         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.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.setVcCardNo(model.getVcCardNo());
         result.setBuildDoctor(model.getBuildDoctor());
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 9bd22ac..3ad2d2e 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
@@ -121,7 +121,7 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert<Resident
         model.setAddress(address);
         model.setProvinceRegisterId(provinceRegisterId);
         model.setCityRegisterId(cityRegisterId);
-        model.setAddressRegister(areaRegisterId);
+        model.setAreaRegisterId(areaRegisterId);
         model.setStreetRegisterId(streetRegisterId);
         model.setAddressRegister(addressRegister);
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java
index 17e14de..d2ff68c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java
@@ -17,7 +17,7 @@ public class ResidentsArchiveResult {
     //性别
     private String sex;
     //出生日期
-    private String brithDay;
+    private String birthDay;
     //国籍
     private String countryId;
     //民族Id
@@ -115,12 +115,12 @@ public class ResidentsArchiveResult {
         this.sex = sex;
     }
 
-    public String getBrithDay() {
-        return brithDay;
+    public String getBirthDay() {
+        return birthDay;
     }
 
-    public void setBrithDay(String brithDay) {
-        this.brithDay = brithDay;
+    public void setBirthDay(String birthDay) {
+        this.birthDay = birthDay;
     }
 
     public String getCountryId() {
-- 
1.8.3.1