Skip to content

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

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

parents ec7dce6a 9aba4ae0
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 146 deletions
src/doctor/followUp/separateFU/components/InspectV3.vue
View file @ e04b9271
......@@ -311,6 +311,7 @@ export default {
})
this.otherInspectList = inspectList.filter(item => item.itemCode === 'otherInspect')
if (auxiliaryExamination.length === 0) return
let array = []
auxiliaryExamination?.forEach(x => {
const items = list.filter(e => e.insType === x)
......
src/doctor/followUp/separateFU/detail/components/ChronicKidneyDiseaseDetail.vue
View file @ e04b9271
......@@ -141,13 +141,13 @@
</div>
<div>
<span>目前运动情况：</span>
<span>{{ visitInfo.nowExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.nowExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.nowExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.nowExerciseMinute }} 分钟/次</span>
</div>
<div>
<span>目标运动情况：</span>
<span>{{ visitInfo.targetExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.targetExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.targetExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.targetExerciseMinute }} 分钟/次</span>
</div>
</div>
<div class="list mt-2">
......@@ -169,12 +169,7 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div v-for="(x, xIndex) in inspectList" :key="xIndex" class="gray-box mb-2">
<div>检查名称：{{ x.itemName }}</div>
<div>检查结果：{{ x.itemValue }}</div>
<div>影像报告：</div>
<ImagePreview :img-list="x.picturesList"></ImagePreview>
</div>
<AuxiliaryInspectDetail :info="visitInfo" />
</van-collapse-item>
<van-collapse-item key="7" title="服药依从性" name="7">
<template #right-icon>
......@@ -308,8 +303,9 @@
<script>
import { useStore } from '@/doctor/store'
import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
import AuxiliaryInspectDetail from './components/AuxiliaryInspectDetail.vue'
export default {
components: { ImagePreview },
components: { ImagePreview, AuxiliaryInspectDetail },
props: {
visitInfo: {
type: Object,
......@@ -357,9 +353,6 @@ export default {
residentInfo() {
return this.visitInfo.residentsRecord || {}
},
inspectList() {
return this.visitInfo.inspectList || []
},
medicateCase() {
if (this.visitInfo.medicateCase) {
return JSON.parse(this.visitInfo.medicateCase)
......
src/doctor/followUp/separateFU/detail/components/CopdDetail.vue
View file @ e04b9271
......@@ -125,13 +125,13 @@
</div>
<div>
<span>目前运动情况：</span>
<span>{{ visitInfo.nowExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.nowExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.nowExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.nowExerciseMinute }} 分钟/次</span>
</div>
<div>
<span>目标运动情况：</span>
<span>{{ visitInfo.targetExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.targetExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.targetExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.targetExerciseMinute }} 分钟/次</span>
</div>
</div>
<div class="py-1">呼吸锻炼</div>
......@@ -188,15 +188,7 @@
</span>
</div>
</div>
<template v-if="inspectList?.length > 0">
<div class="py-1">其他检查</div>
<div v-for="(x, xIndex) in inspectList" :key="xIndex" class="gray-box mb-2">
<div>检查名称：{{ x.itemName }}</div>
<div>检查结果：{{ x.itemValue }}</div>
<div>影像报告：</div>
<ImagePreview :img-list="x.picturesList"></ImagePreview>
</div>
</template>
<AuxiliaryInspectDetail :info="visitInfo" />
</van-collapse-item>
<van-collapse-item key="8" title="服药依从性" name="8">
<template #right-icon>
......@@ -349,8 +341,9 @@
<script>
import { useStore } from '@/doctor/store'
import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
import AuxiliaryInspectDetail from './components/AuxiliaryInspectDetail.vue'
export default {
components: { ImagePreview },
components: { ImagePreview, AuxiliaryInspectDetail },
props: {
visitInfo: {
type: Object,
......@@ -417,9 +410,6 @@ export default {
residentInfo() {
return this.visitInfo.residentsRecord || {}
},
inspectList() {
return this.visitInfo.inspectList || []
},
medicateCase() {
if (this.visitInfo.medicateCase) {
return JSON.parse(this.visitInfo.medicateCase)
......
src/doctor/followUp/separateFU/detail/components/CoronaryHeartDiseaseDetail.vue
View file @ e04b9271
......@@ -141,13 +141,13 @@
</div>
<div>
<span>目前运动情况：</span>
<span>{{ visitInfo.nowExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.nowExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.nowExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.nowExerciseMinute }} 分钟/次</span>
</div>
<div>
<span>目标运动情况：</span>
<span>{{ visitInfo.targetExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.targetExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.targetExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.targetExerciseMinute }} 分钟/次</span>
</div>
</div>
<div class="list mt-2">
......@@ -169,12 +169,7 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div v-for="(x, xIndex) in inspectList" :key="xIndex" class="gray-box mb-2">
<div>检查名称：{{ x.itemName }}</div>
<div>检查结果：{{ x.itemValue }}</div>
<div>影像报告：</div>
<ImagePreview :img-list="x.picturesList"></ImagePreview>
</div>
<AuxiliaryInspectDetail :info="visitInfo" />
</van-collapse-item>
<van-collapse-item key="7" title="服药依从性" name="7">
<template #right-icon>
......@@ -308,8 +303,9 @@
<script>
import { useStore } from '@/doctor/store'
import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
import AuxiliaryInspectDetail from './components/AuxiliaryInspectDetail.vue'
export default {
components: { ImagePreview },
components: { ImagePreview, AuxiliaryInspectDetail },
props: {
visitInfo: {
type: Object,
......@@ -358,9 +354,6 @@ export default {
residentInfo() {
return this.visitInfo.residentsRecord || {}
},
inspectList() {
return this.visitInfo.inspectList || []
},
medicateCase() {
if (this.visitInfo.medicateCase) {
return JSON.parse(this.visitInfo.medicateCase)
......
src/doctor/followUp/separateFU/detail/components/DiabetesDetail.vue
View file @ e04b9271
......@@ -141,13 +141,13 @@
</div>
<div>
<span>目前运动情况：</span>
<span>{{ visitInfo.nowExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.nowExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.nowExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.nowExerciseMinute }} 分钟/次</span>
</div>
<div>
<span>目标运动情况：</span>
<span>{{ visitInfo.targetExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.targetExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.targetExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.targetExerciseMinute }} 分钟/次</span>
</div>
</div>
<div class="list mt-2">
......@@ -184,17 +184,7 @@
</div>
</div>
</div>
<div v-for="(x, xIndex) in inspectList" :key="xIndex">
<div class="py-1">{{ x.insName }}</div>
<div class="gray-box">
<div v-for="(y, yIndex) in x.items" :key="yIndex">
<span>{{ y.itemName }}</span>
<span v-if="y.itemName">：</span>
<span>{{ y.itemValue }}</span>
<span class="ml-1">{{ y.unit }}</span>
</div>
</div>
</div>
<AuxiliaryInspectDetail :info="visitInfo" />
</van-collapse-item>
<van-collapse-item key="7" title="服药依从性" name="7">
<template #right-icon>
......@@ -350,8 +340,9 @@
<script>
import { useStore } from '@/doctor/store'
import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
import AuxiliaryInspectDetail from './components/AuxiliaryInspectDetail.vue'
export default {
components: { ImagePreview },
components: { ImagePreview, AuxiliaryInspectDetail },
props: {
visitInfo: {
type: Object,
......@@ -409,22 +400,6 @@ export default {
residentInfo() {
return this.visitInfo.residentsRecord || {}
},
inspectList() {
let { auxiliaryExamination, inspectList = [] } = this.visitInfo
let auxiliaryExaminationList = auxiliaryExamination.split(',').map(e => +e) || []
let list = []
auxiliaryExaminationList.forEach(item => {
const items = inspectList.filter(e => e.insType === item)
if (items.length > 0) {
list.push({
insType: items[0].insType,
insName: items[0].insName,
items: [...items]
})
}
})
return list
},
medicateCase() {
if (this.visitInfo.medicateCase) {
return JSON.parse(this.visitInfo.medicateCase)
......
src/doctor/followUp/separateFU/detail/components/DyslipidemiaDetail.vue
View file @ e04b9271
......@@ -141,13 +141,13 @@
</div>
<div>
<span>目前运动情况：</span>
<span>{{ visitInfo.nowExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.nowExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.nowExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.nowExerciseMinute }} 分钟/次</span>
</div>
<div>
<span>目标运动情况：</span>
<span>{{ visitInfo.targetExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.targetExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.targetExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.targetExerciseMinute }} 分钟/次</span>
</div>
</div>
<div class="list mt-2">
......@@ -169,12 +169,7 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div v-for="(x, xIndex) in inspectList" :key="xIndex" class="gray-box mb-2">
<div>检查名称：{{ x.itemName }}</div>
<div>检查结果：{{ x.itemValue }}</div>
<div>影像报告：</div>
<ImagePreview :img-list="x.picturesList"></ImagePreview>
</div>
<AuxiliaryInspectDetail :info="visitInfo" />
</van-collapse-item>
<van-collapse-item key="7" title="服药依从性" name="7">
<template #right-icon>
......@@ -308,8 +303,9 @@
<script>
import { useStore } from '@/doctor/store'
import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
import AuxiliaryInspectDetail from './components/AuxiliaryInspectDetail.vue'
export default {
components: { ImagePreview },
components: { ImagePreview, AuxiliaryInspectDetail },
props: {
visitInfo: {
type: Object,
......@@ -358,9 +354,6 @@ export default {
residentInfo() {
return this.visitInfo.residentsRecord || {}
},
inspectList() {
return this.visitInfo.inspectList || []
},
medicateCase() {
if (this.visitInfo.medicateCase) {
return JSON.parse(this.visitInfo.medicateCase)
......
src/doctor/followUp/separateFU/detail/components/HypertensionDetail.vue
View file @ e04b9271
......@@ -144,13 +144,13 @@
</div>
<div>
<span>目前运动情况：</span>
<span>{{ visitInfo.nowExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.nowExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.nowExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.nowExerciseMinute }} 分钟/次</span>
</div>
<div>
<span>目标运动情况：</span>
<span>{{ visitInfo.targetExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.targetExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.targetExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.targetExerciseMinute }} 分钟/次</span>
</div>
</div>
<div class="list mt-2">
......@@ -172,25 +172,7 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div v-for="(x, xIndex) in inspectList" :key="xIndex">
<div style="color: #262626" :class="[xIndex === 0 ? '' : 'mt-2']">{{ x.insName }}</div>
<div class="gray-box mt-1">
<div v-for="(y, yIndex) in x.items" :key="yIndex">
<template v-if="x.insType === 99">
<div>检查结果：{{ store.getDictValue('CP00157', y.itemValue) }}</div>
<div v-if="y.itemValue === '2'">异常情况：{{ y.abnormalSituation }}</div>
<div>影像报告：</div>
<ImagePreview :img-list="y.picturesList"></ImagePreview>
</template>
<template v-else>
<span>{{ y.itemName }}</span>
<span v-if="y.itemName">：</span>
<span>{{ y.itemValue }}</span>
<span class="ml-1">{{ y.unit }}</span>
</template>
</div>
</div>
</div>
<AuxiliaryInspectDetail :info="visitInfo" />
</van-collapse-item>
<van-collapse-item key="7" title="目前高血压用药及依从性" name="7">
<template #right-icon>
......@@ -362,8 +344,9 @@
<script>
import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
import { useStore } from '@/doctor/store'
import AuxiliaryInspectDetail from './components/AuxiliaryInspectDetail.vue'
export default {
components: { ImagePreview },
components: { ImagePreview, AuxiliaryInspectDetail },
props: {
visitInfo: {
type: Object,
......@@ -433,22 +416,6 @@ export default {
} else {
return []
}
},
inspectList() {
let { auxiliaryExamination, inspectList = [] } = this.visitInfo
let auxiliaryExaminationList = auxiliaryExamination.split(',').map(e => +e) || []
let list = []
auxiliaryExaminationList.forEach(item => {
const items = inspectList.filter(e => e.insType === item)
if (items.length > 0) {
list.push({
insType: items[0].insType,
insName: items[0].insName,
items: [...items]
})
}
})
return list
}
},
methods: {
......
src/doctor/followUp/separateFU/detail/components/StrokeDetail.vue
View file @ e04b9271
......@@ -141,13 +141,13 @@
</div>
<div>
<span>目前运动情况：</span>
<span>{{ visitInfo.nowExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.nowExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.nowExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.nowExerciseMinute }} 分钟/次</span>
</div>
<div>
<span>目标运动情况：</span>
<span>{{ visitInfo.targetExerciseWeek || '-' }}次/周、</span>
<span>{{ visitInfo.targetExerciseMinute || '-' }}分钟/次</span>
<span>{{ visitInfo.targetExerciseWeek }} 次/周、</span>
<span>{{ visitInfo.targetExerciseMinute }} 分钟/次</span>
</div>
</div>
<div class="list mt-2">
......@@ -169,12 +169,7 @@
<template #right-icon>
<doc-icon type="doc-down" />
</template>
<div v-for="(x, xIndex) in inspectList" :key="xIndex" class="gray-box mb-2">
<div>检查名称：{{ x.itemName }}</div>
<div>检查结果：{{ x.itemValue }}</div>
<div>影像报告：</div>
<ImagePreview :img-list="x.picturesList"></ImagePreview>
</div>
<AuxiliaryInspectDetail :info="visitInfo" />
</van-collapse-item>
<van-collapse-item key="7" title="服药依从性" name="7">
<template #right-icon>
......@@ -308,8 +303,9 @@
<script>
import { useStore } from '@/doctor/store'
import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
import AuxiliaryInspectDetail from './components/AuxiliaryInspectDetail.vue'
export default {
components: { ImagePreview },
components: { ImagePreview, AuxiliaryInspectDetail },
props: {
visitInfo: {
type: Object,
......@@ -358,9 +354,6 @@ export default {
residentInfo() {
return this.visitInfo.residentsRecord || {}
},
inspectList() {
return this.visitInfo.inspectList || []
},
medicateCase() {
if (this.visitInfo.medicateCase) {
return JSON.parse(this.visitInfo.medicateCase)
......
src/doctor/followUp/separateFU/detail/components/components/AuxiliaryInspectDetail.vue 0 → 100644
View file @ e04b9271
<template>
<div v-for="(x, xIndex) in inspectList" :key="`x-${xIndex}`">
<div style="color: #262626" :class="[xIndex === 0 ? '' : 'mt-2']">{{ x.insName }}</div>
<div class="gray-box mt-1">
<div v-for="(y, yIndex) in x.items" :key="`y-${yIndex}`">
<template v-if="x.diseaseType === 1 && x.insType === 99">
<div>检查结果：{{ store.getDictValue('CP00157', y.itemValue) }}</div>
<div v-if="y.itemValue === '2'">异常情况：{{ y.abnormalSituation }}</div>
<div>影像报告：</div>
<ImagePreview :img-list="y.picturesList"></ImagePreview>
</template>
<template v-else>
<span>{{ y.itemName }}：</span>
<span>{{ y.itemValue }}</span>
<ImagePreview v-if="y.itemType === 5" :img-list="y.picturesList"></ImagePreview>
<span class="ml-1">{{ y.unit }}</span>
</template>
</div>
</div>
</div>
<div v-for="(item, index) in otherInspectList" :key="index">
<div class="gray-box mt-2">
<div>检查名称：{{ item.itemName }}</div>
<div>检查结果：{{ item.itemValue }}</div>
<div>上传图片：</div>
<ImagePreview :img-list="item.picturesList"></ImagePreview>
</div>
</div>
</template>
<script>
import { useStore } from '@/doctor/store'
import ImagePreview from '@/doctor/components/imagePreview/imagePreview.vue'
export default {
components: { ImagePreview },
props: {
info: {
type: Object,
default: () => {}
}
},
data() {
return {
store: useStore(),
inspectList: [],
otherInspectList: []
}
},
watch: {
'info.inspectList': {
handler() {
let { inspectList = [], auxiliaryExamination } = this.info
let auxiliaryList = auxiliaryExamination?.split(',').filter(e => e).map(e => +e)
let list = []
auxiliaryList.forEach(item => {
const items = inspectList.filter(e => e.insType === item)
if (items.length > 0) {
list.push({
// 病种
diseaseType: items[0].diseaseType,
// 1-检验 2-检查
configType: items[0].dataType,
insType: items[0].insType,
insName: items[0].insName,
items: [...items]
})
}
})
this.inspectList = list
this.otherInspectList = inspectList.filter(item => item.itemCode === 'otherInspect')
},
immediate: true
}
}
}
</script>
<style lang="less" scoped>
.gray-box {
background: #F8FAFC;
padding: 8px;
color: #4D5665;
font-size: 13px;
border-radius: 4px;
}
</style>
\ No newline at end of file
src/doctor/patientDetail/components/disease/Visit.vue
View file @ e04b9271
......@@ -60,7 +60,7 @@
<van-button round size='small' class='doc-btn-primary' @click.stop='toDetail(item)'>详情
</van-button>
<!-- 评估 -->
<van-button round size='small' class='doc-btn-primary' @click.stop='toEvaluation(item)' v-if='!(item.allowUpdate !==1 || item.serveType == 5)'>评估</van-button>
<van-button round size='small' class='doc-btn-primary' @click.stop='toEvaluation(item)' v-if='!(item.allowUpdate !==1 || item.serveType == 5 || item.diseaseType === 7)'>评估</van-button>
<van-button round size='small' class='doc-btn-primary' @click.stop='editBtn(item)'
v-if='!(item.allowUpdate !==1 || item.serveType == 5)'>修改
</van-button>
......
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