Explorar o código

Merge branch 'dev' of huangzhanpeng/wlyy_management into dev

lyr %!s(int64=8) %!d(string=hai) anos
pai
achega
cd9a3ae407

+ 5 - 3
patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/message/MessageService.java

@ -334,9 +334,7 @@ public class MessageService extends BaseService {
                map.put("type", type);
                map.put("read", String.valueOf(item.getRead()));
                map.put("sex", String.valueOf(item.getSex()));
                map.put("value1", String.valueOf(item.getValue1()));
                String value2 = String.valueOf(item.getValue2().intValue());
                map.put("value2",value2);
                map.put("czrq", DateUtil.dateToStrLong(item.getCzrq()));
                DevicePatientHealthIndex data =devicePatientHealthIndexDao.findOne(Long.valueOf(item.getTzCode()));
@ -345,6 +343,10 @@ public class MessageService extends BaseService {
                    //记录时间
                    map.put("recordDate",DateUtil.dateToStrLong(data.getRecordDate()));
                    //指标数据
                    map.put("value1", data.getValue1());
                    String value2 = Integer.valueOf(data.getValue2()).toString();
                    map.put("value2",value2);
                    /*//获取上次血糖值
                    if("1".equals(type))
                    {