|
@@ -117,6 +117,7 @@ public class IndividualLogApiController {
|
|
|
PersonInfo person = personInfoService.get(Long.valueOf(personId));
|
|
|
|
|
|
map.put("name",person.getName());
|
|
|
+ map.put("temperatureMax", temperatureConfig.getMax());
|
|
|
map.put("faceImageUrl",person.getFaceImageUrl());
|
|
|
|
|
|
PersonDeviceFilterLog personDeviceFilterLog = personDeviceFilterLogService.lastPersonLog(person.getId());
|
|
@@ -143,7 +144,6 @@ public class IndividualLogApiController {
|
|
|
//todo 最近14天未测体温数
|
|
|
Integer detectedCount = personDeviceFilterLogService.countDayByPersonIdAndDate(person.getId(),today.minusDays(13).toDate(),today.plusDays(1).toDate());
|
|
|
map.put("undetectedCount",14 - detectedCount);
|
|
|
-
|
|
|
//todo 获取连续检测天数
|
|
|
//最近一年的节假日
|
|
|
Set<String> holidaySet = holidayInfoService.getHolidaySetByDate(today.minusDays(364).toDate(),today.plusDays(1).toDate());
|
|
@@ -275,6 +275,8 @@ public class IndividualLogApiController {
|
|
|
}
|
|
|
|
|
|
map.put("list", list1);
|
|
|
+ map.put("temperatureMax",temperatureConfig.getMax());
|
|
|
+
|
|
|
totalList.add(map);
|
|
|
|
|
|
messageResult.setData(totalList);
|