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

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/ServiceStatisticsController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 * Created by lyr-pc on 2017/1/10.
 */
@RestController
@RequestMapping(value = "/patient/service")
@RequestMapping(value = "/doctor/patient/service")
public class ServiceStatisticsController extends BaseController {
    @Autowired

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/BookingController.java

@@ -462,7 +462,7 @@ public class BookingController extends WeixinBaseController {
                                        @RequestParam(value = "pageSize", required = false) Integer pageSize,
                                        @ApiParam(name = "patient", value = "患者编号", defaultValue = "4afdbce6194e412fbc770eb4dfbe7b00")
                                        @RequestParam(value = "patient", required = false) String patient,
                                        @ApiParam(name = "teamCode", value = "行政团队", defaultValue = "shiliuD20160926005")
                                        @ApiParam(name = "teamCode", value = "行政团队")
                                        @RequestParam(value = "teamCode", required = false) Long teamCode) {
        try {
            JSONArray list = patientReservationService.getReservationByPatient(patient, teamCode, pageIndex, pageSize);