diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 9418b9c..af38ad5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1394,6 +1394,9 @@ public class BabyCheckFacade extends BaseServiceImpl { } base.setWeakSonInfo(weakSonInfos);//体弱儿详情 } + base.setWeakSon(model.getWeakSon()); + + base.setHighRiskInfo(model.getHighRiskInfo()); base.setBabyLastHighRisk(getBabyLastHighRisk(model.getPid())); base.setId(id); @@ -1513,6 +1516,8 @@ public class BabyCheckFacade extends BaseServiceImpl { base.setServiceList(serTypeNameList); base.setBabyDiagnosis(model.getBabyDiagnosis()); + + } } return model; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java index 54c55d3..e9a7552 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java @@ -7,8 +7,8 @@ import java.util.Map; * Created by Administrator on 2016/6/20. */ public class BabyBasicResult { - private List highRiskInfo;//儿童高危详情 - private List weakSonInfo;//体弱儿详情 + private List highRiskInfo;//儿童高危详情 + private List weakSonInfo;//体弱儿详情 private List> mHighRiskReason; public List> getmHighRiskReason() { @@ -101,6 +101,34 @@ public class BabyBasicResult { private String babyDiagnosis; + + //是否体弱 0 非高危 1高危 + private Integer weakSon; + + public List getHighRiskInfo() { + return highRiskInfo; + } + + public void setHighRiskInfo(List highRiskInfo) { + this.highRiskInfo = highRiskInfo; + } + + public List getWeakSonInfo() { + return weakSonInfo; + } + + public void setWeakSonInfo(List weakSonInfo) { + this.weakSonInfo = weakSonInfo; + } + + public Integer getWeakSon() { + return weakSon; + } + + public void setWeakSon(Integer weakSon) { + this.weakSon = weakSon; + } + public String getBabyDiagnosis() { return babyDiagnosis; } @@ -201,21 +229,6 @@ public class BabyBasicResult { return correctValue; } - public List getHighRiskInfo() { - return highRiskInfo; - } - - public void setHighRiskInfo(List highRiskInfo) { - this.highRiskInfo = highRiskInfo; - } - - public List getWeakSonInfo() { - return weakSonInfo; - } - - public void setWeakSonInfo(List weakSonInfo) { - this.weakSonInfo = weakSonInfo; - } public void setCorrectValue(String correctValue) { this.correctValue = correctValue;