Merge branch 'dev' of wujunjie/patient-management into dev

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

@@ -166,7 +166,7 @@ public class DoctorTeamGuidanceController extends WeixinBaseController {
            @ApiParam(value = "团队模板标题")
            @RequestParam String title,
            @ApiParam(value = "所属团队ID及名称json串", defaultValue = "[{\"teamName\":\"一农\",\"teamId\":212},{\"teamName\":\"一\",\"teamId\":21}]")
            @RequestParam(required = false) String teamInfo,
            @RequestParam String teamInfo,
            @ApiParam(value = "模板内容")
            @RequestParam String content,
            @ApiParam(value = "图片路径")

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

@@ -62,7 +62,9 @@ public class HealthEduArticleController extends BaseController {
    @ResponseBody
    public String list(@RequestParam("id") long id, @RequestParam("pagesize") int pagesize, @RequestParam(required = true, value = "wheaType") int wheaType) {
        try {
            List<HealthEduArticlePatient> list = healthEduArticlePatientService.findByPatient(getUID(), wheaType, id, pagesize);
//            List<HealthEduArticlePatient> list = healthEduArticlePatientService.findByPatient(getUID(), wheaType, id, pagesize);
//            增加判断是当前居民还是被代理人的文章列表
            List<HealthEduArticlePatient> list = healthEduArticlePatientService.findByPatient(getRepUID(), wheaType, id, pagesize);
            JSONArray jsonArray = new JSONArray();
            Map<String, Doctor> docMap = new HashMap<>();
            if (list != null) {
@@ -189,18 +191,18 @@ public class HealthEduArticleController extends BaseController {
     *
     * @return
     */
    @RequestMapping(value = "/readAllArticle",method = RequestMethod.GET)
    @RequestMapping(value = "/readAllArticle", method = RequestMethod.GET)
    @ResponseBody
    public String readAllArticle() {
        try {
            String patient = getUID();
            healthEduArticleService.readAllArticle(patient);
            return write(200,"更改状态成功！");
            return write(200, "更改状态成功！");
        } catch (Exception e) {
            error(e);
            return invalidUserException(e,-1,"更改状态失败！");
            return invalidUserException(e, -1, "更改状态失败！");
        }
    }
    }
}

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

@@ -53,7 +53,8 @@ public class PatientHealthGuidanceController extends BaseController {
		try {
			Long idl = Long.parseLong(id);
			int pageSize = Integer.parseInt(pagesize);
			JSONArray array = patientHealthGuidanceService.findGuidanceByPatient(getUID(), idl, pageSize);
//			JSONArray array = patientHealthGuidanceService.findGuidanceByPatient(getUID(), idl, pageSize);
			JSONArray array = patientHealthGuidanceService.findGuidanceByPatient(getRepUID(), idl, pageSize);
			return write(200, "查询成功！", "list", array);
		} catch (Exception e) {
			error(e);