Merge branch 'dev' of liuwenbin/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/booking/PatientBookingController.java

@@ -613,21 +613,21 @@ public class PatientBookingController extends WeixinBaseController{
        return json;
    }
//    @RequestMapping(value = "/imm/findWzymBymykh", method = RequestMethod.GET)
//    @ResponseBody
//    @ObserverRequired
//    @ApiOperation("计免：获取计划免疫接种记录")
//    public String findWzymBymykh (@ApiParam(name = "barCode", value = "条形编码", defaultValue = "0052248552")
//                                   @RequestParam(value = "barCode", required = true) String barCode){
//
//        try{
//            String re = immuneService.findYzymBymykh(barCode);
//            return write(200, "查询成功","data",re);
//        }catch (Exception e){
//            error(e);
//            return error(-1, e.getMessage());
//        }
//    }
    @RequestMapping(value = "/imm/findWzymBymykh", method = RequestMethod.GET)
    @ResponseBody
    @ObserverRequired
    @ApiOperation("计免：获取计划免疫接种记录")
    public String findWzymBymykh (@ApiParam(name = "barCode", value = "条形编码", defaultValue = "0052248552")
                                   @RequestParam(value = "barCode", required = true) String barCode){
        try{
            String re = immuneService.findYzymBymykh(barCode);
            return write(200, "查询成功","data",re);
        }catch (Exception e){
            error(e);
            return error(-1, e.getMessage());
        }
    }
    
    /**
     *-----------------计划免疫预约相关接口--------------END