diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
index 2b9ed66..c28d851 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
@@ -6,6 +6,7 @@ import com.lyms.platform.common.result.BaseModel;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Date;
+import java.util.Map;
 
 /**
  *
@@ -121,6 +122,268 @@ public class ResidentsArchiveModel extends BaseModel{
 
     private String publishName;
 
+    /***********荣成新增男性建档字段**********/
+    private Integer isOrNotrdl;//是否进食肉、蛋类（0：否；1：是；默认为1）
+    private Integer isOrNotSc;//是否厌食蔬菜（0：否；1：是；默认为0）
+    private Integer isOrNotSr;//是否有食用生肉嗜好（0：否；1：是；默认为0）
+    private Integer isOrNotXy;//是否吸烟（0：否；1：是；默认为0）
+    private String jizhi;//每天抽烟几支
+    private Integer isOrNotBdXy;//是否存在被动吸烟（0：否；1：偶尔；2：经常；默认为0）
+    private String bdXyHours;//平均每天被动吸烟分钟数
+    private Integer isOrNotYj;//是否饮酒（0：否；1：偶尔；2：经常；默认为0）
+    private String yjMl;//每天饮酒量
+    /***********荣成新增男性建档字段**********/
+
+
+    /***********荣成新增女性建档字段**********/
+    private String ccnl;//初潮年龄
+    private Date mcyj;//末次月经时间
+    private Integer isOrNotGl;//月经周期是否规律（0：否；1：是；默认为1）
+    private String jq;//经期
+    private String  zq;//周期
+    private Integer yjl;//月经量（0：多；1：中；2：少；默认为1）
+    private Integer tj;//痛经（0：无；1：轻；2：重；默认为1）
+    private Integer isOrNotHy;//是否曾经怀孕（0：无；1：有；默认为0）
+    private String hycs;//怀孕次数
+    private String hccs;//活产次数
+    private String zyhc;//足月活产次数
+    private String zccs;//早产次数
+    private String isOrNotRsjj;//是否有以下不良妊娠结局（0：无；默认为0）
+    private Integer isOrNotQxe;//是否分娩过出生缺陷儿（0：无；1：是；默认为0）
+    private String bz;//病种
+    private String xxqk;//详细情况
+    private String xyzns;//现有子女数
+    private Integer znstzk;//子女身体状况（0：健康；1：疾病）
+    private String jtbm;//注明具体病名
+
+    public Integer getIsOrNotrdl() {
+        return isOrNotrdl;
+    }
+
+    public void setIsOrNotrdl(Integer isOrNotrdl) {
+        this.isOrNotrdl = isOrNotrdl;
+    }
+
+    public Integer getIsOrNotSc() {
+        return isOrNotSc;
+    }
+
+    public void setIsOrNotSc(Integer isOrNotSc) {
+        this.isOrNotSc = isOrNotSc;
+    }
+
+    public Integer getIsOrNotSr() {
+        return isOrNotSr;
+    }
+
+    public void setIsOrNotSr(Integer isOrNotSr) {
+        this.isOrNotSr = isOrNotSr;
+    }
+
+    public Integer getIsOrNotXy() {
+        return isOrNotXy;
+    }
+
+    public void setIsOrNotXy(Integer isOrNotXy) {
+        this.isOrNotXy = isOrNotXy;
+    }
+
+    public String getJizhi() {
+        return jizhi;
+    }
+
+    public void setJizhi(String jizhi) {
+        this.jizhi = jizhi;
+    }
+
+    public Integer getIsOrNotBdXy() {
+        return isOrNotBdXy;
+    }
+
+    public void setIsOrNotBdXy(Integer isOrNotBdXy) {
+        this.isOrNotBdXy = isOrNotBdXy;
+    }
+
+    public String getBdXyHours() {
+        return bdXyHours;
+    }
+
+    public void setBdXyHours(String bdXyHours) {
+        this.bdXyHours = bdXyHours;
+    }
+
+    public Integer getIsOrNotYj() {
+        return isOrNotYj;
+    }
+
+    public void setIsOrNotYj(Integer isOrNotYj) {
+        this.isOrNotYj = isOrNotYj;
+    }
+
+    public String getYjMl() {
+        return yjMl;
+    }
+
+    public void setYjMl(String yjMl) {
+        this.yjMl = yjMl;
+    }
+
+    public String getCcnl() {
+        return ccnl;
+    }
+
+    public void setCcnl(String ccnl) {
+        this.ccnl = ccnl;
+    }
+
+    public Date getMcyj() {
+        return mcyj;
+    }
+
+    public void setMcyj(Date mcyj) {
+        this.mcyj = mcyj;
+    }
+
+    public Integer getIsOrNotGl() {
+        return isOrNotGl;
+    }
+
+    public void setIsOrNotGl(Integer isOrNotGl) {
+        this.isOrNotGl = isOrNotGl;
+    }
+
+    public String getJq() {
+        return jq;
+    }
+
+    public void setJq(String jq) {
+        this.jq = jq;
+    }
+
+    public String getZq() {
+        return zq;
+    }
+
+    public void setZq(String zq) {
+        this.zq = zq;
+    }
+
+    public Integer getYjl() {
+        return yjl;
+    }
+
+    public void setYjl(Integer yjl) {
+        this.yjl = yjl;
+    }
+
+    public Integer getTj() {
+        return tj;
+    }
+
+    public void setTj(Integer tj) {
+        this.tj = tj;
+    }
+
+    public Integer getIsOrNotHy() {
+        return isOrNotHy;
+    }
+
+    public void setIsOrNotHy(Integer isOrNotHy) {
+        this.isOrNotHy = isOrNotHy;
+    }
+
+    public String getHycs() {
+        return hycs;
+    }
+
+    public void setHycs(String hycs) {
+        this.hycs = hycs;
+    }
+
+    public String getHccs() {
+        return hccs;
+    }
+
+    public void setHccs(String hccs) {
+        this.hccs = hccs;
+    }
+
+    public String getZyhc() {
+        return zyhc;
+    }
+
+    public void setZyhc(String zyhc) {
+        this.zyhc = zyhc;
+    }
+
+    public String getZccs() {
+        return zccs;
+    }
+
+    public void setZccs(String zccs) {
+        this.zccs = zccs;
+    }
+
+    public String getIsOrNotRsjj() {
+        return isOrNotRsjj;
+    }
+
+    public void setIsOrNotRsjj(String isOrNotRsjj) {
+        this.isOrNotRsjj = isOrNotRsjj;
+    }
+
+    public Integer getIsOrNotQxe() {
+        return isOrNotQxe;
+    }
+
+    public void setIsOrNotQxe(Integer isOrNotQxe) {
+        this.isOrNotQxe = isOrNotQxe;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+
+    public String getXxqk() {
+        return xxqk;
+    }
+
+    public void setXxqk(String xxqk) {
+        this.xxqk = xxqk;
+    }
+
+    public String getXyzns() {
+        return xyzns;
+    }
+
+    public void setXyzns(String xyzns) {
+        this.xyzns = xyzns;
+    }
+
+    public Integer getZnstzk() {
+        return znstzk;
+    }
+
+    public void setZnstzk(Integer znstzk) {
+        this.znstzk = znstzk;
+    }
+
+    public String getJtbm() {
+        return jtbm;
+    }
+
+    public void setJtbm(String jtbm) {
+        this.jtbm = jtbm;
+    }
+
+    /***********荣成新增女性建档字段**********/
+
+
+
     public String getSpouseName() {
         return spouseName;
     }
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 c11cd3b..b01566d 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
@@ -553,11 +553,11 @@ public class ResidentsArchiveFacade{
         result.setStreetRegisterId(model.getStreetRegisterId());
         result.setAddressRegister(model.getAddressRegister());
 
-        result.setPastHistory(model.getPastHistory()==null ? null :JsonUtil.jkstr2Obj(model.getPastHistory(), 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.getPersonalHistory() == null ? null :JsonUtil.jkstr2Obj(model.getPersonalHistory(), 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.setPersonalHistory(model.getPersonalHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPersonalHistory(), 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());
         if (StringUtils.isNotEmpty(model.getBuildDoctor()) && com.lyms.platform.common.utils.StringUtils.isNum(model.getBuildDoctor())){
@@ -587,6 +587,37 @@ public class ResidentsArchiveFacade{
         result.setPublishId(model.getPublishId());
         result.setPublishName(model.getPublishName());
 
+        //荣成新增
+        result.setIsOrNotrdl(model.getIsOrNotrdl());
+        result.setIsOrNotSc(model.getIsOrNotSc());
+        result.setIsOrNotSr(model.getIsOrNotSr());
+        result.setIsOrNotXy(model.getIsOrNotXy());
+        result.setJizhi(model.getJizhi());
+        result.setIsOrNotBdXy(model.getIsOrNotBdXy());
+        result.setBdXyHours(model.getBdXyHours());
+        result.setIsOrNotYj(model.getIsOrNotYj());
+        result.setYjMl(model.getYjMl());
+
+        result.setCcnl(model.getCcnl());
+        result.setMcyj(DateUtil.getyyyy_MM_dd(model.getMcyj()));
+        result.setIsOrNotGl(model.getIsOrNotGl());
+        result.setJq(model.getJq());
+        result.setZq(model.getZq());
+        result.setYjl(model.getYjl());
+        result.setTj(model.getTj());
+        result.setIsOrNotHy(model.getIsOrNotHy());
+        result.setHycs(model.getHycs());
+        result.setHccs(model.getHccs());
+        result.setZyhc(model.getZyhc());
+        result.setZccs(model.getZccs());
+        result.setIsOrNotRsjj(model.getIsOrNotRsjj() == null ? null : JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class));
+        result.setIsOrNotQxe(model.getIsOrNotQxe());
+        result.setBz(model.getBz());
+        result.setXxqk(model.getXxqk());
+        result.setXyzns(model.getXyzns());
+        result.setZnstzk(model.getZnstzk());
+        result.setJtbm(model.getJtbm());
+
         return result;
     }
 
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 e44d91a..4021531 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
@@ -110,6 +110,40 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert<Resident
     //建档日期
     private String buildDay;
 
+    /***********荣成新增男性建档字段**********/
+    private Integer isOrNotrdl;//是否进食肉、蛋类（0：否；1：是；默认为1）
+    private Integer isOrNotSc;//是否厌食蔬菜（0：否；1：是；默认为0）
+    private Integer isOrNotSr;//是否有食用生肉嗜好（0：否；1：是；默认为0）
+    private Integer isOrNotXy;//是否吸烟（0：否；1：是；默认为0）
+    private String jizhi;//每天抽烟几支
+    private Integer isOrNotBdXy;//是否存在被动吸烟（0：否；1：偶尔；2：经常；默认为0）
+    private String bdXyHours;//平均每天被动吸烟分钟数
+    private Integer isOrNotYj;//是否饮酒（0：否；1：偶尔；2：经常；默认为0）
+    private String yjMl;//每天饮酒量
+    /***********荣成新增男性建档字段**********/
+
+
+    /***********荣成新增女性建档字段**********/
+    private String ccnl;//初潮年龄
+    private String mcyj;//末次月经时间
+    private Integer isOrNotGl;//月经周期是否规律（0：否；1：是；默认为1）
+    private String jq;//经期
+    private String  zq;//周期
+    private Integer yjl;//月经量（0：多；1：中；2：少；默认为1）
+    private Integer tj;//痛经（0：无；1：轻；2：重；默认为1）
+    private Integer isOrNotHy;//是否曾经怀孕（0：无；1：有；默认为0）
+    private String hycs;//怀孕次数
+    private String hccs;//活产次数
+    private String zyhc;//足月活产次数
+    private String zccs;//早产次数
+    private Map isOrNotRsjj;//是否有以下不良妊娠结局（0：无；默认为0）
+    private Integer isOrNotQxe;//是否分娩过出生缺陷儿（0：无；1：是；默认为0）
+    private String bz;//病种
+    private String xxqk;//详细情况
+    private String xyzns;//现有子女数
+    private Integer znstzk;//子女身体状况（0：健康；1：疾病）
+    private String jtbm;//注明具体病名
+    /***********荣成新增女性建档字段**********/
 
 
     @Override
@@ -166,7 +200,41 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert<Resident
         }
         model.setVcCardNo(vcCardNo);
         model.setBuildDoctor(buildDoctor);
-        model.setBuildDay((buildDay!=null && buildDay!="") ? DateUtil.parseYMD(buildDay) : null);
+        model.setBuildDay((buildDay != null && buildDay != "") ? DateUtil.parseYMD(buildDay) : null);
+
+        //荣成新增男
+        model.setIsOrNotrdl(isOrNotrdl);
+        model.setIsOrNotSc(isOrNotSc);
+        model.setIsOrNotSr(isOrNotSr);
+        model.setIsOrNotXy(isOrNotXy);
+        model.setJizhi(jizhi);
+        model.setIsOrNotBdXy(isOrNotBdXy);
+        model.setBdXyHours(bdXyHours);
+        model.setIsOrNotYj(isOrNotYj);
+        model.setYjMl(yjMl);
+        //女
+        model.setCcnl(ccnl);
+        model.setMcyj((mcyj != null && mcyj != "") ? DateUtil.parseYMD(mcyj) : null);
+        model.setIsOrNotGl(isOrNotGl);
+        model.setJq(jq);
+        model.setZq(zq);
+        model.setYjl(yjl);
+        model.setTj(tj);
+        model.setIsOrNotHy(isOrNotHy);
+        model.setHycs(hycs);
+        model.setHccs(hccs);
+        model.setZyhc(zyhc);
+        model.setZccs(zccs);
+        if(isOrNotRsjj != null){
+            model.setIsOrNotRsjj(JsonUtil.obj2JsonString(isOrNotRsjj));
+        }
+        model.setIsOrNotQxe(isOrNotQxe);
+        model.setBz(bz);
+        model.setXxqk(xxqk);
+        model.setXyzns(xyzns);
+        model.setZnstzk(znstzk);
+        model.setJtbm(jtbm);
+
         return model;
     }
 
@@ -481,4 +549,228 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert<Resident
     public void setBuildDay(String buildDay) {
         this.buildDay = buildDay;
     }
+
+    public Integer getIsOrNotrdl() {
+        return isOrNotrdl;
+    }
+
+    public void setIsOrNotrdl(Integer isOrNotrdl) {
+        this.isOrNotrdl = isOrNotrdl;
+    }
+
+    public Integer getIsOrNotSc() {
+        return isOrNotSc;
+    }
+
+    public void setIsOrNotSc(Integer isOrNotSc) {
+        this.isOrNotSc = isOrNotSc;
+    }
+
+    public Integer getIsOrNotSr() {
+        return isOrNotSr;
+    }
+
+    public void setIsOrNotSr(Integer isOrNotSr) {
+        this.isOrNotSr = isOrNotSr;
+    }
+
+    public Integer getIsOrNotXy() {
+        return isOrNotXy;
+    }
+
+    public void setIsOrNotXy(Integer isOrNotXy) {
+        this.isOrNotXy = isOrNotXy;
+    }
+
+    public String getJizhi() {
+        return jizhi;
+    }
+
+    public void setJizhi(String jizhi) {
+        this.jizhi = jizhi;
+    }
+
+    public Integer getIsOrNotBdXy() {
+        return isOrNotBdXy;
+    }
+
+    public void setIsOrNotBdXy(Integer isOrNotBdXy) {
+        this.isOrNotBdXy = isOrNotBdXy;
+    }
+
+    public String getBdXyHours() {
+        return bdXyHours;
+    }
+
+    public void setBdXyHours(String bdXyHours) {
+        this.bdXyHours = bdXyHours;
+    }
+
+    public Integer getIsOrNotYj() {
+        return isOrNotYj;
+    }
+
+    public void setIsOrNotYj(Integer isOrNotYj) {
+        this.isOrNotYj = isOrNotYj;
+    }
+
+    public String getYjMl() {
+        return yjMl;
+    }
+
+    public void setYjMl(String yjMl) {
+        this.yjMl = yjMl;
+    }
+
+    public String getCcnl() {
+        return ccnl;
+    }
+
+    public void setCcnl(String ccnl) {
+        this.ccnl = ccnl;
+    }
+
+    public String getMcyj() {
+        return mcyj;
+    }
+
+    public void setMcyj(String mcyj) {
+        this.mcyj = mcyj;
+    }
+
+    public Integer getIsOrNotGl() {
+        return isOrNotGl;
+    }
+
+    public void setIsOrNotGl(Integer isOrNotGl) {
+        this.isOrNotGl = isOrNotGl;
+    }
+
+    public String getJq() {
+        return jq;
+    }
+
+    public void setJq(String jq) {
+        this.jq = jq;
+    }
+
+    public String getZq() {
+        return zq;
+    }
+
+    public void setZq(String zq) {
+        this.zq = zq;
+    }
+
+    public Integer getYjl() {
+        return yjl;
+    }
+
+    public void setYjl(Integer yjl) {
+        this.yjl = yjl;
+    }
+
+    public Integer getTj() {
+        return tj;
+    }
+
+    public void setTj(Integer tj) {
+        this.tj = tj;
+    }
+
+    public Integer getIsOrNotHy() {
+        return isOrNotHy;
+    }
+
+    public void setIsOrNotHy(Integer isOrNotHy) {
+        this.isOrNotHy = isOrNotHy;
+    }
+
+    public String getHycs() {
+        return hycs;
+    }
+
+    public void setHycs(String hycs) {
+        this.hycs = hycs;
+    }
+
+    public String getHccs() {
+        return hccs;
+    }
+
+    public void setHccs(String hccs) {
+        this.hccs = hccs;
+    }
+
+    public String getZyhc() {
+        return zyhc;
+    }
+
+    public void setZyhc(String zyhc) {
+        this.zyhc = zyhc;
+    }
+
+    public String getZccs() {
+        return zccs;
+    }
+
+    public void setZccs(String zccs) {
+        this.zccs = zccs;
+    }
+
+    public Map getIsOrNotRsjj() {
+        return isOrNotRsjj;
+    }
+
+    public void setIsOrNotRsjj(Map isOrNotRsjj) {
+        this.isOrNotRsjj = isOrNotRsjj;
+    }
+
+    public Integer getIsOrNotQxe() {
+        return isOrNotQxe;
+    }
+
+    public void setIsOrNotQxe(Integer isOrNotQxe) {
+        this.isOrNotQxe = isOrNotQxe;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+
+    public String getXxqk() {
+        return xxqk;
+    }
+
+    public void setXxqk(String xxqk) {
+        this.xxqk = xxqk;
+    }
+
+    public String getXyzns() {
+        return xyzns;
+    }
+
+    public void setXyzns(String xyzns) {
+        this.xyzns = xyzns;
+    }
+
+    public Integer getZnstzk() {
+        return znstzk;
+    }
+
+    public void setZnstzk(Integer znstzk) {
+        this.znstzk = znstzk;
+    }
+
+    public String getJtbm() {
+        return jtbm;
+    }
+
+    public void setJtbm(String jtbm) {
+        this.jtbm = jtbm;
+    }
 }
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 5929057..252e544 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
@@ -106,6 +106,268 @@ public class ResidentsArchiveResult {
     //修改时间
     private Date modified;
 
+    /***********荣成新增男性建档字段**********/
+    private Integer isOrNotrdl;//是否进食肉、蛋类（0：否；1：是；默认为1）
+    private Integer isOrNotSc;//是否厌食蔬菜（0：否；1：是；默认为0）
+    private Integer isOrNotSr;//是否有食用生肉嗜好（0：否；1：是；默认为0）
+    private Integer isOrNotXy;//是否吸烟（0：否；1：是；默认为0）
+    private String jizhi;//每天抽烟几支
+    private Integer isOrNotBdXy;//是否存在被动吸烟（0：否；1：偶尔；2：经常；默认为0）
+    private String bdXyHours;//平均每天被动吸烟分钟数
+    private Integer isOrNotYj;//是否饮酒（0：否；1：偶尔；2：经常；默认为0）
+    private String yjMl;//每天饮酒量
+    /***********荣成新增男性建档字段**********/
+
+
+    /***********荣成新增女性建档字段**********/
+    private String ccnl;//初潮年龄
+    private String mcyj;//末次月经时间
+    private Integer isOrNotGl;//月经周期是否规律（0：否；1：是；默认为1）
+    private String jq;//经期
+    private String  zq;//周期
+    private Integer yjl;//月经量（0：多；1：中；2：少；默认为1）
+    private Integer tj;//痛经（0：无；1：轻；2：重；默认为1）
+    private Integer isOrNotHy;//是否曾经怀孕（0：无；1：有；默认为0）
+    private String hycs;//怀孕次数
+    private String hccs;//活产次数
+    private String zyhc;//足月活产次数
+    private String zccs;//早产次数
+    private Map isOrNotRsjj;//是否有以下不良妊娠结局（0：无；默认为0）
+    private Integer isOrNotQxe;//是否分娩过出生缺陷儿（0：无；1：是；默认为0）
+    private String bz;//病种
+    private String xxqk;//详细情况
+    private String xyzns;//现有子女数
+    private Integer znstzk;//子女身体状况（0：健康；1：疾病）
+    private String jtbm;//注明具体病名
+
+    public Integer getIsOrNotrdl() {
+        return isOrNotrdl;
+    }
+
+    public void setIsOrNotrdl(Integer isOrNotrdl) {
+        this.isOrNotrdl = isOrNotrdl;
+    }
+
+    public Integer getIsOrNotSc() {
+        return isOrNotSc;
+    }
+
+    public void setIsOrNotSc(Integer isOrNotSc) {
+        this.isOrNotSc = isOrNotSc;
+    }
+
+    public Integer getIsOrNotSr() {
+        return isOrNotSr;
+    }
+
+    public void setIsOrNotSr(Integer isOrNotSr) {
+        this.isOrNotSr = isOrNotSr;
+    }
+
+    public Integer getIsOrNotXy() {
+        return isOrNotXy;
+    }
+
+    public void setIsOrNotXy(Integer isOrNotXy) {
+        this.isOrNotXy = isOrNotXy;
+    }
+
+    public String getJizhi() {
+        return jizhi;
+    }
+
+    public void setJizhi(String jizhi) {
+        this.jizhi = jizhi;
+    }
+
+    public Integer getIsOrNotBdXy() {
+        return isOrNotBdXy;
+    }
+
+    public void setIsOrNotBdXy(Integer isOrNotBdXy) {
+        this.isOrNotBdXy = isOrNotBdXy;
+    }
+
+    public String getBdXyHours() {
+        return bdXyHours;
+    }
+
+    public void setBdXyHours(String bdXyHours) {
+        this.bdXyHours = bdXyHours;
+    }
+
+    public Integer getIsOrNotYj() {
+        return isOrNotYj;
+    }
+
+    public void setIsOrNotYj(Integer isOrNotYj) {
+        this.isOrNotYj = isOrNotYj;
+    }
+
+    public String getYjMl() {
+        return yjMl;
+    }
+
+    public void setYjMl(String yjMl) {
+        this.yjMl = yjMl;
+    }
+
+    public String getCcnl() {
+        return ccnl;
+    }
+
+    public void setCcnl(String ccnl) {
+        this.ccnl = ccnl;
+    }
+
+    public String getMcyj() {
+        return mcyj;
+    }
+
+    public void setMcyj(String mcyj) {
+        this.mcyj = mcyj;
+    }
+
+    public Integer getIsOrNotGl() {
+        return isOrNotGl;
+    }
+
+    public void setIsOrNotGl(Integer isOrNotGl) {
+        this.isOrNotGl = isOrNotGl;
+    }
+
+    public String getJq() {
+        return jq;
+    }
+
+    public void setJq(String jq) {
+        this.jq = jq;
+    }
+
+    public String getZq() {
+        return zq;
+    }
+
+    public void setZq(String zq) {
+        this.zq = zq;
+    }
+
+    public Integer getYjl() {
+        return yjl;
+    }
+
+    public void setYjl(Integer yjl) {
+        this.yjl = yjl;
+    }
+
+    public Integer getTj() {
+        return tj;
+    }
+
+    public void setTj(Integer tj) {
+        this.tj = tj;
+    }
+
+    public Integer getIsOrNotHy() {
+        return isOrNotHy;
+    }
+
+    public void setIsOrNotHy(Integer isOrNotHy) {
+        this.isOrNotHy = isOrNotHy;
+    }
+
+    public String getHycs() {
+        return hycs;
+    }
+
+    public void setHycs(String hycs) {
+        this.hycs = hycs;
+    }
+
+    public String getHccs() {
+        return hccs;
+    }
+
+    public void setHccs(String hccs) {
+        this.hccs = hccs;
+    }
+
+    public String getZyhc() {
+        return zyhc;
+    }
+
+    public void setZyhc(String zyhc) {
+        this.zyhc = zyhc;
+    }
+
+    public String getZccs() {
+        return zccs;
+    }
+
+    public void setZccs(String zccs) {
+        this.zccs = zccs;
+    }
+
+    public Map getIsOrNotRsjj() {
+        return isOrNotRsjj;
+    }
+
+    public void setIsOrNotRsjj(Map isOrNotRsjj) {
+        this.isOrNotRsjj = isOrNotRsjj;
+    }
+
+    public Integer getIsOrNotQxe() {
+        return isOrNotQxe;
+    }
+
+    public void setIsOrNotQxe(Integer isOrNotQxe) {
+        this.isOrNotQxe = isOrNotQxe;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+
+    public String getXxqk() {
+        return xxqk;
+    }
+
+    public void setXxqk(String xxqk) {
+        this.xxqk = xxqk;
+    }
+
+    public String getXyzns() {
+        return xyzns;
+    }
+
+    public void setXyzns(String xyzns) {
+        this.xyzns = xyzns;
+    }
+
+    public Integer getZnstzk() {
+        return znstzk;
+    }
+
+    public void setZnstzk(Integer znstzk) {
+        this.znstzk = znstzk;
+    }
+
+    public String getJtbm() {
+        return jtbm;
+    }
+
+    public void setJtbm(String jtbm) {
+        this.jtbm = jtbm;
+    }
+
+    /***********荣成新增女性建档字段**********/
+
+
+
     public String getSpouseName() {
         return spouseName;
     }