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

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

@@ -562,9 +562,10 @@ public class BookingController extends WeixinBaseController {
	public String GetPatientReservation(@ApiParam(name="orderId",value="订单id",defaultValue = "9")
										 @RequestParam(value="orderId",required = true) String orderId) {
		try {
			PatientReservation obj =  patientReservationService.findById(orderId);
			//id获取不到，用单号获取一遍
			if(obj==null){
			PatientReservation obj = null;
			try{
				obj =  patientReservationService.findById(orderId);
			}catch (Exception e){
				obj = patientReservationService.findByCode(orderId);
			}
			if(obj!=null) {