Merge branch 'new' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture into new

acupuncture-前台/src/api/patientFile.js

@@ -32,3 +32,11 @@ export function patientDel(data) {
     data: data,
   });
 }
+// 同步身高体重
+export function weightHeight(data) {
+  return request({
+    url: "/api/http/getWeightHeight",
+    method: "post",
+    data: data,
+  });
+}

acupuncture-前台/src/views/patientFile/index.vue

@@ -163,6 +163,13 @@
         min-width="150"
         fixed
       />
+      <el-table-column
+        label="手机号码"
+        align="center"
+        prop="phone"
+        show-overflow-tooltip
+        min-width="150"
+      />
       <el-table-column
         label="身高（cm）"
         align="center"
@@ -175,6 +182,11 @@
         prop="weight"
         min-width="100"
       />
+      <el-table-column label="BMI" align="center" prop="weight" min-width="100">
+        <template slot-scope="scope">
+          {{ calculateBMI(scope.row.weight, scope.row.height) }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="民族"
         align="center"
@@ -199,13 +211,7 @@
         show-overflow-tooltip
         min-width="100"
       />
-      <el-table-column
+
-        label="手机号码"
-        align="center"
-        prop="phone"
-        show-overflow-tooltip
-        min-width="150"
-      />
       <el-table-column
         label="证件类型"
         align="center"
@@ -317,6 +323,12 @@
       width="780px"
       append-to-body
     >
+      <template slot="title">
+        <div class="popup-title">
+          <p>{{ title }}</p>
+          <span @click="getWeightHeight"> 同步身高体重 </span>
+        </div>
+      </template>
       <el-form
         class="formStep"
         ref="form"
@@ -348,6 +360,14 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="手机号码" prop="phone">
+          <el-input
+            type="number"
+            v-model="form.phone"
+            placeholder="请输入"
+            :disabled="formDisabled"
+          />
+        </el-form-item>
         <el-form-item label="身高cm" prop="height">
           <el-input
             v-model="form.height"
@@ -394,14 +414,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="手机号码" prop="phone">
+
-          <el-input
-            type="number"
-            v-model="form.phone"
-            placeholder="请输入"
-            :disabled="formDisabled"
-          />
-        </el-form-item>
         <el-form-item label="证件类型" prop="idCardType">
           <el-select
             v-model="form.idCardType"
@@ -487,6 +500,7 @@ import {
   patientAdd,
   patientUpd,
   patientDel,
+  weightHeight,
 } from "@/api/patientFile";
 export default {
   name: "Notice",
@@ -694,41 +708,41 @@ export default {
             trigger: "blur",
           },
         ],
-        ethnicity: [
+        // ethnicity: [
-          {
+        //   {
-            required: true,
+        //     required: true,
-            message: "民族不能为空",
+        //     message: "民族不能为空",
-            trigger: "blur",
+        //     trigger: "blur",
-          },
+        //   },
-        ],
+        // ],
-        idCardType: [
+        // idCardType: [
-          {
+        //   {
-            required: true,
+        //     required: true,
-            message: "证件类型不能为空",
+        //     message: "证件类型不能为空",
-            trigger: "blur",
+        //     trigger: "blur",
-          },
+        //   },
-        ],
+        // ],
-        idCard: [
+        // idCard: [
-          {
+        //   {
-            required: true,
+        //     required: true,
-            message: "证件号码不能为空",
+        //     message: "证件号码不能为空",
-            trigger: "blur",
+        //     trigger: "blur",
-          },
+        //   },
-        ],
+        // ],
-        educationYears: [
+        // educationYears: [
-          {
+        //   {
-            required: true,
+        //     required: true,
-            message: "受教育年限不能为空",
+        //     message: "受教育年限不能为空",
-            trigger: "blur",
+        //     trigger: "blur",
-          },
+        //   },
-        ],
+        // ],
-        currentIllnessHistory: [
+        // currentIllnessHistory: [
-          {
+        //   {
-            required: true,
+        //     required: true,
-            message: "现病史不能为空",
+        //     message: "现病史不能为空",
-            trigger: "blur",
+        //     trigger: "blur",
-          },
+        //   },
-        ],
+        // ],
       },
     };
   },
@@ -738,6 +752,22 @@ export default {
     this.getList();
   },
   methods: {
+    getWeightHeight() {
+      weightHeight().then((res) => {
+        console.log("res", res);
+        this.form.height = res.data.height;
+        this.form.weight = res.data.weight;
+        this.$modal.msgSuccess("同步成功");
+      });
+    },
+    calculateBMI(WEIGHT, HEIGHT) {
+      if (WEIGHT && HEIGHT) {
+        const weight = parseFloat(WEIGHT);
+        const height = parseFloat(HEIGHT);
+        const bmi = weight / (height / 100) ** 2;
+        return bmi.toFixed(2);
+      }
+    },
     // 上传成功回 - pdg
     handleUploadPdfAdd1(res) {
       if (res.code == 200) {
@@ -929,6 +959,24 @@ export default {
 </script>
 <style scoped src="@/assets/styles/common.css"></style>
 <style scoped>
+.popup-title {
+  font-size: 18px;
+  line-height: 20px;
+  color: #333;
+  display: flex;
+  align-items: center;
+  padding-right: 20px;
+}
+.popup-title p {
+  margin: 0 !important;
+}
+.popup-title span {
+  font-weight: bold;
+  color: blue;
+  border-bottom: 1px solid blue;
+  cursor: pointer;
+  margin-left: 10px;
+}
 .form-item-age {
   display: flex;
   align-items: center;

acupuncture-后台/src/views/patientFile/index.vue

@@ -143,6 +143,13 @@
         min-width="150"
         fixed
       />
+      <el-table-column
+        label="手机号码"
+        align="center"
+        prop="phone"
+        show-overflow-tooltip
+        min-width="150"
+      />
       <el-table-column
         label="身高（cm）"
         align="center"
@@ -155,6 +162,11 @@
         prop="weight"
         min-width="100"
       />
+      <el-table-column label="BMI" align="center" prop="weight" min-width="100">
+        <template slot-scope="scope">
+          {{ calculateBMI(scope.row.weight, scope.row.height) }}
+        </template>
+      </el-table-column>
       <el-table-column
         label="民族"
         align="center"
@@ -179,13 +191,7 @@
         show-overflow-tooltip
         min-width="100"
       />
-      <el-table-column
+
-        label="手机号码"
-        align="center"
-        prop="phone"
-        show-overflow-tooltip
-        min-width="150"
-      />
       <el-table-column
         label="证件类型"
         align="center"
@@ -629,6 +635,14 @@ export default {
     this.getTenantsList(); // 组织列表
   },
   methods: {
+    calculateBMI(WEIGHT, HEIGHT) {
+      if (WEIGHT && HEIGHT) {
+        const weight = parseFloat(WEIGHT);
+        const height = parseFloat(HEIGHT);
+        const bmi = weight / (height / 100) ** 2;
+        return bmi.toFixed(2);
+      }
+    },
     // 组织列表
     getTenantsList() {
       tenantsList({