代码修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/PatientMessageService.java

@@ -95,7 +95,7 @@ public class PatientMessageService {
     */
    public List<Map<String,Object>> getSystemMessageList(String patient,String type,String isRead){
        String typeIn = " '"+type.replace(",","','")+"' ";
        String sql = " select id,title,type,relation_code,sender,sender_name,is_read,code,DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') create_time,data " +
        String sql = " select id,title,type,relation_code,sender,content,sender_name,is_read,code,DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') create_time,data " +
                "from base_system_message where receiver = '"+patient+"' and del=1 and type in ("+typeIn+" )  " ;
        if (StringUtils.isNotBlank(isRead)){
            if ("1".equals(isRead)){

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/service/DeviceService.java

@@ -382,7 +382,6 @@ public class DeviceService {
                    messageDO.setData(JSON.toJSONString(errorIndex,SerializerFeature.WriteNullStringAsEmpty));
                    messageDO.setDel("1");
                    messageDO.setCreateTime(new Date());
                    systemMessageDao.save(messageDO);
                    //推送socket
                    com.alibaba.fastjson.JSONObject message = new com.alibaba.fastjson.JSONObject();
                    message.put("title","您刚刚测量了一次心率");
@@ -402,6 +401,8 @@ public class DeviceService {
                        content_notice.substring(0,content_notice.length()-2);
                        message.put("content_notice","您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                    }
                    messageDO.setContent("您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                    systemMessageDao.save(messageDO);
                    imUtil.sendPatientSystemMessage(messageDO.getReceiver(),JSON.toJSONString(message,SerializerFeature.WriteMapNullValue));
                }
@@ -465,7 +466,6 @@ public class DeviceService {
                    messageDO.setData(JSON.toJSONString(errorIndex,SerializerFeature.WriteNullStringAsEmpty));
                    messageDO.setDel("1");
                    messageDO.setCreateTime(new Date());
                    systemMessageDao.save(messageDO);
                    //推送socket
                    com.alibaba.fastjson.JSONObject message = new com.alibaba.fastjson.JSONObject();
                    message.put("title","您刚刚测量了一次血压");
@@ -485,6 +485,8 @@ public class DeviceService {
                        content_notice.substring(0,content_notice.length()-2);
                        message.put("content_notice","您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                    }
                    messageDO.setContent("您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                    systemMessageDao.save(messageDO);
                    imUtil.sendPatientSystemMessage(messageDO.getReceiver(),JSON.toJSONString(message,SerializerFeature.WriteMapNullValue));
                }
            }

svr/svr-cloud-device/src/main/java/com/yihu/jw/care/service/DeviceUploadService.java

@@ -149,7 +149,6 @@ public class DeviceUploadService {
                    messageDO.setData(JSON.toJSONString(errorIndex,SerializerFeature.WriteNullStringAsEmpty));
                    messageDO.setDel("1");
                    messageDO.setCreateTime(new Date());
                    systemMessageDao.save(messageDO);
                    //推送socket
                    com.alibaba.fastjson.JSONObject message = new com.alibaba.fastjson.JSONObject();
                    message.put("title",typeName2);
@@ -169,6 +168,8 @@ public class DeviceUploadService {
                        content_notice.substring(0,content_notice.length()-2);
                        message.put("content_notice","您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                    }
                    messageDO.setContent("您的key1过高，请注意饮食，尽量食用少油少盐食物".replace("key1",content_notice));
                    systemMessageDao.save(messageDO);
                    imUtil.sendPatientSystemMessage(messageDO.getReceiver(),JSON.toJSONString(message,SerializerFeature.WriteMapNullValue));
                }
            }