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

server-module/src/main/java/com/makeit/module/controller/children/space/PlatRegionSettingFixChildrenController.java

+package com.makeit.module.controller.children.space;
+
+import com.makeit.common.response.ApiResponseEntity;
+import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.dto.platform.space.PlatRegionSettingDTO;
+import com.makeit.dto.platform.space.PlatRegionSettingFixQueryDTO;
+import com.makeit.service.platform.space.PlatRegionSettingFixService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api(tags = "子女端小程序-区域设置固化")
+@RestController
+@RequestMapping("/children/plat/region/setting/fix")
+public class PlatRegionSettingFixChildrenController {
+
+    @Autowired
+    private PlatRegionSettingFixService platRegionSettingFixService;
+
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public ApiResponseEntity<List<PlatRegionSettingDTO>> list(@RequestBody PlatRegionSettingFixQueryDTO dto) {
+        List<PlatRegionSettingDTO> data = platRegionSettingFixService.list(dto);
+        return ApiResponseUtils.success(data);
+    }
+
+}

server-module/src/main/java/com/makeit/module/controller/wechat/space/PlatRegionSettingFixWechatController.java

+package com.makeit.module.controller.wechat.space;
+
+import com.makeit.common.response.ApiResponseEntity;
+import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.dto.platform.space.PlatRegionSettingDTO;
+import com.makeit.dto.platform.space.PlatRegionSettingFixQueryDTO;
+import com.makeit.service.platform.space.PlatRegionSettingFixService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api(tags = "平台端小程序-区域设置固化")
+@RestController
+@RequestMapping("/wechat/plat/region/setting/fix")
+public class PlatRegionSettingFixWechatController {
+
+    @Autowired
+    private PlatRegionSettingFixService platRegionSettingFixService;
+
+    @ApiOperation("列表")
+    @PostMapping("list")
+    public ApiResponseEntity<List<PlatRegionSettingDTO>> list(@RequestBody PlatRegionSettingFixQueryDTO dto) {
+        List<PlatRegionSettingDTO> data = platRegionSettingFixService.list(dto);
+        return ApiResponseUtils.success(data);
+    }
+
+}

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

@@ -309,28 +309,28 @@ public class PlatElderBreatheAnalysisServiceImpl extends ServiceImpl<PlatElderBr
             // 呼吸暂停
             int apneaTime = Integer.parseInt(saasDiseaseModel.getApneaTime());
             int apneaThreshold = Integer.parseInt(saasDiseaseModel.getApneaThreshold());
-            BigDecimal apneaRate = new BigDecimal(apneaTime).divide(new BigDecimal(apneaThreshold), 2, RoundingMode.HALF_UP);
+            BigDecimal apneaRate = new BigDecimal(apneaThreshold).divide(new BigDecimal(apneaTime), 2, RoundingMode.HALF_UP);
 
             // 呼吸过速
             int tachypneaTime = Integer.parseInt(saasDiseaseModel.getTachypneaTime());
             int tachypneaThreshold = Integer.parseInt(saasDiseaseModel.getTachypneaThreshold());
-            BigDecimal tachypneaRate = new BigDecimal(tachypneaTime).divide(new BigDecimal(tachypneaThreshold), 2, RoundingMode.HALF_UP);
+            BigDecimal tachypneaRate = new BigDecimal(tachypneaThreshold).divide(new BigDecimal(tachypneaTime), 2, RoundingMode.HALF_UP);
 
 
             // 呼吸过缓
             int bradypneaTime = Integer.parseInt(saasDiseaseModel.getBradypneaTime());
             int bradypneaThreshold = Integer.parseInt(saasDiseaseModel.getBradypneaThreshold());
-            BigDecimal bradypneaRate = new BigDecimal(bradypneaTime).divide(new BigDecimal(bradypneaThreshold), 2, RoundingMode.HALF_UP);
+            BigDecimal bradypneaRate = new BigDecimal(bradypneaThreshold).divide(new BigDecimal(bradypneaTime), 2, RoundingMode.HALF_UP);
 
             // 心率过缓
             int bradycardiaTime = Integer.parseInt(saasDiseaseModel.getBradycardiaTime());
             int bradycardiaThreshold = Integer.parseInt(saasDiseaseModel.getBradycardiaThreshold());
-            BigDecimal bradycardiaRate = new BigDecimal(bradycardiaTime).divide(new BigDecimal(bradycardiaThreshold), 2, RoundingMode.HALF_UP);
+            BigDecimal bradycardiaRate = new BigDecimal(bradycardiaThreshold).divide(new BigDecimal(bradycardiaTime), 2, RoundingMode.HALF_UP);
 
             // 心率过速
             int tachycardiaTime = Integer.parseInt(saasDiseaseModel.getTachycardiaTime());
             int tachycardiaComparison = Integer.parseInt(saasDiseaseModel.getTachycardiaThreshold());
-            BigDecimal tachycardiaRate = new BigDecimal(tachycardiaTime).divide(new BigDecimal(tachycardiaComparison), 2, RoundingMode.HALF_UP);
+            BigDecimal tachycardiaRate = new BigDecimal(tachycardiaComparison).divide(new BigDecimal(tachycardiaTime), 2, RoundingMode.HALF_UP);
 
             // 呼吸疾病报告
             int brStopCount = 0;
@@ -366,11 +366,11 @@ public class PlatElderBreatheAnalysisServiceImpl extends ServiceImpl<PlatElderBr
             }
 
             // 判断是否满足配置的呼吸心率异常类型
-            BigDecimal dayBrStopRate = brStopCount == 0 ? BigDecimal.ZERO : new BigDecimal(timeHourRange).divide(new BigDecimal(brStopCount), 2, RoundingMode.HALF_UP);
-            BigDecimal dayBrSlowRate = brSlowCount == 0 ? BigDecimal.ZERO : new BigDecimal(timeHourRange).divide(new BigDecimal(brSlowCount), 2, RoundingMode.HALF_UP);
-            BigDecimal dayBrFastRate = brFastCount == 0 ? BigDecimal.ZERO : new BigDecimal(timeHourRange).divide(new BigDecimal(brFastCount), 2, RoundingMode.HALF_UP);
-            BigDecimal dayHrFastRate = hrFastCount == 0 ? BigDecimal.ZERO : new BigDecimal(timeHourRange).divide(new BigDecimal(hrFastCount), 2, RoundingMode.HALF_UP);
-            BigDecimal dayHrSlowRate = hrSlowCount == 0 ? BigDecimal.ZERO : new BigDecimal(timeHourRange).divide(new BigDecimal(hrSlowCount), 2, RoundingMode.HALF_UP);
+            BigDecimal dayBrStopRate = brStopCount == 0 ? BigDecimal.ZERO : new BigDecimal(brStopCount).divide(new BigDecimal(timeHourRange), 2, RoundingMode.HALF_UP);
+            BigDecimal dayBrSlowRate = brSlowCount == 0 ? BigDecimal.ZERO : new BigDecimal(brSlowCount).divide(new BigDecimal(timeHourRange), 2, RoundingMode.HALF_UP);
+            BigDecimal dayBrFastRate = brFastCount == 0 ? BigDecimal.ZERO : new BigDecimal(brFastCount).divide(new BigDecimal(timeHourRange), 2, RoundingMode.HALF_UP);
+            BigDecimal dayHrFastRate = hrFastCount == 0 ? BigDecimal.ZERO : new BigDecimal(hrFastCount).divide(new BigDecimal(timeHourRange), 2, RoundingMode.HALF_UP);
+            BigDecimal dayHrSlowRate = hrSlowCount == 0 ? BigDecimal.ZERO : new BigDecimal(hrSlowCount).divide(new BigDecimal(timeHourRange), 2, RoundingMode.HALF_UP);
 
             boolean brStopFlag = false;
             boolean brFastFlag = false;