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/endpoint/doctor/admin/AdminListInfoController.java

@@ -52,7 +52,7 @@ public class AdminListInfoController extends EnvelopRestEndpoint {
                return ObjEnvelop.getError("该操作没有权限");
            }
            return ObjEnvelop.getSuccess("查询成功",patientInfoPlatFormService.getPatientDeviceInfoWithDetail(patient));
            return ObjEnvelop.getSuccess("查询成功",patientInfoPlatFormService.getPatientDeviceInfoWithDetail(patient,null));
        }catch (Exception e){
            return failedObjEnvelopException2(e);
        }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/third/platForm/PatientInfoPlatFormEndpoint.java

@@ -138,10 +138,12 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "getPatientDeviceInfoWithDetail")
    @ApiOperation("获取居民设备列表(带设备电量、预警情况、是否在线等信息)")
    public ObjEnvelop getPatientDeviceInfoWithDetail(@ApiParam(name="patient",value = "居民id",required = true)
                                        @RequestParam(value = "patient")String patient){
    public ObjEnvelop getPatientDeviceInfoWithDetail(@ApiParam(name="patient",value = "居民id",required = false)
                                                     @RequestParam(value = "patient",required = false)String patient,
                                                     @ApiParam(name="deviceSn",value = "设备SN",required = false)
                                                     @RequestParam(value = "deviceSn",required = false)String deviceSn){
        try {
            return ObjEnvelop.getSuccess("查询成功",patientInfoPlatFormService.getPatientDeviceInfoWithDetail(patient));
            return ObjEnvelop.getSuccess("查询成功",patientInfoPlatFormService.getPatientDeviceInfoWithDetail(patient,deviceSn));
        }catch (Exception e){
            return failedObjEnvelopException2(e);
        }

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

@@ -969,6 +969,7 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
        logTypeDO.setUserName(doctorDO.getName());
        logTypeDO.setOrderId(orderId);
        logTypeDO.setUserType(2);
        //logTypeDO.setCreateTime(DateUtil.strToDateLong(String.valueOf(new Date().getTime() + 1000)));
        logTypeDO.setCreateTime(new Date());
        logTypeDO.setContent("完成服务小结");
        logTypeDO.setType(5);
@@ -1476,9 +1477,10 @@ public class EmergencyAssistanceService extends BaseJpaService<EmergencyAssistan
            eaSql   = "SELECT `status`,DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') AS createTime,complete_time AS completeTime " +
                    "from base_emergency_assistance_order WHERE id = '"+orderId+"'";
            }if ("22".equals(orderType)){
        }
        if ("22".equals(orderType)){
            eaSql   = "SELECT `status`,DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') AS createTime,complete_time AS completeTime " +
                    "from base_security_monitoring_order WHERE id = '"+orderId+"'";
                "from base_security_monitoring_order WHERE id = '"+orderId+"'";
        }
        maps = jdbcTemplate.queryForList(eaSql);
        if (maps.size()==0) {

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

@@ -279,7 +279,7 @@ public class BaseServiceNewsService {
                content = "发起了紧急救护";
                break;
            case "6":
                content = "发起了安防";
                content = "发起了安防监护";
                break;
            default:
                content = "";

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

@@ -1376,11 +1376,25 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        one.setConclusionStatus(2);
        securityMonitoringOrderDao.save(one);
        List<BaseEmergencyWarnLogDO> byOrderIdByType = logDao.findByOrderIdByType(orderId);
        if (byOrderIdByType.size()==0){
            BaseEmergencyWarnLogDO logTypeDOOne = new BaseEmergencyWarnLogDO();
            logTypeDOOne.setUserCode(doctor);
            logTypeDOOne.setUserName(doctorVO.getName());
            logTypeDOOne.setOrderId(orderId);
            logTypeDOOne.setUserType(2);
            logTypeDOOne.setCreateTime(new Date());
            logTypeDOOne.setContent("已知悉");
            logTypeDOOne.setType(1);
            logDao.save(logTypeDOOne);
        }
        BaseEmergencyWarnLogDO logTypeDO = new BaseEmergencyWarnLogDO();
        logTypeDO.setUserCode(doctor);
        logTypeDO.setUserName(one.getDoctor());
        logTypeDO.setUserName(one.getDoctorName());
        logTypeDO.setOrderId(orderId);
        logTypeDO.setUserType(2);
        //logTypeDO.setCreateTime(DateUtil.strToDateLong(String.valueOf(new Date().getTime() + 1000)));
        logTypeDO.setCreateTime(new Date());
        logTypeDO.setContent("完成服务小结");
        logTypeDO.setType(5);
@@ -2742,7 +2756,16 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                        if (deviceSns.size() > 0) {
                            JSONObject objectTmp = patientMonitoringInfo(patientTmp.get("id").toString(), "preventLost", deviceSns.get(0),false);
                            tmp.put("atHome", objectTmp.get("atHome"));
                            tmp.put("address", objectTmp.get("address"));
                            if(objectTmp.containsKey("location")&&null!=objectTmp.getJSONObject("location")){
                                tmp.put("address", objectTmp.getJSONObject("location").get("address"));
                                String lonTmp = null==objectTmp.getJSONObject("location").get("lon")?"":objectTmp.getJSONObject("location").get("lon")+"";
                                String latTmp = null==objectTmp.getJSONObject("location").get("lat")?"":objectTmp.getJSONObject("location").get("lat")+"";
                                if (StringUtils.isNotBlank(latTmp)&&StringUtils.isNotBlank(lonTmp)){
                                    patientTmp.put("latLon",latTmp+","+lonTmp);
                                }
                            }else {
                                tmp.put("address", null);
                            }
                        }else {
                            BasePatientDO patientDO = basePatientDao.findById(id);
                            if (null != patientDO) {

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

@@ -2517,35 +2517,39 @@ public class StatisticsService {
                " on life.hospital = org.code   where life.`status`=2  and org.code not in (select dict_code from wlyy_hospital_sys_dict "+
                "          where dict_name ='jkzl_org') and org.del=1 ";
        List<Map<String,Object>> tmpList = jdbcTemplate.queryForList(sql);
        Map<String,List<Map<String,Object>>> numList = tmpList.stream().collect(Collectors.groupingBy(e->e.get("hospital").toString()));
        sql = " select count(life.id) total,life.hospital,org.name from base_life_care_order life INNER JOIN  base_org org " +
                " on life.hospital = org.code   where life.`status` in (1,3)  and org.code not in (select dict_code from wlyy_hospital_sys_dict "+
                "          where dict_name ='jkzl_org') and org.del=1 ";
        tmpList = jdbcTemplate.queryForList(sql);
        Map<String,List<Map<String,Object>>> numList2 = tmpList.stream().collect(Collectors.groupingBy(e->e.get("hospital").toString()));
        for (Map<String, Object> tmp : list) {
            if (numList.containsKey(tmp.get("code"))||numList2.containsKey(tmp.get("code"))) {
                Long finish=0l;
                Long unfinish=0l;
                if (numList.containsKey(tmp.get("code"))){
                    finish =Long.valueOf(numList.get(tmp.get("code")).get(0).get("total").toString());
                }
                if (numList2.containsKey(tmp.get("code"))){
                    unfinish =Long.valueOf(numList2.get(tmp.get("code")).get(0).get("total").toString());
        try {
            Map<String,List<Map<String,Object>>> numList = tmpList.stream().collect(Collectors.groupingBy(e->e.get("hospital").toString()));
            sql = " select count(life.id) total,life.hospital,org.name from base_life_care_order life INNER JOIN  base_org org " +
                    " on life.hospital = org.code   where life.`status` in (1,3)  and org.code not in (select dict_code from wlyy_hospital_sys_dict "+
                    "          where dict_name ='jkzl_org') and org.del=1 ";
            tmpList = jdbcTemplate.queryForList(sql);
            Map<String,List<Map<String,Object>>> numList2 = tmpList.stream().collect(Collectors.groupingBy(e->e.get("hospital").toString()));
            for (Map<String, Object> tmp : list) {
                if (numList.containsKey(tmp.get("code"))||numList2.containsKey(tmp.get("code"))) {
                    Long finish=0l;
                    Long unfinish=0l;
                    if (numList.containsKey(tmp.get("code"))){
                        finish =Long.valueOf(numList.get(tmp.get("code")).get(0).get("total").toString());
                    }
                    if (numList2.containsKey(tmp.get("code"))){
                        unfinish =Long.valueOf(numList2.get(tmp.get("code")).get(0).get("total").toString());
                    }
                    tmp.put("finish", finish);
                    tmp.put("unfinish", unfinish);
                    tmp.put("total", finish+unfinish);
                    tmp.put("law", commonUtil.getRangeDouble(finish.intValue(),(finish.intValue()+unfinish.intValue())));
                } else {
                    tmp.put("finish", 0);
                    tmp.put("unfinish", 0);
                    tmp.put("total", 0);
                    tmp.put("law", 0);
                }
                tmp.put("finish", finish);
                tmp.put("unfinish", unfinish);
                tmp.put("total", finish+unfinish);
                tmp.put("law", commonUtil.getRangeDouble(finish.intValue(),(finish.intValue()+unfinish.intValue())));
            } else {
                tmp.put("finish", 0);
                tmp.put("unfinish", 0);
                tmp.put("total", 0);
                tmp.put("law", 0);
            }
        }
        if (list.size()>0){
            list.sort(Comparator.comparing(obj -> Double.parseDouble(((Map<String,Object>) obj).get("law").toString())).reversed());
            if (list.size()>0){
                list.sort(Comparator.comparing(obj -> Double.parseDouble(((Map<String,Object>) obj).get("law").toString())).reversed());
            }
        }catch (Exception e){
            return null;
        }
        return list;
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/third/PatientInfoPlatFormService.java

@@ -691,9 +691,20 @@ public class PatientInfoPlatFormService {
    /**
     *获取设备详情
     */
    public List<Map<String,Object>> getPatientDeviceInfoWithDetail(String patient){
    public List<Map<String,Object>> getPatientDeviceInfoWithDetail(String patient,String deviceSn){
        List<Map<String,Object>>  list = new ArrayList<>();
        list = patientDeviceService.patientDeviceListByTopic(patient,null);
        String sql = "select dd.photo,pd.device_sn,dd.brands,dd.category_code,dd.model,pd.device_name,date_format(pd.czrq,'%Y-%m-%d %H:%i:%S' ) deviceTime,dd.device_type as deviceType " +
                "from dm_device dd INNER JOIN wlyy_patient_device pd on dd.category_code = pd.category_code INNER JOIN wlyy_devices wd on dd.model = wd.device_model and pd.device_sn = wd.device_code \n" +
                "where 1=1 and  pd.del=0 ";
        if (org.apache.commons.lang3.StringUtils.isNotBlank(patient)) {
            sql += " and  pd.`user`='" + patient + "' ";
        }
        if (org.apache.commons.lang3.StringUtils.isNotBlank(deviceSn)){
            sql += " and pd.device_sn = '"+deviceSn+"' ";
        }
        sql+=" order by pd.czrq asc ";
        list =  jdbcTemplate.queryForList(sql);
        for (Map<String,Object> tmp :list){
            String category_code = tmp.get("category_code").toString();
            String deviceSN = tmp.get("device_sn").toString();