Merge remote-tracking branch 'origin/dev' into dev

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java

@@ -185,7 +185,8 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
                 score.updateAndGet(v -> v + Long.parseLong(finalSleepScore));
             });
         });
-        return  Long.parseLong(baseScore) + score.get();
+        Long result = Long.parseLong(baseScore) + score.get();
+        return result.compareTo(100L) > 0 ? 100L : result;
     }