diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index d2154bc..c2b1a20 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -653,7 +653,7 @@ public class BabyCheckController extends BaseController { @ResponseBody @TokenRequired public BaseObjectResponse getBabyCheckHemoglobinDetails(@RequestParam(required = true) String hospitalId, - @RequestParam(required = true) String checkDate, + @RequestParam(required = false) String checkDate, @RequestParam(required = true) Integer ageType, @RequestParam(required = true) Integer hemoglobinType, @RequestParam(required = true) Integer page, 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 2025bc7..da85054 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 @@ -4762,10 +4762,12 @@ public class BabyCheckFacade extends BaseServiceImpl { BabyCheckModelQuery query = new BabyCheckModelQuery(); query.setHospitalId(hospitalId); //检查时间筛选 - try { - query.setCheckDateStart(DateUtil.getSNDate(checkDate)[0]); - query.setCheckDateEnd(DateUtil.getSNDate(checkDate)[1]); - } catch (Exception e) { + if(StringUtils.isNotEmpty(checkDate)){ + try { + query.setCheckDateStart(DateUtil.getSNDate(checkDate)[0]); + query.setCheckDateEnd(DateUtil.getSNDate(checkDate)[1]); + } catch (Exception e) { + } } //月龄区间 switch (ageType){