Merge branch 'dev' of liubing/wlyy2.0 into dev

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

@@ -165,15 +165,15 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = "getHealthIndexInfo")
    @ApiOperation("获取居民体征信息")
    public String getHealthIndexInfo(@ApiParam(name="patient",value="患者代码",defaultValue = "eb0b478fbe9245428ecf63cd7517206f")
                                             @RequestParam(value="patient",required = true) String patient,
                                      @ApiParam(name="type",value="指标类型",defaultValue = "1")
                                             @RequestParam(value="type",required = true) int type,
                                      @ApiParam(name="gi_type",value="就餐类型",defaultValue = "0")
                                             @RequestParam(value = "gi_type",required = false) int gi_type,
                                      @ApiParam(name="begin",value="开始时间",defaultValue = "2017-05-22 00:00:00")
                                             @RequestParam(value="begin",required = true) String begin,
                                      @ApiParam(name="end",value="结束时间",defaultValue = "2017-06-02 00:00:00")
                                             @RequestParam(value="end",required = true) String end){
                                     @RequestParam(value="patient",required = true) String patient,
                                     @ApiParam(name="type",value="指标类型",defaultValue = "1")
                                     @RequestParam(value="type",required = true) Integer type,
                                     @ApiParam(name="gi_type",value="就餐类型",defaultValue = "0")
                                     @RequestParam(value = "gi_type",required = false) Integer gi_type,
                                     @ApiParam(name="begin",value="开始时间",defaultValue = "2017-05-22 00:00:00")
                                     @RequestParam(value="begin",required = true) String begin,
                                     @ApiParam(name="end",value="结束时间",defaultValue = "2017-06-02 00:00:00")
                                     @RequestParam(value="end",required = true) String end){
        try {
            return baseController.write (200,"查询成功","data",patientInfoPlatFormService.getHealthIndexInfo(patient,type,gi_type,begin,end));
        }catch (Exception e){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/PatientDeviceService.java

@@ -980,7 +980,7 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
                        ")A ";
                Long orderCount = jdbcTemplate.queryForObject(sql,Long.class);
                devInfo.put("errorCount",orderCount);//         //异常量
            }else if (2==device.getDeviceType()){//健康设备
            }else if (0==device.getDeviceType()){//健康设备
                sql = " select count(id) from wlyy_patient_health_index where device_sn ='"+deviceSn+"' ";
                Long dataCount = jdbcTemplate.queryForObject(sql,Long.class);
                devInfo.put("dataCount",dataCount);//异常量
@@ -1420,7 +1420,7 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
                    if ("疑似离开安全区域".equals(orderDO.getServeDesc())){
                        //超出距离
                        info.put("info1","超出距离: 1km");//todo
                        info.put("info1","超出距离: 1m");//todo
                    }
                    if ("超时未起床".equals(orderDO.getServeDesc())){
                        List<BaseSleepPlan> sleepPlan = sleepPlanDao.findByPatient(orderDO.getPatient());

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

@@ -338,6 +338,10 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
        for (BaseEmergencyWarnLogDO tmp:logDOS){
            tmp.setTimeInfo(DateUtil.getDifferentTimeInfo(new Date(),tmp.getCreateTime(),0));
        }
        if (logDOS.size()==0&&1==emergencyOrderVO.getStatus()){//未响应
            emergencyOrderVO.setOverTimeNotResponse(DateUtil.getDifferentTimeInfo1(new Date(),orderDO.getCreateTime()));
        }
        emergencyOrderVO.setOrderLogInfo(logDOS);
        List<PatientSosContactsDO> contactsDOS = contactsService.getPatientSosContacts(orderDO.getPatient());
        emergencyOrderVO.setSosContacts(contactsDOS);

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

@@ -292,12 +292,12 @@ public class PatientInfoPlatFormService {
            map.put("orderLog",logDOS);
            // (起床预警时长3 午睡预警时长5 起夜预警时长2 详情见设备项目睡眠带发起时定义) (离开安全区域超出距离km) (燃气烟雾 报警时浓度)
            if ("22".equals(orderType)){
                org.json.JSONObject info = new org.json.JSONObject();
                JSONObject info = new JSONObject();
                SecurityMonitoringOrderDO orderDO = securityMonitoringOrderDao.findOne(orderId);
                if ("疑似离开安全区域".equals(orderDO.getServeDesc())){
                    //超出距离
                    info.put("info1","超出距离: 1km");//todo
                    info.put("info1","超出距离: 1m");//todo
                }
                if ("超时未起床".equals(orderDO.getServeDesc())){
                    List<BaseSleepPlan> sleepPlan = sleepPlanDao.findByPatient(orderDO.getPatient());
@@ -379,7 +379,7 @@ public class PatientInfoPlatFormService {
                        if(null!=jsonObject.get("heartRate")){
                            String heartRate = jsonObject.getString("heartRate");
                            if (org.apache.commons.lang3.StringUtils.isNotBlank(heartRate)){
                                info.put("info1", "预警心率: "+heartRate+"次/分钟");
                                info.put("info2", "预警心率: "+heartRate+"次/分钟");
                            }
                        }
                    }