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

 Conflicts:
	src/doctor/Doctor.vue

src/doctor/Doctor.vue

@@ -66,7 +66,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = '6f81c2ac-b9ac-4303-ad52-560bf418ab56'
+                    token = '2fb02c59-8f20-4157-b85e-789e84dea974'
                 }
             }
             if (token) {

src/doctor/followUp/separateFU/components/Inspect.vue

@@ -162,7 +162,6 @@ export default {
             this.form.auxiliaryExaminationName = list.join()
             this.showAuxiliaryExamination = false
 
-            console.log(this.inspectList)
             let inspectList = []
             this.form.auxiliaryExamination.forEach(item => {
                 const items = this.inspectList.filter(e => e.insType === item)
@@ -282,7 +281,6 @@ export default {
                 }
             })
             this.viewData = array
-            console.log(888, this.inspectList)
         }
     },
     watch: {
@@ -290,7 +288,6 @@ export default {
             async handler() {
                 this.inspectList = await this.getCode()
                 this.dataProcess()
-                console.log(this.form)
             },
             immediate: true
         }

src/doctor/followUp/separateFU/form/BaseInfo.vue

@@ -5,7 +5,7 @@
             v-model="form.diseaseTypeName"
             isLink
             readonly
-            :disabled="$route.query.id"
+            :disabled="$route.query.id ? true : false"
             placeholder="请选择"
             :rules="rules.diseaseTypeName"
             @click="showDiseaseType = true"

src/doctor/followUp/separateFU/form/components/HypertensionForm.vue

@@ -635,72 +635,7 @@
                 </template>
             </van-field>
         </div>
-
-        <!-- <div class="bg-fa mt-2">
-            <div class="label-title" required style="color: #262626; font-size: 14px; line-height: 24px">请您确认患者目前服用的降压药、降脂或抗血小板药，在下表中修改或增加，并记录上次随访以来服用的降压药物的依从性</div>
-            <div style="background-color: #FFF; padding: 8px; border-radius: 10px">
-                <van-field
-                    label="药物名称"
-                    v-model="form.drinkOther"
-                    placeholder="0~3000，整数"
-                    class="form-input"
-                    label-width="72px"
-                    label-class="label-mr"
-                >
-
-                </van-field>
-                <van-field
-                    label="剂量"
-                    v-model="form.drinkOther"
-                    placeholder="0~3000，整数"
-                    class="form-input mt-2"
-                    label-width="36px"
-                    label-class="label-mr"
-                >
-
-                </van-field>
-                <van-field
-                    label="频次"
-                    v-model="form.drinkOther"
-                    placeholder="0~3000，整数"
-                    class="form-input mt-2"
-                    label-width="36px"
-                    label-class="label-mr"
-                >
-
-                </van-field>
-                <van-field
-                    label="用法"
-                    v-model="form.drinkOther"
-                    placeholder="0~3000，整数"
-                    class="form-input mt-2"
-                    label-width="36px"
-                    label-class="label-mr"
-                >
-
-                </van-field>
-                <van-field
-                    label="服药依从性"
-                    v-model="form.drinkOther"
-                    placeholder="0~3000，整数"
-                    class="form-input mt-2"
-                    label-width="84px"
-                    label-class="label-mr"
-                >
-
-                </van-field>
-                <van-field
-                    label="不依从原因"
-                    v-model="form.drinkOther"
-                    placeholder="0~3000，整数"
-                    class="form-input mt-2"
-                    label-width="84px"
-                    label-class="label-mr"
-                >
-
-                </van-field>
-            </div>
-        </div> -->
+        
         <!-- 药物不良反应 -->
         <div class="label-title mt-2" required>药物不良反应</div>
         <van-field :rules="rules.drugsAdverse" style="padding: 0">