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

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

@@ -266,8 +266,18 @@ public class DoctorMessageController extends BaseController {
                                                 @RequestParam(value = "pagesize", required = true) Integer pagesize) throws Exception {
        try {
            List<Map<String, String>> list = messageService.getHealthIndexMessageByPatient(getUID(), patient, type, page, pagesize);
            return write(200, "获取超标指标消息成功", "data", list);
            Map<Object, Object> map = new HashMap<Object, Object>();
            ObjectMapper mapper = new ObjectMapper();
            mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
            map.put("status", 200);
            map.put("msg", "获取超标指标消息成功");
            map.put("data", list);
            String tzCode ="";
            for (Map<String, String> one:list){
                tzCode+=","+one.get("tzCode");
            }
            map.put("tzCode",StringUtils.isNotEmpty(tzCode)?tzCode.substring(1):"");
            return mapper.writeValueAsString(map);
        } catch (Exception ex) {
            ex.printStackTrace();
            return invalidUserException(ex, -1, "查询失败");