--

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/assistance/EmergencyAssistanceService.java

@@ -345,12 +345,12 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            Map<String,Object> tmp = new HashMap<>();
            tmp.put("name","系统预警");
            tmp.put("status",0);
            tmp.put(statusName,"未读");
            tmp.put("statusName","未读");
            if (assistanceDO.getOrderSource()!=1){//设备发起工单
                Map<String,Object> tmp2 = new HashMap<>();
                tmp2.put("name","电话通知");
                tmp2.put("status",emeCallPhone.equals(patientDO1.getMobile())?1:0);
                tmp2.put(statusName,emeCallPhone.equals(patientDO1.getMobile())?"已呼叫":"未呼叫");
                tmp2.put("statusName",emeCallPhone.equals(patientDO1.getMobile())?"已呼叫":"未呼叫");
                arr.add(tmp2);
            }
            SystemMessageDO messageDO = systemMessageDao.findByRelationCodeAndReceiver(assistanceDO.getId(),patientId);
@@ -358,7 +358,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
                if (StringUtils.isNotBlank(messageDO.getIsRead())){
                    tmp.put("status",Integer.parseInt(messageDO.getIsRead()));
                    if (Integer.parseInt(messageDO.getIsRead())==1){
                        tmp.put(statusName,"已读");
                        tmp.put("statusName","已读");
                    }
                }
            }