fix: 慢性病管理功能优化完善。
This commit is contained in:
@@ -44,17 +44,30 @@
|
||||
<el-table-column type="index" label="序号" :index="indexMethod" width="50"></el-table-column>
|
||||
<el-table-column label="计划名称" align="center" prop="planName" width="150" />
|
||||
<el-table-column label="人员" align="center" prop="personName" width="100" />
|
||||
<el-table-column label="药品" align="center" width="200">
|
||||
<template #default="scope"> {{ scope.row.shortName }}-{{ scope.row.brand }} </template>
|
||||
<el-table-column label="药品" align="center" prop="medicineName" width="200" />
|
||||
<el-table-column label="剂量" align="center" width="100">
|
||||
<template #default="scope">
|
||||
<span style="display: inline-flex; align-items: center; gap: 4px">
|
||||
{{ scope.row.dosagePerTime }}
|
||||
<dict-tag :options="medical_unit" :value="scope.row.dosageUnit" style="display: inline-flex" />
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="剂量/频率" align="center" width="120">
|
||||
<template #default="scope"> {{ scope.row.dosage }}{{ scope.row.dosageUnit }} × {{ scope.row.frequency }}次/日 </template>
|
||||
</el-table-column>
|
||||
<el-table-column label="频率类型" align="center" prop="frequencyType" width="100">
|
||||
<el-table-column label="频次类型" align="center" prop="frequencyType" width="100">
|
||||
<template #default="scope">
|
||||
<dict-tag :options="medication_frequency_type" :value="scope.row.frequencyType" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="服药时间" align="center" width="180">
|
||||
<template #default="scope">
|
||||
<div v-if="scope.row.timeSlots" class="time-slots-list">
|
||||
<el-tag v-for="(time, idx) in parseTimeSlots(scope.row.timeSlots)" :key="idx" size="small" type="info" class="time-tag">
|
||||
{{ time }}
|
||||
</el-tag>
|
||||
</div>
|
||||
<span v-else>--</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="开始日期" align="center" prop="startDate" width="110">
|
||||
<template #default="scope">
|
||||
{{ formatDate(scope.row.startDate) }}
|
||||
@@ -67,13 +80,13 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="今日进度" align="center" width="100">
|
||||
<template #default="scope">
|
||||
<span v-if="scope.row.status === '1'"> {{ scope.row.todayTakenCount || 0 }}/{{ scope.row.todayTotalCount || 0 }} </span>
|
||||
<span v-if="scope.row.status === 1"> {{ scope.row.todayCompleted || 0 }}/{{ scope.row.todayTotal || 0 }} </span>
|
||||
<span v-else>--</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="提醒" align="center" prop="reminderEnabled" width="80">
|
||||
<el-table-column label="提醒" align="center" prop="remindEnabled" width="80">
|
||||
<template #default="scope">
|
||||
<el-tag v-if="scope.row.reminderEnabled === '1'" type="success">开</el-tag>
|
||||
<el-tag v-if="scope.row.remindEnabled === 1" type="success">开</el-tag>
|
||||
<el-tag v-else type="info">关</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -82,19 +95,19 @@
|
||||
<dict-tag :options="medication_plan_status" :value="scope.row.status" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
|
||||
<el-table-column label="操作" align="center" class-name="small-padding">
|
||||
<template v-slot="scope">
|
||||
<div class="ctrl-btn d-flex">
|
||||
<el-tooltip class="item" effect="dark" content="查看" placement="top">
|
||||
<el-button icon="View" v-hasPermi="['health:medicationPlan:query']" circle @click="handleView(scope.row)"></el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip v-if="scope.row.status === '1'" class="item" effect="dark" content="暂停" placement="top">
|
||||
<el-tooltip v-if="scope.row.status === 1" class="item" effect="dark" content="暂停" placement="top">
|
||||
<el-button icon="VideoPause" v-hasPermi="['health:medicationPlan:edit']" circle @click="handlePause(scope.row)"></el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip v-if="scope.row.status === '3'" class="item" effect="dark" content="恢复" placement="top">
|
||||
<el-tooltip v-if="scope.row.status === 2 || scope.row.status === 3" class="item" effect="dark" content="恢复" placement="top">
|
||||
<el-button icon="VideoPlay" v-hasPermi="['health:medicationPlan:edit']" circle @click="handleResume(scope.row)"></el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip v-if="scope.row.status !== '2'" class="item" effect="dark" content="结束" placement="top">
|
||||
<el-tooltip v-if="scope.row.status !== 2" class="item" effect="dark" content="结束" placement="top">
|
||||
<el-button icon="Finished" v-hasPermi="['health:medicationPlan:edit']" circle @click="handleEnd(scope.row)"></el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip class="item" effect="dark" content="修改" placement="top">
|
||||
@@ -121,20 +134,20 @@
|
||||
<el-dialog :title="title" v-model="open" width="900px" append-to-body>
|
||||
<el-form ref="planRef" :model="form" :inline="true" :rules="rules" label-width="120px">
|
||||
<el-form-item label="计划名称" prop="planName">
|
||||
<el-input v-model="form.planName" placeholder="请输入计划名称(可选)" style="width: 300px" />
|
||||
<el-input v-model="form.planName" placeholder="请输入计划名称(可选)" />
|
||||
</el-form-item>
|
||||
<el-form-item label="人员" prop="personId">
|
||||
<el-select v-model="form.personId" placeholder="请选择人员" filterable style="width: 200px" @change="handlePersonChange">
|
||||
<el-select v-model="form.personId" placeholder="请选择人员" filterable @change="handlePersonChange">
|
||||
<el-option v-for="item in personList" :key="item.id" :label="item.name" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="慢性疾病" prop="chronicDiseaseId">
|
||||
<el-select v-model="form.chronicDiseaseId" placeholder="请选择慢性疾病(可选)" filterable clearable style="width: 300px">
|
||||
<el-select v-model="form.chronicDiseaseId" placeholder="请选择慢性疾病(可选)" filterable clearable>
|
||||
<el-option v-for="item in chronicDiseaseList" :key="item.id" :label="item.diseaseName" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="药品" prop="medicineId">
|
||||
<el-select v-model="form.medicineId" placeholder="请选择药品" filterable style="width: 300px" @change="handleMedicineChange">
|
||||
<el-select v-model="form.medicineId" placeholder="请选择药品" filterable @change="handleMedicineChange">
|
||||
<el-option v-for="item in medicineList" :key="item.id" :label="item.shortName + '-' + item.brand" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@@ -145,32 +158,51 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="频次类型" prop="frequencyType">
|
||||
<el-select v-model="form.frequencyType" placeholder="请选择频次类型" style="width: 150px">
|
||||
<el-select v-model="form.frequencyType" placeholder="请选择频次类型">
|
||||
<el-option label="每天" :value="1" />
|
||||
<el-option label="每周" :value="2" />
|
||||
<el-option label="隔天" :value="3" />
|
||||
<el-option label="自定义" :value="4" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="服药时间点" prop="timeSlots">
|
||||
<el-tag v-for="(time, index) in form.timePointList" :key="index" closable @close="removeTimePoint(index)" style="margin-right: 10px">
|
||||
{{ time }}
|
||||
</el-tag>
|
||||
<el-time-picker v-model="newTimePoint" placeholder="添加时间" format="HH:mm" value-format="HH:mm" @change="addTimePoint" style="width: 120px" />
|
||||
<el-form-item label="服药时间点" prop="timeSlots" style="width: 100%">
|
||||
<div class="time-slots-wrapper">
|
||||
<div v-for="(time, index) in form.timePointList" :key="index" class="time-slot-item">
|
||||
<span class="time-text">{{ time }}</span>
|
||||
<el-icon class="close-icon" @click="removeTimePoint(index)"><Close /></el-icon>
|
||||
</div>
|
||||
<el-time-picker
|
||||
v-model="newTimePoint"
|
||||
placeholder="添加时间"
|
||||
format="HH:mm"
|
||||
value-format="HH:mm"
|
||||
@change="addTimePoint"
|
||||
style="width: 110px"
|
||||
size="small"
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="开始日期" prop="startDate">
|
||||
<el-date-picker v-model="form.startDate" type="date" placeholder="选择开始日期" value-format="YYYY-MM-DD" style="width: 180px" />
|
||||
<el-date-picker v-model="form.startDate" type="date" placeholder="选择开始日期" value-format="YYYY-MM-DD" />
|
||||
</el-form-item>
|
||||
<el-form-item label="结束日期" prop="endDate">
|
||||
<el-date-picker v-model="form.endDate" type="date" placeholder="选择结束日期(可选)" value-format="YYYY-MM-DD" style="width: 180px" />
|
||||
<el-date-picker v-model="form.endDate" type="date" placeholder="选择结束日期(可选)" value-format="YYYY-MM-DD" />
|
||||
</el-form-item>
|
||||
<el-form-item label="启用提醒" prop="remindEnabled">
|
||||
<el-switch v-model="form.remindEnabled" :active-value="1" :inactive-value="0" />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.remindEnabled === 1" label="提前提醒" prop="remindAdvanceMin">
|
||||
<el-input-number v-model="form.remindAdvanceMin" :min="0" :max="60" style="width: 150px" />
|
||||
<el-input-number v-model="form.remindAdvanceMin" :min="0" :max="60" />
|
||||
<span style="margin-left: 10px">分钟</span>
|
||||
</el-form-item>
|
||||
<el-form-item label="通知家属" prop="notifyFamily">
|
||||
<el-switch v-model="form.notifyFamily" :active-value="1" :inactive-value="0" />
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.notifyFamily === 1" label="家属成员" prop="familyMemberIds">
|
||||
<el-select v-model="form.familyMemberIdList" multiple placeholder="请选择家属成员" filterable style="width: 300px">
|
||||
<el-option v-for="item in personList" :key="item.id" :label="item.name" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" style="width: 100%">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" :rows="3" />
|
||||
</el-form-item>
|
||||
@@ -199,6 +231,7 @@ import {
|
||||
import { listMedicineBasic } from '@/api/health/medicineBasic'
|
||||
import { listPerson } from '@/api/health/person'
|
||||
import { listChronicDiseaseByMember } from '@/api/health/chronicDisease'
|
||||
import { Close } from '@element-plus/icons-vue'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
const { medication_frequency_type, medication_plan_status, medical_unit } = proxy.useDict('medication_frequency_type', 'medication_plan_status', 'medical_unit')
|
||||
@@ -290,6 +323,7 @@ function reset() {
|
||||
remindAdvanceMin: 15,
|
||||
notifyFamily: 0,
|
||||
familyMemberIds: null,
|
||||
familyMemberIdList: [],
|
||||
status: 1,
|
||||
remark: null
|
||||
}
|
||||
@@ -337,13 +371,46 @@ function handleSelectionChange(selection) {
|
||||
// 格式化日期
|
||||
function formatDate(date) {
|
||||
if (!date) return ''
|
||||
return date.substring(0, 10)
|
||||
// 处理数组格式 [2026, 3, 21]
|
||||
if (Array.isArray(date)) {
|
||||
return `${date[0]}-${String(date[1]).padStart(2, '0')}-${String(date[2]).padStart(2, '0')}`
|
||||
}
|
||||
// 处理字符串格式
|
||||
if (typeof date === 'string') {
|
||||
return date.substring(0, 10)
|
||||
}
|
||||
return ''
|
||||
}
|
||||
|
||||
// 解析服药时间点 JSON
|
||||
function parseTimeSlots(timeSlots) {
|
||||
if (!timeSlots) return []
|
||||
try {
|
||||
return typeof timeSlots === 'string' ? JSON.parse(timeSlots) : timeSlots
|
||||
} catch (e) {
|
||||
return []
|
||||
}
|
||||
}
|
||||
|
||||
// 将数组日期转换为字符串日期
|
||||
function convertArrayDateToString(dateArray) {
|
||||
if (!dateArray) return null
|
||||
if (Array.isArray(dateArray)) {
|
||||
return `${dateArray[0]}-${String(dateArray[1]).padStart(2, '0')}-${String(dateArray[2]).padStart(2, '0')}`
|
||||
}
|
||||
if (typeof dateArray === 'string') {
|
||||
return dateArray.substring(0, 10)
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
// 查看
|
||||
const handleView = (row) => {
|
||||
getMedicationPlan(row.id).then((response) => {
|
||||
form.value = response.data
|
||||
// 转换日期格式
|
||||
form.value.startDate = convertArrayDateToString(form.value.startDate)
|
||||
form.value.endDate = convertArrayDateToString(form.value.endDate)
|
||||
// 解析 timeSlots JSON
|
||||
if (form.value.timeSlots) {
|
||||
try {
|
||||
@@ -354,6 +421,16 @@ const handleView = (row) => {
|
||||
} else {
|
||||
form.value.timePointList = []
|
||||
}
|
||||
// 解析 familyMemberIds JSON
|
||||
if (form.value.familyMemberIds) {
|
||||
try {
|
||||
form.value.familyMemberIdList = typeof form.value.familyMemberIds === 'string' ? JSON.parse(form.value.familyMemberIds) : form.value.familyMemberIds
|
||||
} catch (e) {
|
||||
form.value.familyMemberIdList = []
|
||||
}
|
||||
} else {
|
||||
form.value.familyMemberIdList = []
|
||||
}
|
||||
title.value = '查看用药计划'
|
||||
open.value = true
|
||||
// 加载该人员的慢性疾病列表
|
||||
@@ -378,6 +455,9 @@ function handleUpdate(row) {
|
||||
const _id = row.id || ids.value
|
||||
getMedicationPlan(_id).then((response) => {
|
||||
form.value = response.data
|
||||
// 转换日期格式
|
||||
form.value.startDate = convertArrayDateToString(form.value.startDate)
|
||||
form.value.endDate = convertArrayDateToString(form.value.endDate)
|
||||
// 解析 timeSlots JSON
|
||||
if (form.value.timeSlots) {
|
||||
try {
|
||||
@@ -388,6 +468,16 @@ function handleUpdate(row) {
|
||||
} else {
|
||||
form.value.timePointList = []
|
||||
}
|
||||
// 解析 familyMemberIds JSON
|
||||
if (form.value.familyMemberIds) {
|
||||
try {
|
||||
form.value.familyMemberIdList = typeof form.value.familyMemberIds === 'string' ? JSON.parse(form.value.familyMemberIds) : form.value.familyMemberIds
|
||||
} catch (e) {
|
||||
form.value.familyMemberIdList = []
|
||||
}
|
||||
} else {
|
||||
form.value.familyMemberIdList = []
|
||||
}
|
||||
open.value = true
|
||||
title.value = '修改用药计划'
|
||||
// 加载该人员的慢性疾病列表
|
||||
@@ -406,7 +496,7 @@ function handlePause(row) {
|
||||
.then(() => {
|
||||
return pauseMedicationPlan(row.id)
|
||||
})
|
||||
.then(() => {
|
||||
.then((response) => {
|
||||
getList()
|
||||
proxy.$modal.msgSuccess('暂停成功')
|
||||
})
|
||||
@@ -439,22 +529,34 @@ function handleEnd(row) {
|
||||
function submitForm() {
|
||||
proxy.$refs.planRef.validate((valid) => {
|
||||
if (valid) {
|
||||
// 构建提交数据,排除后端自动生成的字段
|
||||
const submitData = { ...form.value }
|
||||
// 将时间点列表转为 JSON 字符串
|
||||
form.value.timeSlots = JSON.stringify(form.value.timePointList)
|
||||
// 根据药品ID获取药品名称和规格
|
||||
const medicine = medicineList.value.find((m) => m.id === form.value.medicineId)
|
||||
if (medicine) {
|
||||
form.value.medicineName = medicine.shortName + '-' + medicine.brand
|
||||
form.value.specification = medicine.specification || ''
|
||||
submitData.timeSlots = JSON.stringify(form.value.timePointList)
|
||||
// 将家属成员ID列表转为 JSON 字符串
|
||||
if (form.value.familyMemberIdList && form.value.familyMemberIdList.length > 0) {
|
||||
submitData.familyMemberIds = JSON.stringify(form.value.familyMemberIdList)
|
||||
} else {
|
||||
submitData.familyMemberIds = null
|
||||
}
|
||||
if (form.value.id != null) {
|
||||
updateMedicationPlan(form.value).then((response) => {
|
||||
// 根据药品ID获取药品名称和规格
|
||||
const medicine = medicineList.value.find((m) => m.id === submitData.medicineId)
|
||||
if (medicine) {
|
||||
submitData.medicineName = medicine.shortName + '-' + medicine.brand
|
||||
submitData.specification = medicine.specification || ''
|
||||
}
|
||||
// 移除后端自动管理的字段
|
||||
delete submitData.createTime
|
||||
delete submitData.updateTime
|
||||
delete submitData.familyMemberIdList
|
||||
if (submitData.id != null) {
|
||||
updateMedicationPlan(submitData).then((response) => {
|
||||
proxy.$modal.msgSuccess('修改成功')
|
||||
open.value = false
|
||||
getList()
|
||||
})
|
||||
} else {
|
||||
addMedicationPlan(form.value).then((response) => {
|
||||
addMedicationPlan(submitData).then((response) => {
|
||||
proxy.$modal.msgSuccess('新增成功')
|
||||
open.value = false
|
||||
getList()
|
||||
@@ -515,3 +617,63 @@ getPersonList()
|
||||
getMedicineList()
|
||||
getList()
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.time-slots-wrapper {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 10px 12px;
|
||||
background: #fafbfc;
|
||||
border: 1px solid #e4e7ed;
|
||||
border-radius: 6px;
|
||||
min-height: 44px;
|
||||
}
|
||||
|
||||
.time-slot-item {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
padding: 4px 10px;
|
||||
background: #fff;
|
||||
border: 1px solid #dcdfe6;
|
||||
border-radius: 4px;
|
||||
color: #606266;
|
||||
font-size: 13px;
|
||||
transition: all 0.2s ease;
|
||||
}
|
||||
|
||||
.time-slot-item:hover {
|
||||
border-color: #409eff;
|
||||
color: #409eff;
|
||||
}
|
||||
|
||||
.time-text {
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.close-icon {
|
||||
cursor: pointer;
|
||||
font-size: 12px;
|
||||
color: #c0c4cc;
|
||||
transition: all 0.2s;
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
.close-icon:hover {
|
||||
color: #f56c6c;
|
||||
}
|
||||
|
||||
.time-slots-list {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.time-tag {
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user