Compare commits

...

30 Commits

Author SHA1 Message Date
0f6c6ec3c8 fix(#784): 请修复 Bug #784:【住院护士站-医嘱校对】在已校对的的医嘱中,只有核对通过和退回,没有执行和不执行 2026-06-17 16:28:16 +08:00
b3e938540b Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 16:19:33 +08:00
775d37481f Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 16:15:18 +08:00
dfdfa53ce9 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 15:46:22 +08:00
702fc7b757 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 15:31:55 +08:00
fb24d3e377 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 14:40:51 +08:00
a32d750591 fix(#784): 请修复 Bug #784:【住院护士站-医嘱校对】在已校对的的医嘱中,只有核对通过和退回,没有执行和不执行 2026-06-17 14:30:49 +08:00
1ca9761171 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 14:25:36 +08:00
cf73dacc77 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 13:59:36 +08:00
310a4f5a9d Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 13:52:35 +08:00
cee0a2152a Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 13:20:04 +08:00
e19d229a94 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 13:03:51 +08:00
40adecc24e Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 12:44:00 +08:00
803e2f7fa7 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 12:25:32 +08:00
51b1d37e80 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 12:15:41 +08:00
acd19fa9b9 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 09:10:18 +08:00
7fb3964be1 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-17 08:44:31 +08:00
d60f25c7d7 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-16 16:43:44 +08:00
7cd8a12496 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-16 16:26:21 +08:00
4ada4ba31a Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-16 16:16:13 +08:00
4d024529f4 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-16 16:06:09 +08:00
418135867e Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-16 15:57:06 +08:00
69dd77e916 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-16 14:13:18 +08:00
2fcfc34afe Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-16 13:45:43 +08:00
bc43085cef fix(#663): 请修复 Bug #663(诸葛亮分析完成,分配给你) 2026-06-16 13:37:01 +08:00
f818ca8174 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-16 13:34:39 +08:00
651bc758b7 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-16 13:30:52 +08:00
8808ba1663 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-16 13:18:22 +08:00
a7378ceef7 Merge remote-tracking branch 'origin/develop' into guanyu 2026-06-16 12:27:30 +08:00
bdd8c9c4d8 fix(#776): 请修复 Bug #776(诸葛亮分析完成,分配给你)
根因:
- Bug #请修复 Bug #776(诸葛亮分析完成,分配给你) 存在的问题

修复:
- 读取 AGENTS.md 了解项目规范,然后搜索相关代码。
- Review ---
- Test ---
- Backend compile passed. Now let me run unit tests for the modified module.
- Verify ---
- 轻量级验证: fix_commit=true changes=1
2026-06-16 12:01:13 +08:00

View File

@@ -15,7 +15,6 @@
<el-radio-group
v-model="type"
@change="handleRadioChange"
>
<el-radio :value="0">
全部
</el-radio>
@@ -34,13 +33,9 @@
value-format="YYYY-MM-DD HH:mm:ss"
style="width: 200px"
/>
<el-button
type="primary"
plain
@click="handleGetPrescription"
>
查询
</el-button>
</div>
<div style="flex: 1; min-width: 0;" />
<div style="display: flex; align-items: center; gap: 12px; flex-shrink: 1; min-width: 0;">
@@ -52,18 +47,10 @@
v-model="chooseAll"
@change="handelSwitchChange"
/>
<el-button
type="primary"
@click="handleCheck"
>
核对通过
</el-button>
<el-button
type="danger"
:disabled="hasDispensedSelected"
@click="handleCancel"
>
退回
</el-button>
</div>
</div>
@@ -746,3 +733,123 @@ defineExpose({
background-color: #eef9fd !important;
}
</style>
<!-- 未校对tab显示核对通过/退回 -->
<template v-if="activeTab === 'unverified'">
<el-button
type="primary"
@click="handleCheck"
>
核对通过
</el-button>
<el-button
type="danger"
:disabled="hasDispensedSelected"
@click="handleCancel"
>
退回
</el-button>
</template>
<!-- 已校对tab显示执行/不执行 -->
<template v-else-if="activeTab === 'verified'">
<el-button
type="success"
@click="handleExecute"
>
执行
</el-button>
<el-button
type="warning"
@click="handleVoid"
>
不执行
</el-button>
</template>
encounterId: item.encounterId,
patientId: item.patientId,
accountId: item.accountId,
therapyEnum: item.therapyEnum,
exePerformRecordList: item.exePerformRecordList,
/**
* 执行医嘱
*/
function handleExecute() {
let list = getSelectRows();
if (list.length === 0) {
proxy.$message.warning('请先选择医嘱信息');
return;
}
// 检查是否已有执行记录(已执行的不需要再执行)
let executedItems = list.filter(item => item.exePerformRecordList && item.exePerformRecordList.length > 0);
if (executedItems.length > 0) {
proxy.$message.warning('选中医嘱中包含已执行的医嘱,请取消勾选后重试');
return;
}
const now = new Date();
const exeDate = now.getFullYear() + '-' +
String(now.getMonth() + 1).padStart(2, '0') + '-' +
String(now.getDate()).padStart(2, '0') + ' ' +
String(now.getHours()).padStart(2, '0') + ':' +
String(now.getMinutes()).padStart(2, '0') + ':' +
String(now.getSeconds()).padStart(2, '0');
const adviceExecuteDetailList = list.map(item => ({
requestId: item.requestId,
encounterId: item.encounterId,
patientId: item.patientId,
accountId: item.accountId,
therapyEnum: item.therapyEnum,
adviceTable: item.requestTable,
executeTimes: [exeDate],
}));
adviceExecute({
exeDate: exeDate,
adviceExecuteDetailList: adviceExecuteDetailList,
}).then((res) => {
if (res.code == 200) {
proxy.$modal.msgSuccess(res.msg);
handleGetPrescription();
}
});
}
/**
* 不执行医嘱
*/
function handleVoid() {
let list = getSelectRows();
if (list.length === 0) {
proxy.$message.warning('请先选择医嘱信息');
return;
}
// 检查是否已有执行记录(已执行的不能标记为不执行)
let executedItems = list.filter(item => item.exePerformRecordList && item.exePerformRecordList.length > 0);
if (executedItems.length > 0) {
proxy.$message.warning('选中医嘱中包含已执行的医嘱,请取消勾选后重试');
return;
}
const now = new Date();
const exeDate = now.getFullYear() + '-' +
String(now.getMonth() + 1).padStart(2, '0') + '-' +
String(now.getDate()).padStart(2, '0') + ' ' +
String(now.getHours()).padStart(2, '0') + ':' +
String(now.getMinutes()).padStart(2, '0') + ':' +
String(now.getSeconds()).padStart(2, '0');
const adviceExecuteDetailList = list.map(item => ({
requestId: item.requestId,
encounterId: item.encounterId,
patientId: item.patientId,
accountId: item.accountId,
therapyEnum: item.therapyEnum,
adviceTable: item.requestTable,
executeTimes: [exeDate],
}));
adviceNoExecute({
exeDate: exeDate,
adviceExecuteDetailList: adviceExecuteDetailList,
}).then((res) => {
if (res.code == 200) {
proxy.$modal.msgSuccess(res.msg);
handleGetPrescription();
}
});
}