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

 Conflicts:
	src/doctor/Doctor.vue

src/doctor/patientDetail/PatientDetail.vue

@@ -155,8 +155,8 @@ export default {
                 { name: '筛查管理', id: 'SCREENING' },
                 ...diseaseList.filter(e => this.chronicTagsArray.includes(e.code)),
                 { name: '通用随访', id: 'CURRENCY' },
-                { name: '转诊记录', id: 'REFERRAL' },
-                { name: '会诊记录', id: 'CONSULTATION' }
+                // { name: '转诊记录', id: 'REFERRAL' },
+                // { name: '会诊记录', id: 'CONSULTATION' }
             ]
             return result
         },

src/doctor/search/Search.vue

@@ -40,7 +40,7 @@
 
             <div class="pt-2" v-if="state === 2">
                 <div class="text-12" style="color: #8c8c8c">查找结果：</div>
-                <div class="card" >
+                <div class="card" v-if="result.id">
                     <!-- v-if="result.chronicTagsArrayName || result.firstScreenResult || result.highTagsArray" -->
                     <div class="py-3">
                         <span class="text-16 font-semibold mr-3">{{ result.residentName }}</span>

src/doctor/workbench/Workbench.vue

@@ -66,10 +66,10 @@ export default {
             configTab: [
                 { key: 'work', component: 'TableWork', name: '工作记录' },
                 { key: 'visit', component: 'TableVisit', name: '慢病待随访' },
-                { key: 'receive', component: 'TableReceive', name: '待接诊居民' },
+                // { key: 'receive', component: 'TableReceive', name: '待接诊居民' },
                 // { key: 'screenRecord', component: 'TableScreenRecord', name: '当年待筛查记录' }, 
-                { key: 'firstScreen', component: 'TableFirstScreen', name: '初筛高危待筛查' },
-                { key: 'highRisk', component: 'TableHighRisk', name: '高危待诊断' }
+                // { key: 'firstScreen', component: 'TableFirstScreen', name: '初筛高危待筛查' },
+                // { key: 'highRisk', component: 'TableHighRisk', name: '高危待诊断' }
             ],
             tabActive:{},
             configName: '慢病APP个性化配置',

src/doctor/workbench/tables/Work.vue

@@ -71,7 +71,7 @@
                             </template>
                         </van-field>
                         <div class="my-3">居民姓名</div>
-                        <van-field v-model="form.patientName" placeholder="输入居民姓名" maxlength="100" clearable
+                        <van-field v-model="form.residentName" placeholder="输入居民姓名" maxlength="100" clearable
                             class="doc-input"/>
                         <div class="my-3">服务日期</div>
                         <div class="flex items-center">
@@ -120,7 +120,7 @@ const DefaultForm = {
     // 服务日期-开始日期
     endDate: undefined,
     // 姓名
-    patientName: undefined,
+    residentName: undefined,
     // 身份证号
     idCard: undefined
 }