版本更新

This commit is contained in:
Zhang.WH
2025-10-16 17:38:08 +08:00
parent f515bb8fbb
commit e4c5f36f2e
488 changed files with 41436 additions and 2901 deletions

View File

@@ -29,9 +29,25 @@
</el-button>
</div>
<div>
<el-button class="ml20" type="danger" plain> 不执行 </el-button>
<el-button class="ml20" type="primary"> 皮试结果 </el-button>
<el-button class="ml20 mr20" type="primary"> 执行选中 </el-button>
<span class="descriptions-item-label">全选</span>
<el-switch v-model="chooseAll" @change="handelSwicthChange" />
<el-button
class="ml20"
type="primary"
@click="handleExecute"
:disabled="props.exeStatus == 6"
>
执行选中
</el-button>
<el-button
class="ml20 mr20"
type="danger"
:disabled="props.exeStatus != 6"
plain
@click="handleCancel"
>
取消执行
</el-button>
</div>
</div>
<div
@@ -64,11 +80,16 @@
<template #title>
<div style="display: flex; justify-content: space-between; align-items: center">
<div>
<span class="item-value">{{ item[0].badName }}</span>
<span class="item-value">{{ '【' + item[0].busNo + '】' }}</span>
<span class="item-value">{{ item[0].patientName + item[0].age }}</span>
<span>{{ item[0].contractName }}</span>
<span>{{ item[0].conditionNames }}</span>
<span>{{ item[0].bedName + '【' + item[0].busNo + '】' }}</span>
<span>
{{
item[0].patientName + ' / ' + item[0].genderEnum_enumText + ' / ' + item[0].age
}}
</span>
<el-tag style="margin-left: 10px">{{ item[0].contractName }}</el-tag>
<span style="margin-left: 30px; font-weight: 600">
{{ item[0].conditionNames }}
</span>
</div>
<div
style="
@@ -105,7 +126,12 @@
</div>
</div>
</template>
<el-table :data="item" border :header-cell-style="{ background: '#eef9fd !important' }">
<el-table
:data="item"
border
:ref="'tableRef' + index"
:header-cell-style="{ background: '#eef9fd !important' }"
>
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="类型" align="center" prop="therapyEnum_enumText" width="80">
<template #default="scope">
@@ -114,8 +140,31 @@
</span>
</template>
</el-table-column>
<el-table-column label="医嘱内容" prop="adviceName" />
<el-table-column label="开始/终止" prop="requestTime" width="230" />
<el-table-column label="医嘱内容" prop="adviceName">
<template #default="scope">
<span>
{{ scope.row.adviceName }}
</span>
<template v-if="scope.row.adviceTable == 'med_medication_request'">
<span>
{{ ' 【' + scope.row.volume + '】' }}
</span>
<span style="color: #447c95 !important">
{{
'(' +
scope.row.methodCode_dictText +
' ' +
scope.row.dose +
scope.row.doseUnitCode_dictText +
' ' +
scope.row.rateCode_dictText +
')'
}}
</span>
</template>
</template>
</el-table-column>
<el-table-column label="开始/终止" prop="requestTime" width="200" />
<el-table-column label="预计执行" prop="times">
<template #default="scope">
<div
@@ -129,14 +178,26 @@
style="display: inline-block; margin-left: 15px"
>
<el-checkbox
v-for="(rateItem, rateIndex) in scope.row.rate"
v-for="(rateItem, rateIndex) in scope.row.rate[item]"
:key="rateIndex"
:value="rateItem"
:value="rateItem.rate"
@change="
(value) =>
handleRateChange(
value,
item,
scope.row.checkedRates[timeIndex],
scope.row
)
"
border
size="small"
style="margin-right: 15px"
>
{{ rateItem }}
{{ rateItem.rate }}
<template v-if="rateItem.practitionerName">
{{ rateItem.practitionerName }}
</template>
</el-checkbox>
</el-checkbox-group>
</div>
@@ -151,7 +212,7 @@
</template>
<script setup>
import { getPrescriptionList } from './api';
import { getPrescriptionList, adviceExecute, adviceCancel } from './api';
import { patientInfoList } from '../store/patient.js';
import { formatDate, formatDateStr } from '@/utils/index';
import { ref, getCurrentInstance } from 'vue';
@@ -162,11 +223,16 @@ const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59');
const therapyEnum = ref(undefined);
const { proxy } = getCurrentInstance();
const loading = ref(false);
const chooseAll = ref(false);
const props = defineProps({
exeStatus: {
type: Number,
default: 1,
},
requestStatus: {
type: Number,
default: 1,
},
});
function handleRadioChange() {
@@ -183,6 +249,7 @@ function handleGetPrescription() {
pageNo: 1,
therapyEnum: therapyEnum.value,
exeStatus: props.exeStatus,
requestStatus: props.requestStatus,
}).then((res) => {
// try {
// 根据encounterId分组
@@ -191,22 +258,106 @@ function handleGetPrescription() {
let rate;
let times;
if (prescription.therapyEnum == 1) {
// 长期医嘱 后台返回执行时间点字符串,直接拆分取时间点
rate = prescription.dayTimes?.split(',');
// 用截止时间和医嘱签发时间算出全部执行日期
times = getDateRange(prescription.requestTime, deadline.value);
} else {
// 临时医嘱 直接取医嘱签发时间截取执行时间和执行日期
rate = [formatDateStr(prescription.requestTime, 'HH:mm')];
times = [formatDateStr(prescription.requestTime, 'MM-DD')];
}
prescription.times = times;
prescription.rate = rate;
prescription.year = formatDateStr(prescription.requestTime, 'YYYY');
// 初始化执行时间列表
prescription.executeTimes = [];
// 初始化取消执行Id列表
prescription.procedureIds = [];
// 添加复选框状态管理
prescription.checkedRates = {};
let exeTimeList = prescription.exePerformRecordList.map((item) => {
return formatDateStr(item.occurrenceTime, 'YYYY-MM-DD HH:mm:ss');
});
let stopTimeList = prescription.stopPerformRecordList.map((item) => {
return formatDateStr(item.occurrenceTime, 'YYYY-MM-DD HH:mm:ss');
});
let cancelTimeList = prescription.cancelPerformRecordList.map((item) => {
return formatDateStr(item.occurrenceTime, 'YYYY-MM-DD HH:mm:ss');
});
if (rate) {
times.forEach((time, index) => {
// 默认选中所有执行频次
prescription.checkedRates[index] = [...rate];
// 拼成日期加全部时间点的形式显示示例03-01 [09:00, 10:00, 11:00]
// 重构后的逻辑
let validTimes = [];
let validRates = {};
let newCheckedRates = {};
times.forEach((time, timeIndex) => {
let checkedRatesForTime = [];
let rateItems = [];
rate.forEach((rateItem) => {
let dateStr = prescription.year + '-' + time + ' ' + rateItem + ':00';
prescription.executeTimes.push(dateStr);
switch (props.exeStatus) {
case 1:
// 如果该时间点未执行,则加入待选中列表
if (!exeTimeList.includes(dateStr)) {
rateItems.push({
rate: rateItem,
});
checkedRatesForTime.push(rateItem);
}
break;
case 6:
let index = exeTimeList.findIndex((item) => {
return item == dateStr;
});
if (index != -1) {
rateItems.push({
procedureId: prescription.exePerformRecordList[index].procedureId,
practitionerName: prescription.exePerformRecordList[index].practitionerName,
rate: rateItem,
});
checkedRatesForTime.push(rateItem);
}
break;
case 5:
if (stopTimeList.includes(dateStr)) {
rateItems.push({
rate: rateItem,
});
checkedRatesForTime.push(rateItem);
}
break;
case 9:
if (cancelTimeList.includes(dateStr)) {
rateItems.push({
rate: rateItem,
});
checkedRatesForTime.push(rateItem);
}
break;
}
});
validRates[time] = rateItems;
// 只有当该时间点有待执行的项目时,才保留该时间点
if (checkedRatesForTime.length > 0) {
let newIndex = validTimes.length;
validTimes.push(time);
newCheckedRates[newIndex] = checkedRatesForTime;
}
});
console.log(validRates, '111');
// 更新处方对象
prescription.times = validTimes;
prescription.rate = validRates;
prescription.checkedRates = newCheckedRates;
// 处理已执行记录
prescription.exePerformRecordList.forEach((item) => {
if (prescription.executeTimes.includes(item.occurrenceTime)) {
prescription.procedureIds.push(item.procedureId);
}
});
}
// 把相同encounterId的医嘱放在同一个数组中
@@ -223,18 +374,61 @@ function handleGetPrescription() {
// 将分组结果转换为数组形式
prescriptionList.value = Object.values(groupedPrescriptions);
console.log(prescriptionList.value, '1111');
loading.value = false;
// } catch {
// loading.value = false;
// }
});
chooseAll.value = false;
} else {
prescriptionList.value = [];
// proxy.$message.warning('请选择患者');
}
}
function handleExecute() {
let list = getSelectRows();
list = list.map((item) => {
return {
requestId: item.requestId,
accountId: item.accountId,
adviceTable: item.adviceTable,
executeTimes: item.executeTimes,
};
});
console.log(list, 'list');
adviceExecute({ adviceExecuteDetailList: list }).then((res) => {
if (res.code == 200) {
handleGetPrescription();
}
});
}
function handleCancel() {
let list = getSelectRows();
console.log(list, 'list');
list = list.map((item) => {
return {
procedureId: item.procedureId,
executeTimes: item.cancelTimes,
};
});
adviceCancel({ adviceExecuteParam: list }).then((res) => {
if (res.code == 200) {
handleGetPrescription();
}
});
}
function getSelectRows() {
// 获取选中的医嘱信息
let list = [];
prescriptionList.value.forEach((item, index) => {
list = [...list, ...proxy.$refs['tableRef' + index][0].getSelectionRows()];
});
return list;
}
/**
* 计算两个日期之间的所有日期(包含起始和结束日期)
* @param {string|Date} startDate - 开始日期
@@ -265,6 +459,23 @@ function getDateRange(startDate, endDate) {
return dates;
}
function handleRateChange(value, date, time, row) {
// 拼接当前选中时间
let tiemStr = row.year + '-' + date + ' ' + time + ':00';
if (value) {
row.executeTimes.push(tiemStr);
} else {
row.executeTimes.splice(row.executeTimes.indexOf(tiemStr), 1);
}
console.log(row.executeTimes, 'row.executeTimes');
}
function handelSwicthChange(value) {
prescriptionList.value.forEach((item, index) => {
proxy.$refs['tableRef' + index][0].toggleAllSelection();
});
}
// 处理后端返回的时间集合
function handleTime() {}