From c3ba0dec775a9b9b7d6ae57dc88fd82bb3928a74 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Mon, 14 Dec 2020 18:16:04 +0800
Subject: [PATCH] =?UTF-8?q?20201214=E5=87=86=E5=A4=87=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/wisdomcar/service/RecordService.java    | 6 +++---
 wisdomcar/src/main/resources/application.yml                | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java
index 58fd2010..9d75d3cd 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java
@@ -102,9 +102,9 @@ public class RecordService implements IRecordService{
         String dosage;
         BigDecimal weight = BigDecimal.valueOf(weightInt).divide(BigDecimal.valueOf(1000),2,BigDecimal.ROUND_HALF_UP);
         //总剂量
-        BigDecimal totalDose = weight.divide(BigDecimal.valueOf(0.9),2,BigDecimal.ROUND_HALF_UP);
+        BigDecimal totalDose = weight.multiply(BigDecimal.valueOf(0.9)).setScale(2, BigDecimal.ROUND_HALF_UP);
         //团注剂量
-        BigDecimal dose1 = totalDose.divide(BigDecimal.valueOf(0.1),2,BigDecimal.ROUND_HALF_UP);
+        BigDecimal dose1 = totalDose.multiply(BigDecimal.valueOf(0.1)).setScale(2, BigDecimal.ROUND_HALF_UP);
         //维持剂量
         BigDecimal dose2 = totalDose.subtract(dose1);
         dosage = totalDose + "," + dose1 + "," + dose2;
@@ -207,7 +207,7 @@ public class RecordService implements IRecordService{
         //redis查询急救表
         Long firstAidId = null;
         Object o = redisUtil.get(key);
-        if(ObjectUtil.isNotNull(o)){
+        if(ObjectUtil.isNull(o)){
             FirstAidExample firstAidExample = new FirstAidExample();
             firstAidExample.createCriteria().andCarIdEqualTo(wisdomCarId);
             List<FirstAid> firstAids = firstAidMapper.selectByExample(firstAidExample);
diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml
index a47f2a7b..ac92adb9 100644
--- a/wisdomcar/src/main/resources/application.yml
+++ b/wisdomcar/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test