Commit 5b6c99d36211b3d55d456900f0b31db32c9fe182

Authored by shiyang
1 parent 2942d0cd42

update

Showing 2 changed files with 7 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java View file @ 5b6c99d
... ... @@ -653,7 +653,7 @@
653 653 @ResponseBody
654 654 @TokenRequired
655 655 public BaseObjectResponse getBabyCheckHemoglobinDetails(@RequestParam(required = true) String hospitalId,
656   - @RequestParam(required = true) String checkDate,
  656 + @RequestParam(required = false) String checkDate,
657 657 @RequestParam(required = true) Integer ageType,
658 658 @RequestParam(required = true) Integer hemoglobinType,
659 659 @RequestParam(required = true) Integer page,
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 5b6c99d
... ... @@ -4762,10 +4762,12 @@
4762 4762 BabyCheckModelQuery query = new BabyCheckModelQuery();
4763 4763 query.setHospitalId(hospitalId);
4764 4764 //检查时间筛选
4765   - try {
4766   - query.setCheckDateStart(DateUtil.getSNDate(checkDate)[0]);
4767   - query.setCheckDateEnd(DateUtil.getSNDate(checkDate)[1]);
4768   - } catch (Exception e) {
  4765 + if(StringUtils.isNotEmpty(checkDate)){
  4766 + try {
  4767 + query.setCheckDateStart(DateUtil.getSNDate(checkDate)[0]);
  4768 + query.setCheckDateEnd(DateUtil.getSNDate(checkDate)[1]);
  4769 + } catch (Exception e) {
  4770 + }
4769 4771 }
4770 4772 //月龄区间
4771 4773 switch (ageType){