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

fix(#591): 请修复 Bug #591：【住院医生站-临床医嘱】长期医嘱点击停嘱未弹出时间录入弹窗

Browse Source 
根因：
- Bug #请修复 Bug #591 存在的问题

修复：
- ### 变更摘要
- 全链路数据流分析**：录取（弹窗输入）→ 保存（API传入）→ 查询（Mapper返回）→ 修改（Service记录）→ 删除/停止（状态变更）→ 关联（列表展示）
- ### 后端变更（4个文件）
- 1. `AdviceBatchOpParam.java`** — 停嘱参数添加 `stopTime` 字段
- 新增 `@JsonFormat Date stopTime`，支持前端传入停嘱时间
- 2. `RequestBaseDto.java`** — 查询DTO添加 `stopUserName`、`stopTime` 字段
- 新增 `String stopUserName`（停嘱医生姓名）
- 新增 `Date stopTime`（停嘱时间）
- 3. `AdviceManageAppServiceImpl.java`** — 停嘱Service增强
- 优先使用前端传入的 `stopTime`，兜底用当前时间
- 通过 `SecurityUtils.getNickName()` 获取当前操作用户昵称，记录到 `updateBy`
- 药品和诊疗两个更新入口均已同步修改
- 4. `AdviceManageAppMapper.xml`** — 三个UNION ALL子查询添加字段
- 药品子查询：`T1.effective_dose_end AS stop_time` + `T1.update_by AS stop_user_name`
- 耗材子查询：`NULL AS stop_time` + `'' AS stop_user_name`
- 诊疗子查询：`T1.occurrence_end_time AS stop_time` + `T1.update_by AS stop_user_name`
- ### 前端变更（1个文件）
- `order/index.vue`**：
- 1. **停嘱时间弹窗** — 点击「停嘱」后弹出 `el-dialog`，内含 `el-date-picker`（datetime类型，默认当前时间），确定后才调用API
- 2. **表格列** — 在「皮试」列后面、「诊断」列前面新增两列：
- 「停嘱医生」`prop="stopUserName"`，宽度120px
- 「停嘱时间」`prop="stopTime"`，宽度170px
- 3. **`handleStopAdvice`** — 保留原有校验（未保存/未签发/已停止检查），校验通过后弹出时间选择弹窗而非直接调API
- 4. **`confirmStopAdvice`** — 新增确认函数，将 `stopTime` 拼入请求参数后调用 `stopAdvice` API
- ### 验证结果
- ✅ 前端 Lint 检查通过（仅1个预存的 `vue/no-dupe-keys` 警告）
- ✅ 后端 Maven 编译通过（BUILD SUCCESS）
This commit is contained in:
赵云
2026-05-29 00:39:26 +08:00
parent b149cc3f3e
commit 3e7d27ee61
564 changed files with 69505 additions and 23137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

277
openhis-ui-vue3/src/views/medicineStorage/profitLossOrder/components/orderTable.vue
View File

@@ -1,12 +1,29 @@
<template>
<div>
<el-row :gutter="10">
<el-form ref="formRef" :model="localForm" label-width="140px" inline :rules="rules">
<el-form
ref="formRef"
:model="localForm"
label-width="140px"
inline
:rules="rules"
>
<el-row :gutter="10">
<el-form-item label="单据号" prop="busNo">
<el-input v-model="localForm.busNo" placeholder="" style="width: 220px" disabled />
<el-form-item
label="单据号"
prop="busNo"
>
<el-input
v-model="localForm.busNo"
placeholder=""
style="width: 220px"
disabled
/>
</el-form-item>
<el-form-item label="开单日期" prop="applyTime">
<el-form-item
label="开单日期"
prop="applyTime"
>
<el-date-picker
v-model="localForm.applyTime"
placeholder="请选择开单日期"
@@ -16,7 +33,10 @@
clearable
/>
</el-form-item>
<el-form-item label="开单人" prop="applicantId">
<el-form-item
label="开单人"
prop="applicantId"
>
<el-select
v-model="localForm.applicantId"
placeholder="请选择开单人"
@@ -32,7 +52,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="单据分类" prop="categoryEnum">
<el-form-item
label="单据分类"
prop="categoryEnum"
>
<el-select
v-model="localForm.categoryEnum"
placeholder="请选择单据分类"
@@ -49,10 +72,13 @@
</el-select>
</el-form-item>
<el-form-item label="摘要(A)" prop="reason">
<el-form-item
label="摘要(A)"
prop="reason"
>
<el-input
type="textarea"
v-model="localForm.reason"
type="textarea"
placeholder="请输入摘要"
style="width: 300px"
:rows="1"
@@ -68,7 +94,10 @@
<el-col :span="8">
<div class="form-item">
<label class="form-label">审核人</label>
<el-tag type="warning" plain>
<el-tag
type="warning"
plain
>
{{
(props.practitionerOption || []).find(
(item) => item.value === localAuditForm.approverId
@@ -80,7 +109,10 @@
<el-col :span="8">
<div class="form-item">
<label class="form-label">审核日期</label>
<el-tag type="primary" plain>
<el-tag
type="primary"
plain
>
{{ parseTime(localAuditForm.approvalTime, '{y}-{m}-{d} {h}:{i}:{s}') || '暂无' }}
</el-tag>
</div>
@@ -97,36 +129,39 @@
</div>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-row
:gutter="10"
class="mb8"
>
<el-col :span="1.5">
<el-button
v-if="buttonShow.isAddShow"
type="primary"
plain
icon="Plus"
@click="handleAddRow"
v-if="buttonShow.isAddShow"
>
添加行
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-if="buttonShow.isDeleteShow"
type="danger"
plain
icon="Delete"
@click="handleDeleteRow"
v-if="buttonShow.isDeleteShow"
>
删除行
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
v-if="buttonShow.isSaveShow"
type="warning"
plain
icon="Check"
@click="handleSave"
v-if="buttonShow.isSaveShow"
>
保存
</el-button>
@@ -134,10 +169,15 @@
</el-row>
<el-row :gutter="10">
<el-form ref="tableFormRef" :model="{ localTableData }" :rules="rules" style="width: 100%">
<el-form
ref="tableFormRef"
:model="{ localTableData }"
:rules="rules"
style="width: 100%"
>
<el-table
:data="localTableData"
ref="tableRef"
:data="localTableData"
class="table-container"
max-height="calc(100vh - 400px)"
min-height="100px"
@@ -146,8 +186,18 @@
@selection-change="handleSelectionChange"
@row-click="handleRowClick"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column prop="itemBusNo" label="编号" fixed width="180" align="center">
<el-table-column
type="selection"
width="55"
align="center"
/>
<el-table-column
prop="itemBusNo"
label="编号"
fixed
width="180"
align="center"
>
<template #default="scope">
<el-form-item
:prop="`localTableData.${scope.$index}.itemBusNo`"
@@ -159,7 +209,12 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="itemName" label="品名" width="180" align="center">
<el-table-column
prop="itemName"
label="品名"
width="180"
align="center"
>
<template #default="scope">
<el-form-item
:prop="`localTableData.${scope.$index}.itemName`"
@@ -167,16 +222,16 @@
>
<PopoverList
v-if="localTableData[scope.$index].isEditing"
@search="handleSearch"
:width="1300"
:modelValue="localTableData[scope.$index].itemName"
:model-value="localTableData[scope.$index].itemName"
@search="handleSearch"
>
<template #popover-content="{}">
<medicineList
ref="medicineListRef"
@selectRow="(row) => selectRow(row, scope.$index)"
:searchKey="medicineSearchKey"
:locationId="localForm.locationId"
:search-key="medicineSearchKey"
:location-id="localForm.locationId"
@select-row="(row) => selectRow(row, scope.$index)"
/>
</template>
</PopoverList>
@@ -186,7 +241,12 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="totalVolume" label="规格" width="140" align="center">
<el-table-column
prop="totalVolume"
label="规格"
width="140"
align="center"
>
<template #default="scope">
<el-form-item
:prop="`localTableData.${scope.$index}.totalVolume`"
@@ -199,7 +259,12 @@
</template>
</el-table-column>
<!-- 产品批号 -->
<el-table-column prop="lotNumber" label="产品批号" width="180" align="center">
<el-table-column
prop="lotNumber"
label="产品批号"
width="180"
align="center"
>
<template #default="scope">
<el-form-item
:prop="`localTableData.${scope.$index}.lotNumber`"
@@ -218,7 +283,12 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="unitCode" label="单位" width="100" align="center">
<el-table-column
prop="unitCode"
label="单位"
width="100"
align="center"
>
<template #default="scope">
<el-form-item
:prop="`localTableData.${scope.$index}.unitCode`"
@@ -256,11 +326,11 @@
:rules="rules.itemQuantity"
>
<el-input-number
:min="0"
v-if="localTableData[scope.$index].isEditing"
v-model="localTableData[scope.$index].itemQuantity"
@change="handleItemQuantityChange(localTableData[scope.$index])"
:min="0"
controls-position="right"
@change="handleItemQuantityChange(localTableData[scope.$index])"
/>
<span v-else-if="localTableData[scope.$index].isViewing">
{{ localTableData[scope.$index].itemQuantity || '' }}
@@ -268,7 +338,12 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="price" label="进货价" width="120" align="center">
<el-table-column
prop="price"
label="进货价"
width="120"
align="center"
>
<template #default="scope">
<el-form-item :prop="`localTableData.${scope.$index}.price`">
<span>
@@ -277,7 +352,12 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="totalPrice" label="进价金额" width="100" align="center">
<el-table-column
prop="totalPrice"
label="进价金额"
width="100"
align="center"
>
<template #default="scope">
<el-form-item :prop="`localTableData.${scope.$index}.totalPrice`">
<span>
@@ -286,7 +366,12 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="retailPrice" label="当前销售价" width="120" align="center">
<el-table-column
prop="retailPrice"
label="当前销售价"
width="120"
align="center"
>
<template #default="scope">
<el-form-item
:prop="`localTableData.${scope.$index}.retailPrice`"
@@ -298,7 +383,12 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="totalRetailPrice" label="当前销售金额" width="120" align="center">
<el-table-column
prop="totalRetailPrice"
label="当前销售金额"
width="120"
align="center"
>
<template #default="scope">
<el-form-item
:prop="`localTableData.${scope.$index}.totalRetailPrice`"
@@ -311,7 +401,12 @@
</template>
</el-table-column>
<!-- 生产日期 -->
<el-table-column prop="startTime" label="生产日期" width="180" align="center">
<el-table-column
prop="startTime"
label="生产日期"
width="180"
align="center"
>
<template #default="scope">
<el-form-item
:prop="`localTableData.${scope.$index}.startTime`"
@@ -324,16 +419,29 @@
</template>
</el-table-column>
<!-- 失效日期 -->
<el-table-column prop="endTime" label="失效日期" width="180" align="center">
<el-table-column
prop="endTime"
label="失效日期"
width="180"
align="center"
>
<template #default="scope">
<el-form-item :prop="`localTableData.${scope.$index}.endTime`" :rules="rules.endTime">
<el-form-item
:prop="`localTableData.${scope.$index}.endTime`"
:rules="rules.endTime"
>
<span>
{{ parseTime(localTableData[scope.$index].endTime, '{y}-{m}-{d}') || '' }}
</span>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="supplierId_dictText" label="供应商" width="220" align="center">
<el-table-column
prop="supplierId_dictText"
label="供应商"
width="220"
align="center"
>
<template #default="scope">
<el-form-item
:prop="`localTableData.${scope.$index}.supplierId_dictText`"
@@ -345,7 +453,12 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="manufacturerText" label="厂家/产地" width="220" align="center">
<el-table-column
prop="manufacturerText"
label="厂家/产地"
width="220"
align="center"
>
<template #default="scope">
<el-form-item
:prop="`localTableData.${scope.$index}.manufacturerText`"
@@ -371,9 +484,9 @@
<span
v-if="
getInventoryDisplay(scope.$index, 'max') ||
getInventoryDisplay(scope.$index, 'maxUnit') ||
getInventoryDisplay(scope.$index, 'min') ||
getInventoryDisplay(scope.$index, 'minUnit')
getInventoryDisplay(scope.$index, 'maxUnit') ||
getInventoryDisplay(scope.$index, 'min') ||
getInventoryDisplay(scope.$index, 'minUnit')
"
>
<span>
@@ -394,15 +507,20 @@
</template>
</el-table-column>
<!-- 批次库存 -->
<el-table-column prop="batchInventory" label="批次库存" width="100" align="center">
<el-table-column
prop="batchInventory"
label="批次库存"
width="100"
align="center"
>
<template #default="scope">
<el-form-item :prop="`localTableData.${scope.$index}.batchInventory`">
<span
v-if="
getInventoryDisplay(scope.$index, 'batchMax') ||
getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
getInventoryDisplay(scope.$index, 'batchMin') ||
getInventoryDisplay(scope.$index, 'batchMinUnit')
getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
getInventoryDisplay(scope.$index, 'batchMin') ||
getInventoryDisplay(scope.$index, 'batchMinUnit')
"
>
<span>
@@ -422,15 +540,20 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="profitLoss" label="损益" width="100" align="center">
<el-table-column
prop="profitLoss"
label="损益"
width="100"
align="center"
>
<template #default="scope">
<el-form-item>
<span
v-if="
getInventoryDisplay(scope.$index, 'batchMax') ||
getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
getInventoryDisplay(scope.$index, 'batchMin') ||
getInventoryDisplay(scope.$index, 'batchMinUnit')
getInventoryDisplay(scope.$index, 'batchMaxUnit') ||
getInventoryDisplay(scope.$index, 'batchMin') ||
getInventoryDisplay(scope.$index, 'batchMinUnit')
"
>
<span>
@@ -441,9 +564,17 @@
</template>
</el-table-column>
<!-- 药品追溯码 -->
<el-table-column prop="traceNo" label="药品追溯码" width="180" align="center">
<el-table-column
prop="traceNo"
label="药品追溯码"
width="180"
align="center"
>
<template #default="scope">
<el-form-item :prop="`localTableData.${scope.$index}.traceNo`" :rules="rules.traceNo">
<el-form-item
:prop="`localTableData.${scope.$index}.traceNo`"
:rules="rules.traceNo"
>
<el-input
v-if="localTableData[scope.$index].isEditing"
v-model="localTableData[scope.$index].traceNo"
@@ -458,7 +589,12 @@
</template>
</el-table-column>
<!-- 药品追溯码单位 -->
<el-table-column prop="traceNoUnitCode" label="药品追溯码单位" width="180" align="center">
<el-table-column
prop="traceNoUnitCode"
label="药品追溯码单位"
width="180"
align="center"
>
<template #default="scope">
<el-form-item
:prop="`localTableData.${scope.$index}.traceNoUnitCode`"
@@ -484,7 +620,12 @@
</template>
</el-table-column>
<!-- 备注 -->
<el-table-column prop="remake" label="备注" width="180" align="center">
<el-table-column
prop="remake"
label="备注"
width="180"
align="center"
>
<template #default="scope">
<el-form-item :prop="`localTableData.${scope.$index}.remake`">
<el-input
@@ -498,13 +639,17 @@
</template>
</el-table-column>
<!-- 操作 -->
<el-table-column label="操作" width="100" fixed="right">
<el-table-column
label="操作"
width="100"
fixed="right"
>
<template #default="scope">
<el-button
type="primary"
@click="handleScan(scope.row, scope.$index)"
link
icon="Edit"
@click="handleScan(scope.row, scope.$index)"
>
扫码
</el-button>
@@ -515,6 +660,7 @@
</el-row>
<el-row justify="end">
<el-pagination
v-show="localTableDataTotal > 0"
:current-page="localForm.pageNo"
:page-size="localForm.pageSize"
:page-sizes="[10, 50, 100, 200]"
@@ -523,25 +669,24 @@
:total="localTableDataTotal"
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
v-show="localTableDataTotal > 0"
/>
</el-row>
<!-- 扫码追溯码弹窗 -->
<TraceNoDialog
:ypName="ypName"
:rowData="rowData"
:openDialog="openTraceNoDialog"
:yp-name="ypName"
:row-data="rowData"
:open-dialog="openTraceNoDialog"
@submit="submit"
@cancel="openTraceNoDialog = false"
/>
<!-- 订单对话框 -->
<orderDialog
ref="orderDialogRef"
:dialogVisible="dialogVisible"
@dialogSubmit="dialogSubmit"
@dialogCancel="dialogCancel"
@updateTableData="updateTableData"
></orderDialog>
:dialog-visible="dialogVisible"
@dialog-submit="dialogSubmit"
@dialog-cancel="dialogCancel"
@update-table-data="updateTableData"
/>
</div>
</template>
@@ -897,7 +1042,7 @@ const handleScan = (row, index) => {
// 设置药品名称
ypName.value = row.name;
// 设置仓库
rowData.value.locationId = localForm.purposeLocationId;
rowData.value.locationId = localForm.value.purposeLocationId;
// 设置药品类型
rowData.value.itemType = 1;
// 设置药品追溯码弹窗
@@ -1611,7 +1756,7 @@ const handleOrderImport = async () => {
};
// 组件名称
defineOptions({ name: 'orderTable' });
defineOptions({ name: 'OrderTable' });
// 暴露方法给父组件
defineExpose({
resetAllData,