diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java
index e359511..0d4431c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java
@@ -56,14 +56,12 @@ public class PreEugenicsBaseListResult extends PreEugenicsBaseModel {
     private String husbandAccountNatureStr;
 
 
-
     /**
      * 妻子民族id
      */
     private String wifeNationStr;
 
 
-
     /**
      * 妻子文化程度id
      */
@@ -80,7 +78,6 @@ public class PreEugenicsBaseListResult extends PreEugenicsBaseModel {
     private String wifeCareerStr;
 
 
-
     /**
      * 妻子户口性质:
      * 1农业户口 (含界定为农村居民者) 2.非农业
@@ -88,6 +85,40 @@ public class PreEugenicsBaseListResult extends PreEugenicsBaseModel {
     private String wifeAccountNatureStr;
 
 
+    private String doctorStr;
+
+    public String getHusbandAccountAddressStr() {
+        return husbandAccountAddressStr;
+    }
+
+    public void setHusbandAccountAddressStr(String husbandAccountAddressStr) {
+        this.husbandAccountAddressStr = husbandAccountAddressStr;
+    }
+
+    public String getHusbandCurrentAddressStr() {
+        return husbandCurrentAddressStr;
+    }
+
+    public void setHusbandCurrentAddressStr(String husbandCurrentAddressStr) {
+        this.husbandCurrentAddressStr = husbandCurrentAddressStr;
+    }
+
+    public String getWifeAccountAddressStr() {
+        return wifeAccountAddressStr;
+    }
+
+    public void setWifeAccountAddressStr(String wifeAccountAddressStr) {
+        this.wifeAccountAddressStr = wifeAccountAddressStr;
+    }
+
+    public String getWifeCurrentAddressStr() {
+        return wifeCurrentAddressStr;
+    }
+
+    public void setWifeCurrentAddressStr(String wifeCurrentAddressStr) {
+        this.wifeCurrentAddressStr = wifeCurrentAddressStr;
+    }
+
     public String getHusbandEducationalStr() {
         return husbandEducationalStr;
     }
@@ -168,35 +199,11 @@ public class PreEugenicsBaseListResult extends PreEugenicsBaseModel {
         this.wifeAccountNatureStr = wifeAccountNatureStr;
     }
 
-    public String getHusbandAccountAddressStr() {
-        return husbandAccountAddressStr;
-    }
-
-    public void setHusbandAccountAddressStr(String husbandAccountAddressStr) {
-        this.husbandAccountAddressStr = husbandAccountAddressStr;
-    }
-
-    public String getHusbandCurrentAddressStr() {
-        return husbandCurrentAddressStr;
-    }
-
-    public void setHusbandCurrentAddressStr(String husbandCurrentAddressStr) {
-        this.husbandCurrentAddressStr = husbandCurrentAddressStr;
-    }
-
-    public String getWifeAccountAddressStr() {
-        return wifeAccountAddressStr;
-    }
-
-    public void setWifeAccountAddressStr(String wifeAccountAddressStr) {
-        this.wifeAccountAddressStr = wifeAccountAddressStr;
-    }
-
-    public String getWifeCurrentAddressStr() {
-        return wifeCurrentAddressStr;
+    public String getDoctorStr() {
+        return doctorStr;
     }
 
-    public void setWifeCurrentAddressStr(String wifeCurrentAddressStr) {
-        this.wifeCurrentAddressStr = wifeCurrentAddressStr;
+    public void setDoctorStr(String doctorStr) {
+        this.doctorStr = doctorStr;
     }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
index 59a447d..f69fa1a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
@@ -3,7 +3,9 @@ package com.lyms.platform.operate.web.service.impl;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
+import com.lyms.platform.permission.service.UsersService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
@@ -46,6 +48,9 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen
     @Autowired
     private BasicConfigService basicConfigService;
 
+    @Autowired
+    private UsersService usersService;
+
     /**
      * 根据身份证号获取对应的孕前优生信息
      *
@@ -90,7 +95,15 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen
                 one.setWifeAccountCity(model.getCityRegisterId());
                 one.setWifeAccountArea(model.getAreaRegisterId());
                 one.setWifeAccountStreet(model.getStreetRegisterId());
-                one.setWifeAccountAddress(model.getStreetRegisterId());
+                one.setWifeAccountAddress(model.getAddressRegister());
+
+
+                //  妇女居住地
+                one.setWifeCurrentProvince(model.getProvinceId());
+                one.setWifeCurrentCity(model.getCityId());
+                one.setWifeCurrentArea(model.getAreaId());
+                one.setWifeCurrentStreet(model.getStreetId());
+                one.setWifeCurrentAddress(model.getAddress());
 
                 //  丈夫信息
                 one.setHusbandName(model.getSpouseName());
@@ -346,7 +359,7 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen
                 model.getWifeCurrentStreet(),
                 model.getWifeCurrentAddress(), basicConfigService));
 
-        result.setHusbandEducationalStr(CommonsHelper.getName1(model.getHusbandEducational(),basicConfigService));
+        result.setHusbandEducationalStr(CommonsHelper.getName1(model.getHusbandEducational(), basicConfigService));
         result.setHusbandCardTypeStr(CommonsHelper.getName1(model.getHusbandCardType(), basicConfigService));
         result.setHusbandCareerStr(CommonsHelper.getName1(model.getHusbandCareer(), basicConfigService));
         result.setHusbandNationStr(CommonsHelper.getName1(model.getHusbandNation(), basicConfigService));
@@ -356,10 +369,35 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen
         result.setWifeCardTypeStr(CommonsHelper.getName1(model.getWifeCardType(), basicConfigService));
         result.setWifeCareerStr(CommonsHelper.getName1(model.getWifeCareer(), basicConfigService));
         result.setWifeAccountNatureStr(CommonsHelper.getName1(model.getWifeAccountNature(), basicConfigService));
+        result.setDoctorStr(CommonsHelper.getUserName(model.getDoctor(), usersService));
+
+        setDoctorName(result.getWifeBaseInfo());
+        setDoctorName(result.getWifePhysiqueCheck());
+        setDoctorName(result.getWifeClinicalCheck());
+        setDoctorName(result.getWifeBCheck());
+        setDoctorName(result.getWifeOtherCheck());
+
+        setDoctorName(result.getHusbandBaseInfo());
+        setDoctorName(result.getHusbandPhysiqueCheck());
+        setDoctorName(result.getHusbandClinicalCheck());
+        setDoctorName(result.getHusbandOtherCheck());
+
+        setDoctorName(result.getResultAdvice());
 
         return result;
     }
 
+
+    private void setDoctorName(Map<String,Object> map)
+    {
+        if (map != null && map.size() > 0 && map.get("doctor") != null)
+        {
+            String doctor = String.valueOf(map.get("doctor"));
+            String doctorStr = CommonsHelper.getUserName(doctor,usersService);
+            map.put("doctorStr",doctorStr);
+        }
+    }
+
     /**
      * 单个查询
      *