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

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

@@ -46,7 +46,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.*;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -309,28 +308,28 @@ public class PlatElderBreatheAnalysisServiceImpl extends ServiceImpl<PlatElderBr
             // 呼吸暂停
             // 呼吸暂停
             int apneaTime = Integer.parseInt(saasDiseaseModel.getApneaTime());
             int apneaTime = Integer.parseInt(saasDiseaseModel.getApneaTime());
             int apneaThreshold = Integer.parseInt(saasDiseaseModel.getApneaThreshold());
             int apneaThreshold = Integer.parseInt(saasDiseaseModel.getApneaThreshold());
-            BigDecimal apneaRate = new BigDecimal(apneaThreshold).divide(new BigDecimal(apneaTime), 2, RoundingMode.HALF_UP);
+            BigDecimal apneaRate = new BigDecimal(apneaThreshold);
 
 
             // 呼吸过速
             // 呼吸过速
             int tachypneaTime = Integer.parseInt(saasDiseaseModel.getTachypneaTime());
             int tachypneaTime = Integer.parseInt(saasDiseaseModel.getTachypneaTime());
             int tachypneaThreshold = Integer.parseInt(saasDiseaseModel.getTachypneaThreshold());
             int tachypneaThreshold = Integer.parseInt(saasDiseaseModel.getTachypneaThreshold());
-            BigDecimal tachypneaRate = new BigDecimal(tachypneaThreshold).divide(new BigDecimal(tachypneaTime), 2, RoundingMode.HALF_UP);
+            BigDecimal tachypneaRate = new BigDecimal(tachypneaThreshold);
 
 
 
 
             // 呼吸过缓
             // 呼吸过缓
             int bradypneaTime = Integer.parseInt(saasDiseaseModel.getBradypneaTime());
             int bradypneaTime = Integer.parseInt(saasDiseaseModel.getBradypneaTime());
             int bradypneaThreshold = Integer.parseInt(saasDiseaseModel.getBradypneaThreshold());
             int bradypneaThreshold = Integer.parseInt(saasDiseaseModel.getBradypneaThreshold());
-            BigDecimal bradypneaRate = new BigDecimal(bradypneaThreshold).divide(new BigDecimal(bradypneaTime), 2, RoundingMode.HALF_UP);
+            BigDecimal bradypneaRate = new BigDecimal(bradypneaThreshold);
 
 
             // 心率过缓
             // 心率过缓
             int bradycardiaTime = Integer.parseInt(saasDiseaseModel.getBradycardiaTime());
             int bradycardiaTime = Integer.parseInt(saasDiseaseModel.getBradycardiaTime());
             int bradycardiaThreshold = Integer.parseInt(saasDiseaseModel.getBradycardiaThreshold());
             int bradycardiaThreshold = Integer.parseInt(saasDiseaseModel.getBradycardiaThreshold());
-            BigDecimal bradycardiaRate = new BigDecimal(bradycardiaThreshold).divide(new BigDecimal(bradycardiaTime), 2, RoundingMode.HALF_UP);
+            BigDecimal bradycardiaRate = new BigDecimal(bradycardiaThreshold);
 
 
             // 心率过速
             // 心率过速
             int tachycardiaTime = Integer.parseInt(saasDiseaseModel.getTachycardiaTime());
             int tachycardiaTime = Integer.parseInt(saasDiseaseModel.getTachycardiaTime());
             int tachycardiaComparison = Integer.parseInt(saasDiseaseModel.getTachycardiaThreshold());
             int tachycardiaComparison = Integer.parseInt(saasDiseaseModel.getTachycardiaThreshold());
-            BigDecimal tachycardiaRate = new BigDecimal(tachycardiaComparison).divide(new BigDecimal(tachycardiaTime), 2, RoundingMode.HALF_UP);
+            BigDecimal tachycardiaRate = new BigDecimal(tachycardiaComparison);
 
 
             // 呼吸疾病报告
             // 呼吸疾病报告
             int brStopCount = 0;
             int brStopCount = 0;
@@ -366,11 +365,11 @@ public class PlatElderBreatheAnalysisServiceImpl extends ServiceImpl<PlatElderBr
             }
             }
 
 
             // 判断是否满足配置的呼吸心率异常类型
             // 判断是否满足配置的呼吸心率异常类型
-            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);
+            BigDecimal dayBrStopRate = new BigDecimal(brStopCount);
+            BigDecimal dayBrSlowRate = new BigDecimal(brSlowCount);
+            BigDecimal dayBrFastRate = new BigDecimal(brFastCount);
+            BigDecimal dayHrFastRate = new BigDecimal(hrFastCount);
+            BigDecimal dayHrSlowRate = new BigDecimal(hrSlowCount);
 
 
             boolean brStopFlag = false;
             boolean brStopFlag = false;
             boolean brFastFlag = false;
             boolean brFastFlag = false;