Merge branch 'chronic-dev' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-dev

 Conflicts:
	src/doctor/Doctor.vue

src/doctor/components/bloodPressure/BloodPressure.vue

@@ -94,7 +94,7 @@ export default {
         },
         loadDevice() {
             // 372 || 
-            getPressureDevices(372 || this.authInfo.unitId).then(res => {
+            getPressureDevices(this.authInfo.unitId).then(res => {
                 console.log('getPressureDevices', res)
                 this.deviceList = res.data || []
                 if (!this.deviceList.length) {

src/doctor/diagnose/common/Instpect.vue

@@ -30,7 +30,10 @@
             <div v-for="(row, index1) in viewData" :key="row.insType"
                 class="pt-3 px-2 mb-2 instpect-list-item"
                 :style="`order: ${row.insType}`">
-                <div class="required-mark mb-3">{{ row.insName }}</div>
+                <div class="mb-3 flex items-center justify-between">
+                    <span class="required-mark" >{{ row.insName }}</span>
+                    <BloodPressurePanel :pressureObj="pressureObj" v-if="row.insType == 35"/>
+                </div>
                 <template v-for="(item, index2) in row.items">
                     <van-field :label="getItemName(item)"
                         v-model="item.itemValue"
@@ -82,6 +85,8 @@
                         </template>
                     </van-field>
                 </template>
+                <BloodPressureBt :pressureObj="pressureObj" v-if="row.insType == 35"
+                    @getValue="setPressure($event, row)" style="margin-bottom: .08rem" >测量</BloodPressureBt>
             </div>
             <van-popup v-model:show="selectOption.show3" position="bottom">
                 <van-picker 
@@ -119,13 +124,17 @@ import { getInspectCode } from '@/api/doctor/disease.js'
 import { useStore } from '@/doctor/store/index.js'
 import InputSelect from './InputSelect.vue'
 import DocImageUpload from '@/doctor/components/docImageUpload/DocImageUpload.vue'
+import { BloodPressurePanel, BloodPressureBt } from '@/doctor/components/bloodPressure/index.js'
 
 export default {
     name: 'InstpectCommon',
     components: {
         InputSelect,
-        DocImageUpload
+        DocImageUpload,
+        BloodPressurePanel,
+        BloodPressureBt
     },
+    inject: ['pressureObj'],
     props: {
         // 初始化数据
         info: { default: () => { return {} } },
@@ -278,6 +287,11 @@ export default {
         onSelectInputConfirm(option) {
             this.selectOption.item.itemValue = option.value
             this.selectOption.show4 = false
+        },
+        setPressure(val, row = {}) {
+            const items = row.items || []
+            items[0] && (items[0].itemValue = val.systolicPressure)
+            items[1] && (items[1].itemValue = val.diastolicPressure)
         }
     }
 }