diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java index 040febd..219087c 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java @@ -519,31 +519,49 @@ public class WatchServiceImpl implements IWatchService { switch (watchH5IndexItemVo.getWdType()) { case "sleep": WatchH5IndexItemNewVo sleepData = futureSleepData.get(); + if(ObjectUtil.isNull(sleepData)){ + sleepData = new WatchH5IndexItemNewVo(); + } sleepData.fieldCopy(watchH5IndexItemVo); list.add(sleepData); break; case "steps": WatchH5IndexItemNewVo stepsData = futureStepsData.get(); + if(ObjectUtil.isNull(stepsData)){ + stepsData = new WatchH5IndexItemNewVo(); + } stepsData.fieldCopy(watchH5IndexItemVo); list.add(stepsData); break; case "heart_rate": WatchH5IndexItemNewVo heartData = futureHeartRateData.get(); + if(ObjectUtil.isNull(heartData)){ + heartData = new WatchH5IndexItemNewVo(); + } heartData.fieldCopy(watchH5IndexItemVo); list.add(heartData); break; case "spo2": WatchH5IndexItemNewVo apo2Data = futureSpo2Data.get(); + if(ObjectUtil.isNull(apo2Data)){ + apo2Data = new WatchH5IndexItemNewVo(); + } apo2Data.fieldCopy(watchH5IndexItemVo); list.add(apo2Data); break; case "stress": WatchH5IndexItemNewVo stressData = futureStressData.get(); + if(ObjectUtil.isNull(stressData)){ + stressData = new WatchH5IndexItemNewVo(); + } stressData.fieldCopy(watchH5IndexItemVo); list.add(stressData); break; case "temperature": WatchH5IndexItemNewVo tempData = futureTempData.get(); + if(ObjectUtil.isNull(tempData)){ + tempData = new WatchH5IndexItemNewVo(); + } tempData.fieldCopy(watchH5IndexItemVo); list.add(tempData); break;