diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerHealthyController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerHealthyController.java
index 5ad21ebe8..d39b93abf 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerHealthyController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerHealthyController.java
@@ -1,6 +1,8 @@
 package com.stdiet.custom.controller;
 
 import java.util.List;
+
+import com.stdiet.common.utils.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -42,6 +44,11 @@ public class SysCustomerHealthyController extends BaseController
     {
         startPage();
         List<SysCustomerHealthy> list = sysCustomerHealthyService.selectSysCustomerHealthyList(sysCustomerHealthy);
+        for(SysCustomerHealthy customerHealthy : list){
+            if(StringUtils.isNotEmpty(customerHealthy.getPhone())){
+                customerHealthy.setPhone(StringUtils.hiddenPhoneNumber(customerHealthy.getPhone()));
+            }
+        }
         return getDataTable(list);
     }
 
@@ -54,6 +61,11 @@ public class SysCustomerHealthyController extends BaseController
     public AjaxResult export(SysCustomerHealthy sysCustomerHealthy)
     {
         List<SysCustomerHealthy> list = sysCustomerHealthyService.selectSysCustomerHealthyList(sysCustomerHealthy);
+        for(SysCustomerHealthy customerHealthy : list){
+            if(StringUtils.isNotEmpty(customerHealthy.getPhone())){
+                customerHealthy.setPhone(StringUtils.hiddenPhoneNumber(customerHealthy.getPhone()));
+            }
+        }
         ExcelUtil<SysCustomerHealthy> util = new ExcelUtil<SysCustomerHealthy>(SysCustomerHealthy.class);
         return util.exportExcel(list, "healthy");
     }
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthy.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthy.java
index 6a7a7e9cd..d99a1c138 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthy.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomerHealthy.java
@@ -46,6 +46,14 @@ public class SysCustomerHealthy extends BaseEntity
     @Excel(name = "年龄")
     private Long age;
 
+    /** 身高 */
+    @Excel(name = "身高")
+    private Integer tall;
+
+    /** 体重 */
+    @Excel(name = "体重")
+    private Long weight;
+
     /** 调味品种类，使用 , 隔开 */
     @Excel(name = "调味品种类，使用 , 隔开")
     private String condiment;
@@ -367,9 +375,41 @@ public class SysCustomerHealthy extends BaseEntity
     private String otherAllergen;
 
     /** 体检报告 */
-    @Excel(name = "体检报告")
+    //@Excel(name = "体检报告")
     private String medicalReport;
 
+    /** 体检报告名称 */
+    //@Excel(name = "体检报告名称")
+    private String medicalReportName;
+
+    /** 南方人北方人，0南方 1北方 */
+    @Excel(name = "南方人北方人，0南方 1北方")
+    private Integer position;
+
+    /** 减脂经历方法 */
+    @Excel(name = "减脂经历方法")
+    private String experience;
+
+    /** 是否减脂反弹，0否 1是 */
+    @Excel(name = "是否减脂反弹，0否 1是")
+    private Integer rebound;
+
+    /** 减脂遇到的困难 */
+    @Excel(name = "减脂遇到的困难")
+    private String difficulty;
+
+    /** 是否意识到生活习惯是减脂关键 0否 1是 */
+    @Excel(name = "是否意识到生活习惯是减脂关键 0否 1是")
+    private Integer crux;
+
+    /** 忌口或饮食食物 */
+    @Excel(name = "忌口或饮食食物")
+    private String dishesIngredient;
+
+    /** 饮食习惯 */
+    @Excel(name = "饮食习惯")
+    private Long makeFoodType;
+
     /** 删除标识 0未删除 1已删除。默认0 */
     private Long delFlag;
 
@@ -1181,6 +1221,86 @@ public class SysCustomerHealthy extends BaseEntity
         this.conditioningProject = conditioningProject;
     }
 
+    public Long getWeight() {
+        return weight;
+    }
+
+    public void setWeight(Long weight) {
+        this.weight = weight;
+    }
+
+    public String getMedicalReportName() {
+        return medicalReportName;
+    }
+
+    public void setMedicalReportName(String medicalReportName) {
+        this.medicalReportName = medicalReportName;
+    }
+
+    public Integer getPosition() {
+        return position;
+    }
+
+    public void setPosition(Integer position) {
+        this.position = position;
+    }
+
+    public String getExperience() {
+        return experience;
+    }
+
+    public void setExperience(String experience) {
+        this.experience = experience;
+    }
+
+    public Integer getRebound() {
+        return rebound;
+    }
+
+    public void setRebound(Integer rebound) {
+        this.rebound = rebound;
+    }
+
+    public String getDifficulty() {
+        return difficulty;
+    }
+
+    public void setDifficulty(String difficulty) {
+        this.difficulty = difficulty;
+    }
+
+    public Integer getCrux() {
+        return crux;
+    }
+
+    public void setCrux(Integer crux) {
+        this.crux = crux;
+    }
+
+    public String getDishesIngredient() {
+        return dishesIngredient;
+    }
+
+    public void setDishesIngredient(String dishesIngredient) {
+        this.dishesIngredient = dishesIngredient;
+    }
+
+    public Long getMakeFoodType() {
+        return makeFoodType;
+    }
+
+    public void setMakeFoodType(Long makeFoodType) {
+        this.makeFoodType = makeFoodType;
+    }
+
+    public Integer getTall() {
+        return tall;
+    }
+
+    public void setTall(Integer tall) {
+        this.tall = tall;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java
index a939ac244..ef26782ec 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java
@@ -449,7 +449,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
      * double转为BigDecimal，保留一位小数，向下舍去
      * */
     public BigDecimal getMoney(Double money, int n){
-        return new BigDecimal(money.toString()).setScale(3, BigDecimal.ROUND_HALF_UP);
+        return new BigDecimal(money.toString()).setScale(2, BigDecimal.ROUND_HALF_UP);
     }
 
     /**
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml
index ebe0212e6..6b2fd2382 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerHealthyMapper.xml
@@ -16,6 +16,8 @@
         <result property="conditioningProject"    column="conditioning_project"    />
         <result property="sex"    column="sex"    />
         <result property="age"    column="age"    />
+        <result property="weight"    column="weight"    />
+        <result property="tall"    column="tall"    />
         <result property="condiment"    column="condiment"    />
         <result property="otherCondiment"    column="other_condiment"    />
         <result property="cookingStyle"    column="cooking_style"    />
@@ -97,6 +99,14 @@
         <result property="allergen"    column="allergen"    />
         <result property="otherAllergen"    column="other_allergen"    />
         <result property="medicalReport"    column="medical_report"    />
+        <result property="medicalReportName"    column="medical_report_name"    />
+        <result property="position"    column="position"    />
+        <result property="experience"    column="experience"    />
+        <result property="rebound"    column="rebound"    />
+        <result property="difficulty"    column="difficulty"    />
+        <result property="crux"    column="crux"    />
+        <result property="dishesIngredient"    column="dishes_ingredient"    />
+        <result property="makeFoodType"    column="make_food_type"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateTime"    column="update_time"    />
@@ -105,7 +115,8 @@
     </resultMap>
 
     <sql id="selectSysCustomerHealthyVo">
-        select sch.id, customer_id, conditioning_project_id, sex, age, condiment, other_condiment, cooking_style, cooking_style_rate, wash_vegetables_style, other_wash_vegetables_style, breakfast_type, breakfast_food, lunch_type, dinner, vegetable_rate, common_meat, dinner_time, supper_num, supper_food, diet_hot_and_cold, diet_flavor, vegetables_num, vegetables_rate_type, fruits_num, fruits_time, fruits_rate, rice_num, rice_full, eating_speed, snacks, other_snacks, health_products_flag, health_products_brand, health_products_name, health_products_week_rate, health_products_day_rate, water_num, water_type, water_habit, drinks_num, drink_wine_flag, drink_wine_classify, other_wine_classify, drink_wine_amount, smoke_flag, smoke_rate, second_smoke, work_industry, work_type, defecation_num, other_defecation_num, defecation_time, defecation_shape, defecation_smell, defecation_speed, defecation_color, motion_num, motion_duration, motion_time, aerobic_motion_classify, anaerobic_motion_classify, anaerobic_aerobic_motion_classify, other_motion_classify, motion_field, other_motion_field, sleep_time, sleep_quality, sleep_drug_flag, sleep_drug, stayup_late_flag, stayup_late_week_num, family_illness_history, other_family_illness_history, operation_history, other_operation_history, near_operation_flag, recoverye_situation, long_eat_drug_flag, long_eat_drug_classify, other_long_eat_drug_classify, allergy_flag, allergy_situation, allergen, other_allergen, medical_report, sch.create_time, sch.create_by,sch. update_time, sch.update_by, sch.del_flag
+        select sch.id, customer_id, conditioning_project_id, sex, age, weight, tall, condiment, other_condiment, cooking_style, cooking_style_rate, wash_vegetables_style, other_wash_vegetables_style, breakfast_type, breakfast_food, lunch_type, dinner, vegetable_rate, common_meat, dinner_time, supper_num, supper_food, diet_hot_and_cold, diet_flavor, vegetables_num, vegetables_rate_type, fruits_num, fruits_time, fruits_rate, rice_num, rice_full, eating_speed, snacks, other_snacks, health_products_flag, health_products_brand, health_products_name, health_products_week_rate, health_products_day_rate, water_num, water_type, water_habit, drinks_num, drink_wine_flag, drink_wine_classify, other_wine_classify, drink_wine_amount, smoke_flag, smoke_rate, second_smoke, work_industry, work_type, defecation_num, other_defecation_num, defecation_time, defecation_shape, defecation_smell, defecation_speed, defecation_color, motion_num, motion_duration, motion_time, aerobic_motion_classify, anaerobic_motion_classify, anaerobic_aerobic_motion_classify, other_motion_classify, motion_field, other_motion_field, sleep_time, sleep_quality, sleep_drug_flag, sleep_drug, stayup_late_flag, stayup_late_week_num, family_illness_history, other_family_illness_history, operation_history, other_operation_history, near_operation_flag, recoverye_situation, long_eat_drug_flag, long_eat_drug_classify, other_long_eat_drug_classify, allergy_flag, allergy_situation, allergen, other_allergen, medical_report, medical_report_name,
+        position,experience,rebound,difficulty,crux,dishes_ingredient,make_food_type,sch.create_time, sch.create_by,sch. update_time, sch.update_by, sch.del_flag
     </sql>
 
     <select id="selectSysCustomerHealthyList" parameterType="SysCustomerHealthy" resultMap="SysCustomerHealthyResult">
@@ -115,6 +126,10 @@
         LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'conditioning_project') AS cp ON cp.dict_value = sch.conditioning_project_id
         where sch.del_flag = 0 and sc.del_flag = 0
         <if test="conditioningProjectId != null "> and sch.conditioning_project_id = #{conditioningProjectId}</if>
+        <if test="name != null and name != ''">
+            and (sc.name like concat('%',#{name},'%') or sc.phone like concat('%',#{name},'%'))
+        </if>
+        order by sch.create_time desc
     </select>
 
     <select id="selectSysCustomerHealthyById" parameterType="Long" resultMap="SysCustomerHealthyResult">
@@ -133,6 +148,8 @@
             <if test="conditioningProjectId != null">conditioning_project_id,</if>
             <if test="sex != null">sex,</if>
             <if test="age != null">age,</if>
+            <if test="tall != null">tall,</if>
+            <if test="weight != null">weight,</if>
             <if test="condiment != null">condiment,</if>
             <if test="otherCondiment != null">other_condiment,</if>
             <if test="cookingStyle != null">cooking_style,</if>
@@ -214,6 +231,14 @@
             <if test="allergen != null">allergen,</if>
             <if test="otherAllergen != null">other_allergen,</if>
             <if test="medicalReport != null">medical_report,</if>
+            <if test="medicalReportName != null">medical_report_name,</if>
+            <if test="position != null">position,</if>
+            <if test="experience != null">experience,</if>
+            <if test="rebound != null">rebound,</if>
+            <if test="difficulty != null">difficulty,</if>
+            <if test="crux != null">crux,</if>
+            <if test="dishesIngredient != null">dishes_ingredient,</if>
+            <if test="makeFoodType != null">make_food_type,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateTime != null">update_time,</if>
@@ -226,6 +251,8 @@
             <if test="conditioningProjectId != null">#{conditioningProjectId},</if>
             <if test="sex != null">#{sex},</if>
             <if test="age != null">#{age},</if>
+            <if test="tall != null">#{tall},</if>
+            <if test="weight != null">#{weight},</if>
             <if test="condiment != null">#{condiment},</if>
             <if test="otherCondiment != null">#{otherCondiment},</if>
             <if test="cookingStyle != null">#{cookingStyle},</if>
@@ -307,6 +334,14 @@
             <if test="allergen != null">#{allergen},</if>
             <if test="otherAllergen != null">#{otherAllergen},</if>
             <if test="medicalReport != null">#{medicalReport},</if>
+            <if test="medicalReportName != null">#{medicalReportName},</if>
+            <if test="position != null">#{position},</if>
+            <if test="experience != null">#{experience},</if>
+            <if test="rebound != null">#{rebound},</if>
+            <if test="difficulty != null">#{difficulty},</if>
+            <if test="crux != null">#{crux},</if>
+            <if test="dishesIngredient != null">#{dishesIngredient},</if>
+            <if test="makeFoodType != null">#{makeFoodType},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -322,6 +357,8 @@
             <if test="conditioningProjectId != null">conditioning_project_id = #{conditioningProjectId},</if>
             <if test="sex != null">sex = #{sex},</if>
             <if test="age != null">age = #{age},</if>
+            <if test="tall != null">tall = #{tall},</if>
+            <if test="weight != null">weight = #{weight},</if>
             <if test="condiment != null">condiment = #{condiment},</if>
             <if test="otherCondiment != null">other_condiment = #{otherCondiment},</if>
             <if test="cookingStyle != null">cooking_style = #{cookingStyle},</if>
@@ -403,6 +440,14 @@
             <if test="allergen != null">allergen = #{allergen},</if>
             <if test="otherAllergen != null">other_allergen = #{otherAllergen},</if>
             <if test="medicalReport != null">medical_report = #{medicalReport},</if>
+            <if test="medicalReportName != null">medical_report_name = #{medicalReportName},</if>
+            <if test="position != null">position = #{position},</if>
+            <if test="experience != null">experience = #{experience},</if>
+            <if test="rebound != null">rebound = #{rebound},</if>
+            <if test="difficulty != null">difficulty = #{difficulty},</if>
+            <if test="crux != null">crux = #{crux},</if>
+            <if test="dishesIngredient != null">dishes_ingredient = #{dishesIngredient},</if>
+            <if test="makeFoodType != null">make_food_type = #{makeFoodType},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
diff --git a/stdiet-ui/src/api/custom/healthy.js b/stdiet-ui/src/api/custom/healthy.js
index e0b25c6d0..473401e9c 100644
--- a/stdiet-ui/src/api/custom/healthy.js
+++ b/stdiet-ui/src/api/custom/healthy.js
@@ -51,3 +51,14 @@ export function exportHealthy(query) {
     params: query
   })
 }
+
+// 下载文件
+export function download(fileName) {
+  return request({
+    url: '/common/download',
+    method: 'get',
+    params: {"fileName": fileName}
+  })
+}
+
+
diff --git a/stdiet-ui/src/components/TableDetailMessage/index.vue b/stdiet-ui/src/components/TableDetailMessage/index.vue
new file mode 100644
index 000000000..0083ede66
--- /dev/null
+++ b/stdiet-ui/src/components/TableDetailMessage/index.vue
@@ -0,0 +1,58 @@
+<template>
+  <el-table :show-header="false" :data="data" border :cell-style="columnStyle" style="width: 100%;">
+    <el-table-column width="140" prop="attr_name_one">
+    </el-table-column>
+    <el-table-column prop="value_one">
+      <template slot-scope="scope">
+        <AutoHideMessage :data="scope.row.value_one == null ? '' : (scope.row.value_one+'')" :maxLength="20"/>
+      </template>
+    </el-table-column>
+    <el-table-column width="140" prop="attr_name_two"></el-table-column>
+    <el-table-column prop="value_two">
+      <template slot-scope="scope">
+        <AutoHideMessage :data="scope.row.value_two == null ? '' : (scope.row.value_two+'')" :maxLength="20"/>
+      </template>
+    </el-table-column>
+    <el-table-column width="140" prop="attr_name_three"></el-table-column>
+    <el-table-column prop="value_three">
+      <template slot-scope="scope">
+        <AutoHideMessage :data="scope.row.value_three == null ? '' : (scope.row.value_three+'')" :maxLength="20"/>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+  import AutoHideMessage from "@/components/AutoHideMessage";
+  export default {
+    name: "TableDetailMessage",
+    data() {
+      return {
+      };
+    },
+    props: {
+      data: {}
+    },
+    computed: {
+
+    },
+    components: {
+      AutoHideMessage
+    },
+    methods: {
+      // 自定义列背景色
+      columnStyle({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex == 0 || columnIndex == 2 || columnIndex == 4 || columnIndex == 6) {
+          //第三第四列的背景色就改变了2和3都是列数的下标
+          return "background:#f3f6fc;font-weight:bold";
+        }else{
+          return "background:#ffffff;";
+        }
+      }
+    }
+  };
+</script>
+
+<style>
+
+</style>
diff --git a/stdiet-ui/src/main.js b/stdiet-ui/src/main.js
index 54003076a..2f6f7e638 100644
--- a/stdiet-ui/src/main.js
+++ b/stdiet-ui/src/main.js
@@ -20,6 +20,7 @@ import {getConfigKey} from "@/api/system/config";
 import {
   addDateRange,
   download,
+  downloadResource,
   handleTree,
   parseTime,
   resetForm,
@@ -42,6 +43,7 @@ Vue.prototype.addDateRange = addDateRange
 Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
+Vue.prototype.downloadResource = downloadResource
 Vue.prototype.handleTree = handleTree
 Vue.prototype.toThousands = toThousands
 Vue.prototype.digitUppercase = digitUppercase
diff --git a/stdiet-ui/src/utils/healthyData.js b/stdiet-ui/src/utils/healthyData.js
index 50c160819..893cfde4d 100644
--- a/stdiet-ui/src/utils/healthyData.js
+++ b/stdiet-ui/src/utils/healthyData.js
@@ -1,3 +1,15 @@
+export const  titleArray = [
+  "一、基础信息",
+  "二、减脂经历评估",
+  "三、食品安全评估",
+  "四、饮食结构评估",
+  "五、生活习惯评估",
+  "六、运动习惯评估",
+  "七、睡眠质量评估",
+  "八、既往病史/用药史评估",
+  "九、体检报告"
+]
+
 export const condimentArray = [
   {"name":"鸡精", "value":"1"},
   {"name":"耗油", "value":"2"},
@@ -158,6 +170,11 @@ export const longEatDrugClassifyArray = [
   {"name":"洗洁剂","value": "10"},{"name":"化妆品","value": "11"}
 ]
 
+export const makeFoodTypeArray = [
+  {"name":"居家做饭","value": "1"},{"name":"外卖食堂","value": "2"},{"name":"居家和外食","value": "3"},{"name":"国外饮食","value": "4"},
+  {"name":"运动饮食","value": "5"}
+]
+
 //需要将数组转成字符串的属性名称，包含对象数组、字符串数组
 export const arrayName = [
   "condiment","cookingStyle","cookingStyleRate", "washVegetablesStyle","lunchType","dinner","dietFlavor",
diff --git a/stdiet-ui/src/utils/ruoyi.js b/stdiet-ui/src/utils/ruoyi.js
index 60ca0d6db..3a3a8a697 100644
--- a/stdiet-ui/src/utils/ruoyi.js
+++ b/stdiet-ui/src/utils/ruoyi.js
@@ -97,11 +97,16 @@ export function selectDictLabels(datas, value, separator) {
   return actions.join('').substring(0, actions.join('').length - 1);
 }
 
-// 通用下载方法
+// 通用下载方法（导出Excel,下载之后删除）
 export function download(fileName) {
   window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
 }
 
+// 通用下载本地资源方法
+export function downloadResource(fileName) {
+  window.location.href = baseURL + "/common/download/resource?name=" + encodeURI(fileName);
+}
+
 // 字符串格式化(%s )
 export function sprintf(str) {
   var args = arguments, flag = true, i = 1;
diff --git a/stdiet-ui/src/views/custom/commision/detail/index.vue b/stdiet-ui/src/views/custom/commision/detail/index.vue
index 80dfad23e..148942a93 100644
--- a/stdiet-ui/src/views/custom/commision/detail/index.vue
+++ b/stdiet-ui/src/views/custom/commision/detail/index.vue
@@ -65,10 +65,14 @@
       </el-table-column>
       <el-table-column label="提成" align="center" prop="commision">
         <template scope="scope">
-          {{scope.row.commision.toFixed(3)}}
+          {{scope.row.commision.toFixed(2)}}
+        </template>
+      </el-table-column>
+      <el-table-column label="下月应发提成" align="center" prop="commision">
+        <template scope="scope">
+          {{scope.row.commision.toFixed(2)}}
         </template>
       </el-table-column>
-
     </el-table>
 
     <pagination
diff --git a/stdiet-ui/src/views/custom/commision/detail_day/index.vue b/stdiet-ui/src/views/custom/commision/detail_day/index.vue
index 09c3c6266..2848e9820 100644
--- a/stdiet-ui/src/views/custom/commision/detail_day/index.vue
+++ b/stdiet-ui/src/views/custom/commision/detail_day/index.vue
@@ -65,23 +65,23 @@
       <el-table-column label="岗位" align="center" prop="postName"/>
       <el-table-column label="总提成" align="center" prop="totalCommissionAmount">
         <template scope="scope">
-          {{scope.row.totalCommissionAmount.toFixed(3)}}
+          {{scope.row.totalCommissionAmount.toFixed(fixLength)}}
         </template>
       </el-table-column>
       <el-table-column label="已发放提成" align="center" prop="totalHasSentCommissionAmount">
         <template scope="scope">
-          {{scope.row.totalHasSentCommissionAmount.toFixed(3)}}
+          {{scope.row.totalHasSentCommissionAmount.toFixed(fixLength)}}
         </template>
       </el-table-column>
       <el-table-column label="未发放提成" align="center" prop="totalNotSentCommissionAmount">
         <template scope="scope">
-          {{scope.row.totalNotSentCommissionAmount.toFixed(3)}}
+          {{scope.row.totalNotSentCommissionAmount.toFixed(fixLength)}}
         </template>
 
       </el-table-column>
       <el-table-column label="下月应发提成" align="center" prop="nextMonthCommission">
         <template scope="scope">
-          {{scope.row.nextMonthCommission.toFixed(3)}}
+          {{scope.row.nextMonthCommission.toFixed(fixLength)}}
         </template>
 
       </el-table-column>
@@ -114,7 +114,7 @@
         </el-table-column>
         <el-table-column property="yearMonthCommission" label="提成金额" width="100">
           <template scope="scope">
-            {{scope.row.yearMonthCommission.toFixed(3)}}
+            {{scope.row.yearMonthCommission.toFixed(fixLength)}}
           </template>
         </el-table-column>
       </el-table>
@@ -181,7 +181,8 @@
           postId: null,
         },
         sendCommissionPlanTable: false,
-        sendCommissionPlan:{}
+        sendCommissionPlan:{},
+        fixLength: 2
       };
     },
     created() {
diff --git a/stdiet-ui/src/views/custom/healthy/index.vue b/stdiet-ui/src/views/custom/healthy/index.vue
index cdec7b63e..869b5b5ce 100644
--- a/stdiet-ui/src/views/custom/healthy/index.vue
+++ b/stdiet-ui/src/views/custom/healthy/index.vue
@@ -1,19 +1,28 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <!--<el-form-item label="调理项目" prop="conditioningProjectId">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
+      <el-form-item label="客户信息" prop="name">
         <el-input
-          v-model="queryParams.conditioningProjectId"
-          placeholder="请输入调理项目"
+          v-model="queryParams.name"
+          placeholder="请输入客户姓名或手机号"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="调理项目" prop="conditioningProjectId">
+        <el-select v-model="queryParams.conditioningProjectId" placeholder="请选择">
+          <el-option
+            v-for="dict in conditioningProjectIdOption"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>-->
+      </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -36,7 +45,7 @@
           v-hasPermi="['custom:healthy:edit']"
         >修改</el-button>
       </el-col>-->
-      <!--<el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="danger"
           icon="el-icon-delete"
@@ -46,7 +55,7 @@
           v-hasPermi="['custom:healthy:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!--<el-col :span="1.5">
         <el-button
           type="warning"
           icon="el-icon-download"
@@ -81,6 +90,8 @@
       </el-table-column>
 
       <el-table-column label="年龄" align="center" prop="age" />
+      <el-table-column label="身高（厘米）" align="center" prop="tall" />
+      <el-table-column label="体重（斤）" align="center" prop="weight" />
       <!--<el-table-column label="调味品种类，使用 , 隔开" align="center" prop="condiment" />
       <el-table-column label="其他调味品种类" align="center" prop="otherCondiment" />
       <el-table-column label="喜好的烹调方式，使用 , 隔开" align="center" prop="cookingStyle" />
@@ -162,7 +173,7 @@
       <el-table-column label="过敏源，使用，隔开" align="center" prop="allergen" />
       <el-table-column label="其他过敏源" align="center" prop="otherAllergen" />
       <el-table-column label="体检报告" align="center" prop="medicalReport" />-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right" >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right" >
         <template slot-scope="scope">
           <!--<el-button
             size="mini"
@@ -178,13 +189,13 @@
             @click="handleLookDetail(scope.row)"
             v-hasPermi="['custom:healthy:query']"
           >查看详情</el-button>
-          <!--<el-button
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['custom:healthy:remove']"
-          >删除</el-button>-->
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -475,27 +486,40 @@
 
     <!-- 查看详情 -->
     <el-dialog title="客户健康评估表" v-if="healthyDetailOpen" :visible.sync="healthyDetailOpen" width="1000px" style="overflow: auto;" append-to-body>
-      <el-table :show-header="false" v-for="(item,index) in healthyDetailList"  :data="item" border :cell-style="columnStyle" style="width: 100%;margin-top:20px;">
-        <el-table-column width="140" prop="attr_name_one">
-        </el-table-column>
-        <el-table-column prop="value_one">
-          <template slot-scope="scope">
-            <AutoHideMessage :data="scope.row.value_one == null ? '' : (scope.row.value_one+'')" :maxLength="20"/>
-          </template>
-        </el-table-column>
-        <el-table-column width="140" prop="attr_name_two"></el-table-column>
-        <el-table-column prop="value_two">
-          <template slot-scope="scope">
-            <AutoHideMessage :data="scope.row.value_two == null ? '' : (scope.row.value_two+'')" :maxLength="20"/>
-          </template>
-        </el-table-column>
-        <el-table-column width="140" prop="attr_name_three"></el-table-column>
-        <el-table-column prop="value_three">
-          <template slot-scope="scope">
-            <AutoHideMessage :data="scope.row.value_three == null ? '' : (scope.row.value_three+'')" :maxLength="20"/>
-          </template>
-        </el-table-column>
-      </el-table>
+      <div v-for="(item,index) in healthyDetailList" :class="index != 0 ? 'margin-top-20' : ''"  v-show="titleShowArray[index]" style="margin-bottom: 50px;">
+        <div>
+          <p class="p_title_1" style="margin-top: 5px;">{{titleArray[index]}}</p>
+          <TableDetailMessage :data="item" v-if="index != healthyDetailList.length-1"></TableDetailMessage>
+          <el-table :show-header="false" v-if="index == healthyDetailList.length-1" :data="item" border :cell-style="columnStyle" style="width: 100%;">
+            <el-table-column width="140" prop="attr_name_one">
+            </el-table-column>
+            <el-table-column prop="value_one">
+              <template slot-scope="scope">
+                <AutoHideMessage :data="scope.row.value_one == null ? '' : (scope.row.value_one+'')" :maxLength="20"/>
+                <el-button type="primary" v-show="scope.row.value_one" @click="downloadFile(medicalReportPathArray[0])">下载</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column width="140" prop="attr_name_two"></el-table-column>
+            <el-table-column prop="value_two">
+              <template slot-scope="scope">
+                <AutoHideMessage :data="scope.row.value_two == null ? '' : (scope.row.value_two+'')" :maxLength="20"/>
+                <el-button type="primary" v-show="scope.row.value_two" @click="downloadFile(medicalReportPathArray[1])">下载</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column width="140" prop="attr_name_three"></el-table-column>
+            <el-table-column prop="value_three">
+              <template slot-scope="scope">
+                <AutoHideMessage :data="scope.row.value_three == null ? '' : (scope.row.value_three+'')" :maxLength="20"/>
+                <el-button type="primary" v-show="scope.row.value_three" @click="downloadFile(medicalReportPathArray[2])">下载</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div style="float:right;margin-top:25px;" v-if="index == (groupShowArray[avtiveStep - 1][groupShowArray[avtiveStep - 1].length-1] - 1)">
+          <el-button @click="nextStep(avtiveStep - 1)" v-show="avtiveStep != 1">上一页</el-button>
+          <el-button type="primary" @click="nextStep(avtiveStep + 1)" v-show="avtiveStep != groupShowArray.length">下一页</el-button>
+        </div>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -503,12 +527,21 @@
 <script>
   import { listHealthy, getHealthy, delHealthy, addHealthy, updateHealthy, exportHealthy } from "@/api/custom/healthy";
   import AutoHideMessage from "@/components/AutoHideMessage";
+  import TableDetailMessage from "@/components/TableDetailMessage";
   import * as healthyData from "@/utils/healthyData";
 
   export default {
     name: "Healthy",
     data() {
       return {
+        //title
+        titleArray: healthyData['titleArray'],
+        //每个模块显示
+        titleShowArray:[true,true,false,false,false,false,false,false,false],
+        //分组
+        groupShowArray:[[1],[2,3],[4],[5,6],[7,8],[9]],
+        //当前页码
+        avtiveStep: 1,
         // 遮罩层
         loading: true,
         // 选中数组
@@ -531,7 +564,8 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-          conditioningProjectId: null,
+          name: null,
+          conditioningProjectId: null
         },
         // 表单参数
         form: {},
@@ -544,53 +578,91 @@
         healthyDetailOpen:false,
         healthyDetailList:[[]],
         healthyTitleData:[
-          [["创建时间","客户姓名","手机号"],["调理项目","性别","年龄"]],
-          [["调味品种","烹调方式","烹调频次"],["洗菜方式","",""]],
+          [
+            ["创建时间","客户姓名","手机号"],["调理项目","性别","年龄"],["身高(厘米)","体重(斤)","位置"]
+          ],
+          [
+            ["减脂经历","减脂遇到的困难","减脂是否反弹"],["是否意识到生活习惯是减脂关键","",""]
+          ],
+          [
+            ["调味品种","烹调方式","烹调频次"],["洗菜方式","",""]
+          ],
           [
             ["早餐习惯","早餐吃的食物","午餐习惯"],["晚餐习惯","正餐中素菜占比","最常吃的肉类"],
             ["晚餐时间","每周吃夜宵次数","夜宵通常吃的食物"],["食物的冷热偏好","食物的口味偏好","平均每周吃生菜几次"],
             ["每周吃生菜的频次类型","平均每天吃水果次数","吃水果的时间段"],["平时吃水果的频次","一餐吃几碗饭","吃几成饱"],
-            ["吃饭速度","常吃的零食","有无服用营养保健品"],["营养保健品品牌名","营养保健品产品名","服用营养保健品频次"]
+            ["吃饭速度","饮食特点","常吃的零食"],["有无服用营养保健品","营养保健品品牌名","营养保健品产品名"],
+            ["服用营养保健品频次","忌口过敏食物",""]
           ],
           [
             ["每天的饮水量","喜欢喝什么水","喝水习惯"],["常喝的饮品的每周频次","是否喝酒","喝酒种类"],["对应酒的量","是否抽烟","抽烟频次和烟龄"],
             ["是否经常抽二手烟","工作行业","工作性质"],["排便次数","排便时间段","排便的形状"],["排便的气味","排便的速度","排便的颜色"]
           ],
           [
-            ["每周运动次数","每次运动的时长","每天运动的时间"],["运动","运动场地","睡觉时间"],["睡眠质量","是否有辅助入睡药物","辅助睡眠类药物名称"],
-            ["是否经常熬夜","熬夜频次","家族疾病史"],["手术史","近期是否做过手术","手术恢复情况"],
-            ["是否长期服用药物","长期服用的药物","是否出现过过敏症状"],["过敏症状","过敏源",""]
+            ["每周运动次数","每次运动的时长","每天运动的时间"],
+            ["运动","运动场地",""]
+          ],
+          [
+            ["睡觉时间","睡眠质量","是否有辅助入睡药物"],
+            ["辅助睡眠类药物名称","是否经常熬夜","熬夜频次"]
+          ],
+          [
+            ["家族疾病史","手术史","近期是否做过手术"],
+            ["手术恢复情况","是否长期服用药物","长期服用的药物"],
+            ["是否出现过过敏症状","过敏症状","过敏源"]
+          ],
+          [
+            ["体检报告(1)","体检报告(2)","体检报告(3)"]
           ]
         ],
         //健康详情的属性名称，与标题对应，按竖显示
         healthyValueData:[
-          [["createTime","name","phone"],["conditioningProject","sex","age"]],
+          [["createTime","name","phone"],["conditioningProject","sex","age"],["tall","weight","position"]],
+          [
+            ["experience","difficulty","rebound"],["crux","",""]
+          ],
           [["condiment","cookingStyle","cookingStyleRate"],["washVegetablesStyle","",""]],
           [
             ["breakfastType","breakfastFood","lunchType"],["dinner","vegetableRate","commonMeat"],
             ["dinnerTime","supperNum","supperFood"],["dietHotAndCold","dietFlavor","vegetablesNum"],
-            ["vegetablesRateType","fruitsNum","fruitsTime"],["fruitsRate","riceNum","riceNum"],["eatingSpeed","snacks","healthProductsFlag"],
-            ["healthProductsBrand","healthProductsName","healthProductsWeekRate"]
+            ["vegetablesRateType","fruitsNum","fruitsTime"],["fruitsRate","riceNum","riceNum"],
+            ["eatingSpeed","makeFoodType","snacks"],
+            ["healthProductsFlag","healthProductsBrand","healthProductsName"],
+            ["healthProductsWeekRate","dishesIngredient",""]
           ],
           [
             ["waterNum","waterType","waterHabit"],["drinksNum","drinkWineFlag","drinkWineClassify"],["drinkWineAmount","smokeFlag","smokeRate"],
             ["secondSmoke","workIndustry","workType"],["defecationNum","defecationTime","defecationShape"],["defecationSmell","defecationSpeed","defecationColor"]
           ],
           [
-            ["motionNum","motionDuration","motionTime"],["motion","motionField","sleepTime"],["sleepQuality","sleepDrugFlag","sleepDrug"],
-            ["stayupLateFlag","stayupLateWeekNum","familyIllnessHistory"],["operationHistory","nearOperationFlag","recoveryeSituation"],
-            ["longEatDrugFlag","longEatDrugClassify","allergyFlag"],["allergySituation","allergen",""]
+            ["motionNum","motionDuration","motionTime"],["motion","motionField",""]
+          ],
+          [
+            ["sleepTime","sleepQuality","sleepDrugFlag"],
+            ["sleepDrug","stayupLateFlag","stayupLateWeekNum"]
+          ],
+          [
+            ["familyIllnessHistory","operationHistory","nearOperationFlag"],
+            ["recoveryeSituation","longEatDrugFlag","longEatDrugClassify"],
+            ["allergyFlag","allergySituation","allergen"]
+          ],
+          [
+            ["medicalReport_one","medicalReport_two","medicalReport_three"]
           ]
-        ]
-
-
+        ],
+        //体检报告文件路径名
+        medicalReportPathArray:[],
+        conditioningProjectIdOption:[]
       };
     },
     created() {
       this.getList();
+      this.getDicts("conditioning_project").then(response => {
+        this.conditioningProjectIdOption = response.data;
+      });
     },
     components: {
-      AutoHideMessage
+      AutoHideMessage,TableDetailMessage
     },
     methods: {
       /** 查询客户健康列表 */
@@ -606,12 +678,18 @@
       handleLookDetail(row) {
         const id = row.id || this.ids
         getHealthy(id).then(response => {
+          this.nextStep(1);
           let detailHealthy = this.dealHealthy(response.data);
           //性别
           detailHealthy.sex = detailHealthy.sex == 0 ?  "男" : (detailHealthy.sex == 1 ? "女" : "未知");
+          detailHealthy.position = detailHealthy.position == 0 ?  "南方" : "北方";
+
+          detailHealthy.rebound = detailHealthy.rebound == 0 ? "否" : "是";
+          detailHealthy.crux = detailHealthy.crux == 0 ? "否" : "是";
+
           //调味品
           detailHealthy.condiment += detailHealthy.otherCondiment ? ("，"+detailHealthy.otherCondiment) : "";
-          //烹饪频次
+          //烹饪
           let cookingStyleRate = "";
           console.log(detailHealthy.cookingStyleRate);
           if(detailHealthy.cookingStyleRate != null){
@@ -624,6 +702,11 @@
           detailHealthy.washVegetablesStyle += detailHealthy.otherWashVegetablesStyle ? ("，"+detailHealthy.otherWashVegetablesStyle) : "";
           //素菜占比
           detailHealthy.vegetableRate += "成";
+
+          let makeFoodTypeOption = healthyData["makeFoodTypeArray"].find(opt => opt.value == detailHealthy.makeFoodType+"");
+          detailHealthy.makeFoodType = makeFoodTypeOption ? makeFoodTypeOption.name : "";
+
+
           //零食
           detailHealthy.snacks += detailHealthy.otherSnacks ? ("，" + detailHealthy.otherSnacks) : "";
           detailHealthy.healthProductsFlag = detailHealthy.healthProductsFlag == 1 ? "有" : "无";
@@ -690,6 +773,12 @@
           detailHealthy.allergyFlag = detailHealthy.allergyFlag == 1 ? "有" : "无";
           detailHealthy.allergen += detailHealthy.otherAllergen ? ("，" +detailHealthy.otherAllergen) : "";
 
+          let medicalReportPathArray = detailHealthy.medicalReport ? detailHealthy.medicalReport.split(",") : [];
+          this.medicalReportPathArray = medicalReportPathArray;
+          detailHealthy.medicalReport_one = medicalReportPathArray.length > 0 ? "体检报告(1)" : "";
+          detailHealthy.medicalReport_two =  medicalReportPathArray.length > 1 ? "体检报告(2)" : "";
+          detailHealthy.medicalReport_three = medicalReportPathArray.length > 2 ? "体检报告(3)" : "";
+
           for(let i = 0; i < this.healthyTitleData.length; i++){
             let stepArray = [];
             for(let j= 0; j < this.healthyTitleData[i].length; j++){
@@ -720,6 +809,18 @@
           }
           return str;
       },
+      //翻页，step为第几页
+      nextStep(step){
+        this.avtiveStep = step;
+        for(var index in this.titleShowArray){
+           //console.log(this.groupShowArray[step-1]);
+           if(this.groupShowArray[step-1].find(opt => opt - 1 == index)){
+             this.$set(this.titleShowArray, index, true);
+           }else{
+             this.$set(this.titleShowArray, index, false);
+           }
+        }
+      },
       // 取消按钮
       cancel() {
         this.open = false;
@@ -914,6 +1015,21 @@
           return "background:#ffffff;";
         }
       },
+      downloadFile(fileName){
+         this.downloadResource(fileName);
+      }
     }
   };
 </script>
+
+<style>
+ .margin-top-20{
+   margin-top:20px;
+ }
+ .p_title_1{
+   font-size: 18px;
+   font-weight: bold;
+   margin-top: 30px;
+ }
+</style>
+
diff --git a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
index 46674b665..02351dcb5 100644
--- a/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
+++ b/stdiet-ui/src/views/custom/subhealthy/investigation/index.vue
@@ -10,7 +10,7 @@
     </div>
     <el-form ref="form" label-position="top" :model="form" :rules="rules" label-width="100px" style="padding: 16px">
         <div v-show="stepArray[0]">
-        <p class="p_title_1" style="margin-top: 5px;">一、基础信息</p>
+        <p class="p_title_1" style="margin-top: 5px;">{{healthyData['titleArray'][0]}}</p>
         <el-form-item label="真实姓名" prop="name" style="padding-top: 10px;">
           <el-input v-model="form.name" placeholder="请输入真实姓名" maxlength="20"/>
         </el-form-item>
@@ -20,13 +20,19 @@
             <el-radio :label="parseInt('1')" border>女</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="年龄" prop="age">
-          <el-input type="number" v-model="form.age" placeholder="请输入年龄" autocomplete="off" maxlength="3"></el-input>
+        <el-form-item label="年龄" prop="age" >
+          <el-input type="number" v-model="form.age" placeholder="请输入年龄" autocomplete="off" ></el-input>
         </el-form-item>
-        <el-form-item label="手机号" prop="phone" maxlength="20">
+          <el-form-item label="身高（厘米）" prop="tall" >
+            <el-input type="number" v-model="form.tall" placeholder="请输入身高" autocomplete="off" ></el-input>
+          </el-form-item>
+          <el-form-item label="体重（斤）" prop="weight" >
+            <el-input type="number" v-model="form.weight" placeholder="请输入体重" autocomplete="off" ></el-input>
+          </el-form-item>
+
+        <el-form-item label="手机号" prop="phone" >
           <el-input type="number" v-model="form.phone" placeholder="请输入手机号" />
         </el-form-item>
-
           <el-form-item label="调理项目" prop="conditioningProjectId">
             <el-select v-model="form.conditioningProjectId" placeholder="请选择">
               <el-option
@@ -37,63 +43,104 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="南方人还是北方人" prop="position">
+            <el-radio-group v-model="form.position" style="margin-left: 10px;">
+              <el-radio :label="0" key="1">南方</el-radio>
+              <el-radio :label="1" key="2">北方</el-radio>
+            </el-radio-group>
+          </el-form-item>
       </div>
-
       <div v-show="stepArray[1]">
-      <p class="p_title_1">二、食品安全评估</p>
+        <p class="p_title_1">{{healthyData['titleArray'][1]}}</p>
+        <p class="p_title_2">1、减脂经历</p>
+        <el-form-item label="(1) 用过哪些减脂方法（重点）" prop="experience" class="margin-left">
+          <el-input
+            type="textarea"
+            placeholder="请描述减脂方法"
+            v-model="form.experience"
+            maxlength="200"
+            show-word-limit
+            rows="3"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="(2) 减脂中遇到的困难（重点）" prop="difficulty" class="margin-left">
+          <el-input
+            type="textarea"
+            placeholder="请描述减脂中遇到的困难"
+            v-model="form.difficulty"
+            maxlength="200"
+            show-word-limit
+            rows="3"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="(3) 减脂过程中是否反弹" prop="rebound" class="margin-left">
+          <el-radio-group v-model="form.rebound" style="margin-left: 10px;">
+            <el-radio :label="0" key="1">否</el-radio>
+            <el-radio :label="1" key="2">是</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="(4) 是否意识到生活习惯是减脂关键" prop="crux" class="margin-left">
+          <el-radio-group v-model="form.crux" style="margin-left: 10px;">
+            <el-radio :label="0" key="1">否</el-radio>
+            <el-radio :label="1" key="2">是</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </div>
+      <div v-show="stepArray[2]">
+      <p class="p_title_1">{{healthyData['titleArray'][2]}}</p>
       <p class="p_title_2">1、家庭调味品</p>
       <el-form-item :label="'(1) 调味品种类'" prop="condiment" class="margin-left">
         <el-checkbox-group v-model="form.condiment">
-          <el-checkbox v-for="(item, index) in condimentArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item, index) in healthyData['condimentArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
         <div><span>其他调味品 </span><el-input style="margin-top: 10px;width:70%" v-model="form.otherCondiment" placeholder="请输入其他调味品名称" /></div>
       </el-form-item>
       <p class="p_title_2">2、喜好的烹调方式和周频次</p>
       <el-form-item :label="'(1) 喜好的烹调方式'" prop="cookingStyle" class="margin-left">
         <el-checkbox-group v-model="form.cookingStyle">
-            <el-checkbox v-for="(item,index) in cookingStyleArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+            <el-checkbox v-for="(item,index) in healthyData['cookingStyleArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <el-form-item :label="'(2) 烹调方式的频次（每周）'" prop="cookingStyleRate" class="margin-left">
         <div>
-          <span>煎&nbsp;</span><el-input-number  style="width:35%" v-model="form.cookingStyleRate[0]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
-          <span style="margin-left: 20px;">炸&nbsp;</span><el-input-number  style="width:35%" v-model="form.cookingStyleRate[1]" :step="1" :min="0" ></el-input-number><span>&nbsp;次</span>
+          <span>{{healthyData['cookingStyleRateArray'][0]}}&nbsp;</span><el-input-number  style="width:35%" v-model="form.cookingStyleRate[0]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
+          <span style="margin-left: 20px;">{{healthyData['cookingStyleRateArray'][1]}}&nbsp;</span><el-input-number  style="width:35%" v-model="form.cookingStyleRate[1]" :step="1" :min="0" ></el-input-number><span>&nbsp;次</span>
         </div>
         <div style="margin-top: 5px;">
-          <span>卤&nbsp;</span><el-input-number style="width:35%" v-model="form.cookingStyleRate[2]" :step="1" :min="0" ></el-input-number><span>&nbsp;次</span>
-          <span style="margin-left: 20px;">腌&nbsp;</span><el-input-number   style="width:35%" v-model="form.cookingStyleRate[3]" :step="1" :min="0" ></el-input-number><span>&nbsp;次</span>
+          <span>{{healthyData['cookingStyleRateArray'][2]}}&nbsp;</span><el-input-number style="width:35%" v-model="form.cookingStyleRate[2]" :step="1" :min="0" ></el-input-number><span>&nbsp;次</span>
+          <span style="margin-left: 20px;">{{healthyData['cookingStyleRateArray'][3]}}&nbsp;</span><el-input-number   style="width:35%" v-model="form.cookingStyleRate[3]" :step="1" :min="0" ></el-input-number><span>&nbsp;次</span>
         </div>
         <div style="margin-top: 5px;">
-          <span>腊&nbsp;</span><el-input-number style="width:35%"  v-model="form.cookingStyleRate[4]" :step="1" :min="0" ></el-input-number><span>&nbsp;次</span>
-          <span style="margin-left: 20px;">煲&nbsp;</span><el-input-number  style="width:35%;" v-model="form.cookingStyleRate[5]" :step="1" :min="0" ></el-input-number><span>&nbsp;次</span>
+          <span>{{healthyData['cookingStyleRateArray'][4]}}&nbsp;</span><el-input-number style="width:35%"  v-model="form.cookingStyleRate[4]" :step="1" :min="0" ></el-input-number><span>&nbsp;次</span>
+          <span style="margin-left: 20px;">{{healthyData['cookingStyleRateArray'][5]}}&nbsp;</span><el-input-number  style="width:35%;" v-model="form.cookingStyleRate[5]" :step="1" :min="0" ></el-input-number><span>&nbsp;次</span>
         </div>
       </el-form-item>
       <p class="p_title_2">3、洗菜方式</p>
       <el-form-item :label="'(1) 洗菜方式'" prop="washVegetablesStyle" class="margin-left">
         <el-checkbox-group v-model="form.washVegetablesStyle">
-          <el-checkbox v-for="(item,index) in washVegetablesStyleArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item,index) in healthyData['washVegetablesStyleArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
         <div><span>其他洗菜方式 </span><el-input style="margin-top: 10px;width:70%" v-model="form.otherWashVegetablesStyle" placeholder="请输入其他洗菜方式" /></div>
       </el-form-item>
       </div>
 
-      <div v-show="stepArray[2]">
-      <p class="p_title_1">三、饮食结构评估</p>
+      <div v-show="stepArray[3]">
+      <p class="p_title_1">{{healthyData['titleArray'][3]}}</p>
       <p class="p_title_2">1、您三餐的习惯</p>
       <el-form-item :label="'(1) 早餐习惯'" prop="breakfast" class="margin-left">
         <el-radio-group v-model="form.breakfastType">
-          <el-radio v-for="(item,index) in breakfastTypeArray" :label="item.value" :key="index">{{item.name}}</el-radio>
+          <el-radio v-for="(item,index) in healthyData['breakfastTypeArray']" :label="item.value" :key="index">{{item.name}}</el-radio>
         </el-radio-group>
         <div style="margin-top:8px;"><span>早餐通常吃&nbsp;</span><el-input  v-model="form.breakfastFood" style="width:70%" placeholder="请输入早餐名称" /></div>
       </el-form-item>
       <el-form-item :label="'(2) 午餐习惯'" prop="lunchType" class="margin-left">
         <el-checkbox-group v-model="form.lunchType">
-          <el-checkbox v-for="(item,index) in lunchTypeArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item,index) in healthyData['lunchTypeArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <el-form-item :label="'(3) 晚餐习惯'" prop="dinner" class="margin-left">
         <el-checkbox-group v-model="form.dinner">
-          <el-checkbox v-for="(item,index) in dinnerArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item,index) in healthyData['dinnerArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <el-form-item :label="'(4) 正餐荤素中素菜占比几成'" prop="eatSituation" class="margin-left">
@@ -115,12 +162,12 @@
       <p class="p_title_2">3、您的饮食偏好</p>
       <el-form-item :label="'(1) 冷热偏好'" prop="dietHotAndCold" class="margin-left">
         <el-radio-group v-model="form.dietHotAndCold">
-          <el-radio v-for="(item,index) in dietHotAndColdArray" :label="item.value" :key="index">{{item.name}}</el-radio>
+          <el-radio v-for="(item,index) in healthyData['dietHotAndColdArray']" :label="item.value" :key="index">{{item.name}}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item :label="'(2) 口味偏好'" prop="dietFlavor" class="margin-left">
         <el-checkbox-group v-model="form.dietFlavor">
-          <el-checkbox v-for="(item,index) in dietFlavorArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item,index) in healthyData['dietFlavorArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <p class="p_title_2">4、生食果蔬状况</p>
@@ -129,28 +176,18 @@
       </el-form-item>
       <el-form-item :label="'(2) 每周吃生/拌菜的频次'" prop="vegetablesRateType" class="margin-left">
         <el-radio-group v-model="form.vegetablesRateType">
-          <el-radio v-for="(item,index) in vegetablesRateTypeArray" :label="item.value" :key="index">{{item.name}}</el-radio>
-          <!-- <div><el-radio label="每天吃" key="1">每天吃</el-radio>
-           <el-radio label="经常吃" key="2">经常吃</el-radio>
-           <el-radio label="偶尔吃" key="3">偶尔吃</el-radio></div>
-           <div style="margin-top: 10px;"><el-radio label="从不吃" key="4">从不吃</el-radio></div>-->
+          <el-radio v-for="(item,index) in healthyData['vegetablesRateTypeArray']" :label="item.value" :key="index">{{item.name}}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item :label="'(3) 平均每天吃水果几次以及时间'" prop="fruitsNum" class="margin-left">
         <el-input-number v-model="form.fruitsNum" :step="1" :min="0"></el-input-number>
         <el-radio-group v-model="form.fruitsTime" style="margin-top: 15px;">
-          <el-radio v-for="(item,index) in fruitsTimeArray" :label="item.value" :key="index">{{item.name}}</el-radio>
+          <el-radio v-for="(item,index) in healthyData['fruitsTimeArray']" :label="item.value" :key="index">{{item.name}}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="(4) 平时吃水果的频次" prop="fruitsRate" class="margin-left">
         <el-radio-group v-model="form.fruitsRate">
-          <el-radio v-for="(item,index) in fruitsRateArray" :label="item.value" :key="index">{{item.name}}</el-radio>
-          <!--<div>
-          <el-radio label="每天吃" key="1">每天吃</el-radio>
-          <el-radio label="经常吃" key="2">经常吃</el-radio>
-          <el-radio label="偶尔吃" key="3">偶尔吃</el-radio>
-        </div>
-          <div style="margin-top: 10px;"><el-radio label="从不吃" key="4">从不吃</el-radio></div>-->
+          <el-radio v-for="(item,index) in healthyData['fruitsRateArray']" :label="item.value" :key="index">{{item.name}}</el-radio>
         </el-radio-group>
       </el-form-item>
       <p class="p_title_2">5、饮食习惯</p>
@@ -162,13 +199,24 @@
       </el-form-item>
       <el-form-item label="(2) 吃饭速度" prop="eatingSpeed" class="margin-left">
         <el-radio-group v-model="form.eatingSpeed">
-          <el-radio v-for="(item,index) in eatingSpeedArray" :label="item.value" :key="index">{{item.name}}</el-radio>
+          <el-radio v-for="(item,index) in healthyData['eatingSpeedArray']" :label="item.value" :key="index">{{item.name}}</el-radio>
           </el-radio-group>
       </el-form-item>
+        <el-form-item label="(3) 饮食特点" prop="makeFoodType" class="margin-left">
+          <el-select v-model="form.makeFoodType" placeholder="请选择">
+            <el-option
+              v-for="item in healthyData['makeFoodTypeArray']"
+              :key="item.value"
+              :label="item.name"
+              :value="parseInt(item.value)"
+            />
+          </el-select>
+        </el-form-item>
+
       <p class="p_title_2">6、您常吃的零食</p>
       <el-form-item label="(1) 常吃的零食" prop="snacks" class="margin-left">
         <el-checkbox-group v-model="form.snacks">
-          <el-checkbox v-for="(item,index) in snacksArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item,index) in healthyData['snacksArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
         <div><span>其他零食 </span><el-input style="margin-top: 10px;width:70%" v-model="form.otherSnacks" placeholder="请输入其他零食名称" /></div>
       </el-form-item>
@@ -187,71 +235,83 @@
           <el-input-number style="width:35%;margin-left: 20px;" v-model="form.healthProductsDayRate" :step="1" ::min="0" ></el-input-number><span>&nbsp;次/天</span>
         </div>
       </el-form-item>
+        <p class="p_title_2">8、忌口或过敏食物</p>
+        <el-form-item label="(1) 忌口或过敏、不爱吃的食物（重点）" prop="dishesIngredient" class="margin-left">
+          <el-input
+            type="textarea"
+            placeholder="请描述忌口或过敏、不爱吃的食物"
+            v-model="form.dishesIngredient"
+            maxlength="200"
+            show-word-limit
+            rows="3"
+          ></el-input>
+        </el-form-item>
       </div>
-      <div v-show="stepArray[3]">
-      <p class="p_title_1">四、生活习惯评估</p>
+
+      <div v-show="stepArray[4]">
+      <p class="p_title_1">{{healthyData['titleArray'][4]}}</p>
       <p class="p_title_2">1、您每天的饮水习惯</p>
       <el-form-item label="(1) 每天饮水量（毫升）" prop="waterNum" class="margin-left">
         <el-input-number v-model="form.waterNum" :step="50" :min="0"></el-input-number>
       </el-form-item>
       <el-form-item label="(2) 喜欢喝什么水" prop="waterType" class="margin-left">
         <el-checkbox-group v-model="form.waterType">
-          <el-checkbox v-for="(item,index) in waterTypeArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item,index) in healthyData['waterTypeArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <el-form-item label="(3) 喝水习惯" prop="waterHabit" class="margin-left">
         <el-checkbox-group v-model="form.waterHabit">
-          <el-checkbox v-for="(item,index) in waterHabitArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item,index) in healthyData['waterHabitArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <p class="p_title_2">2、您常喝的饮品和每周频次</p>
       <el-form-item label="(1) 每周常喝的饮品次数" prop="drinksNum" class="margin-left">
         <div>
-          <span>老火汤&nbsp;</span><el-input-number type="number" style="width:35%;margin-left: 13px;" v-model="form.drinksNum[0]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
+          <span>{{healthyData['drinksNumArray'][0]}}&nbsp;</span><el-input-number type="number" style="width:35%;margin-left: 13px;" v-model="form.drinksNum[0]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
         </div>
         <div class="margin-top-10">
-          <span>咖啡&nbsp;</span><el-input-number style="width:35%;margin-left: 25px;" v-model="form.drinksNum[1]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
+          <span>{{healthyData['drinksNumArray'][1]}}&nbsp;</span><el-input-number style="width:35%;margin-left: 25px;" v-model="form.drinksNum[1]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
         </div>
         <div class="margin-top-10">
-          <span>浓茶&nbsp;</span><el-input-number type="number" style="width:35%;margin-left: 25px;" v-model="form.drinksNum[2]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
+          <span>{{healthyData['drinksNumArray'][2]}}&nbsp;</span><el-input-number type="number" style="width:35%;margin-left: 25px;" v-model="form.drinksNum[2]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
         </div>
         <div class="margin-top-10">
-          <span>奶茶&nbsp;</span><el-input-number  type="number" style="width:35%;margin-left: 25px;" v-model="form.drinksNum[3]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
+          <span>{{healthyData['drinksNumArray'][3]}}&nbsp;</span><el-input-number  type="number" style="width:35%;margin-left: 25px;" v-model="form.drinksNum[3]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
         </div>
         <div class="margin-top-10">
-          <span>冷饮&nbsp;</span><el-input-number type="number" style="width:35%;margin-left: 25px;" v-model="form.drinksNum[4]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
+          <span>{{healthyData['drinksNumArray'][4]}}&nbsp;</span><el-input-number type="number" style="width:35%;margin-left: 25px;" v-model="form.drinksNum[4]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
         </div>
         <div class="margin-top-10">
-          <span>碳酸饮料&nbsp;</span><el-input-number type="number" style="width:35%;" v-model="form.drinksNum[5]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
+          <span>{{healthyData['drinksNumArray'][5]}}&nbsp;</span><el-input-number type="number" style="width:35%;" v-model="form.drinksNum[5]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
         </div>
         <div class="margin-top-10">
-          <span>甜饮料&nbsp;</span><el-input-number type="number" style="width:35%;margin-left: 13px;" v-model="form.drinksNum[6]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
+          <span>{{healthyData['drinksNumArray'][6]}}&nbsp;</span><el-input-number type="number" style="width:35%;margin-left: 13px;" v-model="form.drinksNum[6]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
         </div>
         <div class="margin-top-10">
-          <span>鲜榨果汁&nbsp;</span><el-input-number type="number" style="width:35%;" v-model="form.drinksNum[7]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
+          <span>{{healthyData['drinksNumArray'][7]}}&nbsp;</span><el-input-number type="number" style="width:35%;" v-model="form.drinksNum[7]" :step="1" :min="0"></el-input-number><span>&nbsp;次</span>
         </div>
       </el-form-item>
       <p class="p_title_2">3、您的饮酒习惯</p>
       <el-form-item label="(1) 是否喝酒" prop="drinkWineFlag" class="margin-left">
         <el-radio-group v-model="form.drinkWineFlag">
-          <el-radio v-for="(item,index) in drinkWineFlagArray" :label="item.value" :key="index">{{item.name}}</el-radio>
+          <el-radio v-for="(item,index) in healthyData['drinkWineFlagArray']" :label="item.value" :key="index">{{item.name}}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="(2) 通常喝什么酒" prop="drinkWineClassify" class="margin-left">
         <el-checkbox-group v-model="form.drinkWineClassify">
-          <el-checkbox v-for="(item,index) in drinkWineClassifyArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item,index) in healthyData['drinkWineClassifyArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
         <div><span>其他酒 </span><el-input style="margin-top: 10px;width:70%" v-model="form.otherWineClassify" placeholder="请输入其他酒名称" /></div>
       </el-form-item>
       <el-form-item label="(3) 通常喝多少" prop="drinkWineAmount" class="margin-left">
         <div>
-          <span>白酒</span><el-input-number class="width-50-left-8-right-5" type="number" v-model="form.drinkWineAmount[0]" :step="1" :min="0"></el-input-number><span>&nbsp;两</span>
+          <span>{{healthyData['drinkWineAmountArray'][0]}}</span><el-input-number class="width-50-left-8-right-5" type="number" v-model="form.drinkWineAmount[0]" :step="1" :min="0"></el-input-number><span>&nbsp;两</span>
         </div>
         <div class="margin-top-10">
-          <span>啤酒</span><el-input-number class="width-50-left-8-right-5" type="number" v-model="form.drinkWineAmount[1]" :step="1" :min="0"></el-input-number><span>&nbsp;瓶</span>
+          <span>{{healthyData['drinkWineAmountArray'][1]}}</span><el-input-number class="width-50-left-8-right-5" type="number" v-model="form.drinkWineAmount[1]" :step="1" :min="0"></el-input-number><span>&nbsp;瓶</span>
         </div>
         <div class="margin-top-10">
-          <span>红酒</span><el-input-number class="width-50-left-8-right-5" type="number" v-model="form.drinkWineAmount[2]" :step="100" :min="0"></el-input-number><span>&nbsp;毫升</span>
+          <span>{{healthyData['drinkWineAmountArray'][2]}}</span><el-input-number class="width-50-left-8-right-5" type="number" v-model="form.drinkWineAmount[2]" :step="100" :min="0"></el-input-number><span>&nbsp;毫升</span>
         </div>
         <!--<div class="margin-top-10">
           <span>其他</span><el-input-number class="width-50-left-8-right-5" type="number" v-model="form.drinkWineAmount[3]" :step="100" :min="0"></el-input-number><span>&nbsp;毫升</span>
@@ -266,13 +326,13 @@
       </el-form-item>
       <el-form-item label="(2) 吸烟频次以及烟龄" prop="smokeRate" class="margin-left">
         <div>
-          <span>每天抽烟</span><el-input-number type="number" class="width-50-left-8-right-5" v-model="form.smokeRate[0]" :step="1" :min="0"></el-input-number><span>次</span>
+          <span>{{healthyData['smokeRateArray'][0]}}</span><el-input-number type="number" class="width-50-left-8-right-5" v-model="form.smokeRate[0]" :step="1" :min="0"></el-input-number><span>次</span>
         </div>
         <div class="margin-top-10">
-          <span>烟龄</span><el-input-number type="number" class="width-50-left-8-right-5" v-model="form.smokeRate[1]" :step="1" :min="0"></el-input-number><span>年</span>
+          <span>{{healthyData['smokeRateArray'][1]}}</span><el-input-number type="number" class="width-50-left-8-right-5" v-model="form.smokeRate[1]" :step="1" :min="0"></el-input-number><span>年</span>
         </div>
         <div class="margin-top-10">
-          <span>已戒烟</span><el-input-number type="number" class="width-50-left-8-right-5" v-model="form.smokeRate[2]" :step="1" :min="0"></el-input-number><span>年</span>
+          <span>{{healthyData['smokeRateArray'][2]}}</span><el-input-number type="number" class="width-50-left-8-right-5" v-model="form.smokeRate[2]" :step="1" :min="0"></el-input-number><span>年</span>
         </div>
       </el-form-item>
       <el-form-item label="(3) 是否常吸二手烟" prop="secondSmoke" class="margin-left">
@@ -287,7 +347,7 @@
       </el-form-item>
       <el-form-item label="(2) 工作性质" prop="workType" style="padding-top: 10px;">
         <el-checkbox-group v-model="form.workType">
-          <el-checkbox v-for="(item,index) in workTypeArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item,index) in healthyData['workTypeArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <p class="p_title_2">4、您的排便状况</p>
@@ -302,7 +362,7 @@
 
       <el-form-item label="(2) 排便时间" prop="defecationTime" style="padding-top: 10px;">
         <el-checkbox-group v-model="form.defecationTime">
-          <el-checkbox v-for="(item,index) in defecationTimeArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item,index) in healthyData['defecationTimeArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <el-form-item label="(2) 排便情况" prop="defecationSituation" style="padding-top: 10px;">
@@ -320,8 +380,9 @@
         </div>
       </el-form-item>
       </div>
-      <div v-show="stepArray[4]">
-      <p class="p_title_1">五、运动习惯评估</p>
+
+      <div v-show="stepArray[5]">
+      <p class="p_title_1">{{healthyData['titleArray'][5]}}</p>
       <p class="p_title_2">1、运动频率</p>
       <el-form-item label="(1) 每周运动情况" prop="motionSituation" class="margin-left">
         <div>
@@ -345,37 +406,38 @@
       <el-form-item label="(1) 运动方式、项目" prop="motionProject" class="margin-left">
         <div><span>有氧运动</span>
           <el-checkbox-group v-model="form.aerobicMotionClassify">
-            <el-checkbox v-for="(item,index) in aerobicMotionClassifyArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+            <el-checkbox v-for="(item,index) in healthyData['aerobicMotionClassifyArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
           </el-checkbox-group>
         </div>
         <div><span>有氧运动</span>
           <el-checkbox-group v-model="form.anaerobicMotionClassify">
-            <el-checkbox v-for="(item,index) in anaerobicMotionClassifyArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+            <el-checkbox v-for="(item,index) in healthyData['anaerobicMotionClassifyArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
           </el-checkbox-group>
         </div>
         <div><span>有氧无氧结合运动</span>
           <el-checkbox-group v-model="form.anaerobicAerobicMotionClassify">
-            <el-checkbox v-for="(item,index) in anaerobicAerobicMotionClassifyArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+            <el-checkbox v-for="(item,index) in healthyData['anaerobicAerobicMotionClassifyArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
           </el-checkbox-group>
         </div>
         <div><span>其他项目 </span><el-input style="margin-top: 10px;width:70%" v-model="form.otherMotionClassify" placeholder="请输入其他运动项目名称" /></div>
       </el-form-item>
       <el-form-item label="(2) 运动场地" prop="motionField" class="margin-left">
         <el-checkbox-group v-model="form.motionField">
-          <el-checkbox v-for="(item,index) in motionFieldArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item,index) in healthyData['motionFieldArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
         <div><span>其他场地 </span><el-input style="margin-top: 10px;width:70%" v-model="form.otherMotionField" placeholder="请输入其他运动场地名称" /></div>
       </el-form-item>
       </div>
-      <div v-show="stepArray[5]">
-      <p class="p_title_1">六、睡眠质量评估</p>
+
+      <div v-show="stepArray[6]">
+      <p class="p_title_1">{{healthyData['titleArray'][6]}}</p>
       <p class="p_title_2">1、您的睡眠状况</p>
       <el-form-item label="(1) 一般晚上几点睡" prop="sleepTime" class="margin-left">
         <el-time-select v-model="form.sleepTime" :picker-options="{ start: '00:00', step: '01:00', end: '24:00' }" placeholder="请选择时间" :editable="false"/>
       </el-form-item>
       <el-form-item label="(2) 睡眠质量" prop="sleepQuality" class="margin-left">
         <el-checkbox-group v-model="form.sleepQuality">
-          <el-checkbox v-for="(item,index) in sleepQualityArray" :label="item.value" :key="index">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item,index) in healthyData['sleepQualityArray']" :label="item.value" :key="index">{{item.name}}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
       <p class="p_title_2">2、辅助入睡药物情况</p>
@@ -397,12 +459,12 @@
         </div>
       </el-form-item>
       </div>
-      <div v-show="stepArray[6]">
-      <p class="p_title_1">七、既往病史/用药史评估</p>
+      <div v-show="stepArray[7]">
+      <p class="p_title_1">{{healthyData['titleArray'][7]}}</p>
       <p class="p_title_2">1、家族疾病史情况</p>
       <el-form-item label="（1）家族疾病史（直系亲属例如爸爸妈妈、爷爷奶奶、外公外婆有相关疾病）（可多选）" prop="familyIllnessHistory" class="margin-left">
         <el-checkbox-group v-model="form.familyIllnessHistory">
-          <el-checkbox v-for="(item, index) in familyIllnessHistoryArray" :key="index" :label="item.value" >{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item, index) in healthyData['familyIllnessHistoryArray']" :key="index" :label="item.value" >{{item.name}}</el-checkbox>
         </el-checkbox-group>
         <div><span>其他家族病史</span>
           <el-input
@@ -418,7 +480,7 @@
       <p class="p_title_2">2、手术情况</p>
       <el-form-item label="(1) 手术史，因病进行过手术治疗，手术的部分（可多选）" prop="familyIllnessHistory" class="margin-left">
         <el-checkbox-group v-model="form.operationHistory">
-          <el-checkbox v-for="(item, index) in operationHistoryArray" :key="index" :label="item.value" >{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item, index) in healthyData['operationHistoryArray']" :key="index" :label="item.value" >{{item.name}}</el-checkbox>
         </el-checkbox-group>
         <div><span>其他手术史</span>
           <el-input
@@ -455,7 +517,7 @@
       </el-form-item>
       <el-form-item label="(2) 长期服用药物有（可多选）" prop="longEatDrugClassify" class="margin-left">
         <el-checkbox-group v-model="form.longEatDrugClassify">
-          <el-checkbox v-for="(item, index) in longEatDrugClassifyArray" :key="index" :label="item.value">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item, index) in healthyData['longEatDrugClassifyArray']" :key="index" :label="item.value">{{item.name}}</el-checkbox>
         </el-checkbox-group>
         <div><span>其他长期服用的药物</span>
           <el-input
@@ -488,7 +550,7 @@
 
       <el-form-item label="(2) 引起过敏源(可多选)" prop="allergen" class="margin-left">
         <el-checkbox-group v-model="form.allergen">
-          <el-checkbox v-for="(item, index) in allergenArray" :key="index" :label="item.value">{{item.name}}</el-checkbox>
+          <el-checkbox v-for="(item, index) in healthyData['allergenArray']" :key="index" :label="item.value">{{item.name}}</el-checkbox>
         </el-checkbox-group>
         <div><span>其他过敏源</span>
           <el-input
@@ -503,8 +565,8 @@
       </el-form-item>
       </div>
 
-      <div v-show="stepArray[7]">
-        <p class="p_title_1">八、体检报告</p>
+      <div v-show="stepArray[8]">
+        <p class="p_title_1">{{healthyData['titleArray'][8]}}</p>
         <p class="p_title_2">1、体检报告</p>
         <el-form-item label="(1) 请上传相应的体检报告" prop="fileList" class="margin-left">
           <el-upload style="margin-left: 20px;"
@@ -556,6 +618,7 @@
 </template>
 <script>
 import { getDictData,addCustomerHealthy } from "@/api/custom/customerInvestigation";
+import * as healthyData from "@/utils/healthyData";
 const logo = require("@/assets/logo/st_logo.png");
 export default {
   name: "index",
@@ -567,132 +630,11 @@ export default {
           callback();
       };
     return {
+      healthyData:healthyData,
       logo,
       submitFlag: false,
-      //调味品种类
-      condimentArray:[
-        {"name":"鸡精", "value":"1"},
-        {"name":"耗油", "value":"2"},
-        {"name":"生抽", "value":"3"},
-        {"name":"老抽", "value":"4"},
-        {"name":"香油", "value":"5"},
-        {"name":"浓汤宝", "value":"6"},
-        {"name":"鸡粉", "value":"7"},
-        {"name":"花椒", "value":"8"},
-        {"name":"辣椒油", "value":"9"}
-      ],
-      cookingStyleArray:[
-        {"name":"煎","value":"1"},{"name":"烤","value":"2"},{"name":"炸","value":"3"},{"name":"卤","value":"4"},
-        {"name":"腌","value":"5"},{"name":"腊","value":"6"},{"name":"煲","value":"7"},{"name":"炒","value":"8"},
-        {"name":"蒸","value":"9"},{"name":"刺身","value":"10"},{"name":"水煮","value":"11"}
-      ],
-      cookingStyleRateArray:["煎","炸","卤","腌","腊","煲"],
-      washVegetablesStyleArray:[
-        {"name":"先切后洗","value": "1"},{"name":"先洗后切","value": "2"},{"name":"切后浸泡","value": "3"}
-      ],
-      breakfastTypeArray:[
-        {"name":"不吃","value": "1"},{"name":"偶尔吃","value": "2"},{"name":"每天吃","value": "3"}
-      ],
-      lunchTypeArray:[
-        {"name":"外卖","value":"1"},{"name":"自带餐","value":"2"},{"name":"快餐","value":"3"},{"name":"餐厅","value":"4"}
-      ],
-      dinnerArray:[
-        {"name":"餐馆吃","value":"1"},{"name":"在家吃","value":"2"},{"name":"丰盛","value":"3"},{"name":"清淡","value":"4"}
-      ],
-      dietHotAndColdArray:[
-        {"name":"偏冷食","value":"1"},{"name":"偏冷食","value":"2"},{"name":"正常","value":"3"}
-      ],
-      dietFlavorArray:[
-        {"name":"偏油","value":"1"},{"name":"偏咸","value":"2"},{"name":"偏辣","value":"3"},
-        {"name":"偏甜","value":"4"},{"name":"偏酸","value":"5"},{"name":"清淡","value":"6"}
-      ],
-      vegetablesRateTypeArray:[
-        {"name":"每天吃","value":"1"},{"name":"经常吃","value":"2"},{"name":"偶尔吃","value":"3"},{"name":"从不吃","value":"4"}
-      ],
-      fruitsTimeArray:[
-        {"name":"餐前","value":"1"},{"name":"餐后","value":"2"},{"name":"餐间","value":"3"}
-      ],
-      fruitsRateArray:[
-        {"name":"每天吃","value":"1"},{"name":"经常吃","value":"2"},{"name":"偶尔吃","value":"3"},{"name":"从不吃","value":"4"}
-      ],
-      eatingSpeedArray:[
-        {"name":"很快","value":"1"},{"name":"偏快","value":"2"},{"name":"正常","value":"3"},{"name":"偏慢","value":"4"}
-        ,{"name":"很慢","value":"5"}
-      ],
-      snacksArray:[
-        {"name":"面包","value":"1"},{"name":"蛋糕","value":"2"},{"name":"饼干","value":"3"},{"name":"冰淇淋","value":"4"}
-        ,{"name":"糖果","value":"5"},{"name":"巧克力","value":"6"},{"name":"方便面","value":"7"},{"name":"薯条","value":"8"},{"name":"肉干","value":"9"},
-        {"name":"坚果","value":"10"},{"name":"饮料","value":"11"},{"name":"果脯","value":"12"},{"name":"牛奶","value":"13"}
-      ],
-      waterTypeArray:[
-        {"name":"冰水","value":"1"},{"name":"温水","value":"2"},{"name":"常温水","value":"3"}
-      ],
-      waterHabitArray:[
-        {"name":"均匀地喝","value":"1"},{"name":"餐前多喝","value":"2"},{"name":"餐后多喝","value":"3"},{"name":"餐间多喝","value":"4"},
-        {"name":"随时喝","value":"5"}
-      ],
-      drinksNumArray:["老火汤","咖啡","浓茶","奶茶","冷饮","碳酸饮料","甜饮料","鲜榨果汁"],
-      drinkWineFlagArray:[
-        {"name":"经常饮酒","value": "1"},{"name":"不饮酒","value": "2"},{"name":"偶尔","value": "3"}
-      ],
-      drinkWineClassifyArray:[
-        {"name":"白酒","value": "1"},{"name":"红酒","value": "2"},{"name":"啤酒","value": "3"}
-      ],
-      drinkWineAmountArray:["白酒","啤酒","红酒"],
-      smokeRateArray:["每天抽烟","烟龄","已戒烟"],
-      workTypeArray:[
-        {"name":"工作时间长","value": "1"},{"name":"久坐","value": "2"},{"name":"久站","value": "3"},
-        {"name":"走动多","value": "4"},{"name":"强度大","value": "5"},{"name":"用电脑多","value": "6"},{"name":"体力工作多","value": "7"}
-      ],
-      defecationTimeArray:[
-        {"name":"上午","value": "1"},{"name":"中午","value": "2"},{"name":"晚上","value": "3"}
-      ],
-      aerobicMotionClassifyArray:[
-        {"name":"跳绳","value": "1"},{"name":"跑步","value": "2"},{"name":"游泳","value": "3"}
-      ],
-      anaerobicMotionClassifyArray:[
-        {"name":"撸铁","value": "1"},{"name":"俯卧撑","value": "2"}
-      ],
-      anaerobicAerobicMotionClassifyArray:[
-        {"name":"拳击","value": "1"},{"name":"瑜伽","value": "2"}
-      ],
-      motionFieldArray:[
-        {"name":"居家","value": "1"},{"name":"健身房","value": "2"},{"name":"户外","value": "3"}, {"name":"健身房","value": "4"}
-      ],
-      sleepQualityArray:[
-        {"name":"好","value": "1"},{"name":"一般","value": "2"},{"name":"入睡难","value": "3"},
-        {"name":"失眠","value": "4"},{"name":"易醒","value": "5"},{"name":"多梦","value": "6"}
-      ],
-      familyIllnessHistoryArray:[
-        {"name":"高血压病","value": "1"},{"name":"脑卒中","value": "2"},{"name":"冠心病","value": "3"},
-        {"name":"外周血管病","value": "4"},{"name":"心力衰竭","value": "5"},{"name":"冠心病","value": "6"},
-        {"name":"肥胖症","value": "7"},{"name":"慢性肾脏疾病","value": "8"},{"name":"骨质疏松","value": "9"},
-        {"name":"痛风","value": "10"},{"name":"精神疾病","value": "11"},{"name":"恶性肿瘤","value": "12"},
-        {"name":"慢性阻塞性肺病","value": "13"},{"name":"风湿性免疫性疾病","value": "14"},
-      ],
-      operationHistoryArray:[
-        {"name":"头颅（含脑）","value": "1"},{"name":"眼","value": "2"},{"name":"耳鼻咽喉","value": "3"},
-        {"name":"颌面部及口腔","value": "4"},{"name":"颈部或甲状腺","value": "5"},{"name":"胸部（含肺部）","value": "6"},
-        {"name":"心脏（含心脏介入）","value": "7"},{"name":"外周血管","value": "8"},{"name":"胃肠","value": "9"},
-        {"name":"肝胆","value": "10"},{"name":"肾脏","value": "11"},{"name":"脊柱","value": "12"},
-        {"name":"四肢及关节","value": "13"},{"name":"前列腺","value": "14"},{"name":"妇科","value": "15"},{"name":"乳腺","value": "16"}
-        ,{"name":"膀胱","value": "17"}
-      ],
-      longEatDrugClassifyArray:[
-        {"name":"降压药","value": "1"},{"name":"降糖药","value": "2"},{"name":"降尿酸药","value": "3"},
-        {"name":"抗心律失常药","value": "4"},{"name":"缓解哮喘药物","value": "5"},{"name":"抗压郁药物","value": "6"},
-        {"name":"雌激素类药物","value": "7"},{"name":"利尿剂","value": "8"},{"name":"中草药","value": "9"},
-        {"name":"避孕药","value": "10"},{"name":"强的松类药物","value": "11"},{"name":"镇静剂或安眠药","value": "12"},
-        {"name":"调值药（降脂药）","value": "13"},{"name":"解热镇痛药（如布洛芬等）","value": "14"}
-      ],
-      allergenArray:[
-        {"name":"青霉素","value": "1"},{"name":"磺胺类","value": "2"},{"name":"链霉素","value": "3"},
-        {"name":"头孢类","value": "4"},{"name":"鸡蛋","value": "5"},{"name":"牛奶","value": "6"},
-        {"name":"海鲜","value": "7"},{"name":"花粉或尘螨","value": "8"},{"name":"粉尘","value": "9"},
-        {"name":"洗洁剂","value": "10"},{"name":"化妆品","value": "11"}
-      ],
       conditioningProjectIdOption:[],
-      stepArray: [true,false,false,false,false,false,false,false],
+      stepArray: [true,false,false,false,false,false,false,false,false],
       stepActive: 0,
       form: {
         name: null,
@@ -700,13 +642,15 @@ export default {
         conditioningProjectId: 0,
         sex: 1,
         age: null,
-        condiment:["1","5","9","6","1","3"],
+        tall: null,
+        weight: null,
+        condiment:["1","2","3"],
         otherCondiment:null,
         cookingStyle: ["8","9","4","11"],
         cookingStyleRate:[1,1,1,1,1,1],
         washVegetablesStyle:["2"],
         otherWashVegetablesStyle: null,
-        breakfastType:"1",
+        breakfastType:"2",
         breakfastFood: null,
         lunchType:["3"],
         dinner:["2"],
@@ -725,7 +669,7 @@ export default {
         riceNum: 1,
         riceFull: 8,
         eatingSpeed: "3",
-        snacks: ["10","11","13","12","3","1"],
+        snacks: ["1"],
         otherSnacks:null,
         healthProductsFlag: 0,
         healthProductsBrand:null,
@@ -734,7 +678,7 @@ export default {
         healthProductsDayRate:0,
 
         waterNum: 1500,
-        waterType: ["2"],
+        waterType: ["3"],
         waterHabit: ["5"],
         drinksNum:[0,0,0,0,0,0,0,0],
         drinkWineFlag: "3",
@@ -785,7 +729,15 @@ export default {
         allergySituation: null,
         allergen:[],
         otherAllergen:null,
-        medicalReport:[]
+        medicalReport:[],
+        medicalReportName:"",
+        position:0,
+        experience: null,
+        rebound: 0,
+        difficulty:null,
+        crux:0,
+        dishesIngredient:null,
+        makeFoodType:3
       },
       upload: {
           // 是否禁用上传
@@ -820,6 +772,24 @@ export default {
             message: "年龄格式不正确",
           },
         ],
+        tall: [
+          { required: true, trigger: "blur", message: "请填写身高" },
+          {
+            required: true,
+            trigger: "blur",
+            pattern: /^[1-9]\d*$/,
+            message: "身高格式不正确",
+          },
+        ],
+        weight: [
+          { required: true, trigger: "blur", message: "请填写体重" },
+          {
+            required: true,
+            trigger: "blur",
+            pattern: /^[1-9]\d*$/,
+            message: "体重格式不正确",
+          },
+        ],
         phone: [
           { required: true, trigger: "blur", message: "请填写手机号" },
           { required: true, trigger: "blur", message: "请填写正确的手机号" },
@@ -833,6 +803,19 @@ export default {
           conditioningProjectId:[
               { required: true, trigger: "blur", message: "请选择调理项目" }
           ],
+        position:[
+          { required: true, trigger: "blur", message: "请选择地理位置" }
+        ],
+        /*experience:[
+          { required: true, trigger: "blur", message: "请描述您的减脂经历" }
+        ],
+        difficulty:[
+          { required: true, trigger: "blur", message: "请描述您减脂中遇到的困难" }
+        ],
+          dishesIngredient:[
+            { required: true, trigger: "blur", message: "请描述您忌口、过敏食物" }
+          ]*/
+
           /*fileList:[
               {required: true, trigger: "blur", validator: checkReportFile}
           ]*/