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

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

@@ -350,8 +350,8 @@ public class PatientInfoPlatFormService {
                                com.alibaba.fastjson.JSONArray nightArr = jsonObject.getJSONArray("sleepNightRecordList");
                                if (nightArr.size()>0){
                                    com.alibaba.fastjson.JSONObject tmp = nightArr.getJSONObject(0);
                                    Long time =Long.parseLong(tmp.getString("createTime"));
                                    info.put("info1","离床时间: "+DateUtil.dateToStrLong(new Date(time)));
                                    String time = tmp.getString("createTime");
                                    info.put("info1","离床时间: "+time);
                                }
                            }
                        }