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

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

@@ -168,7 +168,7 @@ public class DoctorHealthEduArticleController extends WeixinBaseController {
                    jsonArray.put(json);
                }
            }
            return write(200, "查询成功", "list", jsonArray);
            return write(200, "查询成功", "data", jsonArray);
        } catch (Exception ex) {
            error(ex);
            return invalidUserException(ex, -1, "查询失败!");

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

@@ -142,7 +142,7 @@ public class DoctorHealthGuidanceController extends WeixinBaseController {
				return error(-1, "请输入需查询的居民的团队");
			}
			JSONArray result = patientHealthGuidanceService.findByPatientAndGuidanceAndTeam(patient,teamCode,page,pagesize);
			return write(200, "查询成功！", "list", result);
			return write(200, "查询成功！", "data", result);
		} catch (Exception e) {
			error(e);
			return error(-1, "查询失败！");