Commit 7d768b439a76cff80fdc3b18d7a02926da9db1ac
1 parent
2efd10ba84
Exists in
master
and in
1 other branch
commit
Showing 1 changed file with 10 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
View file @
7d768b4
... | ... | @@ -28,7 +28,7 @@ |
28 | 28 | //孕妇名字 |
29 | 29 | private String name; |
30 | 30 | //年龄 |
31 | - private int age; | |
31 | + private String age; | |
32 | 32 | //孕周 |
33 | 33 | private String dueWeek; |
34 | 34 | //风险等级 |
35 | 35 | |
... | ... | @@ -93,11 +93,14 @@ |
93 | 93 | this.id = id; |
94 | 94 | } |
95 | 95 | |
96 | - public int getAge() { | |
96 | + public String getAge() { | |
97 | + if(null==age){ | |
98 | + return SPIT; | |
99 | + } | |
97 | 100 | return age; |
98 | 101 | } |
99 | 102 | |
100 | - public void setAge(int age) { | |
103 | + public void setAge(String age) { | |
101 | 104 | this.age = age; |
102 | 105 | } |
103 | 106 | |
... | ... | @@ -237,7 +240,10 @@ |
237 | 240 | public RiskPatientsResult convertToResult(Patients destModel) { |
238 | 241 | setId(destModel.getId()); |
239 | 242 | setName(destModel.getUsername()); |
240 | - setAge(destModel.getAge()); | |
243 | + Integer age = destModel.getAge(); | |
244 | + if(null!=age){ | |
245 | + setAge(age+""); | |
246 | + } | |
241 | 247 | setRealPhone(destModel.getPhone()); |
242 | 248 | // setrFactor(destModel.getRiskFactorId() == null ? "" : JsonUtil.array2JsonString(destModel.getRiskFactorId())); |
243 | 249 | sethScore(destModel.getRiskScore()); |