| 
															
																@ -337,15 +337,22 @@ public class MessageService extends BaseService { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                map.put("value1", String.valueOf(item.getValue1())); 
															 | 
															
															 | 
															
																                map.put("value1", String.valueOf(item.getValue1())); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                String value2 = String.valueOf(item.getValue2().intValue()); 
															 | 
															
															 | 
															
																                String value2 = String.valueOf(item.getValue2().intValue()); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                map.put("value2",value2); 
															 | 
															
															 | 
															
																                map.put("value2",value2); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                map.put("czrq", DateUtil.dateToStrLong(item.getCzrq())); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                //获取上次血糖值 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                if("1".equals(type)) 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                DevicePatientHealthIndex data =devicePatientHealthIndexDao.findOne(Long.valueOf(item.getTzCode())); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                if(data!=null) 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                { 
															 | 
															
															 | 
															
																                { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                    String preValue = devicePatientHealthIndexDao.getPreValue(item.getSender(),Long.valueOf(item.getTzCode()),value2); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                    map.put("preValue",preValue); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                    //记录时间 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                    map.put("recordDate",DateUtil.dateToStrLong(data.getRecordDate())); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                    /*//获取上次血糖值 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                    if("1".equals(type)) 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                    { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                        String preValue = devicePatientHealthIndexDao.getPreValue(item.getSender(),Long.valueOf(item.getTzCode()),value2); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                        map.put("preValue",preValue); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																                    }*/ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                } 
															 | 
															
															 | 
															
																                } 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                map.put("czrq", DateUtil.dateToStrLong(item.getCzrq())); 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                re.add(map); 
															 | 
															
															 | 
															
																                re.add(map); 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																                item.setRead(0);//把消息设置为已读 
															 | 
															
															 | 
															
																                item.setRead(0);//把消息设置为已读 
															 |