From 6756312932a4d1037374811b0ea32d724f235c24 Mon Sep 17 00:00:00 2001
From: "nightkis1995@sina.com" <nightkis1995@sina.com>
Date: Wed, 25 Dec 2024 17:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=BE=E7=97=85=E5=88=97=E8=A1=A8=E6=97=A0?=
=?UTF-8?q?=E9=99=90=E5=8A=A0=E8=BD=BDbug=E4=BF=AE=E5=A4=8D=EF=BC=9B?=
=?UTF-8?q?=E8=AF=8A=E6=96=AD=E8=AF=A6=E6=83=85=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/doctor/Doctor.vue | 4 +--
src/doctor/diagnose/form/DiagnoseForm.vue | 13 +++++++-
src/doctor/patientDetail/PatientDetail.vue | 3 +-
.../patientDetail/components/disease/List.vue | 28 ++++++++++++----
.../components/disease/Visit.vue | 2 +-
.../components/screening/Record.vue | 32 +++++++++++++------
src/doctor/screening/first/FristForm.vue | 10 +++++-
src/doctor/screening/second/SecondForm.vue | 10 +++++-
src/doctor/workbench/tables/FirstScreen.vue | 14 +++++++-
src/doctor/workbench/tables/HighRisk.vue | 15 ++++++++-
10 files changed, 105 insertions(+), 26 deletions(-)
diff --git a/src/doctor/Doctor.vue b/src/doctor/Doctor.vue
index 2817935..cce90a7 100644
--- a/src/doctor/Doctor.vue
+++ b/src/doctor/Doctor.vue
@@ -57,11 +57,11 @@ export default {
if (!token) {
token = sessionStorage.getItem('token')
if (process.env.NODE_ENV !== 'production') {
- token = '6584f8d8-5d17-4bbd-917e-2bd1ac8a1cf3'
+ token = '10757dc5-8d19-4f8e-9c66-ea55fcc45844'
}
}
if (token) {
- sessionStorage.setItem('token', token)
+ sessionStorage.setItem('token', token)
const res = await getDict()
this.store.$patch({ dict: res.data || {} })
const user = await getAuthInfo()
diff --git a/src/doctor/diagnose/form/DiagnoseForm.vue b/src/doctor/diagnose/form/DiagnoseForm.vue
index e8ff00e..2819284 100644
--- a/src/doctor/diagnose/form/DiagnoseForm.vue
+++ b/src/doctor/diagnose/form/DiagnoseForm.vue
@@ -1,6 +1,6 @@
<template>
<div class="h-full flex flex-col diagnose-form">
- <DocNavBar title="新增慢病诊断" class="shrink-0"></DocNavBar>
+ <DocNavBar :title="`${id ? '修改' : '新增'}慢病诊断`" class="shrink-0"></DocNavBar>
</div>
</template>
@@ -10,6 +10,17 @@ 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>
diff --git a/src/doctor/patientDetail/PatientDetail.vue b/src/doctor/patientDetail/PatientDetail.vue
index 374f11f..9c0c8a2 100644
--- a/src/doctor/patientDetail/PatientDetail.vue
+++ b/src/doctor/patientDetail/PatientDetail.vue
@@ -66,7 +66,8 @@
<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"
diff --git a/src/doctor/patientDetail/components/disease/List.vue b/src/doctor/patientDetail/components/disease/List.vue
index 3f32235..a46773e 100644
--- a/src/doctor/patientDetail/components/disease/List.vue
+++ b/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() {
diff --git a/src/doctor/patientDetail/components/disease/Visit.vue b/src/doctor/patientDetail/components/disease/Visit.vue
index bfb360e..1faa0d4 100644
--- a/src/doctor/patientDetail/components/disease/Visit.vue
+++ b/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
diff --git a/src/doctor/patientDetail/components/screening/Record.vue b/src/doctor/patientDetail/components/screening/Record.vue
index b84d1d4..a4e6c54 100644
--- a/src/doctor/patientDetail/components/screening/Record.vue
+++ b/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) {
}
},
diff --git a/src/doctor/screening/first/FristForm.vue b/src/doctor/screening/first/FristForm.vue
index 117fa05..16aba48 100644
--- a/src/doctor/screening/first/FristForm.vue
+++ b/src/doctor/screening/first/FristForm.vue
@@ -1,6 +1,6 @@
<template>
<div class="h-full flex flex-col screening-first">
- <DocNavBar title="新增主要慢病高危筛查" class="shrink-0"></DocNavBar>
+ <DocNavBar :title="`${id ? '修改' : '新增'}主要慢病高危筛查`" class="shrink-0"></DocNavBar>
</div>
</template>
@@ -10,6 +10,14 @@ 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>
diff --git a/src/doctor/screening/second/SecondForm.vue b/src/doctor/screening/second/SecondForm.vue
index 2e25d76..5bb1e49 100644
--- a/src/doctor/screening/second/SecondForm.vue
+++ b/src/doctor/screening/second/SecondForm.vue
@@ -1,6 +1,6 @@
<template>
<div class="h-full flex flex-col screening-second">
- <DocNavBar title="新增专病高危筛查" class="shrink-0"></DocNavBar>
+ <DocNavBar :title="`${id ? '修改' : '新增'}专病高危筛查`" class="shrink-0"></DocNavBar>
</div>
</template>
@@ -10,6 +10,14 @@ 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>
diff --git a/src/doctor/workbench/tables/FirstScreen.vue b/src/doctor/workbench/tables/FirstScreen.vue
index 87d891b..10a3566 100644
--- a/src/doctor/workbench/tables/FirstScreen.vue
+++ b/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,
diff --git a/src/doctor/workbench/tables/HighRisk.vue b/src/doctor/workbench/tables/HighRisk.vue
index 94d05c4..964643f 100644
--- a/src/doctor/workbench/tables/HighRisk.vue
+++ b/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,
--
2.18.0