diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 60f0560..5c8a7bb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -503,7 +503,7 @@ public class BabyBuildController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/queryHisBabyDiagnosis") @ResponseBody - public BaseResponse queryHisBabyDiagnosis(@RequestParam(value = "blNo", required = true) String blNo) { + public BaseResponse queryHisBabyDiagnosis(@RequestParam(value = "blNo", required = false) String blNo) { return babyBookbuildingFacade.queryHisBabyDiagnosis(blNo); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 22812a8..698df5e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -2391,22 +2391,24 @@ public class BabyCheckFacade extends BaseServiceImpl { if (CollectionUtils.isNotEmpty(list)) { try { AwModel model = list.get(0); - - if (model.getPthreeDs() <= value) { - res = "上"; - } else if (model.getPthreeDs() > value && value >= model.getPtwoDs()) { - res = "中上"; - } else if (model.getPtwoDs() > value && value >= model.getPoneDs()) { - res = "中+"; - } else if (model.getPoneDs() > value && value > model.getRoneDs()) { - res = "正常"; - } else if (model.getRoneDs() >= value && value > model.getRtwoDs()) { - res = "中-"; - } else if (model.getRtwoDs() >= value && value > model.getRthreeDs()) { - res = "中下"; - } else if (model.getRtwoDs() >= value) { - res = "下"; + if(value !=null){ + if (model.getPthreeDs() <= value) { + res = "上"; + } else if (model.getPthreeDs() > value && value >= model.getPtwoDs()) { + res = "中上"; + } else if (model.getPtwoDs() > value && value >= model.getPoneDs()) { + res = "中+"; + } else if (model.getPoneDs() > value && value > model.getRoneDs()) { + res = "正常"; + } else if (model.getRoneDs() >= value && value > model.getRtwoDs()) { + res = "中-"; + } else if (model.getRtwoDs() >= value && value > model.getRthreeDs()) { + res = "中下"; + } else if (model.getRtwoDs() >= value) { + res = "下"; + } } + map.put("res", res); map.put("value", model.getMiddleDs().toString()); } catch (Exception e) {