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

svr/svr-iot/src/main/java/com/yihu/iot/controller/monitorPlatform/MonitorPlatformController.java

@@ -941,12 +941,9 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
                //健康分  retWeekTime("week");  周的健康分
                List<Map<String, Object>> scoreDO = monitorPlatformService.getHealthScoreByPatient(patient,date,endDate);
                if (scoreDO.size() > 0){
                    Map<String,Object> healthScoreDO = scoreDO.get(0);
                    json.put("score",healthScoreDO.get("score")); //健康分值
                    json.put("total",healthScoreDO.get("total")); //健康分值总分
                    json.put("score",scoreDO); //健康分值
                }else {
                    json.put("score",0); //健康分值
                    json.put("total",0); //健康分值总分
                }
            }
            if (type.equals("realtime") || type.equals("all")){