老人报表更新

server-module/src/main/java/com/makeit/module/controller/elder/PlatElderReportMonthController.java

@@ -27,7 +27,7 @@ import java.util.List;
  * @author eugene young
  * @author eugene young
  * @since 2023-08-29
  * @since 2023-08-29
  */
  */
-@Api(tags = "长者报告-周报")
+@Api(tags = "长者报告-月报")
 @RestController
 @RestController
 @RequestMapping("/plat/elder/report/month")
 @RequestMapping("/plat/elder/report/month")
 public class PlatElderReportMonthController {
 public class PlatElderReportMonthController {

server-service/src/main/java/com/makeit/service/saas/impl/SaasElderReportConfigServiceImpl.java

@@ -56,7 +56,7 @@ public class SaasElderReportConfigServiceImpl extends ServiceImpl<SaasElderRepor
         // 根据睡眠报告结果配置得出最后的睡眠评分
         // 根据睡眠报告结果配置得出最后的睡眠评分
         EvaluateReportVO finalReport = new EvaluateReportVO();
         EvaluateReportVO finalReport = new EvaluateReportVO();
         for (EvaluateReportVO evaluateReportVO : evaluateReportList) {
         for (EvaluateReportVO evaluateReportVO : evaluateReportList) {
-            String[] scoreRange = evaluateReportVO.getScoreRange().split("~");
+            String[] scoreRange = evaluateReportVO.getScoreRange().split("-");
             long scoreRangeStart = Long.parseLong(scoreRange[0]);
             long scoreRangeStart = Long.parseLong(scoreRange[0]);
             long scoreRangeEnd = Long.parseLong(scoreRange[1]);
             long scoreRangeEnd = Long.parseLong(scoreRange[1]);
             if (scoreRangeStart <= totalScore && scoreRangeEnd >= totalScore) {
             if (scoreRangeStart <= totalScore && scoreRangeEnd >= totalScore) {