Commit 652689cabb7e5eccbd3f837f01ff4154391e8cbd
1 parent
84eae36cb2
Exists in
master
and in
6 other branches
儿保非空判断
Showing 1 changed file with 7 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
652689c
| ... | ... | @@ -405,7 +405,7 @@ |
| 405 | 405 | value = StringUtils.isNotEmpty(value) ? value : ""; |
| 406 | 406 | model.setEyeRedReflex(value); |
| 407 | 407 | |
| 408 | - value = request.getEyeDioptroscopy(); | |
| 408 | + value = request.getEyeDioptroscopy(); | |
| 409 | 409 | value = StringUtils.isNotEmpty(value) ? value : ""; |
| 410 | 410 | model.setEyeDioptroscopy(value); |
| 411 | 411 | |
| 412 | 412 | |
| ... | ... | @@ -460,12 +460,13 @@ |
| 460 | 460 | BabyModel bm = new BabyModel(); |
| 461 | 461 | |
| 462 | 462 | //添加结案记录 |
| 463 | - bm.setEndCase(request.getEndCase()); | |
| 464 | - if (1 == request.getEndCase()) { | |
| 465 | - bm.setOutcome(request.getOutcome()); | |
| 466 | - bm.setEndCaseTime(new Date()); | |
| 463 | + if (null != request.getEndCase()) { | |
| 464 | + bm.setEndCase(request.getEndCase()); | |
| 465 | + if (1 == request.getEndCase()) { | |
| 466 | + bm.setOutcome(request.getOutcome()); | |
| 467 | + bm.setEndCaseTime(new Date()); | |
| 468 | + } | |
| 467 | 469 | } |
| 468 | - | |
| 469 | 470 | bm.setModified(new Date()); |
| 470 | 471 | if (request.getHighRisk() == null) { |
| 471 | 472 | bm.setLastHighRisk(0); |
| ... | ... | @@ -473,7 +474,6 @@ |
| 473 | 474 | bm.setLastHighRisk(request.getHighRisk()); |
| 474 | 475 | bm.setHighRiskInfo(request.getHighRiskInfo()); |
| 475 | 476 | } |
| 476 | - | |
| 477 | 477 | //添加儿童高危因素 |
| 478 | 478 | if (request.getWeakSon() == null) { |
| 479 | 479 | bm.setWeakSon(0); |