From b870ff81cc5682e52f1f451de739583d296cf1ed Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 13 Oct 2016 16:25:14 +0800 Subject: [PATCH] commit --- .../src/main/java/com/lyms/platform/pojo/AntExChuModel.java | 9 +++++++++ .../lyms/platform/operate/web/request/AntExcAddRequest.java | 12 ++++++++++++ .../com/lyms/platform/operate/web/result/AntexChuResult.java | 10 ++++++++++ 3 files changed, 31 insertions(+) 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 b1d22a9..688f5f8 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 @@ -22,6 +22,7 @@ public class AntExChuModel implements Serializable { //末次月经 private Date lastMenses; private String cDueWeek; + private String bg; // 既往史 private String pastHistory ; // 家族史 @@ -126,6 +127,14 @@ public class AntExChuModel implements Serializable { return cervical; } + public String getBg() { + return bg; + } + + public void setBg(String bg) { + this.bg = bg; + } + public void setCervical(String cervical) { this.cervical = cervical; } 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 c5ec6b9..9ecbdd8 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 @@ -96,6 +96,9 @@ public class AntExcAddRequest implements IBasicRequestConvert { //血压 private Map bp; + + private String bg; + private List placentas; /*//心率 private double heartRate; @@ -189,6 +192,14 @@ public class AntExcAddRequest implements IBasicRequestConvert { //实验结果 private String syjg; + public String getBg() { + return bg; + } + + public void setBg(String bg) { + this.bg = bg; + } + public Map getBp() { return bp; } @@ -821,6 +832,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { @Override public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel=new AntExChuModel(); + antExChuModel.setBg(bg); antExChuModel.setId(id); antExChuModel.setParentId(parentId); antExChuModel.setSyjg(syjg); 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 edade4c..4acd8b3 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 @@ -44,6 +44,7 @@ public class AntexChuResult { private String dueDate; private String cDueWeek; + private String bg; /** * 初检信息 @@ -286,6 +287,14 @@ public class AntexChuResult { return heart; } + public String getBg() { + return bg; + } + + public void setBg(String bg) { + this.bg = bg; + } + public void setHeart(String heart) { this.heart = heart; } @@ -908,6 +917,7 @@ public class AntexChuResult { setYqWeight(antExChuModel.getYqWeight()); setBaricIndex(antExChuModel.getBaricIndex()); setHighrisk(JsonUtil.toList(antExChuModel.getHighrisk(), List.class)); + setBg(antExChuModel.getBg()); try { setCestationInfo(JsonUtil.str2Obj(antExChuModel.getCestationInfo(), Map.class)); } catch (Exception e) { -- 1.8.3.1