From 6f6e804a48c822f339e1974cfe482bc2f60227a3 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期一, 25 九月 2023 12:42:08 +0800
Subject: [PATCH] 修改健康保健

---
 ruoyi-ui/src/api/healthy/index.js          |    4 
 ruoyi-ui/src/views/healthy/healthYear.vue  |  159 ++++---
 ruoyi-ui/src/views/healthy/healthyInfo.vue |   11 
 ruoyi-ui/src/views/healthy/index.vue       |  978 ++++++++++++++++++++++++++++++++++--------------
 4 files changed, 769 insertions(+), 383 deletions(-)

diff --git a/ruoyi-ui/src/api/healthy/index.js b/ruoyi-ui/src/api/healthy/index.js
index 4e164ec..b61a782 100644
--- a/ruoyi-ui/src/api/healthy/index.js
+++ b/ruoyi-ui/src/api/healthy/index.js
@@ -160,7 +160,7 @@
 //鑾峰緱鎵�鏈�
 export function listHealthNote(query) {
   return request({
-    url: '/zHealthNote/all',
+    url: '/zHealthNote',
     method: 'get',
     params: query
   })
@@ -170,7 +170,7 @@
 export function updateHealthNote(data) {
   return request({
     url: '/zHealthNote',
-    method: 'put',
+    method: 'post',
     data: data
   })
 }
diff --git a/ruoyi-ui/src/views/healthy/healthYear.vue b/ruoyi-ui/src/views/healthy/healthYear.vue
index 487f86c..2b07be1 100644
--- a/ruoyi-ui/src/views/healthy/healthYear.vue
+++ b/ruoyi-ui/src/views/healthy/healthYear.vue
@@ -86,7 +86,7 @@
           plain
           icon="el-icon-download"
           size="mini"
-          @click="handleExport"
+          @click="handleExportTemplate"
           v-hasPermi="['family:note:export']"
         >瀵煎叆妯℃澘涓嬭浇</el-button>
       </el-col>
@@ -162,10 +162,10 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >鍒犻櫎</el-button>
-          <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:bignote:list']">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right"  @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
 
-          </el-dropdown> -->
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -294,7 +294,7 @@
 
 
 //鍦╯ystem/note/index.js涓鍏ユ帴鍙e嚱鏁�  --鎺ュソ浜�
-import {listHealth,enload,delHealth,getHealthInfo, addHealth, uploadPic} from "@/api/healthy/index";
+import {listHealth,enload,delHealth,uploadPic, addHealth} from "@/api/healthy/index";
 
 export default {
   name: "Role",
@@ -359,6 +359,15 @@
         checkTime:undefined,
 
       },
+      healthList:{
+        checkTime:undefined,
+        type:undefined,
+        hospital:undefined,
+        title:undefined,
+        notice:undefined,
+        remark:undefined,
+        url:undefined
+      },
       // 琛ㄥ崟鍙傛暟
       form: {},
       defaultProps: {
@@ -367,40 +376,31 @@
       },
       // 琛ㄥ崟鏍¢獙
       rules: {
-        usePeople: [{
+        title: [{
           required: true,
-          message: '璇疯緭鍏ヤ娇鐢ㄤ汉',
+          message: '璇疯緭鍏ユ爣棰�',
           trigger: 'blur'
         }],
 
-        useFor: [{
+        hospital: [{
           required: true,
-          message: '璇疯緭鍏ョ敤閫�',
+          message: '璇疯緭鍏ュ氨鐥呭尰闄�',
           trigger: 'blur'
         }],
         type: [{
           required: true,
-          message: '璇疯緭鍏ュ彴璐﹀唴瀹�',
+          message: '璇疯緭鍏ョ被鍒�',
           trigger: 'blur'
         }],
-        balance: [{
+
+        checkTime: [{
           required: true,
-          message: '璇疯緭鍏ラ噾棰�',
-          trigger: 'blur'
-        }],
-        kind: [{
-          // required: true,
-          message: '璇疯緭鍏ユ敮浠樻柟寮�',
-          trigger: 'blur'
-        }],
-        createTime: [{
-          required: true,
-          message: '璇烽�夋嫨鏃ユ湡閫夋嫨',
+          message: '閫夋嫨浣撴鏃堕棿',
           trigger: 'change'
         }],
-        price: [{
+        notice: [{
           required: true,
-          message: '璇烽�夋嫨浜嬮」鍐呭',
+          message: '璇疯緭鍏ユ敞鎰忎簨椤�',
           trigger: 'blur'
         }],
       },
@@ -422,7 +422,7 @@
     },
 
     //闅旇鍙樿壊
-    tableRowClassName({ row, rowIndex }) {
+    tableRowClassName({row, rowIndex}) {
       if (rowIndex % 2 == 0) {
         return "statistics-warning-row1";
       } else {
@@ -452,17 +452,15 @@
       );
     },
     handleRemove(file) {
-      for(let i = 0; i < this.fileList.length; i++)
-      {
-        if(this.fileList[i].url==file.url)
-          this.$delete(this.fileList,i);
+      for (let i = 0; i < this.fileList.length; i++) {
+        if (this.fileList[i].url == file.url)
+          this.$delete(this.fileList, i);
       }
     },
     handleRemoveFile(file) {
-      for(let i = 0; i < this.fileListOther.length; i++)
-      {
-        if(this.fileListOther[i].url==file.url)
-          this.$delete(this.fileListOther,i);
+      for (let i = 0; i < this.fileListOther.length; i++) {
+        if (this.fileListOther[i].url == file.url)
+          this.$delete(this.fileListOther, i);
       }
     },
 
@@ -514,7 +512,7 @@
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
       console.log(this.ids)
-      this.single = selection.length!=1
+      this.single = selection.length != 1
       this.multiple = !selection.length
     },
 
@@ -527,7 +525,7 @@
 
 
     /** 鏌ョ湅璇︾粏淇℃伅 */
-    handleCheck(row){
+    handleCheck(row) {
       const id = row.id;
       this.$router.push("/self/healthy/healthyInfo/" + id);
     },
@@ -537,9 +535,9 @@
       let jd = true
 
       this.$router.push({
-        path:"/self/healthy/healthyInfo/" + id,
-        query:{
-          detail:jd
+        path: "/self/healthy/healthyInfo/" + id,
+        query: {
+          detail: jd
         }
       });
     },
@@ -550,15 +548,15 @@
       this.dialogVisible = true;
     },
     /** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
-    submitDataScope: function() {
+    submitDataScope: function () {
 
-      let ul = this.fileList.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+      let ul = this.fileList.map(function (elem) {
+        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API, "")
       }).join(",")
-      let uls = this.fileListOther.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+      let uls = this.fileListOther.map(function (elem) {
+        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API, "")
       }).join(",")
-      this.formDat.url = ul+","+uls
+      this.formDat.url = ul + "," + uls
       this.$refs["elForm"].validate(valid => {
         if (valid) {
 
@@ -573,33 +571,28 @@
       Object.keys(this.formDat).forEach(key => {
         this.formDat[key] = '';
       });
-      for(let i = 0; i <= this.fileList.length; i++)
-      {
+      for (let i = 0; i <= this.fileList.length; i++) {
         this.handleRemove(this.fileList[0]);
       }
-      for(let i = 0; i < this.fileListOther.length; i++){
+      for (let i = 0; i < this.fileListOther.length; i++) {
         this.handleRemoveFile(this.fileListOther[0]);
       }
 
     },
-    requestUpload(params)
-    {
+    requestUpload(params) {
       var file = params.file;
       var formData = new FormData();
       formData.append('uploadFile', file);
       let _this = this
 
       uploadPic(formData).then(response => {
-        let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+        let pth = response.data.originalFilename.substr(response.data.originalFilename.length - 4, response.data.originalFilename.length)
 
-        if(_this.fot.includes(pth) === true)
-        {
-          _this.fileList.push({name:response.data.fileName, "url":response.data.url})
+        if (_this.fot.includes(pth) === true) {
+          _this.fileList.push({name: response.data.fileName, "url": response.data.url})
 
-        }
-
-        else{
-          _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+        } else {
+          _this.fileListOther.push({name: response.data.fileName, url: response.data.url})
 
         }
       })
@@ -608,36 +601,50 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete(row) {
       const Ids = row.id || this.ids;
-      this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
+      this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function () {
         return delHealth(Ids);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
-      this.download('/zfEconomy/export', {
-        ...this.queryParams
-      }, `zfEconomy_${new Date().getTime()}.xlsx`)
-    }
-  },
-  /** 瀵煎叆鎿嶄綔*/
-  handleEnport(params){
-    var file = params.file;
-    var formData = new FormData();
-    formData.append('excelImport', file);
-    let _this = this
-    alert(file)
-    enload(formData).then(response => {
-      _this.getList();
-      Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
+      const Ids = this.ids;
 
-    }).catch(err)
+      if (Ids.length == 0) {
+        this.download('/family/zfEvent/export', {
+          ...this.queryParams
+        }, `zYearInfo${new Date().getTime()}.xlsx`)
+      } else {
+        this.download('/family/zYearInfo/export1/' + Ids, {}, `zYearInfo${new Date().getTime()}.xlsx`)
+      }
+    },
+    /** 瀵煎叆妯℃澘涓嬭浇鎿嶄綔*/
+    handleExportTemplate()
     {
-      Message({ message: "瀵煎叆澶辫触", type: 'error' })
-    }
+      this.download('/zYearInfo/model', {
 
+      }, `zYearInfo${new Date().getTime()}.xlsx`)
+    },
+    /** 瀵煎叆鎿嶄綔*/
+    handleEnport(params) {
+      var file = params.file;
+      var formData = new FormData();
+      formData.append('excelImport', file);
+      let _this = this
+      alert(file)
+      enload(formData).then(response => {
+        _this.getList();
+        Message({message: "瀵煎叆鎴愬姛", type: 'warning'})
+
+      }).catch(err)
+      {
+        Message({message: "瀵煎叆澶辫触", type: 'error'})
+      }
+
+    }
   }
 
 };
diff --git a/ruoyi-ui/src/views/healthy/healthyInfo.vue b/ruoyi-ui/src/views/healthy/healthyInfo.vue
index f83ddb5..847e028 100644
--- a/ruoyi-ui/src/views/healthy/healthyInfo.vue
+++ b/ruoyi-ui/src/views/healthy/healthyInfo.vue
@@ -153,7 +153,7 @@
   </div>
 </template>
 <script>
-import {getHealthInfo,  uploadPic, download, updateSecret} from "@/api/healthy/index";
+import {getHealthInfo, uploadPic, download, updateHealth} from "@/api/healthy/index";
 import {addRole, updateRole} from "@/api/system/role";
 import {blobValidate} from "@/utils/ruoyi";
 import errorCode from "@/utils/errorCode";
@@ -330,7 +330,7 @@
 
         if (valid) {
           if (this.formData.id != undefined) {
-            updateSecret(this.formData).then(response => {
+            updateHealth(this.formData).then(response => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
               // this.open = false;
               this.btn=false
@@ -425,13 +425,6 @@
       })
 
     },
-
-    /** 瀵煎嚭鎸夐挳鎿嶄綔 */
-    handleExport() {
-      this.download('/zYearInfo/export', {
-        ...this.queryParams
-      }, `zYearInfo${new Date().getTime()}.xlsx`)
-    }
 
   }
 }
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index ec963a3..81be780 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -592,13 +592,73 @@
       </div>
     </el-container>
 
+    <div>
+      <el-tabs type="border-card" v-model="activeName"
+               v-loading="loading" :data="HealthNoteList" >
+        <el-button size='mini' type="text" class="btn_edit" @click="saveData" style='top: 0px;right: 20px;'>
+          <sapn v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></sapn>
+          <span >{{ editMode ? '淇濆瓨' : '淇敼' }}</span>
+        </el-button>
+        <el-tab-pane label="鐢熸椿涔犳儻" name="lifeHabits" >
+          <template v-if="editMode">
+            <div style="padding-top: 10px">
+            <el-input  v-model="HealthNoteList.lifeHabits"  ></el-input>
+            </div>
+          </template>
+          <template v-else>
+            {{ HealthNoteList.lifeHabits }}
+          </template>
+        </el-tab-pane>
+        <el-tab-pane label="浠ュ線鐥呭彶" name="historyDisease">
+          {{HealthNoteList.historyDisease}}}
+        </el-tab-pane>
+        <el-tab-pane label="娌荤枟淇℃伅" name="treatmentInfo">
+          <!-- 娌荤枟淇℃伅鐨勫唴瀹� -->
+          {{HealthNoteList.treatmentInfo}}}
+        </el-tab-pane>
+        <el-tab-pane label="瀹舵棌鐥呭彶" name="familyDisease">
+          <!-- 瀹舵棌鐥呭彶鐨勫唴瀹� -->
+          {{HealthNoteList.familyDisease}}}
+        </el-tab-pane>
+        <el-tab-pane label="鐜扮梾鍙�" name="nowDisease">
+          <!-- 鐩墠鐥呮儏鐨勫唴瀹� -->
+          {{HealthNoteList.nowDisease}}}
+        </el-tab-pane>
+        <el-tab-pane label="鐤剧梾鍙戠敓" name="diseaseHappen">
+          <!-- 鐤剧梾鍙戠敓鐨勫唴瀹� -->
+          {{HealthNoteList.diseaseHappen}}}
+        </el-tab-pane>
+        <el-tab-pane label="鐤剧梾鍙戝睍" name="diseaseDevelop">
+          <!-- 鐤剧梾鍙戝睍鐨勫唴瀹� -->
+          {{HealthNoteList.diseaseDevelop}}}
+        </el-tab-pane>
+        <el-tab-pane label="鐤剧梾娌荤枟" name="diseaseTreat">
+          <!-- 鐤剧梾娌荤枟鐨勫唴瀹� -->
+          {{HealthNoteList.diseaseTreat}}}
+        </el-tab-pane>
+        <el-tab-pane label="鐤剧梾澶嶅彂" name="diseaseBack">
+          <!-- 鐤剧梾澶嶅彂鐨勫唴瀹� -->
+          {{HealthNoteList.diseaseBack}}}
+        </el-tab-pane>
+      </el-tabs>
+    </div>
   </div>
 </template>
 
 <script>
 import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-import {getCategory,listHealthBase,updateHealthBase,listHealthHabit,updateHealthHabit,listHealthHuli,updateHealthHuli,listHealthNow,updateHealthNow} from "@/api/healthy/index";
+import {
+  listHealthNote,
+  updateHealthNote,listHealthBase,
+  updateHealthBase,
+  listHealthHabit,
+  updateHealthHabit,
+  listHealthHuli,
+  updateHealthHuli,
+  listHealthNow,
+  updateHealthNow,
+} from "@/api/healthy/index";
 
 import { blobValidate } from '../../utils/ruoyi'
 
@@ -609,6 +669,8 @@
     return {
       dictionary: {},
       // 閬僵灞�
+      editMode: false, // 鏄惁澶勪簬缂栬緫妯″紡
+      activeName: 'lifeHabits',
       disabled: false,
       isEditing:false,
       inds: undefined,
@@ -844,6 +906,17 @@
 
         },
       },
+      HealthNoteList:{
+        lifeHabits:undefined,
+        historyDisease:undefined,
+        treatmentInfo:undefined,
+        familyDisease:undefined,
+        nowDisease:undefined,
+        diseaseHappen:undefined,
+        diseaseDevelop:undefined,
+        diseaseTreat:undefined,
+        diseaseBack:undefined
+      },
       fit:['fill'],
       //涓嬫媺瀹炵幇
       activeNames:['1'],
@@ -852,6 +925,7 @@
       // 鏄惁鏄剧ず寮瑰嚭灞�
       open: false,
       // open:true,
+      code:undefined,
       // 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
       bear:undefined,
       mrs:undefined,
@@ -887,11 +961,7 @@
       deptOptions: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        pageNum: 1,
-        pageSize: 5,
-        startDate:undefined,
-        content:undefined,
-        witness:undefined,
+
       },
       // 琛ㄥ崟鍙傛暟
       form: {},
@@ -910,16 +980,19 @@
   created() {
     this.getList()
 
-
-
-
-
   },
-  mounted() {
-    this.originalBloodType = this.HealthyBaseList.bloodClass;// 鍦ㄧ粍浠舵寕杞芥椂淇濆瓨鍘熷琛�鍨嬬姸鎬�
-  },
+
   methods: {
+    saveData() {
+      // 灏嗘暟鎹彂閫佺粰鍚庣
+      const data = {
+        lifeHabits: this.HealthNoteList.lifeHabits,
+        historyDisease: this.HealthNoteList.historyDisease,
+        // 鍏朵粬瀛楁鐪佺暐锛岃琛ュ厖瀹屾暣
+      };
 
+
+    },
     //琛�鍨嬩慨鏀�
     handlebloodChange() {
       if (this.selectedBloodType === '') {
@@ -1193,9 +1266,9 @@
       //涓汉淇℃伅
       listHealthBase(this.queryParams).then(response => {
         if (response.data.length === 0) {
-
-          this.HealthyBaseList = {};
           this.loading = false;
+          this.HealthyBaseList = {};
+
 
         } else {
           this.HealthyBaseList = response.data;
@@ -1232,11 +1305,298 @@
             this.selectedgeneticDiseaseType = 'diabetes';
           } else if (this.HealthyBaseList.geneticDiseaseClass.tumor === 1) {
             this.selectedgeneticDiseaseType = 'tumor';
-          }else if (this.HealthyBaseList.geneticDiseaseClass.other === 1) {
+          } else if (this.HealthyBaseList.geneticDiseaseClass.other === 1) {
             this.selectedgeneticDiseaseType = 'other';
           }
-          this.loading = false;
+          //鐢熸椿涔犳儻
+          listHealthHabit(this.queryParams).then(response => {
+              if (response.data.length === 0) {
+                this.loading = false;
+                this.LiveHabbitList = {};
 
+              } else {
+                this.LiveHabbitList = response.data;
+                console.log(this.LiveHabbitList.sleepClass)
+
+                //鐫$湢鐨�
+                if (this.LiveHabbitList.sleepClass.good === 1) {
+                  this.selectedsleepType = 'good';
+                } else if (this.LiveHabbitList.sleepClass.general === 1) {
+                  this.selectedsleepType = 'general';
+                } else if (this.LiveHabbitList.sleepClass.easyWake === 1) {
+                  this.selectedsleepType = 'easyWake';
+                } else if (this.LiveHabbitList.sleepClass.dreaminess === 1) {
+                  this.selectedsleepType = 'dreaminess';
+                } else if (this.LiveHabbitList.sleepClass.sleepless === 1) {
+                  this.selectedsleepType = 'sleepless';
+                } else if (this.LiveHabbitList.sleepClass.snore === 1) {
+                  this.selectedsleepType = 'snore';
+                } else if (this.LiveHabbitList.sleepClass.wakefulness === 1) {
+                  this.selectedsleepType = 'wakefulness';
+                }
+                //澶т究
+                if (this.LiveHabbitList.stoolStatusClass.normal === 1) {
+                  this.selectedstoolStatusType = 'normal';
+                } else if (this.LiveHabbitList.stoolStatusClass.constipation === 1) {
+                  this.selectedstoolStatusType = 'constipation';
+                } else if (this.LiveHabbitList.stoolStatusClass.diarrhea === 1) {
+                  this.selectedstoolStatusType = 'diarrhea';
+                } else if (this.LiveHabbitList.stoolStatusClass.incontinence === 1) {
+                  this.selectedstoolStatusType = 'incontinence';
+                }
+                //灏忎究
+                if (this.LiveHabbitList.urineStatusClass.normal === 1) {
+                  this.selectedurineStatusType = 'normal';
+                } else if (this.LiveHabbitList.urineStatusClass.nightUrinaryRetention === 1) {
+                  this.selectedurineStatusType = 'nightUrinaryRetention';
+                } else if (this.LiveHabbitList.urineStatusClass.incontinence === 1) {
+                  this.selectedurineStatusType = 'incontinence';
+                } else if (this.LiveHabbitList.urineStatusClass.enuresis === 1) {
+                  this.selectedurineStatusType = 'enuresis';
+                }
+                //楗涔犳儻
+                if (this.LiveHabbitList.eatingHabitsClass.uniformityOfMeatAndVegetables === 1) {
+                  this.selectedeatingHabitsType = 'uniformityOfMeatAndVegetables';
+                } else if (this.LiveHabbitList.eatingHabitsClass.meat === 1) {
+                  this.selectedeatingHabitsType = 'meat';
+                } else if (this.LiveHabbitList.eatingHabitsClass.vegetable === 1) {
+                  this.selectedeatingHabitsType = 'vegetable';
+                } else if (this.LiveHabbitList.eatingHabitsClass.salt === 1) {
+                  this.selectedeatingHabitsType = 'salt';
+                } else if (this.LiveHabbitList.eatingHabitsClass.oil === 1) {
+                  this.selectedeatingHabitsType = 'oil';
+                } else if (this.LiveHabbitList.eatingHabitsClass.sugar === 1) {
+                  this.selectedeatingHabitsType = 'sugar';
+                } else if (this.LiveHabbitList.eatingHabitsClass.other === 1) {
+                  this.selectedeatingHabitsType = 'other';
+                }
+
+                //鐢熸椿浜嬩欢
+
+                if (this.LiveHabbitList.lifeEventClass.bereave === 1) {
+                  this.selectedlifeEventType = 'bereave';
+                } else if (this.LiveHabbitList.lifeEventClass.liveAlone === 1) {
+                  this.selectedlifeEventType = 'liveAlone';
+                } else if (this.LiveHabbitList.lifeEventClass.inHospital === 1) {
+                  this.selectedlifeEventType = 'inHospital';
+                } else if (this.LiveHabbitList.lifeEventClass.divide === 1) {
+                  this.selectedlifeEventType = 'divide';
+                } else if (this.LiveHabbitList.lifeEventClass.other === 1) {
+                  this.selectedlifeEventType = 'other';
+                }
+                //鎶ょ悊鏌ヤ綋
+                listHealthHuli(this.queryParams).then(response => {
+                    if (response.data.length === 0) {
+                      this.loading = false;
+                      this.HealthHuliList = {};
+
+                    } else {
+                      this.HealthHuliList = response.data;
+
+                      //鐨偆绮樿啘
+
+                      if (this.HealthHuliList.skinTypeClass.acne === 1) {
+                        this.selectedskinType = 'acne';
+                      } else if (this.HealthHuliList.skinTypeClass.psoriasis === 1) {
+                        this.selectedskinType = 'psoriasis';
+                      } else if (this.HealthHuliList.skinTypeClass.color === 1) {
+                        this.selectedskinType = 'color';
+                      } else if (this.HealthHuliList.skinTypeClass.edema === 1) {
+                        this.selectedskinType = 'edema';
+                      } else if (this.HealthHuliList.skinTypeClass.rash === 1) {
+                        this.selectedskinType = 'rash';
+                      } else if (this.HealthHuliList.skinTypeClass.bloodStasis === 1) {
+                        this.selectedskinType = 'bloodStasis';
+                      } else if (this.HealthHuliList.skinTypeClass.snom === 1) {
+                        this.selectedskinType = 'snom';
+                      } else if (this.HealthHuliList.skinTypeClass.nevus === 1) {
+                        this.selectedskinType = 'nevus';
+                      } else if (this.HealthHuliList.skinTypeClass.ulcer === 1) {
+                        this.selectedskinType = 'ulcer';
+                      } else if (this.HealthHuliList.skinTypeClass.other === 1) {
+                        this.selectedskinType = 'other';
+                      }
+                      //蹇冮噷鐘舵��
+                      if (this.HealthHuliList.psychologyTypeClass.optimistic === 1) {
+                        this.selectedpsychologyType = 'optimistic';
+                      } else if (this.HealthHuliList.psychologyTypeClass.worry === 1) {
+                        this.selectedpsychologyType = 'worry';
+                      } else if (this.HealthHuliList.psychologyTypeClass.fear === 1) {
+                        this.selectedpsychologyType = 'fear';
+                      } else if (this.HealthHuliList.psychologyTypeClass.suspicion === 1) {
+                        this.selectedpsychologyType = 'suspicion';
+                      } else if (this.HealthHuliList.psychologyTypeClass.miss === 1) {
+                        this.selectedpsychologyType = 'miss';
+                      } else if (this.HealthHuliList.psychologyTypeClass.constrain === 1) {
+                        this.selectedpsychologyType = 'constrain';
+                      } else if (this.HealthHuliList.psychologyTypeClass.other === 1) {
+                        this.selectedpsychologyType = 'other';
+                      }
+
+                      //鐥呬緥鎬佸害
+                      if (this.HealthHuliList.attitudeClass.lucidity === 1) {
+                        this.selectedpattitudeType = 'lucidity';
+                      } else if (this.HealthHuliList.attitudeClass.unknown === 1) {
+                        this.selectedpattitudeType = 'unknown';
+                      } else if (this.HealthHuliList.attitudeClass.normal === 1) {
+                        this.selectedpattitudeType = 'normal';
+                      } else if (this.HealthHuliList.attitudeClass.abnormal === 1) {
+                        this.selectedpattitudeType = 'abnormal';
+                      } else if (this.HealthHuliList.attitudeClass.other === 1) {
+                        this.selectedpattitudeType = 'other';
+                      }
+
+                      //鍏ㄨ韩钀ュ吇
+                      if (this.HealthHuliList.nutritionClass.good === 1) {
+                        this.selectednutritionType = 'good';
+                      } else if (this.HealthHuliList.nutritionClass.medium === 1) {
+                        this.selectednutritionType = 'medium';
+                      } else if (this.HealthHuliList.nutritionClass.poor === 1) {
+                        this.selectednutritionType = 'poor';
+                      } else if (this.HealthHuliList.nutritionClass.obesity === 1) {
+                        this.selectednutritionType = 'obesity';
+                      } else if (this.HealthHuliList.nutritionClass.thin === 1) {
+                        this.selectednutritionType = 'thin';
+                      } else if (this.HealthHuliList.nutritionClass.fluid === 1) {
+                        this.selectednutritionType = 'fluid';
+                      } else if (this.HealthHuliList.nutritionClass.other === 1) {
+                        this.selectednutritionType = 'other';
+                      }
+                      listHealthNow(this.queryParams).then(response => {
+
+                          if (response.data.length === 0) {
+                            this.loading = false;
+                            this.HealthNowList = {};
+
+                          } else {
+                            this.HealthNowList = response.data;
+                            //鑴戣绠�
+                            if (this.HealthNowList.brainDiseaseClass.ischemicStroke === 1) {
+                              this.selectedbrainDiseaseType = 'ischemicStroke';
+                            } else if (this.HealthNowList.brainDiseaseClass.cerebralHemorrhage === 1) {
+                              this.selectedbrainDiseaseType = 'cerebralHemorrhage';
+                            } else if (this.HealthNowList.brainDiseaseClass.subarachnoidHemorrhage === 1) {
+                              this.selectedbrainDiseaseType = 'subarachnoidHemorrhage';
+                            } else if (this.HealthNowList.brainDiseaseClass.TIA === 1) {
+                              this.selectedbrainDiseaseType = 'TIA';
+                            } else if (this.HealthNowList.brainDiseaseClass.other === 1) {
+                              this.selectedbrainDiseaseType = 'other';
+                            }
+                            //蹇冭剰鐤剧梾
+                            if (this.HealthNowList.heartDiseaseClass.myocardialInfarct === 1) {
+                              this.selectedheartDiseaseType = 'myocardialInfarct';
+                            } else if (this.HealthNowList.heartDiseaseClass.anginaPectoris === 1) {
+                              this.selectedheartDiseaseType = 'anginaPectoris';
+                            } else if (this.HealthNowList.heartDiseaseClass.coronaryRevascularization === 1) {
+                              this.selectedheartDiseaseType = 'coronaryRevascularization';
+                            } else if (this.HealthNowList.heartDiseaseClass.congestiveHeartFailure === 1) {
+                              this.selectedheartDiseaseType = 'congestiveHeartFailure';
+                            } else if (this.HealthNowList.heartDiseaseClass.precordialPain === 1) {
+                              this.selectedheartDiseaseType = 'precordialPain';
+                            } else if (this.HealthNowList.heartDiseaseClass.other === 1) {
+                              this.selectedheartDiseaseType = 'other';
+                            }
+                            //琛�绠$柧鐥�
+                            if (this.HealthNowList.vascularDiseaseClass.dissectingAneurysm === 1) {
+                              this.selectedvascularDiseaseType = 'dissectingAneurysm';
+                            } else if (this.HealthNowList.vascularDiseaseClass.arterialOcclusiveDiseases === 1) {
+                              this.selectedvascularDiseaseType = 'arterialOcclusiveDiseases';
+                            } else if (this.HealthNowList.vascularDiseaseClass.other === 1) {
+                              this.selectedvascularDiseaseType = 'other';
+                            }
+                            //娑堝寲绯荤粺鐤剧梾
+                            if (this.HealthNowList.digestiveSystemDiseaseClass.gastroduodenalUlcer === 1) {
+                              this.selecteddigestiveSystemDiseaseType = 'gastroduodenalUlcer';
+                            } else if (this.HealthNowList.digestiveSystemDiseaseClass.esophagitis === 1) {
+                              this.selecteddigestiveSystemDiseaseType = 'esophagitis';
+                            } else if (this.HealthNowList.digestiveSystemDiseaseClass.gastritis === 1) {
+                              this.selecteddigestiveSystemDiseaseType = 'gastritis';
+                            } else if (this.HealthNowList.digestiveSystemDiseaseClass.colitis === 1) {
+                              this.selecteddigestiveSystemDiseaseType = 'colitis';
+                            } else if (this.HealthNowList.digestiveSystemDiseaseClass.hepatitis === 1) {
+                              this.selecteddigestiveSystemDiseaseType = 'hepatitis';
+                            } else if (this.HealthNowList.digestiveSystemDiseaseClass.cholecystitis === 1) {
+                              this.selecteddigestiveSystemDiseaseType = 'cholecystitis';
+                            } else if (this.HealthNowList.digestiveSystemDiseaseClass.cholelithiasis === 1) {
+                              this.selecteddigestiveSystemDiseaseType = 'cholelithiasis';
+                            } else if (this.HealthNowList.digestiveSystemDiseaseClass.fattyLiver === 1) {
+                              this.selecteddigestiveSystemDiseaseType = 'fattyLiver';
+                            } else if (this.HealthNowList.digestiveSystemDiseaseClass.hyperlipidemia === 1) {
+                              this.selecteddigestiveSystemDiseaseType = 'hyperlipidemia';
+                            } else if (this.HealthNowList.digestiveSystemDiseaseClass.haemorrhoids === 1) {
+                              this.selecteddigestiveSystemDiseaseType = 'haemorrhoids';
+                            } else if (this.HealthNowList.digestiveSystemDiseaseClass.other === 1) {
+                              this.selecteddigestiveSystemDiseaseType = 'other';
+                            }
+                            //鍛煎惛绯荤粺鐤剧梾
+                            if (this.HealthNowList.respiratorySystemDiseaseClass.COPD === 1) {
+                              this.selectedrespiratorySystemDiseaseType = 'COPD';
+                            } else if (this.HealthNowList.respiratorySystemDiseaseClass.pneumonia === 1) {
+                              this.selectedrespiratorySystemDiseaseType = 'pneumonia';
+                            } else if (this.HealthNowList.respiratorySystemDiseaseClass.bronchitis === 1) {
+                              this.selectedrespiratorySystemDiseaseType = 'bronchitis';
+                            } else if (this.HealthNowList.respiratorySystemDiseaseClass.bronchialAsthma === 1) {
+                              this.selectedrespiratorySystemDiseaseType = 'bronchialAsthma';
+                            } else if (this.HealthNowList.respiratorySystemDiseaseClass.pulmonaryTuberculosis === 1) {
+                              this.selectedrespiratorySystemDiseaseType = 'pulmonaryTuberculosis';
+                            } else if (this.HealthNowList.respiratorySystemDiseaseClass.other === 1) {
+                              this.selectedrespiratorySystemDiseaseType = 'other';
+                            } else if (this.HealthNowList.respiratorySystemDiseaseClass.upperRespiratoryTractInfection === 1) {
+                              this.selectedrespiratorySystemDiseaseType = 'upperRespiratoryTractInfection';
+                            }
+                            //鑲捐剰鐤剧梾
+                            if (this.HealthNowList.kidneyDiseaseClass.diabetes === 1) {
+                              this.selectedkidneyDiseaseDiseaseType = 'diabetes';
+                            } else if (this.HealthNowList.kidneyDiseaseClass.renalFailure === 1) {
+                              this.selectedkidneyDiseaseDiseaseType = 'renalFailure';
+                            } else if (this.HealthNowList.kidneyDiseaseClass.acuteNephritis === 1) {
+                              this.selectedkidneyDiseaseDiseaseType = 'acuteNephritis';
+                            } else if (this.HealthNowList.kidneyDiseaseClass.chronicNephritis === 1) {
+                              this.selectedkidneyDiseaseDiseaseType = 'chronicNephritis';
+                            } else if (this.HealthNowList.kidneyDiseaseClass.urinaryCalculus === 1) {
+                              this.selectedkidneyDiseaseDiseaseType = 'urinaryCalculus';
+                            } else if (this.HealthNowList.kidneyDiseaseClass.urinaryTractInfection === 1) {
+                              this.selectedkidneyDiseaseDiseaseType = 'urinaryTractInfection';
+                            } else if (this.HealthNowList.kidneyDiseaseClass.other === 1) {
+                              this.selectedkidneyDiseaseDiseaseType = 'other';
+                            }
+                            //鍏朵粬鐤剧梾
+                            if (this.HealthNowList.otherDiseaseClass.pregnant === 1) {
+                              this.selectedotherDiseaseType = 'pregnant';
+                            } else if (this.HealthNowList.otherDiseaseClass.cold === 1) {
+                              this.selectedotherDiseaseType = 'cold';
+                            } else if (this.HealthNowList.otherDiseaseClass.infectious === 1) {
+                              this.selectedotherDiseaseType = 'infectious';
+                            } else if (this.HealthNowList.otherDiseaseClass.pulmonaryBulla === 1) {
+                              this.selectedotherDiseaseType = 'pulmonaryBulla';
+                            } else if (this.HealthNowList.otherDiseaseClass.hemoptysis === 1) {
+                              this.selectedotherDiseaseType = 'hemoptysis';
+                            } else if (this.HealthNowList.otherDiseaseClass.activeBleeding === 1) {
+                              this.selectedotherDiseaseType = 'activeBleeding';
+                            } else if (this.HealthNowList.otherDiseaseClass.other === 1) {
+                              this.selectedotherDiseaseType = 'other';
+                            }
+
+
+                            this.loading = false;
+                          }
+                        }
+                      );
+
+
+                      this.loading = false;
+
+
+                    }
+
+                  }
+                );
+                this.loading = false;
+              }
+
+            }
+          );
+          this.loading = false;
 
 
         }
@@ -1245,298 +1605,315 @@
           console.error(error);
         });
       //鐢熸椿涔犳儻
-      listHealthHabit(this.queryParams).then(response => {
-          if(response.data.length == 0){
-
-            this.LiveHabbitList={ };
-            this.loading = false;
-          }
-          else{
-            this.LiveHabbitList = response.data;
-            console.log(this.LiveHabbitList.sleepClass)
-
-            //鐫$湢鐨�
-            if (this.LiveHabbitList.sleepClass.good === 1) {
-              this.selectedsleepType = 'good';
-            } else if (this.LiveHabbitList.sleepClass.general === 1) {
-              this.selectedsleepType = 'general';
-            } else if (this.LiveHabbitList.sleepClass.easyWake === 1) {
-              this.selectedsleepType = 'easyWake';
-            } else if (this.LiveHabbitList.sleepClass.dreaminess === 1) {
-              this.selectedsleepType = 'dreaminess';
-            } else if (this.LiveHabbitList.sleepClass.sleepless === 1) {
-              this.selectedsleepType = 'sleepless';
-            } else if (this.LiveHabbitList.sleepClass.snore === 1) {
-              this.selectedsleepType = 'snore';
-            } else if (this.LiveHabbitList.sleepClass.wakefulness === 1) {
-              this.selectedsleepType = 'wakefulness';
-            }
-            //澶т究
-            if (this.LiveHabbitList.stoolStatusClass.normal === 1) {
-              this.selectedstoolStatusType = 'normal';
-            } else if (this.LiveHabbitList.stoolStatusClass.constipation === 1) {
-              this.selectedstoolStatusType = 'constipation';
-            } else if (this.LiveHabbitList.stoolStatusClass.diarrhea === 1) {
-              this.selectedstoolStatusType = 'diarrhea';
-            } else if (this.LiveHabbitList.stoolStatusClass.incontinence === 1) {
-              this.selectedstoolStatusType = 'incontinence';
-            }
-            //灏忎究
-            if (this.LiveHabbitList.urineStatusClass.normal === 1) {
-              this.selectedurineStatusType = 'normal';
-            } else if (this.LiveHabbitList.urineStatusClass.nightUrinaryRetention === 1) {
-              this.selectedurineStatusType = 'nightUrinaryRetention';
-            } else if (this.LiveHabbitList.urineStatusClass.incontinence === 1) {
-              this.selectedurineStatusType = 'incontinence';
-            } else if (this.LiveHabbitList.urineStatusClass.enuresis === 1) {
-              this.selectedurineStatusType = 'enuresis';
-            }
-            //楗涔犳儻
-            if (this.LiveHabbitList.eatingHabitsClass.uniformityOfMeatAndVegetables === 1) {
-              this.selectedeatingHabitsType = 'uniformityOfMeatAndVegetables';
-            } else if (this.LiveHabbitList.eatingHabitsClass.meat === 1) {
-              this.selectedeatingHabitsType = 'meat';
-            } else if (this.LiveHabbitList.eatingHabitsClass.vegetable === 1) {
-              this.selectedeatingHabitsType = 'vegetable';
-            } else if (this.LiveHabbitList.eatingHabitsClass.salt === 1) {
-              this.selectedeatingHabitsType = 'salt';
-            }else if (this.LiveHabbitList.eatingHabitsClass.oil === 1) {
-              this.selectedeatingHabitsType = 'oil';
-            } else if (this.LiveHabbitList.eatingHabitsClass.sugar === 1) {
-              this.selectedeatingHabitsType = 'sugar';
-            } else if (this.LiveHabbitList.eatingHabitsClass.other === 1) {
-              this.selectedeatingHabitsType = 'other';
-            }
-
-            //鐢熸椿浜嬩欢
-
-            if (this.LiveHabbitList.lifeEventClass.bereave === 1) {
-              this.selectedlifeEventType = 'bereave';
-            } else if (this.LiveHabbitList.lifeEventClass.liveAlone === 1) {
-              this.selectedlifeEventType = 'liveAlone';
-            } else if (this.LiveHabbitList.lifeEventClass.inHospital === 1) {
-              this.selectedlifeEventType = 'inHospital';
-            } else if (this.LiveHabbitList.lifeEventClass.divide === 1) {
-              this.selectedlifeEventType = 'divide';
-            }else if (this.LiveHabbitList.lifeEventClass.other === 1) {
-              this.selectedlifeEventType = 'other';
-            }
-            this.loading = false;
-          }
-
-        }
-      );
+      // listHealthHabit(this.queryParams).then(response => {
+      //     if(response.data.length === 0){
+      //       this.loading = false;
+      //       this.LiveHabbitList={ };
+      //
+      //     }
+      //     else{
+      //       this.LiveHabbitList = response.data;
+      //       console.log(this.LiveHabbitList.sleepClass)
+      //
+      //       //鐫$湢鐨�
+      //       if (this.LiveHabbitList.sleepClass.good === 1) {
+      //         this.selectedsleepType = 'good';
+      //       } else if (this.LiveHabbitList.sleepClass.general === 1) {
+      //         this.selectedsleepType = 'general';
+      //       } else if (this.LiveHabbitList.sleepClass.easyWake === 1) {
+      //         this.selectedsleepType = 'easyWake';
+      //       } else if (this.LiveHabbitList.sleepClass.dreaminess === 1) {
+      //         this.selectedsleepType = 'dreaminess';
+      //       } else if (this.LiveHabbitList.sleepClass.sleepless === 1) {
+      //         this.selectedsleepType = 'sleepless';
+      //       } else if (this.LiveHabbitList.sleepClass.snore === 1) {
+      //         this.selectedsleepType = 'snore';
+      //       } else if (this.LiveHabbitList.sleepClass.wakefulness === 1) {
+      //         this.selectedsleepType = 'wakefulness';
+      //       }
+      //       //澶т究
+      //       if (this.LiveHabbitList.stoolStatusClass.normal === 1) {
+      //         this.selectedstoolStatusType = 'normal';
+      //       } else if (this.LiveHabbitList.stoolStatusClass.constipation === 1) {
+      //         this.selectedstoolStatusType = 'constipation';
+      //       } else if (this.LiveHabbitList.stoolStatusClass.diarrhea === 1) {
+      //         this.selectedstoolStatusType = 'diarrhea';
+      //       } else if (this.LiveHabbitList.stoolStatusClass.incontinence === 1) {
+      //         this.selectedstoolStatusType = 'incontinence';
+      //       }
+      //       //灏忎究
+      //       if (this.LiveHabbitList.urineStatusClass.normal === 1) {
+      //         this.selectedurineStatusType = 'normal';
+      //       } else if (this.LiveHabbitList.urineStatusClass.nightUrinaryRetention === 1) {
+      //         this.selectedurineStatusType = 'nightUrinaryRetention';
+      //       } else if (this.LiveHabbitList.urineStatusClass.incontinence === 1) {
+      //         this.selectedurineStatusType = 'incontinence';
+      //       } else if (this.LiveHabbitList.urineStatusClass.enuresis === 1) {
+      //         this.selectedurineStatusType = 'enuresis';
+      //       }
+      //       //楗涔犳儻
+      //       if (this.LiveHabbitList.eatingHabitsClass.uniformityOfMeatAndVegetables === 1) {
+      //         this.selectedeatingHabitsType = 'uniformityOfMeatAndVegetables';
+      //       } else if (this.LiveHabbitList.eatingHabitsClass.meat === 1) {
+      //         this.selectedeatingHabitsType = 'meat';
+      //       } else if (this.LiveHabbitList.eatingHabitsClass.vegetable === 1) {
+      //         this.selectedeatingHabitsType = 'vegetable';
+      //       } else if (this.LiveHabbitList.eatingHabitsClass.salt === 1) {
+      //         this.selectedeatingHabitsType = 'salt';
+      //       }else if (this.LiveHabbitList.eatingHabitsClass.oil === 1) {
+      //         this.selectedeatingHabitsType = 'oil';
+      //       } else if (this.LiveHabbitList.eatingHabitsClass.sugar === 1) {
+      //         this.selectedeatingHabitsType = 'sugar';
+      //       } else if (this.LiveHabbitList.eatingHabitsClass.other === 1) {
+      //         this.selectedeatingHabitsType = 'other';
+      //       }
+      //
+      //       //鐢熸椿浜嬩欢
+      //
+      //       if (this.LiveHabbitList.lifeEventClass.bereave === 1) {
+      //         this.selectedlifeEventType = 'bereave';
+      //       } else if (this.LiveHabbitList.lifeEventClass.liveAlone === 1) {
+      //         this.selectedlifeEventType = 'liveAlone';
+      //       } else if (this.LiveHabbitList.lifeEventClass.inHospital === 1) {
+      //         this.selectedlifeEventType = 'inHospital';
+      //       } else if (this.LiveHabbitList.lifeEventClass.divide === 1) {
+      //         this.selectedlifeEventType = 'divide';
+      //       }else if (this.LiveHabbitList.lifeEventClass.other === 1) {
+      //         this.selectedlifeEventType = 'other';
+      //       }
+      //       this.loading = false;
+      //     }
+      //
+      //   }
+      // );
 
       //鎶ょ悊鏌ヤ綋
-      listHealthHuli(this.queryParams).then(response => {
-          if(response.data.length == 0){
-
-            this.HealthHuliList={};
-            this.loading = false;
-          }
-          else{
-            this.HealthHuliList = response.data;
-
-            //鐨偆绮樿啘
-
-            if (this.HealthHuliList.skinTypeClass.acne === 1) {
-              this.selectedskinType = 'acne';
-            } else if (this.HealthHuliList.skinTypeClass.psoriasis === 1) {
-              this.selectedskinType = 'psoriasis';
-            } else if (this.HealthHuliList.skinTypeClass.color === 1) {
-              this.selectedskinType = 'color';
-            } else if (this.HealthHuliList.skinTypeClass.edema === 1) {
-              this.selectedskinType = 'edema';
-            }else if (this.HealthHuliList.skinTypeClass.rash === 1) {
-              this.selectedskinType = 'rash';
-            }else if (this.HealthHuliList.skinTypeClass.bloodStasis === 1) {
-              this.selectedskinType = 'bloodStasis';
-            } else if (this.HealthHuliList.skinTypeClass.snom === 1) {
-              this.selectedskinType = 'snom';
-            }else if (this.HealthHuliList.skinTypeClass.nevus === 1) {
-              this.selectedskinType = 'nevus';
-            }else if (this.HealthHuliList.skinTypeClass.ulcer === 1) {
-              this.selectedskinType = 'ulcer';
-            }else if (this.HealthHuliList.skinTypeClass.other === 1) {
-              this.selectedskinType = 'other';
-            }
-            //蹇冮噷鐘舵��
-            if (this.HealthHuliList.psychologyTypeClass.optimistic === 1) {
-              this.selectedpsychologyType = 'optimistic';
-            } else if (this.HealthHuliList.psychologyTypeClass.worry === 1) {
-              this.selectedpsychologyType = 'worry';
-            } else if (this.HealthHuliList.psychologyTypeClass.fear === 1) {
-              this.selectedpsychologyType = 'fear';
-            } else if (this.HealthHuliList.psychologyTypeClass.suspicion === 1) {
-              this.selectedpsychologyType = 'suspicion';
-            }else if (this.HealthHuliList.psychologyTypeClass.miss === 1) {
-              this.selectedpsychologyType = 'miss';
-            }else if (this.HealthHuliList.psychologyTypeClass.constrain === 1) {
-              this.selectedpsychologyType = 'constrain';
-            } else if (this.HealthHuliList.psychologyTypeClass.other === 1) {
-              this.selectedpsychologyType = 'other';
-            }
-
-            //鐥呬緥鎬佸害
-            if (this.HealthHuliList.attitudeClass.lucidity === 1) {
-              this.selectedpattitudeType = 'lucidity';
-            } else if (this.HealthHuliList.attitudeClass.unknown === 1) {
-              this.selectedpattitudeType = 'unknown';
-            } else if (this.HealthHuliList.attitudeClass.normal === 1) {
-              this.selectedpattitudeType = 'normal';
-            } else if (this.HealthHuliList.attitudeClass.abnormal === 1) {
-              this.selectedpattitudeType = 'abnormal';
-            }else if (this.HealthHuliList.attitudeClass.other === 1) {
-              this.selectedpattitudeType = 'other';
-            }
-
-            //鍏ㄨ韩钀ュ吇
-            if (this.HealthHuliList.nutritionClass.good === 1) {
-              this.selectednutritionType = 'good';
-            } else if (this.HealthHuliList.nutritionClass.medium === 1) {
-              this.selectednutritionType = 'medium';
-            } else if (this.HealthHuliList.nutritionClass.poor === 1) {
-              this.selectednutritionType = 'poor';
-            } else if (this.HealthHuliList.nutritionClass.obesity === 1) {
-              this.selectednutritionType = 'obesity';
-            }else if (this.HealthHuliList.nutritionClass.thin === 1) {
-              this.selectednutritionType = 'thin';
-            } else if (this.HealthHuliList.nutritionClass.fluid === 1) {
-              this.selectednutritionType = 'fluid';
-            }else if (this.HealthHuliList.nutritionClass.other === 1) {
-              this.selectednutritionType = 'other';
-            }
-            this.loading = false;
-
-
-          }
-
-        }
-      );
+      // listHealthHuli(this.queryParams).then(response => {
+      //     if(response.data.length ===0){
+      //       this.loading = false;
+      //       this.HealthHuliList={};
+      //
+      //     }
+      //     else{
+      //       this.HealthHuliList = response.data;
+      //
+      //       //鐨偆绮樿啘
+      //
+      //       if (this.HealthHuliList.skinTypeClass.acne === 1) {
+      //         this.selectedskinType = 'acne';
+      //       } else if (this.HealthHuliList.skinTypeClass.psoriasis === 1) {
+      //         this.selectedskinType = 'psoriasis';
+      //       } else if (this.HealthHuliList.skinTypeClass.color === 1) {
+      //         this.selectedskinType = 'color';
+      //       } else if (this.HealthHuliList.skinTypeClass.edema === 1) {
+      //         this.selectedskinType = 'edema';
+      //       }else if (this.HealthHuliList.skinTypeClass.rash === 1) {
+      //         this.selectedskinType = 'rash';
+      //       }else if (this.HealthHuliList.skinTypeClass.bloodStasis === 1) {
+      //         this.selectedskinType = 'bloodStasis';
+      //       } else if (this.HealthHuliList.skinTypeClass.snom === 1) {
+      //         this.selectedskinType = 'snom';
+      //       }else if (this.HealthHuliList.skinTypeClass.nevus === 1) {
+      //         this.selectedskinType = 'nevus';
+      //       }else if (this.HealthHuliList.skinTypeClass.ulcer === 1) {
+      //         this.selectedskinType = 'ulcer';
+      //       }else if (this.HealthHuliList.skinTypeClass.other === 1) {
+      //         this.selectedskinType = 'other';
+      //       }
+      //       //蹇冮噷鐘舵��
+      //       if (this.HealthHuliList.psychologyTypeClass.optimistic === 1) {
+      //         this.selectedpsychologyType = 'optimistic';
+      //       } else if (this.HealthHuliList.psychologyTypeClass.worry === 1) {
+      //         this.selectedpsychologyType = 'worry';
+      //       } else if (this.HealthHuliList.psychologyTypeClass.fear === 1) {
+      //         this.selectedpsychologyType = 'fear';
+      //       } else if (this.HealthHuliList.psychologyTypeClass.suspicion === 1) {
+      //         this.selectedpsychologyType = 'suspicion';
+      //       }else if (this.HealthHuliList.psychologyTypeClass.miss === 1) {
+      //         this.selectedpsychologyType = 'miss';
+      //       }else if (this.HealthHuliList.psychologyTypeClass.constrain === 1) {
+      //         this.selectedpsychologyType = 'constrain';
+      //       } else if (this.HealthHuliList.psychologyTypeClass.other === 1) {
+      //         this.selectedpsychologyType = 'other';
+      //       }
+      //
+      //       //鐥呬緥鎬佸害
+      //       if (this.HealthHuliList.attitudeClass.lucidity === 1) {
+      //         this.selectedpattitudeType = 'lucidity';
+      //       } else if (this.HealthHuliList.attitudeClass.unknown === 1) {
+      //         this.selectedpattitudeType = 'unknown';
+      //       } else if (this.HealthHuliList.attitudeClass.normal === 1) {
+      //         this.selectedpattitudeType = 'normal';
+      //       } else if (this.HealthHuliList.attitudeClass.abnormal === 1) {
+      //         this.selectedpattitudeType = 'abnormal';
+      //       }else if (this.HealthHuliList.attitudeClass.other === 1) {
+      //         this.selectedpattitudeType = 'other';
+      //       }
+      //
+      //       //鍏ㄨ韩钀ュ吇
+      //       if (this.HealthHuliList.nutritionClass.good === 1) {
+      //         this.selectednutritionType = 'good';
+      //       } else if (this.HealthHuliList.nutritionClass.medium === 1) {
+      //         this.selectednutritionType = 'medium';
+      //       } else if (this.HealthHuliList.nutritionClass.poor === 1) {
+      //         this.selectednutritionType = 'poor';
+      //       } else if (this.HealthHuliList.nutritionClass.obesity === 1) {
+      //         this.selectednutritionType = 'obesity';
+      //       }else if (this.HealthHuliList.nutritionClass.thin === 1) {
+      //         this.selectednutritionType = 'thin';
+      //       } else if (this.HealthHuliList.nutritionClass.fluid === 1) {
+      //         this.selectednutritionType = 'fluid';
+      //       }else if (this.HealthHuliList.nutritionClass.other === 1) {
+      //         this.selectednutritionType = 'other';
+      //       }
+      //       this.loading = false;
+      //
+      //
+      //     }
+      //
+      //   }
+      // );
 
       //鐜板瓨鍋ュ悍闂
-      listHealthNow(this.queryParams).then(response => {
-          if(response.data.length == 0){
+      //
+      // listHealthNow(this.queryParams).then(response => {
+      //
+      //     if(response.data.length ===0){
+      //       this.loading = false;
+      //       this.HealthNowList={};
+      //
+      //     }
+      //     else{
+      //       this.HealthNowList = response.data;
+      //       //鑴戣绠�
+      //       if (this.HealthNowList.brainDiseaseClass.ischemicStroke === 1) {
+      //         this.selectedbrainDiseaseType = 'ischemicStroke';
+      //       } else if (this.HealthNowList.brainDiseaseClass.cerebralHemorrhage === 1) {
+      //         this.selectedbrainDiseaseType = 'cerebralHemorrhage';
+      //       } else if (this.HealthNowList.brainDiseaseClass.subarachnoidHemorrhage === 1) {
+      //         this.selectedbrainDiseaseType = 'subarachnoidHemorrhage';
+      //       } else if (this.HealthNowList.brainDiseaseClass.TIA === 1) {
+      //         this.selectedbrainDiseaseType = 'TIA';
+      //       }else if (this.HealthNowList.brainDiseaseClass.other === 1) {
+      //         this.selectedbrainDiseaseType = 'other';
+      //       }
+      //       //蹇冭剰鐤剧梾
+      //       if (this.HealthNowList.heartDiseaseClass.myocardialInfarct === 1) {
+      //         this.selectedheartDiseaseType = 'myocardialInfarct';
+      //       } else if (this.HealthNowList.heartDiseaseClass.anginaPectoris === 1) {
+      //         this.selectedheartDiseaseType = 'anginaPectoris';
+      //       } else if (this.HealthNowList.heartDiseaseClass.coronaryRevascularization === 1) {
+      //         this.selectedheartDiseaseType = 'coronaryRevascularization';
+      //       } else if (this.HealthNowList.heartDiseaseClass.congestiveHeartFailure === 1) {
+      //         this.selectedheartDiseaseType = 'congestiveHeartFailure';
+      //       }else if (this.HealthNowList.heartDiseaseClass.precordialPain === 1) {
+      //         this.selectedheartDiseaseType = 'precordialPain';
+      //       }else if (this.HealthNowList.heartDiseaseClass.other === 1) {
+      //         this.selectedheartDiseaseType = 'other';
+      //       }
+      //       //琛�绠$柧鐥�
+      //       if (this.HealthNowList.vascularDiseaseClass.dissectingAneurysm === 1) {
+      //         this.selectedvascularDiseaseType = 'dissectingAneurysm';
+      //       } else if (this.HealthNowList.vascularDiseaseClass.arterialOcclusiveDiseases === 1) {
+      //         this.selectedvascularDiseaseType = 'arterialOcclusiveDiseases';
+      //       } else if (this.HealthNowList.vascularDiseaseClass.other === 1) {
+      //         this.selectedvascularDiseaseType = 'other';
+      //       }
+      //       //娑堝寲绯荤粺鐤剧梾
+      //       if (this.HealthNowList.digestiveSystemDiseaseClass.gastroduodenalUlcer === 1) {
+      //         this.selecteddigestiveSystemDiseaseType = 'gastroduodenalUlcer';
+      //       } else if (this.HealthNowList.digestiveSystemDiseaseClass.esophagitis === 1) {
+      //         this.selecteddigestiveSystemDiseaseType = 'esophagitis';
+      //       } else if (this.HealthNowList.digestiveSystemDiseaseClass.gastritis === 1) {
+      //         this.selecteddigestiveSystemDiseaseType = 'gastritis';
+      //       } else if (this.HealthNowList.digestiveSystemDiseaseClass.colitis === 1) {
+      //         this.selecteddigestiveSystemDiseaseType = 'colitis';
+      //       }else if (this.HealthNowList.digestiveSystemDiseaseClass.hepatitis === 1) {
+      //         this.selecteddigestiveSystemDiseaseType = 'hepatitis';
+      //       }else if (this.HealthNowList.digestiveSystemDiseaseClass.cholecystitis === 1) {
+      //         this.selecteddigestiveSystemDiseaseType = 'cholecystitis';
+      //       }else if (this.HealthNowList.digestiveSystemDiseaseClass.cholelithiasis === 1) {
+      //         this.selecteddigestiveSystemDiseaseType = 'cholelithiasis';
+      //       } else if (this.HealthNowList.digestiveSystemDiseaseClass.fattyLiver === 1) {
+      //         this.selecteddigestiveSystemDiseaseType = 'fattyLiver';
+      //       } else if (this.HealthNowList.digestiveSystemDiseaseClass.hyperlipidemia === 1) {
+      //         this.selecteddigestiveSystemDiseaseType = 'hyperlipidemia';
+      //       }else if (this.HealthNowList.digestiveSystemDiseaseClass.haemorrhoids === 1) {
+      //         this.selecteddigestiveSystemDiseaseType = 'haemorrhoids';
+      //       }else if (this.HealthNowList.digestiveSystemDiseaseClass.other === 1) {
+      //         this.selecteddigestiveSystemDiseaseType = 'other';
+      //       }
+      //       //鍛煎惛绯荤粺鐤剧梾
+      //       if (this.HealthNowList.respiratorySystemDiseaseClass.COPD === 1) {
+      //         this.selectedrespiratorySystemDiseaseType = 'COPD';
+      //       } else if (this.HealthNowList.respiratorySystemDiseaseClass.pneumonia === 1) {
+      //         this.selectedrespiratorySystemDiseaseType = 'pneumonia';
+      //       } else if (this.HealthNowList.respiratorySystemDiseaseClass.bronchitis === 1) {
+      //         this.selectedrespiratorySystemDiseaseType = 'bronchitis';
+      //       } else if (this.HealthNowList.respiratorySystemDiseaseClass.bronchialAsthma === 1) {
+      //         this.selectedrespiratorySystemDiseaseType = 'bronchialAsthma';
+      //       }else if (this.HealthNowList.respiratorySystemDiseaseClass.pulmonaryTuberculosis === 1) {
+      //         this.selectedrespiratorySystemDiseaseType = 'pulmonaryTuberculosis';
+      //       }else if (this.HealthNowList.respiratorySystemDiseaseClass.other === 1) {
+      //         this.selectedrespiratorySystemDiseaseType = 'other';
+      //       }else if (this.HealthNowList.respiratorySystemDiseaseClass.upperRespiratoryTractInfection === 1) {
+      //         this.selectedrespiratorySystemDiseaseType = 'upperRespiratoryTractInfection';
+      //       }
+      //       //鑲捐剰鐤剧梾
+      //       if (this.HealthNowList.kidneyDiseaseClass.diabetes === 1) {
+      //         this.selectedkidneyDiseaseDiseaseType = 'diabetes';
+      //       } else if (this.HealthNowList.kidneyDiseaseClass.renalFailure === 1) {
+      //         this.selectedkidneyDiseaseDiseaseType = 'renalFailure';
+      //       } else if (this.HealthNowList.kidneyDiseaseClass.acuteNephritis === 1) {
+      //         this.selectedkidneyDiseaseDiseaseType = 'acuteNephritis';
+      //       } else if (this.HealthNowList.kidneyDiseaseClass.chronicNephritis === 1) {
+      //         this.selectedkidneyDiseaseDiseaseType = 'chronicNephritis';
+      //       }else if (this.HealthNowList.kidneyDiseaseClass.urinaryCalculus === 1) {
+      //         this.selectedkidneyDiseaseDiseaseType = 'urinaryCalculus';
+      //       }else if (this.HealthNowList.kidneyDiseaseClass.urinaryTractInfection === 1) {
+      //         this.selectedkidneyDiseaseDiseaseType = 'urinaryTractInfection';
+      //       }else if (this.HealthNowList.kidneyDiseaseClass.other === 1) {
+      //         this.selectedkidneyDiseaseDiseaseType = 'other';
+      //       }
+      //       //鍏朵粬鐤剧梾
+      //       if (this.HealthNowList.otherDiseaseClass.pregnant === 1) {
+      //         this.selectedotherDiseaseType = 'pregnant';
+      //       } else if (this.HealthNowList.otherDiseaseClass.cold === 1) {
+      //         this.selectedotherDiseaseType = 'cold';
+      //       } else if (this.HealthNowList.otherDiseaseClass.infectious === 1) {
+      //         this.selectedotherDiseaseType = 'infectious';
+      //       } else if (this.HealthNowList.otherDiseaseClass.pulmonaryBulla === 1) {
+      //         this.selectedotherDiseaseType = 'pulmonaryBulla';
+      //       }else if (this.HealthNowList.otherDiseaseClass.hemoptysis === 1) {
+      //         this.selectedotherDiseaseType = 'hemoptysis';
+      //       }else if (this.HealthNowList.otherDiseaseClass.activeBleeding === 1) {
+      //         this.selectedotherDiseaseType = 'activeBleeding';
+      //       }else if (this.HealthNowList.otherDiseaseClass.other === 1) {
+      //         this.selectedotherDiseaseType = 'other';
+      //       }
+      //
+      //       this.loading = false;
+      //
+      //     }
+      //
+      //   }
+      // );
 
-            this.HealthNowList={};
+      listHealthNote(this.queryParams).then(response => {
+
+          if (response.data.length === 0) {
             this.loading = false;
-          }
-          else{
-            this.HealthNowList = response.data;
-            //鑴戣绠�
-            if (this.HealthNowList.brainDiseaseClass.ischemicStroke === 1) {
-              this.selectedbrainDiseaseType = 'ischemicStroke';
-            } else if (this.HealthNowList.brainDiseaseClass.cerebralHemorrhage === 1) {
-              this.selectedbrainDiseaseType = 'cerebralHemorrhage';
-            } else if (this.HealthNowList.brainDiseaseClass.subarachnoidHemorrhage === 1) {
-              this.selectedbrainDiseaseType = 'subarachnoidHemorrhage';
-            } else if (this.HealthNowList.brainDiseaseClass.TIA === 1) {
-              this.selectedbrainDiseaseType = 'TIA';
-            }else if (this.HealthNowList.brainDiseaseClass.other === 1) {
-              this.selectedbrainDiseaseType = 'other';
-            }
-            //蹇冭剰鐤剧梾
-            if (this.HealthNowList.heartDiseaseClass.myocardialInfarct === 1) {
-              this.selectedheartDiseaseType = 'myocardialInfarct';
-            } else if (this.HealthNowList.heartDiseaseClass.anginaPectoris === 1) {
-              this.selectedheartDiseaseType = 'anginaPectoris';
-            } else if (this.HealthNowList.heartDiseaseClass.coronaryRevascularization === 1) {
-              this.selectedheartDiseaseType = 'coronaryRevascularization';
-            } else if (this.HealthNowList.heartDiseaseClass.congestiveHeartFailure === 1) {
-              this.selectedheartDiseaseType = 'congestiveHeartFailure';
-            }else if (this.HealthNowList.heartDiseaseClass.precordialPain === 1) {
-              this.selectedheartDiseaseType = 'precordialPain';
-            }else if (this.HealthNowList.heartDiseaseClass.other === 1) {
-              this.selectedheartDiseaseType = 'other';
-            }
-            //琛�绠$柧鐥�
-            if (this.HealthNowList.vascularDiseaseClass.dissectingAneurysm === 1) {
-              this.selectedvascularDiseaseType = 'dissectingAneurysm';
-            } else if (this.HealthNowList.vascularDiseaseClass.arterialOcclusiveDiseases === 1) {
-              this.selectedvascularDiseaseType = 'arterialOcclusiveDiseases';
-            } else if (this.HealthNowList.vascularDiseaseClass.other === 1) {
-              this.selectedvascularDiseaseType = 'other';
-            }
-            //娑堝寲绯荤粺鐤剧梾
-            if (this.HealthNowList.digestiveSystemDiseaseClass.gastroduodenalUlcer === 1) {
-              this.selecteddigestiveSystemDiseaseType = 'gastroduodenalUlcer';
-            } else if (this.HealthNowList.digestiveSystemDiseaseClass.esophagitis === 1) {
-              this.selecteddigestiveSystemDiseaseType = 'esophagitis';
-            } else if (this.HealthNowList.digestiveSystemDiseaseClass.gastritis === 1) {
-              this.selecteddigestiveSystemDiseaseType = 'gastritis';
-            } else if (this.HealthNowList.digestiveSystemDiseaseClass.colitis === 1) {
-              this.selecteddigestiveSystemDiseaseType = 'colitis';
-            }else if (this.HealthNowList.digestiveSystemDiseaseClass.hepatitis === 1) {
-              this.selecteddigestiveSystemDiseaseType = 'hepatitis';
-            }else if (this.HealthNowList.digestiveSystemDiseaseClass.cholecystitis === 1) {
-              this.selecteddigestiveSystemDiseaseType = 'cholecystitis';
-            }else if (this.HealthNowList.digestiveSystemDiseaseClass.cholelithiasis === 1) {
-              this.selecteddigestiveSystemDiseaseType = 'cholelithiasis';
-            } else if (this.HealthNowList.digestiveSystemDiseaseClass.fattyLiver === 1) {
-              this.selecteddigestiveSystemDiseaseType = 'fattyLiver';
-            } else if (this.HealthNowList.digestiveSystemDiseaseClass.hyperlipidemia === 1) {
-              this.selecteddigestiveSystemDiseaseType = 'hyperlipidemia';
-            }else if (this.HealthNowList.digestiveSystemDiseaseClass.haemorrhoids === 1) {
-              this.selecteddigestiveSystemDiseaseType = 'haemorrhoids';
-            }else if (this.HealthNowList.digestiveSystemDiseaseClass.other === 1) {
-              this.selecteddigestiveSystemDiseaseType = 'other';
-            }
-            //鍛煎惛绯荤粺鐤剧梾
-            if (this.HealthNowList.respiratorySystemDiseaseClass.COPD === 1) {
-              this.selectedrespiratorySystemDiseaseType = 'COPD';
-            } else if (this.HealthNowList.respiratorySystemDiseaseClass.pneumonia === 1) {
-              this.selectedrespiratorySystemDiseaseType = 'pneumonia';
-            } else if (this.HealthNowList.respiratorySystemDiseaseClass.bronchitis === 1) {
-              this.selectedrespiratorySystemDiseaseType = 'bronchitis';
-            } else if (this.HealthNowList.respiratorySystemDiseaseClass.bronchialAsthma === 1) {
-              this.selectedrespiratorySystemDiseaseType = 'bronchialAsthma';
-            }else if (this.HealthNowList.respiratorySystemDiseaseClass.pulmonaryTuberculosis === 1) {
-              this.selectedrespiratorySystemDiseaseType = 'pulmonaryTuberculosis';
-            }else if (this.HealthNowList.respiratorySystemDiseaseClass.other === 1) {
-              this.selectedrespiratorySystemDiseaseType = 'other';
-            }else if (this.HealthNowList.respiratorySystemDiseaseClass.upperRespiratoryTractInfection === 1) {
-              this.selectedrespiratorySystemDiseaseType = 'upperRespiratoryTractInfection';
-            }
-            //鑲捐剰鐤剧梾
-            if (this.HealthNowList.kidneyDiseaseClass.diabetes === 1) {
-              this.selectedkidneyDiseaseDiseaseType = 'diabetes';
-            } else if (this.HealthNowList.kidneyDiseaseClass.renalFailure === 1) {
-              this.selectedkidneyDiseaseDiseaseType = 'renalFailure';
-            } else if (this.HealthNowList.kidneyDiseaseClass.acuteNephritis === 1) {
-              this.selectedkidneyDiseaseDiseaseType = 'acuteNephritis';
-            } else if (this.HealthNowList.kidneyDiseaseClass.chronicNephritis === 1) {
-              this.selectedkidneyDiseaseDiseaseType = 'chronicNephritis';
-            }else if (this.HealthNowList.kidneyDiseaseClass.urinaryCalculus === 1) {
-              this.selectedkidneyDiseaseDiseaseType = 'urinaryCalculus';
-            }else if (this.HealthNowList.kidneyDiseaseClass.urinaryTractInfection === 1) {
-              this.selectedkidneyDiseaseDiseaseType = 'urinaryTractInfection';
-            }else if (this.HealthNowList.kidneyDiseaseClass.other === 1) {
-              this.selectedkidneyDiseaseDiseaseType = 'other';
-            }
-            //鍏朵粬鐤剧梾
-            if (this.HealthNowList.otherDiseaseClass.pregnant === 1) {
-              this.selectedotherDiseaseType = 'pregnant';
-            } else if (this.HealthNowList.otherDiseaseClass.cold === 1) {
-              this.selectedotherDiseaseType = 'cold';
-            } else if (this.HealthNowList.otherDiseaseClass.infectious === 1) {
-              this.selectedotherDiseaseType = 'infectious';
-            } else if (this.HealthNowList.otherDiseaseClass.pulmonaryBulla === 1) {
-              this.selectedotherDiseaseType = 'pulmonaryBulla';
-            }else if (this.HealthNowList.otherDiseaseClass.hemoptysis === 1) {
-              this.selectedotherDiseaseType = 'hemoptysis';
-            }else if (this.HealthNowList.otherDiseaseClass.activeBleeding === 1) {
-              this.selectedotherDiseaseType = 'activeBleeding';
-            }else if (this.HealthNowList.otherDiseaseClass.other === 1) {
-              this.selectedotherDiseaseType = 'other';
-            }
+            this.HealthNoteList = {};
 
+          } else {
+            this.HealthNoteList = response.data;
+            console.log(this.HealthNoteList)
             this.loading = false;
 
           }
 
         }
       );
-
     },
 
 
@@ -1858,4 +2235,13 @@
 }
 .form{
   background:center/11% no-repeat url('../../assets/icons/form.png') ;
+}
+.app-container {
+  background-color: #FEF7FC;
+}
+.btn_edit{
+  background:center no-repeat url('../../assets/icons/edit.png') ;
+  position: absolute;
+  top: 0;
+  padding-right: 90px;
 }</style>

--
Gitblit v1.9.1