Commit 4a41dfe6b0a23b93203e2d4b4efd7d6c4d78c233
1 parent
dc4c062a51
Exists in
master
and in
1 other branch
111
Showing 1 changed file with 13 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
View file @
4a41dfe
| ... | ... | @@ -5,7 +5,9 @@ |
| 5 | 5 | import com.lyms.platform.common.utils.DateUtil; |
| 6 | 6 | import com.lyms.platform.common.utils.StringUtils; |
| 7 | 7 | import com.lyms.platform.pojo.ReferralApplyOrderModel; |
| 8 | +import org.apache.commons.collections.CollectionUtils; | |
| 8 | 9 | |
| 10 | +import java.util.ArrayList; | |
| 9 | 11 | import java.util.Date; |
| 10 | 12 | import java.util.List; |
| 11 | 13 | |
| ... | ... | @@ -29,7 +31,7 @@ |
| 29 | 31 | private String rLevel; |
| 30 | 32 | //风险因素 |
| 31 | 33 | private List<String> rRisk; |
| 32 | - private Integer score; | |
| 34 | + private Integer score=0; | |
| 33 | 35 | //病情描述 |
| 34 | 36 | private String diseaseDesc; |
| 35 | 37 | //转院必要性 |
| ... | ... | @@ -224,6 +226,12 @@ |
| 224 | 226 | } |
| 225 | 227 | |
| 226 | 228 | public List<String> getrRisk() { |
| 229 | + if(CollectionUtils.isEmpty(rRisk)){ | |
| 230 | + List<String> list = new ArrayList<>(); | |
| 231 | + list.add("-"); | |
| 232 | + return list; | |
| 233 | + } | |
| 234 | + | |
| 227 | 235 | return rRisk; |
| 228 | 236 | } |
| 229 | 237 | |
| ... | ... | @@ -232,6 +240,9 @@ |
| 232 | 240 | } |
| 233 | 241 | |
| 234 | 242 | public Integer getScore() { |
| 243 | + if(null==score){ | |
| 244 | + return 0; | |
| 245 | + } | |
| 235 | 246 | return score; |
| 236 | 247 | } |
| 237 | 248 | |
| ... | ... | @@ -283,7 +294,7 @@ |
| 283 | 294 | setPotentialRisk(destModel.getPotentialRisk()); |
| 284 | 295 | setStatus(ApplyOrderStatusEnums.getTitle(destModel.getStatus())); |
| 285 | 296 | setTransferredHospital(destModel.getTransferredHospital()); |
| 286 | - setAge(destModel.getAge()); | |
| 297 | + setAge(DateUtil.getAge(destModel.getBirth())); | |
| 287 | 298 | setCardNo(destModel.getCardNo()); |
| 288 | 299 | setPhone(destModel.getPhone()); |
| 289 | 300 | return this; |