Commit 93487cd6 by huangjy

fix: 睡眠模型分析判断问题

parent 3ebbb1b6
......@@ -297,12 +297,11 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
for (Map.Entry<String, AnalysisVO> entry : totalMap.entrySet()) {
AnalysisVO analysisVO = entry.getValue();
if (!analysisVO.getIsAction()) {
if (!analysisVO.getIsAction() && !analysisVO.getIsMoveBed()) {
if (StringUtils.isEmpty(startSleepTime)) {
startSleepTime = entry.getKey();
}
sleepMinute++;
continue;
}
if (StringUtils.isEmpty(startSleepTime) && sleepMinute == 0) {
continue;
......@@ -460,7 +459,7 @@ public class PlatElderSleepServiceImpl extends ServiceImpl<PlatElderSleepMapper,
TreeMap<String, AnalysisVO> sleepMap = entry.getValue();
for (Map.Entry<String, AnalysisVO> voEntry : sleepMap.entrySet()) {
AnalysisVO analysisVO = voEntry.getValue();
if (analysisVO.getAwakeMinuteActionFlag()) {
if (analysisVO.getAwakeMinuteActionFlag() || analysisVO.getIsMoveBed()) {
if (StringUtils.isEmpty(startAwakeTime)) {
startAwakeTime = voEntry.getKey();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment