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

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

@@ -129,7 +129,7 @@ public class DoctorHealthController extends BaseController {
				List<Object> list = healthIndexService.findIndexByPatient2(patient, type, begin, end, page, pagesize);
				jsonArray = new JSONArray(list);
			}else{
				List<DevicePatientHealthIndex> list = healthIndexService.findIndexByPatient(getUID(), type, begin, end, page, pagesize);
				List<DevicePatientHealthIndex> list = healthIndexService.findIndexByPatient(patient, type, begin, end, page, pagesize);
				if (list != null) {
					for (DevicePatientHealthIndex model : list) {
						JSONObject modelJson = new JSONObject();