Commit 74ea867c9fa9b756faf031d78ef78554231c1073

Authored by baohanddd

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java View file @ 74ea867
... ... @@ -30,11 +30,13 @@
30 30 //手机号
31 31 private String phone;
32 32 //高危因素
33   - private String riskFactor;
  33 + private List riskFactor;
34 34 //高危评分
35 35 private String riskScore;
36 36 //备注
37 37 private String remarks;
  38 + //末次月经
  39 + private String lastMenses;
38 40 //<!---------基本信息----------->
39 41  
40 42 private List data = new ArrayList();
41 43  
... ... @@ -87,13 +89,7 @@
87 89 this.remarks = remarks;
88 90 }
89 91  
90   - public String getRiskFactor() {
91   - return riskFactor;
92   - }
93 92  
94   - public void setRiskFactor(String riskFactor) {
95   - this.riskFactor = riskFactor;
96   - }
97 93  
98 94 public String getRiskScore() {
99 95 return riskScore;
100 96  
... ... @@ -123,8 +119,12 @@
123 119 setPhone(patients.getPhone());
124 120 setRemarks("产妇备注");
125 121 setRiskScore("60");
126   - setRiskFactor("高危因素");
  122 + /* List<Map> list=new ArrayList<>();
  123 + setRiskFactor();*/
127 124 setDueWeek("");
  125 + if(null!=patients.getLastMenses()){
  126 + setLastMenses(DateUtil.getYmd(patients.getLastMenses()));
  127 + }
128 128 if(CollectionUtils.isNotEmpty(destModel)){
129 129 List<AntData> dataList = new ArrayList<>();
130 130 if(null!=antExChuModel){
... ... @@ -182,6 +182,14 @@
182 182  
183 183 public void setData(List data) {
184 184 this.data = data;
  185 + }
  186 +
  187 + public String getLastMenses() {
  188 + return lastMenses;
  189 + }
  190 +
  191 + public void setLastMenses(String lastMenses) {
  192 + this.lastMenses = lastMenses;
185 193 }
186 194 }