From 62e3d12e52640f8bdc18c2c846476848fb55fb6f Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Thu, 8 Dec 2016 16:14:57 +0800
Subject: [PATCH] update

---
 .../main/java/com/lyms/platform/common/enums/SexEnum.java | 15 ++++++++-------
 .../lyms/platform/operate/web/facade/FolicAcidFacade.java | 13 +++++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SexEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SexEnum.java
index 32a64f6..e5183ae 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/SexEnum.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SexEnum.java
@@ -5,31 +5,32 @@ package com.lyms.platform.common.enums;
  * Created by Zhang.Rui on 2016/4/7.
  */
 public enum SexEnum {
-    MAN(1, "男"), WOMAN(0, "女");
+    MAN("ac334aa6-b0f2-4b25-a231-cf968c14ef8b", "男"),
+    WOMAN("c23779f1-cb6e-44d0-9fc8-0a990bf6184c", "女");
 
-    private Integer id;
+    private String id;
     private String text;
 
 
-    SexEnum(int id, String text) {
+    SexEnum(String id, String text) {
         this.id = id;
         this.text = text;
     }
 
-    public static String getTextById(int id) {
+    public static String getTextById(String id) {
         for (SexEnum sexEnum : values()) {
-            if (sexEnum.getId() == id) {
+            if (sexEnum.getId().equals(id)) {
                 return sexEnum.getText();
             }
         }
         return "未知";
     }
 
-    public Integer getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(Integer id) {
+    public void setId(String id) {
         this.id = id;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
index 92e3dea..2fc07f5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
@@ -4,12 +4,14 @@ import com.lyms.platform.biz.service.BasicConfigService;
 import com.lyms.platform.biz.service.FolicAcidService;
 import com.lyms.platform.biz.service.ResidentsArchiveService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
+import com.lyms.platform.common.enums.SexEnum;
 import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.ExcelUtil;
+import com.lyms.platform.common.utils.SystemConfig;
 import com.lyms.platform.operate.web.request.FolicAcidAddRequest;
 import com.lyms.platform.operate.web.request.FolicAcidQueryRequest;
 import com.lyms.platform.operate.web.utils.CommonsHelper;
@@ -18,12 +20,14 @@ import com.lyms.platform.permission.model.OrganizationQuery;
 import com.lyms.platform.permission.model.Users;
 import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.permission.service.UsersService;
+import com.lyms.platform.pojo.BasicConfig;
 import com.lyms.platform.pojo.FolicAcid;
 import com.lyms.platform.pojo.ResidentsArchiveModel;
 import com.lyms.platform.query.FolicAcidQuery;
 import com.lyms.platform.query.ResidentsArchiveQuery;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.struts.config.BaseConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -176,6 +180,15 @@ public class FolicAcidFacade {
             archiveMap.put("age", archiveModel.getAge());
             archiveMap.put("phone", archiveModel.getPhone());
             archiveMap.put("id", archiveModel.getId());
+            if (archiveModel.getSex()== SystemConfig.WOMAN_ID){
+                archiveMap.put("sex", SexEnum.getTextById(SystemConfig.WOMAN_ID));
+            }else {
+                archiveMap.put("sex", SexEnum.getTextById(SystemConfig.MAN_ID));
+            }
+            archiveMap.put("residenceRegister",CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(),
+                    archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(),
+                    archiveModel.getAddressRegister(), basicConfigService));
+            archiveMap.put("workUnit",archiveModel.getWorkUnit());
 
         }
         resultMap.put("folicAcidResult",folicAcid);
-- 
1.8.3.1