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

 Conflicts:
	src/doctor/Doctor.vue

src/assets/css/atomic.less

@@ -80,6 +80,7 @@
 // 字体大小
 .text-16 { font-size: 16px; }
 .text-12 { font-size: 12px; }
+.text-start { text-align: start; }
 .text-center { text-align: center; }
 .text-end { text-align: end; }
 .text-black { color: #000; }

src/doctor/components/archiveCommon/archiveCommon.vue

@@ -322,7 +322,8 @@ export default {
         'info': {
             handler() {
                 this.init()
-            }
+            },
+            immediate: true
         }
     },
     methods: {

src/doctor/components/docNavBar/DocNavBar.vue

@@ -26,10 +26,15 @@ export default {
     props: {
         title: String,
         // 是否首页
-        home: Boolean
+        home: Boolean,
+        backFunc: Function
     },
     methods: {
         goBack() {
+            if (this.backFunc) {
+                this.backFunc()
+                return
+            }
             if (this.home) {
                 backHome()
                 return

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

@@ -5,40 +5,43 @@
             <div v-for="item in diagnoseRecord" :key="item.id"
                 class="card-back-1 mb-3">
                 <div class="title px-4 py-1">诊断列表</div>
-                <div class="flex flex-col py-3 px-4 doc-list-card" style="row-gap: .04rem;line-height: 1.5;">
-                    <div class="flex">
-                        <span class="label shrink-0">诊断名称</span>
-                        <span class="grow text-wrap">{{ item.diseaseName }}({{item.icdCode}})</span>
-                    </div>
-                    <div class="flex">
-                        <span class="label shrink-0">诊断评估</span>
-                        <span class="grow" >{{ item.diagnoseResultValue || '-' }}</span>
-                    </div>
-                    <div>
-                        <span class="label">诊断单位</span>
-                        <span>{{ item.diseaseUnitName }}</span>
-                    </div>
-                    <div>
-                        <span class="label">诊断科室</span>
-                        <span>{{ item.diseaseOfficeName }}</span>
-                    </div>
-                    <div>
-                        <span class="label">诊断医生</span>
-                        <span>{{ item.diseaseDoctorName }}</span>
-                    </div>
-                    <div>
-                        <span class="label">数据来源</span>
-                        <span>{{ item.sourceName || '-' }}</span>
-                    </div>
-                    <div>
-                        <span class="label">诊断日期</span>
-                        <span>{{ item.diseaseDate }}</span>
-                    </div>
-                    <div>
-                        <span class="label">纳入管理日期</span>
-                        <span>{{ item.manageDate }}</span>
-                    </div>
-                    <div class="divider my-2"></div>
+                <div class="py-3 px-4 doc-list-card">
+                    <div class="flex flex-col" style="row-gap: .04rem;line-height: 1.5;"
+                        @click="toDetail(item)">
+                        <div class="flex">
+                            <span class="label shrink-0">诊断名称</span>
+                            <span class="grow text-wrap">{{ item.diseaseName }}({{item.icdCode}})</span>
+                        </div>
+                        <div class="flex">
+                            <span class="label shrink-0">诊断评估</span>
+                            <span class="grow" >{{ item.diagnoseResultValue || '-' }}</span>
+                        </div>
+                        <div>
+                            <span class="label">诊断单位</span>
+                            <span>{{ item.diseaseUnitName }}</span>
+                        </div>
+                        <div>
+                            <span class="label">诊断科室</span>
+                            <span>{{ item.diseaseOfficeName }}</span>
+                        </div>
+                        <div>
+                            <span class="label">诊断医生</span>
+                            <span>{{ item.diseaseDoctorName }}</span>
+                        </div>
+                        <div>
+                            <span class="label">数据来源</span>
+                            <span>{{ item.sourceName || '-' }}</span>
+                        </div>
+                        <div>
+                            <span class="label">诊断日期</span>
+                            <span>{{ item.diseaseDate }}</span>
+                        </div>
+                        <div>
+                            <span class="label">纳入管理日期</span>
+                            <span>{{ item.manageDate }}</span>
+                        </div>
+                    </div>
+                    <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='editBtn(item)'

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

@@ -6,7 +6,8 @@
                 class="first-card mb-3">
                 <div class="title px-4 py-1">主要慢病筛查记录</div>
                 <div class="py-3 px-4 doc-list-card">
-                    <div class="flex flex-col" style="row-gap: .04rem;line-height: 1.5;">
+                    <div class="flex flex-col" style="row-gap: .04rem;line-height: 1.5;"
+                        @click="toFirstDetail(item)">
                         <div class="flex">
                             <span class="label shrink-0">高危评估</span>
                             <span class="grow">{{ item.screenResultName }}</span>
@@ -50,7 +51,8 @@
                 class="second-card mb-3">
                 <div class="title px-4 py-1">专病筛查记录</div>
                 <div class=" py-3 px-4 doc-list-card">
-                    <div class="flex flex-col" style="row-gap: .04rem;line-height: 1.5;">
+                    <div class="flex flex-col" style="row-gap: .04rem;line-height: 1.5;"
+                        @click="toSecondDetail(item)">
                         <div class="flex">
                             <span class="label shrink-0">高危评估</span>
                             <span class="grow" >{{ item.specialScreenResultName }}</span>

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

@@ -15,28 +15,31 @@
                             {'second-card': item.serveType == 2},
                             {'general-card': item.serveType == 3}]">
                         <div class="title px-4 py-1">{{item.serveTypeName}}</div>
-                        <div class="flex flex-col gap-y-2.5 py-3 px-4 doc-list-card" @click="toDetail(item)">
-                            <div>
-                                <span class="label">随访日期</span>
-                                <span>{{ item.visitDate }}</span>
+                        <div class="py-3 px-4 doc-list-card" @click="toDetail(item)">
+                            <div class="flex flex-col" style="row-gap: .04rem;line-height: 1.5;"
+                                @click="toDetail(item)">
+                                <div>
+                                    <span class="label">随访日期</span>
+                                    <span>{{ item.visitDate }}</span>
+                                </div>
+                                <div>
+                                    <span class="label">随访类型</span>
+                                    <span>{{ item.visitTypeName || '-' }}</span>
+                                </div>
+                                <div>
+                                    <span class="label">随访方式</span>
+                                    <span>{{ item.visitWayName || '-' }}</span>
+                                </div>
+                                <div class="text-ellipsis">
+                                    <span class="label">随访医生</span>
+                                    <span>{{ item.visitDoctorName || '-' }}</span>
+                                </div>
+                                <div class="text-ellipsis">
+                                    <span class="label">随访机构</span>
+                                    <span>{{ item.visitUnitName || '-' }}</span>
+                                </div>
                             </div>
-                            <div>
-                                <span class="label">随访类型</span>
-                                <span>{{ item.visitTypeName || '-' }}</span>
-                            </div>
-                            <div>
-                                <span class="label">随访方式</span>
-                                <span>{{ item.visitWayName || '-' }}</span>
-                            </div>
-                            <div class="text-ellipsis">
-                                <span class="label">随访医生</span>
-                                <span>{{ item.visitDoctorName || '-' }}</span>
-                            </div>
-                            <div class="text-ellipsis">
-                                <span class="label">随访机构</span>
-                                <span>{{ item.visitUnitName || '-' }}</span>
-                            </div>
-                            <div class="divider" v-if="item.serveType == 3"></div>
+                            <div class="divider my-3" v-if="item.serveType == 3"></div>
                             <div class="bt-group" v-if="item.serveType == 3">
                                 <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)'

src/doctor/screening/first/FormCont.vue

+<template>
+    <div class="screening-first-cont">
+        form
+    </div>
+</template>
+
+<script>
+export default {
+    
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/doctor/screening/first/FristForm.vue

 <template>
     <div class="h-full flex flex-col screening-first">
-        <DocNavBar :title="`${id ? '修改' : '新增'}主要慢病高危筛查`" class="shrink-0"></DocNavBar>
+        <DocNavBar :title="`${id ? '修改' : '新增'}主要慢病高危筛查`" class="shrink-0"
+            :backFunc="onBack"></DocNavBar>
+        <div class="p-4 overflow-y-auto grow" ref="all">
+            <archiveCommon :info="baseInfo" v-if="step == 1"></archiveCommon>
+            <FormCont v-else-if="step == 2"/>
+            <Result v-else-if="step == 3" :residentInfoId="residentInfoId"/>
+        </div>
+        <div class="shrink-0" v-if="step !== 3">
+            <div class='bottom-small-line'></div>
+            <div class='px-5 py-2 grow flex justify-between'>
+                <template v-if='step == 1'>
+                    <van-button type='primary' block round
+                        @click='toNext(2)'>下一步</van-button>
+                </template>
+                <template v-else>
+                    <van-button type='primary' block round
+                        @click='toNext(3)'>提交</van-button>
+                </template>
+            </div>
+        </div>
     </div>
 </template>
 
 <script>
 import DocNavBar from '@/doctor/components/docNavBar/DocNavBar.vue'
+import archiveCommon from '@/doctor/components/archiveCommon/archiveCommon.vue'
+import FormCont from './FormCont.vue'
+import Result from './Result.vue'
+import { getChronicResidentsId } from '@/api/doctor/generalFU'
 
 export default {
     components: {
-        DocNavBar
+        DocNavBar,
+        archiveCommon,
+        FormCont,
+        Result
+    },
+    data() {
+        return {
+            step: 1,
+            // 患者基础信息
+            baseInfo: {}
+        }
     },
     computed: {
         id() {
@@ -18,6 +51,30 @@ export default {
         residentInfoId() {
             return this.$route.query.residentInfoId
         }
+    },
+    created() {
+        this.init()
+    },
+    methods: {
+        async init() {
+            if (this.id) {
+
+            } else {
+                let res = await getChronicResidentsId(this.residentInfoId)
+                this.baseInfo = res.data || {}
+            }
+        },
+        toNext(val) {
+            this.$refs.all.scrollTo(0, 0)
+            this.step = val
+        },
+        onBack() {
+            if (this.step == 1) {
+                this.$router.back()
+            } else {
+                this.step--
+            }
+        }
     }
 }
 </script>

src/doctor/screening/first/Result.vue

+<template>
+    <div class="screening-first-result text-center pt-3 px-3">
+        <doc-icon type="doc-check-circle" style="font-size: .46rem;"/>
+        <div class="mt-3">筛查完成</div>
+        <div class="text-start mt-5">
+            <span style="color: #595959;">通过筛查，您的慢病高危评估结果为：</span>
+            <span class="text-red">高危人群</span>
+        </div>
+        <div style="margin-top: .48rem">
+            <van-button type='primary' block round plain
+                @click='toScreen'>专病高危筛查</van-button>
+            <div class="pt-3"></div>
+            <van-button type='primary' block round plain
+                @click='toDetail'>查看居民详情</van-button>
+            <div class="text-16 pt-5" style="color: #8c8c8c;"
+                @click="toWorkbench">返回工作台</div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    props: {
+        residentInfoId: String
+    },
+    methods: {
+        toScreen() {
+            this.$router.replace({
+                path: '/doctor/screening/secondForm',
+                query: {
+                    residentInfoId: this.residentInfoId
+                }
+            })
+        },
+        toDetail() {
+            this.$router.replace({
+                path: '/doctor/patient-detail',
+                query: {
+                    residentInfoId: this.residentInfoId
+                }
+            })
+        },
+        toWorkbench() {
+            this.$router.replace({
+                path: '/doctor/workbench'
+            })
+        }
+    }
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>