From 6a46bbb20ff9d258a7d9ac875a349cdcd848ae45 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 23 Jun 2016 16:45:04 +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 | 87 ++++++++++++++++------ 1 file changed, 65 insertions(+), 22 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 7b010f8..08ada5e 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 @@ -7,6 +7,7 @@ import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.Patients; +import com.sun.javafx.collections.MappingChange; import org.apache.commons.collections.CollectionUtils; import java.util.ArrayList; @@ -85,7 +86,7 @@ public class AntexChuResult { //体重指数 private String baricIndex ; // 本次妊娠情况 - private String cestationInfo; + private Map cestationInfo; // 宫高 private String gonggao ; //腹围 @@ -108,7 +109,7 @@ public class AntexChuResult { //高危评分 private String highriskSocre; // 其他高危 - private String otherHighRisk; + private Map otherHighRisk; // 诊断 private String diagnosis; //处理意见 @@ -120,7 +121,7 @@ public class AntexChuResult { //产检日期 private String checkTime; //下次产检时间 - private String nextCheckTime; + private Map nextCheckTime; /**-------------辅助检查结果录入------------------**/ @@ -260,11 +261,11 @@ public class AntexChuResult { this.bxbjs = bxbjs; } - public String getCestationInfo() { + public Map getCestationInfo() { return cestationInfo; } - public void setCestationInfo(String cestationInfo) { + public void setCestationInfo(Map cestationInfo) { this.cestationInfo = cestationInfo; } @@ -417,11 +418,11 @@ public class AntexChuResult { this.neoDeath = neoDeath; } - public String getNextCheckTime() { + public Map getNextCheckTime() { return nextCheckTime; } - public void setNextCheckTime(String nextCheckTime) { + public void setNextCheckTime(Map nextCheckTime) { this.nextCheckTime = nextCheckTime; } @@ -433,17 +434,14 @@ public class AntexChuResult { this.nt = nt; } - public String getOtherHighRisk() { + public Map getOtherHighRisk() { return otherHighRisk; } - public void setOtherHighRisk(String otherHighRisk) { + public void setOtherHighRisk(Map otherHighRisk) { this.otherHighRisk = otherHighRisk; } - - - public List getPlacentas() { return placentas; } @@ -740,13 +738,48 @@ 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)); + try { + + setPastHistory(JsonUtil.str2Obj(antExChuModel.getPastHistory(), Map.class)); + }catch (Exception e){ + + } + try { + setFamilyHistory(JsonUtil.str2Obj(antExChuModel.getFamilyHistory(), Map.class)); + + }catch (Exception e){ + + } + try { + setPersonalHistory(JsonUtil.str2Obj(antExChuModel.getPersonalHistory(), Map.class)); + + }catch (Exception e){ + + } + try { + setYmjzHistory(JsonUtil.str2Obj(antExChuModel.getYmjzHistory(), Map.class)); + + }catch (Exception e){ + + } + try { + setYwgmHistory(JsonUtil.str2Obj(antExChuModel.getYwgmHistory(), Map.class)); + + }catch (Exception e){ + + } + try { + setFksxHistory(JsonUtil.str2Obj(antExChuModel.getFksxHistory(), Map.class)); + + }catch (Exception e){ + + } + try { + setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(), Map.class)); + + }catch (Exception e){ + + } setPregnancyTimes(antExChuModel.getPregnancyTimes()); setProdTime(antExChuModel.getProdTime()); setDelivery(antExChuModel.getDelivery()); @@ -760,19 +793,29 @@ public class AntexChuResult { setWeight(antExChuModel.getWeight()); setYqWeight(antExChuModel.getYqWeight()); setBaricIndex(antExChuModel.getBaricIndex()); - setCestationInfo(antExChuModel.getCestationInfo()); + try { + + setCestationInfo(JsonUtil.str2Obj(antExChuModel.getCestationInfo(),Map.class)); + }catch (Exception e){ + + } setGonggao(antExChuModel.getGonggao()); setFuwei(antExChuModel.getFuwei()); setTireNumber1(antExChuModel.getTireNumber1()); setPlacentas(antExChuModel.getPlacentas()); setHighriskSocre(antExChuModel.getHighriskSocre()); - setOtherHighRisk(antExChuModel.getOtherHighRisk()); + setOtherHighRisk(JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class)); setDiagnosis(antExChuModel.getDiagnosis()); setTreatOpinion(antExChuModel.getTreatOpinion()); setDirOpinion(antExChuModel.getDirOpinion()); setProdDoctor(antExChuModel.getProdDoctor()); setCheckTime(antExChuModel.getCheckTime()); - setNextCheckTime(antExChuModel.getNextCheckTime()); + try { + + setNextCheckTime(JsonUtil.str2Obj(antExChuModel.getNextCheckTime(),Map.class)); + }catch (Exception e){ + + } setAbo(antExChuModel.getAbortion()); setAlbumin(antExChuModel.getAbortion()); setXhdb(antExChuModel.getXhdb()); -- 1.8.3.1