医生端小程序 v1.2 1、居民详情随访列表接口替换

                 2、随访列表详情调整（his、通用、专病、公卫）

src/api/doctor/disease.js

@@ -7,7 +7,7 @@ export function fetchDiseaseTypeList(params, loading) {
 
 // 查询随访列表
 export function getVisitManageList(params, loading) {
-    return fetchBase({ url: `/chronic-admin/v1/chronic-visit-record/page`, body: params, loading })
+    return fetchBase({ url: `/chronic-admin/v1/chronic-visit-record/record-list`, body: params, loading })
 }
 
 // 获取检验项目对码表

src/api/doctor/doctorFetch.js

@@ -34,7 +34,6 @@ export function fetchBase({
         backHome()
         return
     }
-    let bodys = {...body, source: 2}
     return new Promise((resolve, reject) => {
         if (loading) {
             loadingList++
@@ -44,7 +43,7 @@ export function fetchBase({
             method: method,
             url: `${url}`,
             params: params,
-            data: bodys,
+            data: body,
             headers: {
                 'Authorization': `${token}`,
                 'Content-Type': contentType

src/api/doctor/generalFU.js

@@ -78,4 +78,9 @@ export function upLoadMultifile(params) {
 //短信重发
 export function messageResend(params) {
     return fetchBase({ url: `/chronic-admin/v1/chronic-visit-currency/resend-sms`, body: params, loading: true })
+}
+
+//慢病管理列表主键查询
+export function getVisitManageVByUuId(params) {
+    return fetchBase({ url: `/chronic-admin/v1/chronic-visit-record/record-uuid`, body: params, loading: true })
 }
\ No newline at end of file

src/doctor/Doctor.vue

@@ -66,7 +66,7 @@ export default {
             if (!token) {
                 token = sessionStorage.getItem('token')
                 if (process.env.NODE_ENV !== 'production') {
-                    token = 'f1f98c99-ac8d-47db-8066-fe24a548c784'
+                    token = '095c2992-4a95-4f5b-bdbf-9415d0f69f85'
                 }
             }
             if (token) {

src/doctor/followUp/detail/FollowUpDetail.vue

+<template>
+    <div class='h-full'>
+        <!-- 公卫数据详情 -->
+        <GwDetail :info="detailInfo" v-if="showGw"/>
+        <!-- 通用随访详情 -->
+        <CurrencyFUDetail :id="detailInfo.relationId" :resident-id="residentId" v-else-if="showCommon"></CurrencyFUDetail>
+        <!-- 专病随访详情 -->
+<!--        <VisitDetail :id="detailInfo.relationId" :resident-id="residentId" :disease-type="diseaseType"  v-else-if="showFU"></VisitDetail>-->
+        <!-- his -->
+<!--        <HisDetail :info="detailInfo"  v-else-if="showHis"></HisDetail>-->
+        <!-- 报卡随访详情 -->
+        <CrsVisitDetail :relationUuid="detailInfo.relationUuid"   v-else-if="showCrs"></CrsVisitDetail>
+    </div>
+</template>
+
+<script>
+import { getVisitManageVByUuId } from '@/api/doctor/generalFU'
+import GwDetail from '@/doctor/followUp/detail/components/GwDetail'
+import CrsVisitDetail from '@/doctor/followUp/detail/components/CrsVisitDetail'
+import CurrencyFUDetail from '@/doctor/followUp/generalFU/detail/Detail'
+
+export default {
+    name: 'FollowUpDetail',
+    components: { CurrencyFUDetail, CrsVisitDetail, GwDetail },
+    props: {
+        // id: [String, Number],
+        // residentId: [String, Number],
+        // diseaseType: [String, Number]
+    },
+    data() {
+        return {
+            detailInfo: {},
+            showCommon: false,
+            showFU: false,
+            showHis: false,
+            showCrs: false,
+            showGw: false
+        }
+    },
+    watch: {
+        id: {
+            handler() {
+                this.load()
+            },
+            immediate: true
+        }
+    },
+    computed: {
+        relationUuid() {
+            return this.$route.query.relationUuid
+        },
+        diseaseType() {
+            return this.$route.query.diseaseType
+        },
+        residentId() {
+            return this.$route.query.residentInfoId
+        }
+    },
+    methods: {
+        load() {
+            let par = {
+                relationUuid: this.relationUuid
+            }
+            getVisitManageVByUuId(par).then(res => {
+                let record = res.data
+                this.detailInfo = record
+                this.showGw = this.PhlIsShow(record)
+                this.showFU = this.FUIsShow(record)
+                this.showCommon = this.GAUIsShow(record)
+                this.showHis = this.HisIsShow(record)
+                this.showCrs = this.CrsIsShow(record)
+            })
+        },
+        //判断是否是专病随访
+        FUIsShow(record) {
+            let res = false
+            if ((record.serveType == 3 || (record.serveType == 4) && record.source != 4)) {
+                res = true
+            }
+            return res
+        },
+        //判断是否是 通用随访
+        GAUIsShow(record) {
+            let res = false
+            if (record.serveType == 5) {
+                res = true
+            }
+            return res
+        },
+        //判断是否是his
+        HisIsShow(record) {
+            let res = false
+            if (record.serveType == 1 || record.serveType == 2) {
+                res = true
+            }
+            return res
+        },
+        //判断是否显示报卡随访
+        CrsIsShow(record) {
+            let res = false
+            if (record.serveType == 6) {
+                res = true
+            }
+            return res
+        },
+        //判断是否显示报卡随访
+        PhlIsShow(record) {
+            let res = false
+            if (record.source == 4) {
+                res = true
+            }
+            return res
+        }
+    }
+}
+</script>
+
+<style scoped lang='less'>
+
+</style>
\ No newline at end of file

src/doctor/followUp/detail/components/CrsVisitDetail.vue

+<template>
+
+</template>
+
+<script>
+export default {
+    name: 'CrsVisitDetail',
+    data() {
+        return {
+
+        }
+    }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file

src/doctor/followUp/detail/components/GwDetail.vue

+<template>
+
+</template>
+
+<script>
+export default {
+    name: 'GwDetail',
+    data() {
+        return {
+
+        }
+    }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file

src/doctor/followUp/generalFU/detail/Detail.vue

@@ -255,8 +255,11 @@ import { fetchCurrencyById, messageResend } from '@/api/doctor/generalFU'
 import { getTemplateDetail } from '@/api/doctor/workbench'
 
 export default {
-    name: 'CurrencyFUDetail.vue',
+    name: 'CurrencyFUDetail',
     components: { ImagePreview, Mp4, Mp3 },
+    props: {
+        id: String,
+    },
     data() {
         return {
             activeCollapse: [],
@@ -307,9 +310,6 @@ export default {
         }
     },
     computed: {
-        routerDetail() {
-            return this.$route.query
-        },
         residentInfo() {
             return this.info.residentsRecord || {}
         },
@@ -374,12 +374,12 @@ export default {
     },
     methods: {
         async load() {
-            if (!this.routerDetail.relationId) {
+            if (!this.id) {
                 this.$message.info('未获取到信息')
                 return
             }
             let par = {
-                id: this.routerDetail.relationId
+                id: this.id
             }
             fetchCurrencyById(par).then(res => {
                 let result = res.data || {}
@@ -401,7 +401,7 @@ export default {
         //重新发送
         toReSend() {
             let par = {
-                id: this.routerDetail.relationId
+                id: this.id
             }
             messageResend(par).then(() => {
                 this.load()

src/doctor/patientDetail/PatientDetail.vue

@@ -245,6 +245,7 @@ export default {
                     residentInfoId: this.residentInfoId,
                     // operateType=1 新增死亡   3-撤销删除
                     operateType: 3,
+                    source: 2
                 }
                 saveResidentsDeath(query).then(res => {
                     if (res.code == 'SUCCESS') {

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

@@ -48,14 +48,14 @@
                             <span class="label">随访机构</span>
                             <span>{{ item.serveUnitName || '-' }}</span>
                         </div>
-                        <div class="divider" v-if="item.serveType == 5"></div>
-                        <div class="bt-group" v-if="item.serveType == 5">
+                        <div class="divider"></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" v-if="item.allowUpdate == 1">转诊</van-button>
+<!--                             <van-button round size="small" class="doc-btn-primary" v-if="item.allowUpdate == 1">转诊</van-button>-->
                             <van-button round size="small" class="doc-btn-primary" @click='editBtn(item)'
                                 v-if="!(item.allowUpdate !==1 || item.serveType == 5)">修改</van-button>
                             <van-button round size="small" class="doc-btn-red" @click="delBtn(item)"
-                                v-if="!(item.allowUpdate !==1 || item.serveType == 5)">删除</van-button> -->
+                                v-if="!(item.allowUpdate !==1 || item.serveType == 5)">删除</van-button>
                         </div>
                     </div>
                 </div>
@@ -113,8 +113,8 @@ export default {
     methods: {
         load(loading = true) {
             const query = {
-                pageIndex: this.pagination.pageIndex,
-                pageSize: this.pagination.pageSize,
+                // pageIndex: this.pagination.pageIndex,
+                // pageSize: this.pagination.pageSize,
                 residentInfoId: this.residentInfoId,
                 diseaseType: this.diseaseType,
             }
@@ -122,7 +122,7 @@ export default {
                 if (this.pagination.pageIndex === 1) {
                     this.list = []
                 } 
-                this.list = this.list.concat(res.data.dataList || [])
+                this.list = this.list.concat(res.data || [])
                 this.pagination.total = res.data.total || 0
                 this.finished = this.list.length >= this.pagination.total
             }).finally(() => {
@@ -144,15 +144,15 @@ export default {
                 this.$message.info('暂时无法查看 详情信息')
                 return
             }
-            if (record.serveType === 5) {
                 // 通用随访
                 this.$router.push({
-                    path: '/doctor/followUp/generalFU/detail',
+                    path: '/doctor/followUp/detail',
                     query: {
-                        relationId: record.relationId
+                        relationUuid: record.relationUuid,
+                        residentInfoId: this.residentInfoId,
+                        diseaseType: this.diseaseType,
                     }
                 })
-            }
         },
         editBtn() {
 

src/router/index.js

@@ -81,9 +81,9 @@ const routes = [
                 component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/screening/detail/SecondDetail.vue')
             },
             {
-                path: 'followUp/generalFU/detail',
-                name: 'followUp-generalFU-detail',
-                component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/followUp/generalFU/detail/Detail')
+                path: 'followUp/detail',
+                name: 'followUp-detail',
+                component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/followUp/detail/FollowUpDetail')
             },
             {
                 path: 'followUp/generalFU/add',