From 227fe63c88da9ae1982286f4778050f31a9119dd Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 23 Jun 2016 14:58:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=A6=87=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/result/AntexChuResult.java | 132 ++++++++++++++------- 1 file changed, 88 insertions(+), 44 deletions(-) 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 418f2a6..7f4b143 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 @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.common.base.IBasicResultConvert; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.AntenatalExaminationModel; @@ -11,6 +12,7 @@ import org.apache.commons.collections.CollectionUtils; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * @@ -43,19 +45,19 @@ public class AntexChuResult { /**初检信息 **/ // 既往史 - private String pastHistory ; + private Map pastHistory ; // 家族史 - private String familyHistory ; + private Map familyHistory ; //个人史 - private String personalHistory; + private Map personalHistory; //疫苗接种史 - private String ymjzHistory ; + private Map ymjzHistory ; //药物过敏史 - private String ywgmHistory ; + private Map ywgmHistory ; //妇科手术史 - private String fksxHistory ; + private Map fksxHistory ; // 叶酸服用 - private String ysfyHistory ; + private Map ysfyHistory ; //孕次 private String pregnancyTimes; // 产次 @@ -307,21 +309,7 @@ public class AntexChuResult { } - public String getFamilyHistory() { - return familyHistory; - } - public void setFamilyHistory(String familyHistory) { - this.familyHistory = familyHistory; - } - - public String getFksxHistory() { - return fksxHistory; - } - - public void setFksxHistory(String fksxHistory) { - this.fksxHistory = fksxHistory; - } public String getFuwei() { return fuwei; @@ -453,21 +441,6 @@ public class AntexChuResult { this.otherHighRisk = otherHighRisk; } - public String getPastHistory() { - return pastHistory; - } - - public void setPastHistory(String pastHistory) { - this.pastHistory = pastHistory; - } - - public String getPersonalHistory() { - return personalHistory; - } - - public void setPersonalHistory(String personalHistory) { - this.personalHistory = personalHistory; - } @@ -683,11 +656,51 @@ public class AntexChuResult { this.yghxkt = yghxkt; } - public String getYmjzHistory() { + public Map getFamilyHistory() { + return familyHistory; + } + + public void setFamilyHistory(Map familyHistory) { + this.familyHistory = familyHistory; + } + + public Map getFksxHistory() { + return fksxHistory; + } + + public void setFksxHistory(Map fksxHistory) { + this.fksxHistory = fksxHistory; + } + + public Map getPastHistory() { + return pastHistory; + } + + public void setPastHistory(Map pastHistory) { + this.pastHistory = pastHistory; + } + + public Map getPersonalHistory() { + return personalHistory; + } + + public void setPersonalHistory(Map personalHistory) { + this.personalHistory = personalHistory; + } + + public String getRh() { + return rh; + } + + public void setRh(String rh) { + this.rh = rh; + } + + public Map getYmjzHistory() { return ymjzHistory; } - public void setYmjzHistory(String ymjzHistory) { + public void setYmjzHistory(Map ymjzHistory) { this.ymjzHistory = ymjzHistory; } @@ -699,19 +712,19 @@ public class AntexChuResult { this.yqWeight = yqWeight; } - public String getYsfyHistory() { + public Map getYsfyHistory() { return ysfyHistory; } - public void setYsfyHistory(String ysfyHistory) { + public void setYsfyHistory(Map ysfyHistory) { this.ysfyHistory = ysfyHistory; } - public String getYwgmHistory() { + public Map getYwgmHistory() { return ywgmHistory; } - public void setYwgmHistory(String ywgmHistory) { + public void setYwgmHistory(Map ywgmHistory) { this.ywgmHistory = ywgmHistory; } @@ -727,11 +740,42 @@ public class AntexChuResult { if(null!=antExChuModel){ setId(antExChuModel.getId()); setParentId(antExChuModel.getParentId()); + setPastHistory(JsonUtil.str2Obj(antExChuModel.getPastHistory(),Map.class)); + setFamilyHistory(JsonUtil.str2Obj(antExChuModel.getFamilyHistory(),Map.class)); + setPersonalHistory(JsonUtil.str2Obj(antExChuModel.getPersonalHistory(),Map.class)); + setYmjzHistory(JsonUtil.str2Obj(antExChuModel.getYmjzHistory(),Map.class)); + setYwgmHistory(JsonUtil.str2Obj(antExChuModel.getYwgmHistory(),Map.class)); + setFksxHistory(JsonUtil.str2Obj(antExChuModel.getFksxHistory(),Map.class)); + setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(),Map.class)); + setPregnancyTimes(antExChuModel.getPregnancyTimes()); + setProdTime(antExChuModel.getProdTime()); + setDelivery(antExChuModel.getDelivery()); + setPlanedProd(antExChuModel.getPlanedProd()); + setAbortion(antExChuModel.getAbortion()); + setStillbirth(antExChuModel.getStillbirth()); + setStillChan(antExChuModel.getStillChan()); + setNeoDeath(antExChuModel.getNeoDeath()); + setBirthDefect(antExChuModel.getBirthDefect()); + setHeight(antExChuModel.getHeight()); + setWeight(antExChuModel.getWeight()); + setYqWeight(antExChuModel.getYqWeight()); + setBaricIndex(antExChuModel.getBaricIndex()); + setCestationInfo(antExChuModel.getCestationInfo()); + setGonggao(antExChuModel.getGonggao()); + setFuwei(antExChuModel.getFuwei()); + setTireNumber1(antExChuModel.getTireNumber1()); + setPlacentas(antExChuModel.getPlacentas()); + setHighriskSocre(antExChuModel.getHighriskSocre()); + setOtherHighRisk(antExChuModel.getOtherHighRisk()); + setDiagnosis(antExChuModel.getDiagnosis()); + setTreatOpinion(antExChuModel.getTreatOpinion()); + setDirOpinion(antExChuModel.getDirOpinion()); + setProdDoctor(antExChuModel.getProdDoctor()); + setCheckTime(antExChuModel.getCheckTime()); + setNextCheckTime(antExChuModel.getNextCheckTime()); setAbo(antExChuModel.getAbortion()); setAlbumin(antExChuModel.getAbortion()); - setBaricIndex(antExChuModel.getBaricIndex()); } - return this; } } -- 1.8.3.1