From 871f3dc05626fdfa0a0db0ff0474ce774ef1d76d Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Thu, 18 Mar 2021 19:16:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0bmi=E5=80=BC=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom/SysFoodHeatStatisticsController.java       |  1 -
 stdiet-ui/src/components/BodySignView/index.vue       |  7 ++++---
 stdiet-ui/src/components/HealthyView/index.vue        | 11 +++++++----
 .../src/components/PhysicalSignsDialog/index.vue      |  8 ++++++++
 stdiet-ui/src/utils/healthyData.js                    |  6 ++++++
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysFoodHeatStatisticsController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysFoodHeatStatisticsController.java
index 4e9350315..7307e2008 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysFoodHeatStatisticsController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysFoodHeatStatisticsController.java
@@ -30,7 +30,6 @@ public class SysFoodHeatStatisticsController extends BaseController
     /**
      * 查询外食热量统计列表
      */
-    @PreAuthorize("@ss.hasPermi('custom:foodHeatStatistics:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysCustomerHeatStatistics sysCustomerHeatStatistics)
     {
diff --git a/stdiet-ui/src/components/BodySignView/index.vue b/stdiet-ui/src/components/BodySignView/index.vue
index b7f1cdffc..ed5c404dd 100644
--- a/stdiet-ui/src/components/BodySignView/index.vue
+++ b/stdiet-ui/src/components/BodySignView/index.vue
@@ -104,9 +104,10 @@ export default {
       [{ title: "方便沟通时间", value: "connectTime" }],
     ];
     if (this.dev) {
-      basicInfo.splice(3, 0, [{ title: "蛋白范围", value: "recProtein" }]);
-      basicInfo.splice(4, 0, [{ title: "基础代谢BMR", value: "basicBMR" }]);
-      basicInfo.splice(5, 0, [
+      basicInfo.splice(3, 0, [{ title: "BMI", value: "bmi" }]);
+      basicInfo.splice(4, 0, [{ title: "蛋白范围", value: "recProtein" }]);
+      basicInfo.splice(5, 0, [{ title: "基础代谢BMR", value: "basicBMR" }]);
+      basicInfo.splice(6, 0, [
         { title: "不运动总热量", value: "notSportHeat" },
       ]);
       basicInfo.splice(basicInfo.length, 0, [
diff --git a/stdiet-ui/src/components/HealthyView/index.vue b/stdiet-ui/src/components/HealthyView/index.vue
index 3f33b25fe..298d9abac 100644
--- a/stdiet-ui/src/components/HealthyView/index.vue
+++ b/stdiet-ui/src/components/HealthyView/index.vue
@@ -90,12 +90,15 @@ export default {
       [{ title: "地域", value: "position" }],
     ];
     if (this.dev) {
-      basicInfo.splice(3, 0, [{ title: "推荐蛋白范围", value: "recProtein" }]);
-      basicInfo.splice(4, 0, [{ title: "基础代谢BMR", value: "basicBMR" }]);
-      basicInfo.splice(5, 0, [
+      basicInfo.splice(3, 0, [{ title: "BMI", value: "bmi" }]);
+      basicInfo.splice(4, 0, [{ title: "推荐蛋白范围", value: "recProtein" }]);
+      basicInfo.splice(5, 0, [{ title: "基础代谢BMR", value: "basicBMR" }]);
+      basicInfo.splice(6, 0, [
         { title: "不运动总热量", value: "notSportHeat" },
       ]);
-      basicInfo.splice(basicInfo.length, 0, [{ title: "备注", value: "remark" }]);
+      basicInfo.splice(basicInfo.length, 0, [
+        { title: "备注", value: "remark" },
+      ]);
     }
 
     return {
diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
index 2d7f4c080..875da991d 100644
--- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
+++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
@@ -305,6 +305,7 @@ export default {
           ["创建时间", "客户姓名", "手机号"],
           ["调理项目", "性别", "年龄"],
           ["身高(厘米)", "体重(斤)", "地域"],
+          ["BMI", "", ""],
         ],
         [
           ["减脂经历", "减脂遇到的困难", "减脂是否反弹"],
@@ -355,6 +356,7 @@ export default {
           ["createTime", "name", "phone"],
           ["conditioningProject", "sex", "age"],
           ["tall", "weight", "position"],
+          ["bmi", "", ""],
         ],
         [
           ["experience", "difficulty", "rebound"],
@@ -711,6 +713,12 @@ export default {
           }
           return arr;
         }, []);
+      detailHealthy.bmi = (
+        detailHealthy.weight /
+        2 /
+        (detailHealthy.tall / 100) /
+        (detailHealthy.tall / 100)
+      ).toFixed(1);
       this.detailHealthy = detailHealthy;
       for (let i = 0; i < this.healthyTitleData.length; i++) {
         let stepArray = [];
diff --git a/stdiet-ui/src/utils/healthyData.js b/stdiet-ui/src/utils/healthyData.js
index 509d7ecbf..a0c1a9816 100644
--- a/stdiet-ui/src/utils/healthyData.js
+++ b/stdiet-ui/src/utils/healthyData.js
@@ -473,6 +473,12 @@ const moduleObj = {
 
 //健康信息处理，将数组转为字符串
 export function dealHealthy(customerHealthy) {
+  customerHealthy.bmi = (
+    customerHealthy.weight /
+    2 /
+    (customerHealthy.tall / 100) /
+    (customerHealthy.tall / 100)
+  ).toFixed(1);
   customerHealthy.basicBMR = (
     (10 * customerHealthy.weight) / 2 +
     6.25 * customerHealthy.tall -