Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -611,7 +611,8 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            jsonObject.put("sessionId",null);
            jsonObject.put("UnRead",0);
        }
        result.put("phone",patientDO.getMobile());
        result.put("phone",patientDO.getPhoto());
        result.put(ResponseContant.resultFlag, ResponseContant.success);
        result.put(ResponseContant.resultMsg,jsonObject);
        return result;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -389,6 +389,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        emergencyOrderVO.setPatientName(orderDO.getPatientName());
        emergencyOrderVO.setSex(patientDO.getSex());
        emergencyOrderVO.setTopicItem(orderDO.getTopicItem());
        emergencyOrderVO.setPhone(patientDO.getMobile());
        emergencyOrderVO.setOrderType(22);
        if (StringUtils.isNotBlank(orderDO.getSceneImg())) {
            emergencyOrderVO.setSceneImg(orderDO.getSceneImg());
@@ -623,6 +624,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
            jsonObject.put("UnRead", 0);
        }
        jsonObject.put("photo",patientDO.getPhoto());
        result.put("resultFlag", 1);
        result.put("resultMsg", jsonObject);
        return result;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -3787,8 +3787,7 @@ public class StatisticsService {
        jsonObject.put("lineDevice",total.get(0));
        total = jdbcTemplate.queryForList(sevenDayUseSql,Integer.class);
        Float num = 0F;
        if (total.size()>0)
        {
        if (total.size()>0) {
            num= (float)Integer.parseInt(jsonObject.get("deviceTotal").toString())/(float)total.get(0);
        }
        jsonObject.put("sevenDayUse",num);
@@ -3798,8 +3797,7 @@ public class StatisticsService {
    public List<Map<String, Object>> findByPatientHelper(String patient){
        String sql = "SELECT ph.doctor,ph.doctor_name,d.mobile,d.qrcode  FROM base_patient_helper ph INNER JOIN base_doctor d ON d.id = ph.doctor WHERE  ph.del = 1 AND ph.patient = '"+patient+"'";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        return list;
        return jdbcTemplate.queryForList(sql);
    }
    public List<Map<String, Object>> findDictEmeStatus(){
@@ -3844,13 +3842,11 @@ public class StatisticsService {
            SystemMessageDO byRelationCodeAndReceiver = systemMessageDao.findByRelationCodeAndReceiver(orderId, patient);
            familyMap.put("statusName", "未读");
            familyMap.put("status", 0);
            if (null!=byRelationCodeAndReceiver){
                if (StringUtils.isNotBlank(byRelationCodeAndReceiver.getIsRead())) {
                    //familyMap.put("status", Integer.parseInt(byRelationCodeAndReceiver.getIsRead()));
                    if (Integer.parseInt(byRelationCodeAndReceiver.getIsRead()) == 1) {
                        familyMap.put("statusName", "已读");
                        familyMap.put("status", 1);
                    }
            if (null != byRelationCodeAndReceiver && StringUtils.isNotBlank(byRelationCodeAndReceiver.getIsRead())) {
                //familyMap.put("status", Integer.parseInt(byRelationCodeAndReceiver.getIsRead()));
                if (Integer.parseInt(byRelationCodeAndReceiver.getIsRead()) == 1) {
                    familyMap.put("statusName", "已读");
                    familyMap.put("status", 1);
                }
            }