wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

bug 588

Browse Source
This commit is contained in:
Ranyunqiao
2026-06-12 11:09:03 +08:00
parent f407a2a886
commit a08808b41d
2 changed files with 421 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
View File

@@ -712,6 +712,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
tempServiceRequest.setUnitCode(regAdviceSaveDto.getUnitCode()); // 请求单位编码
tempServiceRequest.setCategoryEnum(regAdviceSaveDto.getCategoryEnum()); // 请求类型
tempServiceRequest.setTherapyEnum(regAdviceSaveDto.getTherapyEnum()); // 治疗类型,临时(需要前端传)
tempServiceRequest.setRateCode(regAdviceSaveDto.getRateCode()); // 用药频次
// 文字医嘱(type=8)不走定价体系，activityId设置为0L占位
if (ItemType.TEXT.getValue().equals(regAdviceSaveDto.getAdviceType())) {
tempServiceRequest.setActivityId(0L);

527
healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue
View File

@@ -1,20 +1,47 @@
<template>
<div class="inpatientDoctor-order-container" style="width: 100%">
<div style="margin-bottom: 5px" class="order-operate-btn">
<div
class="inpatientDoctor-order-container"
style="width: 100%"
>
<div
style="margin-bottom: 5px"
class="order-operate-btn"
>
<div style="height: 44px; display: flex; align-items: center; flex: none">
<el-button type="primary" @click="handleAddPrescription()" :disabled="false">
<el-button
type="primary"
:disabled="false"
@click="handleAddPrescription()"
>
新增
</el-button>
<el-button type="primary" @click="handleSaveBatch()" :disabled="false"> 保存 </el-button>
<el-button type="primary" @click="handleSave()" :disabled="isSaveDisabled"> 签发 </el-button>
<el-button type="warning" plain @click="handleSingOut()" :disabled="false">
<el-button
type="primary"
:disabled="false"
@click="handleSaveBatch()"
>
保存
</el-button>
<el-button
type="primary"
:disabled="isSaveDisabled"
@click="handleSave()"
>
签发
</el-button>
<el-button
type="warning"
plain
:disabled="false"
@click="handleSingOut()"
>
撤回
</el-button>
<el-button
type="primary"
plain
@click="proxy.$refs.orderFroupRef.handleOpen()"
:disabled="false"
@click="proxy.$refs.orderFroupRef.handleOpen()"
>
组套
</el-button>
@@ -26,17 +53,50 @@
>
历史
</el-button>
<el-button type="default" @click="combination()" :disabled="false"> 组合 </el-button>
<el-button type="default" @click="split()" :disabled="false"> 拆组 </el-button>
<el-button type="danger" plain @click="handleStopAdvice()" :disabled="false">
<el-button
type="default"
:disabled="false"
@click="combination()"
>
组合
</el-button>
<el-button
type="default"
:disabled="false"
@click="split()"
>
拆组
</el-button>
<el-button
type="danger"
plain
:disabled="false"
@click="handleStopAdvice()"
>
停嘱
</el-button>
<el-button type="success" plain @click="handleResumeAdvice()" :disabled="false">
<el-button
type="success"
plain
:disabled="false"
@click="handleResumeAdvice()"
>
恢复
</el-button>
<el-button type="danger" plain @click="handleDelete()" :disabled="false"> 删除 </el-button>
<el-button
type="danger"
plain
:disabled="false"
@click="handleDelete()"
>
删除
</el-button>
<span class="descriptions-item-label"> 诊断： </span>
<el-select v-model="conditionDefinitionId" placeholder="诊断" style="width: 180px">
<el-select
v-model="conditionDefinitionId"
placeholder="诊断"
style="width: 180px"
>
<el-option
v-for="item in diagnosisList"
:key="item.conditionId"
@@ -46,7 +106,11 @@
/>
</el-select>
<span class="descriptions-item-label"> 费用性质： </span>
<el-select v-model="accountId" placeholder="费用性质" style="width: 180px">
<el-select
v-model="accountId"
placeholder="费用性质"
style="width: 180px"
>
<el-option
v-for="item in contractList"
:key="item.accountId"
@@ -61,50 +125,96 @@
刷新
</el-button> -->
</div>
<div class="operate-btns" style="display: flex; align-items: center; gap: 12px;">
<el-radio-group v-model="therapyEnum">
<el-radio-button value="">全部</el-radio-button>
<el-radio-button value="1">长期</el-radio-button>
<el-radio-button value="2">临时</el-radio-button>
</el-radio-group>
<el-select v-model="orderClassCode" placeholder="医嘱类型" style="width: 240px" clearable>
<el-option
v-for="item in adviceTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-select v-model="orderStatus" placeholder="医嘱状态" style="width: 240px" clearable>
<el-option
v-for="item in statusOption"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-button link type="primary" @click="handleTransferOrg">转科</el-button>
<el-button link type="primary" :disabled="buttonDisabled" @click="handleLeaveHospital">
出院
</el-button>
<el-button link type="primary" @click="onNursingStatus">护理状态</el-button>
<el-button link type="primary" @click="refresh()">刷新数据</el-button>
<div
class="operate-btns"
style="display: flex; align-items: center; gap: 12px;"
>
<el-radio-group v-model="therapyEnum">
<el-radio-button value="">
全部
</el-radio-button>
<el-radio-button value="1">
长期
</el-radio-button>
<el-radio-button value="2">
临时
</el-radio-button>
</el-radio-group>
<el-select
v-model="orderClassCode"
placeholder="医嘱类型"
style="width: 240px"
clearable
>
<el-option
v-for="item in adviceTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-select
v-model="orderStatus"
placeholder="医嘱状态"
style="width: 240px"
clearable
>
<el-option
v-for="item in statusOption"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-button
link
type="primary"
@click="handleTransferOrg"
>
转科
</el-button>
<el-button
link
type="primary"
:disabled="buttonDisabled"
@click="handleLeaveHospital"
>
出院
</el-button>
<el-button
link
type="primary"
@click="onNursingStatus"
>
护理状态
</el-button>
<el-button
link
type="primary"
@click="refresh()"
>
刷新数据
</el-button>
</div>
</div>
<div class="inpatientDoctor-order-table">
<vxe-table
ref="prescriptionRef"
v-loading="loading"
auto-resize
height="100%"
ref="prescriptionRef"
:data="filterPrescriptionList"
:row-config="{ keyField: 'uniqueKey' }" :expand-config="{ expandRowKeys: expandOrder }"
:row-config="{ keyField: 'uniqueKey' }"
:expand-config="{ expandRowKeys: expandOrder }"
border
@cell-click="clickRow"
@cell-dblclick="clickRowDb"
v-loading="loading"
@checkbox-change="handleSelectionChange"
>
<vxe-column type="expand" width="40">
<vxe-column
type="expand"
width="40"
>
<template #content="scope">
<OrderForm
:row="scope.row"
@@ -118,21 +228,39 @@
/>
</template>
</vxe-column>
<vxe-column type="checkbox" align="center" width="60" />
<vxe-column title="组" align="center" width="60" field="groupIcon" />
<vxe-column
type="checkbox"
align="center"
width="60"
/>
<vxe-column
title="组"
align="center"
width="60"
field="groupIcon"
/>
<vxe-column title="类型" align="center" field="" width="140">
<vxe-column
title="类型"
align="center"
field=""
width="140"
>
<template #default="scope">
<el-radio-group
v-if="getRowDisabled(scope.row)"
v-model="scope.row.therapyEnum"
size="small"
v-if="getRowDisabled(scope.row)"
:disabled="scope.row.dischargeFlag"
@click.stop
style="white-space: nowrap"
@click.stop
>
<el-radio-button value="1">长期</el-radio-button>
<el-radio-button value="2">临时</el-radio-button>
<el-radio-button value="1">
长期
</el-radio-button>
<el-radio-button value="2">
临时
</el-radio-button>
</el-radio-group>
<span
v-else
@@ -142,12 +270,22 @@
</span>
</template>
</vxe-column>
<vxe-column title="开嘱医生" align="center" field="requesterId_dictText" width="120">
<vxe-column
title="开嘱医生"
align="center"
field="requesterId_dictText"
width="120"
>
<template #default="scope">
{{ scope.row.requesterId_dictText || '-' }}
</template>
</vxe-column>
<vxe-column title="开始时间" align="center" field="startTime" width="200">
<vxe-column
title="开始时间"
align="center"
field="startTime"
width="200"
>
<template #default="scope">
<el-date-picker
v-if="scope.row.isEdit"
@@ -164,14 +302,20 @@
</span>
</template>
</vxe-column>
<vxe-column title="医嘱" align="center" field="productName" width="300">
<vxe-column
title="医嘱"
align="center"
field="productName"
width="300"
>
<template #default="scope">
<template v-if="getRowDisabled(scope.row)">
<el-select
:ref="'adviceTypeRef' + scope.rowIndex"
style="width: 35%; margin-right: 8px"
:model-value="getRowSelectValue(scope.row)"
:ref="'adviceTypeRef' + scope.rowIndex"
:disabled="!isCategoryLoaded"
clearable
@change="
(value) => {
filterPrescriptionList[scope.rowIndex].adviceName = undefined;
@@ -206,7 +350,6 @@
}
}
"
clearable
>
<el-option
v-for="item in adviceTypeList"
@@ -223,14 +366,14 @@
>
<adviceBaseList
ref="adviceTableRef"
:patientInfo="patientInfo"
@selectAdviceBase="(row) => selectAdviceBase(scope.row.uniqueKey, row)"
:patient-info="patientInfo"
@select-advice-base="(row) => selectAdviceBase(scope.row.uniqueKey, row)"
/>
<template #reference>
<el-input
:ref="'adviceRef' + scope.rowIndex"
style="width: 62%"
v-model="scope.row.adviceName"
style="width: 62%"
placeholder="请选择项目"
@input="handleChange"
@focus="handleFocus(scope.row, scope.rowIndex)"
@@ -255,33 +398,99 @@
<span v-else>{{ scope.row.adviceName }}</span>
</template>
</vxe-column>
<vxe-column title="状态" align="center" field="" width="90">
<vxe-column
title="状态"
align="center"
field=""
width="90"
>
<template #default="scope">
<el-tag v-if="scope.row.chargeStatus == 5" type="info">
<el-tag
v-if="scope.row.chargeStatus == 5"
type="info"
>
{{ scope.row.chargeStatus_enumText }}
</el-tag>
<el-tag v-else-if="scope.row.statusEnum == 2" type="success">已签发</el-tag>
<el-tag v-else-if="!scope.row.requestId && scope.row.statusEnum == 1" type="warning">
<el-tag
v-else-if="scope.row.statusEnum == 2"
type="success"
>
已签发
</el-tag>
<el-tag
v-else-if="!scope.row.requestId && scope.row.statusEnum == 1"
type="warning"
>
待保存
</el-tag>
<el-tag v-else-if="scope.row.statusEnum == 1" type="primary">待签发</el-tag>
<el-tag v-else-if="scope.row.statusEnum == 10" type="primary">已校对</el-tag>
<el-tag v-else-if="scope.row.statusEnum == 11" type="primary">待接收</el-tag>
<el-tag v-else-if="scope.row.statusEnum == 3" type="success">已校对</el-tag>
<el-tag v-else-if="scope.row.statusEnum == 13" type="warning">已停嘱</el-tag>
<el-tag v-else-if="scope.row.statusEnum == 6" type="danger">停止</el-tag>
<el-tag v-else-if="scope.row.statusEnum == 20" type="success">已完成</el-tag>
<el-tag v-else type="info">{{ scope.row.chargeStatus_enumText }}</el-tag>
<el-tag
v-else-if="scope.row.statusEnum == 1"
type="primary"
>
待签发
</el-tag>
<el-tag
v-else-if="scope.row.statusEnum == 10"
type="primary"
>
已校对
</el-tag>
<el-tag
v-else-if="scope.row.statusEnum == 11"
type="primary"
>
待接收
</el-tag>
<el-tag
v-else-if="scope.row.statusEnum == 3"
type="success"
>
已校对
</el-tag>
<el-tag
v-else-if="scope.row.statusEnum == 13"
type="warning"
>
已停嘱
</el-tag>
<el-tag
v-else-if="scope.row.statusEnum == 6"
type="danger"
>
停止
</el-tag>
<el-tag
v-else-if="scope.row.statusEnum == 20"
type="success"
>
已完成
</el-tag>
<el-tag
v-else
type="info"
>
{{ scope.row.chargeStatus_enumText }}
</el-tag>
</template>
</vxe-column>
<vxe-column title="单次剂量" align="center" field="" width="120">
<vxe-column
title="单次剂量"
align="center"
field=""
width="120"
>
<template #default="scope">
<span v-if="!scope.row.isEdit">
{{ scope.row.dose ? scope.row.dose + ' ' + scope.row.doseUnitCode_dictText : '' }}
</span>
</template>
</vxe-column>
<vxe-column title="总量" align="center" field="" width="100">
<vxe-column
title="总量"
align="center"
field=""
width="100"
>
<template #default="scope">
<span v-if="!scope.row.isEdit">
{{
@@ -292,43 +501,77 @@
</span>
</template>
</vxe-column>
<vxe-column title="总金额" align="right" field="" header-align="center" width="100">
<vxe-column
title="总金额"
align="right"
field=""
header-align="center"
width="100"
>
<template #default="scope">
<span v-if="!scope.row.isEdit" style="text-align: right">
<span
v-if="!scope.row.isEdit"
style="text-align: right"
>
{{ scope.row.totalPrice ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
</span>
</template>
</vxe-column>
<vxe-column title="药房/科室" align="center" field="" width="240">
<vxe-column
title="药房/科室"
align="center"
field=""
width="240"
>
<template #default="scope">
<span v-if="!scope.row.isEdit">
{{ scope.row.positionName || scope.row.orgName }}
</span>
</template>
</vxe-column>
<vxe-column title="频次/用法" align="center" field="" width="180">
<vxe-column
title="频次/用法"
align="center"
field=""
width="180"
>
<template #default="scope">
<span v-if="!scope.row.isEdit && scope.row.adviceType == 1" style="text-align: right">
<span
v-if="!scope.row.isEdit && (scope.row.adviceType == 1 || scope.row.adviceType == 7 || scope.row.adviceType == 8)"
style="text-align: right"
>
{{
[
scope.row.rateCode_dictText,
scope.row.dispensePerDuration ? scope.row.dispensePerDuration + '天' : '',
scope.row.methodCode_dictText,
]
.filter(Boolean)
.join(' ')
scope.row.adviceType == 8
? (scope.row.rateCode_dictText || scope.row.rateCode || '-')
: [
scope.row.rateCode_dictText,
scope.row.dispensePerDuration ? scope.row.dispensePerDuration + '天' : '',
scope.row.methodCode_dictText,
]
.filter(Boolean)
.join(' ')
}}
</span>
</template>
</vxe-column>
<vxe-column title="注射药品" align="center" field="" width="80">
<vxe-column
title="注射药品"
align="center"
field=""
width="80"
>
<template #default="scope">
<span v-if="!scope.row.isEdit">
{{ scope.row.injectFlag_enumText || '-' }}
</span>
</template>
</vxe-column>
<vxe-column title="皮试" align="center" field="" width="80">
<vxe-column
title="皮试"
align="center"
field=""
width="80"
>
<template #default="scope">
<span v-if="!scope.row.isEdit">
{{ scope.row.skinTestFlag_enumText || '-' }}
@@ -340,33 +583,60 @@
size="small"
@click.stop
>
<el-option :value="1" label="是" />
<el-option :value="0" label="否" />
<el-option
:value="1"
label="是"
/>
<el-option
:value="0"
label="否"
/>
</el-select>
</template>
</vxe-column>
<vxe-column title="停嘱医生" align="center" field="stopUserName" width="120">
<vxe-column
title="停嘱医生"
align="center"
field="stopUserName"
width="120"
>
<template #default="scope">
<span v-if="!scope.row.isEdit">
{{ scope.row.stopUserName || "-" }}
</span>
</template>
</vxe-column>
<vxe-column title="停嘱时间" align="center" field="stopTime" width="170">
<vxe-column
title="停嘱时间"
align="center"
field="stopTime"
width="170"
>
<template #default="scope">
<span v-if="!scope.row.isEdit">
{{ scope.row.stopTime || "-" }}
</span>
</template>
</vxe-column>
<vxe-column title="备注" align="center" field="remark" width="150" show-overflow="title">
<vxe-column
title="备注"
align="center"
field="remark"
width="150"
show-overflow="title"
>
<template #default="scope">
<span v-if="!scope.row.isEdit">
{{ scope.row.remark || '-' }}
</span>
</template>
</vxe-column>
<vxe-column title="诊断" align="center" field="diagnosisName" width="150">
<vxe-column
title="诊断"
align="center"
field="diagnosisName"
width="150"
>
<template #default="scope">
<span v-if="!scope.row.isEdit">
{{ scope.row.diagnosisName || scope.row.conditionDefinitionName }}
@@ -376,18 +646,21 @@
</vxe-table>
</div>
<!-- // 底部按钮 -->
<application-form-bottom-btn :patientInfo="patientInfo" @refResh="refresh" />
<application-form-bottom-btn
:patient-info="patientInfo"
@ref-resh="refresh"
/>
<OrderGroupDrawer
ref="orderFroupRef"
:diagnosis="diagnosisInfo"
:organizationId="patientInfo?.orgId || ''"
@useOrderGroup="handleSaveGroup"
:organization-id="patientInfo?.orgId || ''"
@use-order-group="handleSaveGroup"
/>
<PrescriptionHistory
ref="prescriptionHistoryRef"
:diagnosis="diagnosisInfo"
:patientInfo="patientInfo || {}"
@userPrescriptionHistory="handleSaveHistory"
:patient-info="patientInfo || {}"
@user-prescription-history="handleSaveHistory"
/>
<LeaveHospitalDialog
ref="leaveHospitalDialogRef"
@@ -406,12 +679,27 @@
</div>
</template>
</el-drawer> -->
<el-dialog v-model="openDrawer" width="85%" style="height: 800px">
<NursingStatus></NursingStatus>
<el-dialog
v-model="openDrawer"
width="85%"
style="height: 800px"
>
<NursingStatus />
</el-dialog>
<el-dialog v-model="stopDialogVisible" title="停嘱确认" width="400px" :close-on-click-modal="false">
<el-form :model="stopForm" label-width="100px">
<el-form-item label="停嘱时间" required>
<el-dialog
v-model="stopDialogVisible"
title="停嘱确认"
width="400px"
:close-on-click-modal="false"
>
<el-form
:model="stopForm"
label-width="100px"
>
<el-form-item
label="停嘱时间"
required
>
<el-date-picker
v-model="stopForm.stopTime"
type="datetime"
@@ -423,8 +711,15 @@
</el-form-item>
</el-form>
<template #footer>
<el-button @click="stopDialogVisible = false">取消</el-button>
<el-button type="primary" @click="confirmStopAdvice">确定</el-button>
<el-button @click="stopDialogVisible = false">
取消
</el-button>
<el-button
type="primary"
@click="confirmStopAdvice"
>
确定
</el-button>
</template>
</el-dialog>
</template>
@@ -764,6 +1059,9 @@ function getListInfo(addNewRow) {
// 🔧 修复：同时保存 orgName，当 orgId 在科室树中匹配不到时作为兜底显示
// 优先从科室树查找名称，其次用 positionName（后端已保存的科室名），最后用 contentJson 中的 orgName
orgName: findOrgName(item.positionId || parsedContent?.orgId || item.orgId) || item.positionName || parsedContent?.orgName || undefined,
// 确保文字医嘱的 rateCode / rateCode_dictText 不被 item 中的 null/undefined 覆盖
rateCode: item.rateCode || parsedContent?.rateCode || undefined,
rateCode_dictText: item.rateCode_dictText || parsedContent?.rateCode_dictText || undefined,
// Bug #589: 从contentJson检测出院带药标记，恢复类型显示
// 后端存储时adviceType转为1（药品），通过prescriptionCategory=3标识出院带药
...(parsedContent?.prescriptionCategory == 3 ? {
@@ -1006,6 +1304,13 @@ function clickRowDb({ row, column, event }) {
if (row.statusEnum == 1) {
// 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
row.therapyEnum = String(row.therapyEnum ?? '1');
if (row.adviceType == 8) {
if (!row.orgId && userStore.orgId) {
row.orgId = userStore.orgId;
row.positionId = userStore.orgId;
row.orgName = userStore.orgName || findOrgName(userStore.orgId) || '';
}
}
row.isEdit = true;
const index = prescriptionList.value.findIndex((item) => item.uniqueKey === row.uniqueKey);
rowIndex.value = index;
@@ -1088,6 +1393,14 @@ function handleDiagnosisChange(item) {
function expandTextRow(rowIndex) {
const row = filterPrescriptionList.value[rowIndex];
if (!row) return;
// 自动获取当前用户所在的科室
if (!row.orgId && userStore.orgId) {
row.orgId = userStore.orgId;
row.positionId = userStore.orgId;
row.orgName = userStore.orgName || findOrgName(userStore.orgId) || '';
}
expandOrder.value = [row.uniqueKey];
nextTick(() => {
if (prescriptionRef.value?.setRowExpand) {