修改健康公示已经最近14天曲线图

web/src/main/java/com/jpsoft/smart/modules/mobile/controller/IndividualLogApiController.java

@@ -116,10 +116,10 @@ public class IndividualLogApiController {
             map.put("lastTemperature",lastTemperatureStr);
 
             if(lastTemperatureDou>=37){
-                map.put("isNormal","异常");
+                map.put("isNormal",false);
             }
             else{
-                map.put("isNormal","正常");
+                map.put("isNormal",true);
             }
 
             double curTemperature = 0;
@@ -146,12 +146,10 @@ public class IndividualLogApiController {
                 Date dt2 = rightNow2.getTime();
                 String endDate = sdf.format(dt2);
 
-                PersonDeviceFilterLog item = personDeviceFilterLogService.getByPersonIdAndDate(person.getId(), startDate, endDate);
+                PersonDeviceFilterLog item = personDeviceFilterLogService.findByPersonOrderTemperature(person.getId(), startDate, endDate);
 
                 if(item!=null){
-                    String temperature = item.getTemperature().toString();
-
-                    curTemperature = Double.parseDouble(temperature);
+                    curTemperature = item.getTemperature().doubleValue();
 
                     if(curTemperature<37){
                         totalDays++;
@@ -242,9 +240,11 @@ public class IndividualLogApiController {
                     }
                 }
 
-                map.put("list", list1);
+                if(list1.size()>0) {
+                    map.put("list", list1);
 
-                totalList.add(map);
+                    totalList.add(map);
+                }
             }
 
             messageResult.setData(totalList);