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

@@ -940,13 +940,15 @@ public class PatientInfoPlatFormService {
                if(bl){
                    //取之前时间的监控
                    try {
                        JSONObject tmp = ysDeviceService.deviceVideoTimeList(patient, deviceSn, 1,beforeTime.substring(0,10)+" 00:00:00",beforeTime.substring(0,10)+" 23:59:59",0, null);
                        //JSONObject tmp = ysDeviceService.deviceVideoUrlByTime(deviceSn, 1,"3","2",beforeTime,afterTime,1000, null);
                        //JSONObject tmp = ysDeviceService.deviceVideoTimeList(patient, deviceSn, 1,filterTime.substring(0,10)+" 00:00:01",filterTime.substring(0,10)+" 23:59:59",0, null);
                        JSONObject tmp = ysDeviceService.videoList2(patient,deviceSn,1,null,null,4,null,filterTime.substring(0,10)+" 00:00:01",filterTime.substring(0,10)+" 23:59:59","2",null,null,null);
                        detailInfo.put("monitorInfoStatus", tmp.getIntValue(ResponseContant.resultFlag));
                        if (tmp.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                            detailInfo.put("monitorInfo", tmp.getString(ResponseContant.resultMsg));
                        } else {
                            detailInfo.put("monitorInfo", tmp.getJSONObject(ResponseContant.resultMsg));
                            JSONObject js1 = tmp.getJSONObject(ResponseContant.resultMsg);
                            js1.put("hdAddress",js1.getString("url"));
                            detailInfo.put("monitorInfo",js1);
                        }
                    } catch (Exception e) {
                        e.printStackTrace();