From 8b6c6c2bba4460e8d6697efffb0cc8b099cec221 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Mon, 7 Jan 2019 15:54:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=A3=E6=88=90=E7=94=B7=E5=A5=B3=E5=A9=9A?= =?UTF-8?q?=E6=A3=80=E5=BB=BA=E6=A1=A3=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/ViewFacade.java | 26 +++ .../operate/web/result/ResidentsPageResult.java | 202 ++++++++++++++++++++- 2 files changed, 227 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index e2ea185..40a386a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -4677,6 +4677,32 @@ public class ViewFacade { result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDay())); result.setId(model.getId()); + result.setCcnl(model.getCcnl()); + if(null != model.getMcyj()){ + 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()); + result.setStsc(model.getStsc()); + result.setZylc(model.getZylc()); + result.setRglc(model.getRglc()); + 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/result/ResidentsPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsPageResult.java index 4435411..1da1e82 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsPageResult.java @@ -1,7 +1,7 @@ package com.lyms.platform.operate.web.result; - +import java.util.Date; public class ResidentsPageResult { @@ -85,6 +85,206 @@ public class ResidentsPageResult { //建档号 private String id; + /***********荣成新增女性建档字段**********/ + private String ccnl;//初潮年龄 + private String mcyj;//末次月经时间 + private String isOrNotGl;//月经周期是否规律（0：否；1：是；默认为1） + private String jq;//经期 + private String zq;//周期 + private String yjl;//月经量（0：多；1：中；2：少；默认为1） + private String tj;//痛经（0：无；1：轻；2：重；默认为1） + private String isOrNotHy;//是否曾经怀孕（0：无；1：有；默认为0） + private String hycs;//怀孕次数 + private String hccs;//活产次数 + private String zyhc;//足月活产次数 + private String zccs;//早产次数 + private String isOrNotRsjj;//是否有以下不良妊娠结局（0：无；默认为0） + private String stsc;//死胎死产次数 + private String zylc;//自然流产次数 + private String rglc;//人工流产次数 + private String isOrNotQxe;//是否分娩过出生缺陷儿（0：无；1：是；默认为0） + private String bz;//病种 + private String xxqk;//详细情况 + private String xyzns;//现有子女数 + private String znstzk;//子女身体状况（0：健康；1：疾病） + private String jtbm;//注明具体病名 + + + 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 String getIsOrNotGl() { + return isOrNotGl; + } + + public void setIsOrNotGl(String 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 String getYjl() { + return yjl; + } + + public void setYjl(String yjl) { + this.yjl = yjl; + } + + public String getTj() { + return tj; + } + + public void setTj(String tj) { + this.tj = tj; + } + + public String getIsOrNotHy() { + return isOrNotHy; + } + + public void setIsOrNotHy(String 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 String getStsc() { + return stsc; + } + + public void setStsc(String stsc) { + this.stsc = stsc; + } + + public String getZylc() { + return zylc; + } + + public void setZylc(String zylc) { + this.zylc = zylc; + } + + public String getRglc() { + return rglc; + } + + public void setRglc(String rglc) { + this.rglc = rglc; + } + + public String getIsOrNotQxe() { + return isOrNotQxe; + } + + public void setIsOrNotQxe(String 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 String getZnstzk() { + return znstzk; + } + + public void setZnstzk(String znstzk) { + this.znstzk = znstzk; + } + + public String getJtbm() { + return jtbm; + } + + public void setJtbm(String jtbm) { + this.jtbm = jtbm; + } public String getSpouseName() { return spouseName; -- 1.8.3.1