Skip to content

F
frontend-h5
Commit 3bd2ead7 authored by gengchunlei's avatar gengchunlei
Browse files
Options

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

 Conflicts:
	src/doctor/Doctor.vue
parents 85bdb57c 3c6c626d
Hide whitespace changes
Inline Side-by-side
Showing with 539 additions and 30 deletions
src/api/doctor/generalFU.js
View file @ 3bd2ead7
......@@ -19,11 +19,6 @@ export function fetchCurrencyById(params) {
return fetchBase({ url: `/chronic-admin/v1/chronic-visit-currency/record`, body: params, loading: true })
}
// 慢性病管理列表查询
export function getResidentByPage(params) {
return fetchBase({ url: `/chronic-admin/v1/chronic-residents-record/page`, body: params, loading: true })
}
// 查询待随访列表
export function getVisitAll(params, loading = true) {
return fetchBase({ url: `/chronic-admin/v1/chronic-visit-task/query-all-list`, body: params, loading })
......
src/api/doctor/resident.js
View file @ 3bd2ead7
......@@ -8,4 +8,9 @@ export function queryResidentInfo(params) {
//更新居民基本信息
export function updateResident(params) {
return fetchBase({ url: `/chronic-admin/v1/chronic-residents-record/update`, body: params, loading: true })
}
// 慢性病管理列表查询
export function getResidentByPage(params) {
return fetchBase({ url: `/chronic-admin/v1/chronic-residents-record/page`, body: params, loading: true })
}
\ No newline at end of file
src/assets/icons/doctor/doc-camera.svg 0 → 100644
View file @ 3bd2ead7
<svg width="17" height="15" viewBox="0 0 17 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.6699 2.6466H8.49851C8.49851 1.71832 7.74259 0.962402 6.81432 0.962402H5.69253C4.76426 0.962402 4.00834 1.71832 4.00834 2.6466H2.33019C1.40192 2.6466 0.645996 3.40252 0.645996 4.33079V13.3051C0.645996 14.2334 1.40192 14.9893 2.33019 14.9893H14.6699C15.5981 14.9893 16.354 14.2334 16.354 13.3051V4.33079C16.351 3.40252 15.5951 2.6466 14.6699 2.6466ZM8.49851 12.1833C6.64197 12.1833 5.13315 10.6745 5.13315 8.81794C5.13315 6.9614 6.64197 5.45258 8.49851 5.45258C10.3551 5.45258 11.8639 6.9614 11.8639 8.81794C11.8639 10.6745 10.3551 12.1833 8.49851 12.1833ZM13.8262 6.57436C13.3606 6.57436 12.9857 6.1964 12.9857 5.73378C12.9857 5.27115 13.3636 4.89319 13.8262 4.89319C14.2919 4.89319 14.6668 5.27115 14.6668 5.73378C14.6668 6.1964 14.2919 6.57436 13.8262 6.57436Z" fill="#575B66"/>
</svg>
src/assets/icons/doctor/doc-edit.svg 0 → 100644
View file @ 3bd2ead7
<svg width="14" height="15" viewBox="0 0 14 15" xmlns="http://www.w3.org/2000/svg">
<path d="M1.75 12.7496H2.8105L9.796 5.76407L8.7355 4.70357L1.75 11.6891V12.7496ZM13.75 14.2496H0.25V11.0673L10.3263 0.991074C10.4669 0.850471 10.6576 0.771484 10.8565 0.771484C11.0554 0.771484 11.2461 0.850471 11.3868 0.991074L13.5085 3.11282C13.6491 3.25347 13.7281 3.4442 13.7281 3.64307C13.7281 3.84195 13.6491 4.03268 13.5085 4.17332L4.93225 12.7496H13.75V14.2496ZM9.796 3.64307L10.8565 4.70357L11.917 3.64307L10.8565 2.58257L9.796 3.64307Z"/>
</svg>
src/assets/icons/doctor/doc-left-1.svg
View file @ 3bd2ead7
<svg width="9" height="15" viewBox="0 0 9 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7.5 13.689L1.5 7.68896L7.5 1.68896" stroke="#262626" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M7.5 13.689L1.5 7.68896L7.5 1.68896" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
src/doctor/components/checkBtn/CheckBtn.vue
View file @ 3bd2ead7
......@@ -136,7 +136,12 @@ export default {
}
.check-btn[column-2] {
.check-btn-item {
width: calc(50% - 5px)
width: calc(50% - 5px);
}
}
.check-btn[column-1] {
.check-btn-item {
width: 100%;
}
}
</style>
src/doctor/components/idCardScan/IdCardScan.vue
View file @ 3bd2ead7
<template>
<van-uploader :max-size="5 * 1024 * 1024" :after-read="afterRead" max-count="1"
class="id-card-scan">
<doc-icon type="doc-scan" class="shrink-0 mr-3" style="color: var(--van-primary-color)"/>
<slot>
<doc-icon type="doc-scan" class="shrink-0 mr-3 text-primary"/>
</slot>
</van-uploader>
</template>
......
src/doctor/patientDetail/PatientDetail.vue
View file @ 3bd2ead7
......@@ -2,20 +2,178 @@
<div class="h-full flex flex-col patient-detail">
<DocNavBar title="居民详情" class="shrink-0">
<template #right>
<span class="addBtn">新增</span>
<span class="text-primary">新增</span>
</template>
</DocNavBar>
<div class="grow flex flex-col" style="background: #f5f5f5;min-height: 0px;">
<div :class="['px-4 pt-4 doc-list-card resident-info shrink-0',
{'resident-info-collapsed': collapsed}]">
<div class="mb-4">
<span class="name mr-2">{{ residentInfo.residentName || '-' }}</span>
<span class="tag mr-2">{{ residentInfo.currentAge || '-' }}岁</span>
<span class="tag mr-2">{{ residentInfo.genderName || '-' }}</span>
<doc-icon type="doc-edit" class="text-primary" />
</div>
<div class="flex flex-col gap-y-2.5">
<div>
<span class="label">身份证号</span>
<span>{{ $idCardHide(residentInfo.idCard) || '-' }}</span>
</div>
<div>
<span class="label">联系电话</span>
<span>{{ residentInfo.telephone || '-' }}</span>
</div>
<div>
<span class="label">人群分类</span>
<span>{{ residentInfo.chronicCrowdName || '-' }}</span>
</div>
<div class="flex">
<span class="label">慢病标签</span>
<span>
<ChronicTag :list='residentInfo.chronicTagsArray' />
</span>
</div>
<div>
<span class="label">建档状态</span>
<span v-if="residentInfo.id">
<span v-if="!!residentInfo.residentsBaseDTO">已建档</span>
<span v-else style="color: #8C8C8C">未建档</span>
</span>
</div>
<div>
<span class="label">签约状态</span>
<span v-if="residentInfo.id">
<span v-if="!!residentInfo.signedInfoDTO">已建档</span>
<span v-else style="color: #8C8C8C">未建档</span>
</span>
</div>
</div>
<div :class="['text-center py-1 fold-btn', { 'fold-btn-collapsed': collapsed }]"
@click="() => collapsed = !collapsed">
<doc-icon type="doc-left-1" />
</div>
</div>
<van-tabs shrink v-model:active="activeTab" class="shrink-0 patient-detail-tabs">
<van-tab v-for="item in tabList" :key="item.id"
:title="item.name"></van-tab>
</van-tabs>
<div class="grow py-3 px-2" style="min-height: 0px;">
<ScreeningList v-if="activeTabItem.id === 'SCREENING'"/>
</div>
</div>
</div>
</template>
<script>
import DocNavBar from '@/doctor/components/docNavBar/DocNavBar.vue'
import ChronicTag from '@/doctor/components/chronicTag/ChronicTag.vue'
import { queryResidentInfo } from '@/api/doctor/resident.js'
import { showNotify } from 'vant'
import ScreeningList from './components/screening/Index.vue'
export default {
components: {
DocNavBar,
ChronicTag,
ScreeningList
},
data() {
return {
residentInfo: {},
// 折叠
collapsed: true,
// 标签页index
activeTab: 0
}
},
computed: {
residentInfoId() {
return this.$route.query.residentInfoId
},
chronicTagsArray() {
const chronicTagsArray = this.residentInfo.chronicTagsArray || ''
return chronicTagsArray.split(',')
},
tabList() {
const diseaseList = [
{ name: '高血压', value: 1, code: '1', id: 'HYPERTENSION' },
{ name: '糖尿病', value: 3, code: '2', id: 'DIABETE' },
{ name: '冠心病', value: 4, code: '4', id: 'COPD' },
{ name: '脑卒中', value: 5, code: '8', id: 'STROKE' },
{ name: '慢性阻塞性疾病', value: 6, code: '16', id: 'NEPHROPATHY' },
{ name: '慢性肾病', value: 7, code: '32', id: 'KIDNEY' },
{ name: '血脂异常', value: 8, code: '64', id: 'DYSLIPEMIA' }
]
const result = [
{ name: '筛查管理', id: 'SCREENING' },
...diseaseList.filter(e => this.chronicTagsArray.includes(e.code)),
{ name: '通用随访', id: 'CURRENCY' },
{ name: '转诊记录', id: 'REFERRAL' },
{ name: '会诊记录', id: 'CONSULTATION' }
]
return result
},
activeTabItem() {
return this.tabList[this.activeTab] || {}
},
},
created() {
if (!this.residentInfoId) {
showNotify({ type: 'warning', message: '未获取到患者信息', duration: 0 })
return
}
this.load()
},
methods: {
load() {
queryResidentInfo({ residentInfoId: this.residentInfoId }).then(res => {
this.residentInfo = res.data || {}
})
}
}
}
</script>
<style lang="less" scoped>
.addBtn {
color: var(--van-primary-color);
.resident-info {
position: relative;
overflow: hidden;
border-radius: 0;
height: 230px;
transition: height .2s;
}
.resident-info-collapsed {
height: 90px;
}
.fold-btn {
color: #BFBFBF;
background: #fff;
position: absolute;
bottom: 0;
left: 16px;
right: 16px;
border-bottom: 1px solid #c0ccdf;
.svg-icon {
transform: rotate(90deg);
}
}
.fold-btn-collapsed {
.svg-icon {
transform: rotate(-90deg);
}
}
:deep(.patient-detail-tabs) {
.van-tab {
color: #262626;
}
.van-tab--active {
color: var(--van-tab-active-text-color);
font-weight: 500;
}
.van-tabs__line {
width: 28px;
height: 2px;
bottom: 22px;
}
}
</style>
src/doctor/patientDetail/components/screening/Index.vue 0 → 100644
View file @ 3bd2ead7
<template>
<div class="h-full flex flex-col screening-index">
<van-tabs shrink type="card" class="shrink-0 doc-tab-round"
v-model:active="activeTab">
<van-tab title="筛查记录"></van-tab>
<van-tab title="随访记录"></van-tab>
</van-tabs>
<div class="grow py-3 overflow-y-auto">
<ScreenRecordList v-if="activeTab == 0"/>
<VisitList v-else-if="activeTab == 1"/>
</div>
</div>
</template>
<script>
import ScreenRecordList from './Record.vue'
import VisitList from './Visit.vue'
export default {
components: {
ScreenRecordList,
VisitList
},
data() {
return {
activeTab: 0
}
}
}
</script>
<style lang="less" scoped>
</style>
src/doctor/patientDetail/components/screening/Record.vue 0 → 100644
View file @ 3bd2ead7
<template>
<div class="record-list" style="height: 900px">
筛查记录
</div>
</template>
<script>
export default {
}
</script>
<style lang="less" scoped>
</style>
src/doctor/patientDetail/components/screening/Visit.vue 0 → 100644
View file @ 3bd2ead7
<template>
<div class="visit-list" style="height: 900px">
随访记录
</div>
</template>
<script>
export default {
}
</script>
<style lang="less" scoped>
</style>
src/doctor/search/Search.vue 0 → 100644
View file @ 3bd2ead7
<template>
<div class="flex flex-col pt-2 search">
<div class="flex items-center px-4 pb-1 shrink-0 top-bar">
<span class="shrink-0 pr-2 back-bt" @click="toBack">
<doc-icon type="doc-left-1" style="color: #262626"/>
</span>
<div class="grow flex items-center mr-2 input-box">
<!-- <doc-icon type="doc-search" class="shrink-0" style="color: #595959"/> -->
<van-field v-model="idCard" placeholder="请输入身份证号查询"
autocomplete="off"
clearable
:formatter="formatter"
@clear="idCardClear"
ref="idCardField"/>
<IdCardScan>
<doc-icon type="doc-camera" class="shrink-0 mr-3" style="color: #575B66"/>
</IdCardScan>
</div>
<span class="text-16 shrink-0 text-primary" @click="search">
搜索
</span>
</div>
<div class="grow px-4 overflow-y-auto">
<div class="pt-3" v-if="state === 1">
<div class="flex justify-between items-end pt-2 pb-1">
<span class="text-16 font-semibold">搜索历史</span>
<span class="flex items-center"
@click="clearHistory">
<doc-icon type="doc-delete" style="color: #8c8c8c"/>
<span class="ml-1" style="color: #595959">清除历史</span>
</span>
</div>
<div class="flex flex-wrap mt-4 history-list">
<span v-for="item in history" :key="item"
@click="toSearch(item)">{{ $idCardHide(item) }}</span>
</div>
</div>
<div class="pt-2" v-if="state === 2">
<div class="text-12" style="color: #8c8c8c">查找结果：</div>
<div class="card"
v-if="result.chronicTagsArrayName || result.firstScreenResult || result.highTagsArray">
<div class="py-3">
<span class="text-16 font-semibold mr-3">{{ result.residentName }}</span>
<span class="text-12 mr-3">{{ result.currentAge || '-' }} 岁</span>
<span class="text-12 mr-3">{{ result.genderName }}</span>
<span class="text-12" v-if="result.chronicStatus == 9">死亡</span>
</div>
<div class="mb-2">
<span class="label">身份证号</span>
<span>{{ $idCardHide(result.idCard) }}</span>
</div>
<div class="mb-2">
<span class="label">人群分类</span>
<span>{{ result.chronicCrowdName || '-' }}</span>
</div>
<!-- <div class="flex mb-2">
<span class="shrink-0 label">专病高危评估</span>
<span>{{ result.highTagsArrayName || '-' }}</span>
</div> -->
<div class="flex mb-2">
<span class="shrink-0 label">慢病标签</span>
<ChronicTag :list="result.chronicTagsArray"/>
<!-- <span>{{ result.chronicTagsArrayName }}</span> -->
</div>
<div class="text-12 tip">
<div style="color: #A5AEBE;" >提示：</div>
<div style="color: #768092;">如需为居民进行 慢病诊断筛查 ，请在医生PC端进行操作</div>
</div>
<div class="text-center mt-5">
<van-button round type="primary" class="detail-bt" @click="toDetail">详情</van-button>
</div>
</div>
<div class="card" v-else-if="!!result.id">
<div class="py-3">
<span class="text-16 font-semibold mr-3">{{ result.residentName }}</span>
<span class="text-12 mr-3">{{ result.currentAge || '-' }} 岁</span>
<span class="text-12">{{ result.genderName }}</span>
</div>
<div class="mb-2">
<span class="label">身份证号</span>
<span>{{ $idCardHide(result.idCard) }}</span>
</div>
<div class="text-12 tip">
<div style="color: #A5AEBE;" >提示：</div>
<div style="color: #768092;">如需为居民进行 慢病诊断筛查 ，请在医生PC端进行操作</div>
</div>
</div>
<div class="text-center empty" v-else>
<img src="@/assets/image/doctor/empty.png" alt="" style="width: 1.2rem;">
<p>暂无数据</p>
</div>
</div>
</div>
</div>
</template>
<script>
import { getResidentByPage } from '@/api/doctor/resident.js'
import { validateIdCard } from '@/utils/commonReg.js'
import { setLocalStorage, getLocalStorage } from '@/utils/common.js'
import { showFailToast } from 'vant'
import ChronicTag from '@/doctor/components/chronicTag/ChronicTag.vue'
import IdCardScan from '@/doctor/components/idCardScan/IdCardScan.vue'
export default {
components: {
ChronicTag,
IdCardScan
},
data() {
return {
// 查询使用
idCard: undefined,
// 历史记录
history: [],
result: {},
state: 1,
show: false,
value1: undefined,
value2: undefined
}
},
computed: {
historyKey() {
return 'search-history'
},
},
created() {
this.history = getLocalStorage(this.historyKey) || []
},
methods: {
formatter(value) {
return value.replace(/[\u4e00-\u9fa5/\s+/]|[^a-zA-Z0-9\u4E00-\u9FA5]/g, '');
},
search() {
if (!this.idCard) return
if (!validateIdCard(this.idCard)) {
showFailToast('请输入正确的身份证号')
return
}
const query = {
idCard: this.idCard,
pageIndex: 1,
pageSize: 10
}
getResidentByPage(query).then(res => {
const result = res?.data?.dataList || []
this.result = result[0] || {}
this.setHistory()
}).finally(() => {
this.state = 2
})
},
toSearch(idCard) {
this.idCard = idCard
this.search()
},
toDetail() {
this.$router.push({
path: `/doctor/resident/base`,
query: {
residentId: this.result.residentInfoId
}
})
},
toBack() {
this.$router.back()
},
idCardClear() {
this.state = 1
},
setHistory() {
const history = getLocalStorage(this.historyKey) || []
const index = history.findIndex(e => e === this.idCard)
if (index > -1) {
history.splice(index, 1)
}
history.unshift(this.idCard)
if (history.length > 8) {
history.pop()
}
this.history = history
setLocalStorage(this.historyKey, history)
},
clearHistory() {
setLocalStorage(this.historyKey, [])
this.history = []
}
}
}
</script>
<style lang="less" scoped>
.search {
height: 100vh;
}
.top-bar {
border-bottom: 1px solid #e5e5e5;
.back-bt {
flex-basis: 24px;
text-align: center;
}
.input-box {
background-color: #FAFAFA;
border: 1px solid #F5F5F5;
border-radius: 4px;
.svg-icon {
font-size: 16px;
}
.van-cell {
font-size: 14px;
padding: 4px 10px;
background: transparent;
&::after {
display: none;
}
}
}
}
.history-list {
gap: 10px;
>span {
border-radius: 34px;
background-color: #EFF2F7;
padding: 2px 12px;
}
}
.card {
line-height: 1.2;
.label {
display: inline-block;
color: #8C8C8C;
min-width: 8em;
}
.tip {
background-color: #F8FAFC;
padding: 8px 10px;
line-height: 1.5;
}
.detail-bt {
color: #607FF0;
background-color: #F0F3FF;
border: 0;
width: 50%;
height: 32px;
}
}
</style>
src/doctor/workbench/Workbench.vue
View file @ 3bd2ead7
......@@ -51,7 +51,9 @@ export default {
},
methods: {
toSearch() {
this.$router.push({
path: '/doctor/search'
})
},
tabSelect(item, index) {
this.tabActive = item
......
src/doctor/workbench/tables/Visit.vue
View file @ 3bd2ead7
......@@ -240,11 +240,16 @@ export default {
},
toDetail(record) {
if (!record) return
// let path = `/residentWX/screening/firstDetail/${record.id}`
// if (this.activeTab == '2') {
// path = `/residentWX/screening/SecondDetail/${record.id}`
// }
// this.$router.push({ path })
if (record.residentInfoId == null) {
showToast('暂时无法查看 详情信息')
return
}
this.$router.push({
path: '/doctor/patient-detail',
query: {
residentInfoId: record.residentInfoId
}
})
},
onIgnore(record) {
delVisit({ id: record.id }).then(() => {
......
src/doctor/workbench/tables/Work.vue
View file @ 3bd2ead7
......@@ -44,7 +44,7 @@
</div>
<div class="divider my-3"></div>
<div class="bt-group">
<van-button round size="small" class="doc-btn-primary">详情</van-button>
<van-button round size="small" class="doc-btn-primary" @click="toDetail(item)">详情</van-button>
</div>
</div>
</div>
......@@ -94,6 +94,7 @@ import { getWorkByPage } from '@/api/doctor/workbench.js'
import { useStore } from '@/doctor/store'
import CheckBtn from '@/doctor/components/checkBtn/CheckBtn.vue'
import IdCardScan from '@/doctor/components/idCardScan/IdCardScan.vue'
import { showToast } from 'vant'
const DefaultForm = {
// 数据来源,[DC00051]
......@@ -197,11 +198,16 @@ export default {
},
toDetail(record) {
if (!record) return
// let path = `/residentWX/screening/firstDetail/${record.id}`
// if (this.activeTab == '2') {
// path = `/residentWX/screening/SecondDetail/${record.id}`
// }
// this.$router.push({ path })
if (record.residentInfoId == null) {
showToast('暂时无法查看 详情信息')
return
}
this.$router.push({
path: '/doctor/patient-detail',
query: {
residentInfoId: record.residentInfoId
}
})
},
dateHandle() {
if (this.rangeDate && this.rangeDate.length) {
......
src/router/index.js
View file @ 3bd2ead7
......@@ -45,18 +45,23 @@ const routes = [
name: 'doctor-workbench',
component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/workbench/Workbench.vue')
},
{
path: 'search',
name: 'doctor-search',
component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/search/Search.vue')
},
{
path: 'patient-detail',
name: 'doctor-patient-detail',
component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/patientDetail/PatientDetail.vue')
},
{
path: 'followUp/list',
name: 'followUp-list',
component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/followUp/List')
},
{
path: 'followUp/search',
name: 'followUp-search',
component: () => import(/* webpackChunkName: "doctor" */ '@/doctor/followUp/search/Search.vue')
},
{
path: 'followUp/generalFU/detail',
name: 'followUp-generalFU-detail',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment