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

 Conflicts:
	src/doctor/Doctor.vue

src/doctor/archives/form/BaseInfo.vue

@@ -189,7 +189,7 @@
         </div>
         <div class='px-5  grow flex flex-col justify-end pt-2 pb-2'>
             <van-button type='primary' block round
-                        @click='onSubmit'>提交
+                @click='onSubmit'>提交
             </van-button>
         </div>
     </div>

src/doctor/diagnose/detail/DiagnoseDtail.vue

+<template>
+    <div class="h-full flex flex-col diagnose-dtail">
+        <DocNavBar title="诊断详情" class="shrink-0"></DocNavBar>
+    </div>
+</template>
+
+<script>
+import DocNavBar from '@/doctor/components/docNavBar/DocNavBar.vue'
+
+export default {
+    components: {
+        DocNavBar
+    }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/doctor/diagnose/form/DiagnoseForm.vue

+<template>
+    <div class="h-full flex flex-col diagnose-form">
+        <DocNavBar :title="`${id ? '修改' : '新增'}慢病诊断`" class="shrink-0"></DocNavBar>
+    </div>
+</template>
+
+<script>
+import DocNavBar from '@/doctor/components/docNavBar/DocNavBar.vue'
+
+export default {
+    components: {
+        DocNavBar
+    },
+    computed: {
+        id() {
+            return this.$route.query.id
+        },
+        diseaseType() {
+            return this.$route.query.diseaseType
+        },
+        residentInfoId() {
+            return this.$route.query.residentInfoId
+        }
+    }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/doctor/patientDetail/PatientDetail.vue

@@ -66,12 +66,12 @@
                 <GeneralList v-else-if="activeTabItem.id === 'CURRENCY'"/>
                 <ReferralList v-else-if="activeTabItem.id === 'REFERRAL'"/>
                 <ConsultationList v-else-if="activeTabItem.id === 'CONSULTATION'"/>
-                <DiseaseList v-else :diseaseName="activeTabItem.name" :diseaseType="activeTabItem.value"/>
+                <DiseaseList v-else :key="activeTabItem.value" :diseaseName="activeTabItem.name"
+                    :diseaseType="activeTabItem.value"/>
             </div>
             <van-popup
                 v-model:show="addVisible"
                 position="bottom"
-                :style="{ height: '30%' }"
             >
                 <div class="popup-bottom-panel">
                     <div class="p-4 text-16 flex items-center justify-between"
@@ -83,7 +83,7 @@
                     <div class="p-4">
                         <CheckBtn :options="addOptions" activeStyleNone
                             @change="onAddChange" column-1 />
-                        <div class="pb-4"></div>
+                        <div class="pb-5"></div>
                     </div>
                 </div>
             </van-popup>
@@ -127,7 +127,11 @@ export default {
             // 新增弹窗
             addVisible: false,
             addOptions: [
-                { name: '新增通用随访', value: 1, path: '/doctor/followUp/generalFU/add' }
+                { name: '新增主要慢病高危筛查', value: 1, path: '/doctor/screening/firstForm' },
+                { name: '新增专病高危筛查', value: 2, path: '/doctor/screening/secondForm' },
+                { name: '新增慢病诊断', value: 3, path: '/doctor/diagnose/form' },
+                { name: '新增通用随访', value: 4, path: '/doctor/followUp/generalFU/add' },
+
             ]
         }
     },

src/doctor/patientDetail/components/disease/List.vue

@@ -38,14 +38,14 @@
                         <span class="label">纳入管理日期</span>
                         <span>{{ item.manageDate }}</span>
                     </div>
-                    <!-- <div class="divider"></div>
+                    <div class="divider my-2"></div>
                     <div class="bt-group">
                         <van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
                         <van-button round size="small" class="doc-btn-primary" @click='editBtn(item)'
                             v-if="item.allowUpdate == 1">修改</van-button>
                         <van-button round size="small" class="doc-btn-red" @click="delBtn(item)"
                             v-if="item.allowDelete ==1">删除</van-button>
-                    </div> -->
+                    </div>
                 </div>
             </div>
             <div v-for="item in treatmentRecord" :key="item.id"
@@ -185,13 +185,27 @@ export default {
             })
         },
         onRefresh() {
-            this.load()
+            this.load(false)
         },
-        toDetail() {
-
+        toDetail(record) {
+            this.$router.push({
+                path: '/doctor/diagnose/detail',
+                query: {
+                    residentInfoId: this.residentInfoId,
+                    diseaseType: this.diseaseType,
+                    id: record.id
+                }
+            })
         },
-        editBtn() {
-
+        editBtn(record) {
+            this.$router.push({
+                path: '/doctor/diagnose/form',
+                query: {
+                    residentInfoId: this.residentInfoId,
+                    diseaseType: this.diseaseType,
+                    id: record.id
+                }
+            })
         },
         delBtn() {
 

src/doctor/patientDetail/components/disease/Visit.vue

@@ -136,7 +136,7 @@ export default {
         },
         onRefresh() {
             this.pagination.pageIndex = 1
-            this.load()
+            this.load(false)
         },
         toDetail(record) {
             if (!record) return

src/doctor/patientDetail/components/screening/Record.vue

@@ -36,14 +36,14 @@
                             <span>{{ item.created }}</span>
                         </div>
                     </div>
-                    <!-- <div class="divider"></div>
+                    <div class="divider my-3"></div>
                     <div class="bt-group">
                         <van-button round size="small" class="doc-btn-primary" @click="toFirstDetail(item)">详情</van-button>
-                        <van-button round size="small" class="doc-btn-primary" @click='editBtn(item)'
+                        <van-button round size="small" class="doc-btn-primary" @click="editFirstBtn(item)"
                             v-if="item.allowUpdate == 1">修改</van-button>
-                        <van-button round size="small" class="doc-btn-red" @click="delBtn(item)"
+                        <van-button round size="small" class="doc-btn-red" @click="delFirstBtn(item)"
                             v-if="item.allowDelete ==1">删除</van-button>
-                    </div> -->
+                    </div>
                 </div>
             </div>
             <div v-for="item in secondScreenList" :key="item.id"
@@ -80,14 +80,14 @@
                             <span>{{ item.created }}</span>
                         </div>
                     </div>
-                    <!-- <div class="divider"></div>
+                    <div class="divider my-3"></div>
                     <div class="bt-group">
                         <van-button round size="small" class="doc-btn-primary" @click="toSecondDetail(item)">详情</van-button>
-                        <van-button round size="small" class="doc-btn-primary" @click='editBtn(item)'
+                        <van-button round size="small" class="doc-btn-primary" @click='editSecondBtn(item)'
                             v-if="item.allowUpdate == 1">修改</van-button>
-                        <van-button round size="small" class="doc-btn-red" @click="delBtn(item)"
+                        <van-button round size="small" class="doc-btn-red" @click="delSecondBtn(item)"
                             v-if="item.allowUpdate == 1">删除</van-button>
-                    </div> -->
+                    </div>
                 </div>
             </div>
         </van-pull-refresh>
@@ -173,10 +173,22 @@ export default {
                 }
             })
         },
-        editBtn() {
+        editFirstBtn(record) {
+            this.$router.push({
+                path: '/doctor/screening/firstForm',
+                query: { residentInfoId: this.residentInfoId, id:record.id }
+            })
+        },
+        delFirstBtn(record) {
 
         },
-        delBtn() {
+        editSecondBtn(record) {
+            this.$router.push({
+                path: '/doctor/screening/secondForm',
+                query: { residentInfoId: this.residentInfoId, id:record.id }
+            })
+        },
+        delSecondBtn(record) {
 
         }
     },

src/doctor/screening/first/FristForm.vue

+<template>
+    <div class="h-full flex flex-col screening-first">
+        <DocNavBar :title="`${id ? '修改' : '新增'}主要慢病高危筛查`" class="shrink-0"></DocNavBar>
+    </div>
+</template>
+
+<script>
+import DocNavBar from '@/doctor/components/docNavBar/DocNavBar.vue'
+
+export default {
+    components: {
+        DocNavBar
+    },
+    computed: {
+        id() {
+            return this.$route.query.id
+        },
+        residentInfoId() {
+            return this.$route.query.residentInfoId
+        }
+    }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/doctor/screening/second/SecondForm.vue

+<template>
+    <div class="h-full flex flex-col screening-second">
+        <DocNavBar :title="`${id ? '修改' : '新增'}专病高危筛查`" class="shrink-0"></DocNavBar>
+    </div>
+</template>
+
+<script>
+import DocNavBar from '@/doctor/components/docNavBar/DocNavBar.vue'
+
+export default {
+    components: {
+        DocNavBar
+    },
+    computed: {
+        id() {
+            return this.$route.query.id
+        },
+        residentInfoId() {
+            return this.$route.query.residentInfoId
+        }
+    }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/doctor/workbench/Workbench.vue

@@ -67,10 +67,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/FirstScreen.vue

@@ -42,7 +42,7 @@
                                 <div class="divider my-3"></div>
                                 <div class="bt-group">
                                     <van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
-                                    <!-- <van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">复筛</van-button> -->
+                                    <van-button round size="small" class="doc-btn-primary" @click="toScreen(item)">复筛</van-button>
                                     <van-button round size="small" class="doc-btn-primary" @click="onIgnore(item)">忽略</van-button>
                                 </div>
                             </div>
@@ -230,6 +230,18 @@ export default {
                 }
             })
         },
+        toScreen(record) {
+            if (record.residentInfoId == null) {
+                showToast('暂时无法进行筛查')
+                return
+            }
+            this.$router.push({
+                path: '/doctor/screening/secondForm',
+                query: {
+                    residentInfoId: record.residentInfoId
+                }
+            })
+        },
         onIgnore(record) {
             let params={
                 relationId:record.screenId,

src/doctor/workbench/tables/HighRisk.vue

@@ -46,7 +46,7 @@
                                 <div class="divider my-3"></div>
                                 <div class="bt-group">
                                     <van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
-                                    <!-- <van-button round size="small" class="doc-btn-primary" @click='toDetail(item)'>诊断</van-button> -->
+                                    <van-button round size="small" class="doc-btn-primary" @click='toDiagnose(item)'>诊断</van-button>
                                     <van-button round size="small" class="doc-btn-primary" @click="onIgnore(item)">忽略</van-button>
                                 </div>
                             </div>
@@ -260,6 +260,19 @@ export default {
                 }
             })
         },
+        toDiagnose(record) {
+            if (record.residentInfoId == null) {
+                showToast('暂时无法进行诊断')
+                return
+            }
+            this.$router.push({
+                path: '/doctor/screening/secondForm',
+                query: {
+                    residentInfoId: record.residentInfoId,
+                    diseaseType: record.diseaseType
+                }
+            })
+        },
         onIgnore(record) {
             let params={
                 relationId: record.screenId,

src/doctor/workbench/tables/Receive.vue

@@ -46,7 +46,7 @@
                                 <div class="divider my-3"></div>
                                 <div class="bt-group">
                                     <van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
-                                    <!-- <van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">接诊</van-button> -->
+                                    <van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">接诊</van-button>
                                     <van-button round size="small" class="doc-btn-primary" @click="onIgnore(item)">忽略</van-button>
                                 </div>
                             </div>

src/router/index.js

@@ -60,11 +60,21 @@ const routes = [
                 name: 'doctor-archives-form',
                 component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/archives/form/BaseInfo.vue')
             },
+            {
+                path: 'screening/firstForm',
+                name: 'screening-first-form',
+                component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/screening/first/FristForm.vue')
+            },
             {
                 path: 'screening/firstDetail',
                 name: 'screening-firstDetail',
                 component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/screening/detail/FirstDetail.vue')
             },
+            {
+                path: 'screening/secondForm',
+                name: 'screening-second-form',
+                component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/screening/second/SecondForm.vue')
+            },
             {
                 path: 'screening/secondDetail',
                 name: 'screening-secondDetail',
@@ -80,6 +90,16 @@ const routes = [
                 name: 'followUp-generalFU-add',
                 component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/followUp/generalFU/form/Index')
             },
+            {
+                path: 'diagnose/form',
+                name: 'diagnose-form',
+                component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/diagnose/form/DiagnoseForm.vue')
+            },
+            {
+                path: 'diagnose/detail',
+                name: 'diagnose-detail',
+                component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/diagnose/detail/DiagnoseDtail.vue')
+            }
         ]
     },
     {