Commit ee150b8168f499280061ef9b348f5d13fc67b771
1 parent
844416eb6d
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 18 additions and 16 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
View file @
ee150b8
| ... | ... | @@ -503,7 +503,7 @@ |
| 503 | 503 | */ |
| 504 | 504 | @RequestMapping(method = RequestMethod.GET, value = "/queryHisBabyDiagnosis") |
| 505 | 505 | @ResponseBody |
| 506 | - public BaseResponse queryHisBabyDiagnosis(@RequestParam(value = "blNo", required = true) String blNo) { | |
| 506 | + public BaseResponse queryHisBabyDiagnosis(@RequestParam(value = "blNo", required = false) String blNo) { | |
| 507 | 507 | return babyBookbuildingFacade.queryHisBabyDiagnosis(blNo); |
| 508 | 508 | } |
| 509 | 509 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
ee150b8
| ... | ... | @@ -2391,22 +2391,24 @@ |
| 2391 | 2391 | if (CollectionUtils.isNotEmpty(list)) { |
| 2392 | 2392 | try { |
| 2393 | 2393 | AwModel model = list.get(0); |
| 2394 | - | |
| 2395 | - if (model.getPthreeDs() <= value) { | |
| 2396 | - res = "上"; | |
| 2397 | - } else if (model.getPthreeDs() > value && value >= model.getPtwoDs()) { | |
| 2398 | - res = "中上"; | |
| 2399 | - } else if (model.getPtwoDs() > value && value >= model.getPoneDs()) { | |
| 2400 | - res = "中+"; | |
| 2401 | - } else if (model.getPoneDs() > value && value > model.getRoneDs()) { | |
| 2402 | - res = "正常"; | |
| 2403 | - } else if (model.getRoneDs() >= value && value > model.getRtwoDs()) { | |
| 2404 | - res = "中-"; | |
| 2405 | - } else if (model.getRtwoDs() >= value && value > model.getRthreeDs()) { | |
| 2406 | - res = "中下"; | |
| 2407 | - } else if (model.getRtwoDs() >= value) { | |
| 2408 | - res = "下"; | |
| 2394 | + if(value !=null){ | |
| 2395 | + if (model.getPthreeDs() <= value) { | |
| 2396 | + res = "上"; | |
| 2397 | + } else if (model.getPthreeDs() > value && value >= model.getPtwoDs()) { | |
| 2398 | + res = "中上"; | |
| 2399 | + } else if (model.getPtwoDs() > value && value >= model.getPoneDs()) { | |
| 2400 | + res = "中+"; | |
| 2401 | + } else if (model.getPoneDs() > value && value > model.getRoneDs()) { | |
| 2402 | + res = "正常"; | |
| 2403 | + } else if (model.getRoneDs() >= value && value > model.getRtwoDs()) { | |
| 2404 | + res = "中-"; | |
| 2405 | + } else if (model.getRtwoDs() >= value && value > model.getRthreeDs()) { | |
| 2406 | + res = "中下"; | |
| 2407 | + } else if (model.getRtwoDs() >= value) { | |
| 2408 | + res = "下"; | |
| 2409 | + } | |
| 2409 | 2410 | } |
| 2411 | + | |
| 2410 | 2412 | map.put("res", res); |
| 2411 | 2413 | map.put("value", model.getMiddleDs().toString()); |
| 2412 | 2414 | } catch (Exception e) { |