From 94833149f21bdfc7f80ff63bf2ab12d2f3844a47 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 6 Jul 2016 09:26:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/AntExChuModel.java | 71 +++++++++++++++++++- .../operate/web/request/AntExcAddRequest.java | 26 +++++++- .../operate/web/result/AntexChuResult.java | 75 +++++++++++++++++++++- 3 files changed, 168 insertions(+), 4 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 814e693..5d5ce4d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -70,9 +70,78 @@ public class AntExChuModel implements Serializable { private String tireNumber1; private String syjg; private List placentas; - + //心脏 + private String heart; + //肺部 + private String lungs; + //外阴 + private String vulva; + //阴道 + private String vagina; + // 宫颈 + private String cervical; + //子宫 + private String uterus; + //附件 + private String fujian; private Date created; + public String getCervical() { + return cervical; + } + + public void setCervical(String cervical) { + this.cervical = cervical; + } + + public String getFujian() { + return fujian; + } + + public void setFujian(String fujian) { + this.fujian = fujian; + } + + public String getHeart() { + return heart; + } + + public void setHeart(String heart) { + this.heart = heart; + } + + public String getLungs() { + return lungs; + } + + public void setLungs(String lungs) { + this.lungs = lungs; + } + + public String getUterus() { + return uterus; + } + + public void setUterus(String uterus) { + this.uterus = uterus; + } + + public String getVagina() { + return vagina; + } + + public void setVagina(String vagina) { + this.vagina = vagina; + } + + public String getVulva() { + return vulva; + } + + public void setVulva(String vulva) { + this.vulva = vulva; + } + public Date getCreated() { return created; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index 8cacbca..cbcebb0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -44,6 +44,9 @@ public class AntExcAddRequest implements IBasicRequestConvert { private Map fksxHistory ; // 叶酸服用 private Map ysfyHistory ; + //本次妊娠情况 + private Map cestationInfo; + //孕次 private Integer pregnancyTimes; // 产次 @@ -70,8 +73,20 @@ public class AntExcAddRequest implements IBasicRequestConvert { private String yqWeight ; //体重指数 private String baricIndex; - //本次妊娠情况 - private Map cestationInfo; + //心脏 + private String heart; + //肺部 + private String lungs; + //外阴 + private String vulva; + //阴道 + private String vagina; + // 宫颈 + private String cervical; + //子宫 + private String uterus; + //附件 + private String fujian; // 宫高 private String gonggao; //腹围 @@ -766,6 +781,13 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setYghxkt(yghxkt); antExChuModel.setXqjq(xqjq); antExChuModel.setXnsd(xnsd); + antExChuModel.setHeart(heart); + antExChuModel.setLungs(lungs); + antExChuModel.setVulva(vulva); + antExChuModel.setVagina(vagina); + antExChuModel.setCervical(cervical); + antExChuModel.setUterus(uterus); + antExChuModel.setFujian(fujian); // antExChuModel.setMdxqsy(mdxqsy); antExChuModel.setHivkt(hivkt); antExChuModel.setYdfmw(JsonUtil.obj2JsonString(ydfmw)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index c6edecd..eb0f969 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -92,7 +92,20 @@ public class AntexChuResult { private String fuwei; // 胎数 private String tireNumber1; - + //心脏 + private String heart; + //肺部 + private String lungs; + //外阴 + private String vulva; + //阴道 + private String vagina; + // 宫颈 + private String cervical; + //子宫 + private String uterus; + //附件 + private String fujian; private List placentas; /* //心率 @@ -203,8 +216,61 @@ public class AntexChuResult { this.abo = abo; } + public String getCervical() { + return cervical; + } + + public void setCervical(String cervical) { + this.cervical = cervical; + } + + public String getFujian() { + return fujian; + } + + public void setFujian(String fujian) { + this.fujian = fujian; + } + + public String getHeart() { + return heart; + } + + public void setHeart(String heart) { + this.heart = heart; + } + + public String getLungs() { + return lungs; + } + + public void setLungs(String lungs) { + this.lungs = lungs; + } + public String getUterus() { + return uterus; + } + public void setUterus(String uterus) { + this.uterus = uterus; + } + + public String getVagina() { + return vagina; + } + + public void setVagina(String vagina) { + this.vagina = vagina; + } + + public String getVulva() { + return vulva; + } + + public void setVulva(String vulva) { + this.vulva = vulva; + } public String getAlbumin() { return albumin; @@ -771,6 +837,13 @@ public class AntexChuResult { setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(), Map.class)); } catch (Exception e) { } + setHeart(antExChuModel.getHeart()); + setLungs(antExChuModel.getLungs()); + setVulva(antExChuModel.getVulva()); + setVagina(antExChuModel.getVagina()); + setCervical(antExChuModel.getCervical()); + setUterus(antExChuModel.getUterus()); + setFujian(antExChuModel.getFujian()); setYghxkt(antExChuModel.getYghxkt()); setPregnancyTimes(antExChuModel.getPregnancyTimes()); setProdTime(antExChuModel.getProdTime()); -- 1.8.3.1