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

fix(ui): 修复多个功能模块的验证和数据处理问题

Browse Source 
- 在医生工作站退费功能中添加患者选择验证
- 统一药品管理中的仓库类型选择逻辑，移除重复代码
- 修复统计管理页面清空按钮的数据重置问题
- 修正西药管理页面处方打印按钮的功能绑定
- 完善库存报表查询的SQL过滤条件实现
- 更新多个控制器接口参数类型以支持业务流程
- 优化退费列表对话框的数据加载和错误处理
This commit is contained in:
chenqi
2026-03-02 23:27:11 +08:00
parent ce8b0b16b1
commit 9116ea4a84
22 changed files with 447 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java
View File

@@ -108,9 +108,9 @@ public class ProductDetailAppServiceImpl extends ServiceImpl<InventoryItemMapper
if (devCategoryCodes != null && !devCategoryCodes.isEmpty()) {
queryWrapper.in(CommonConstants.FieldName.DevCategoryCode, devCategoryCodes);
}
// 库存是否为零
// 库存是否为零 (zeroFlag: 1=库存为零, 0=库存大于零)
if (zeroFlag != null) {
if (Whether.YES.getValue().equals(zeroFlag)) {
if (Integer.valueOf(1).equals(zeroFlag)) {
queryWrapper.eq(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
} else {
queryWrapper.gt(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
@@ -259,9 +259,9 @@ public class ProductDetailAppServiceImpl extends ServiceImpl<InventoryItemMapper
if (devCategoryCodes != null && !devCategoryCodes.isEmpty()) {
queryWrapper.in(CommonConstants.FieldName.DevCategoryCode, devCategoryCodes);
}
// 库存是否为零
// 库存是否为零 (zeroFlag: 1=库存为零, 0=库存大于零)
if (zeroFlag != null) {
if (Whether.YES.getValue().equals(zeroFlag)) {
if (Integer.valueOf(1).equals(zeroFlag)) {
queryWrapper.eq(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
} else {
queryWrapper.gt(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
@@ -507,9 +507,9 @@ public class ProductDetailAppServiceImpl extends ServiceImpl<InventoryItemMapper
if (devCategoryCodes != null && !devCategoryCodes.isEmpty()) {
queryWrapper.in(CommonConstants.FieldName.DevCategoryCode, devCategoryCodes);
}
// 库存是否为零
// 库存是否为零 (zeroFlag: 1=库存为零, 0=库存大于零)
if (zeroFlag != null) {
if (Whether.YES.getValue().equals(zeroFlag)) {
if (Integer.valueOf(1).equals(zeroFlag)) {
queryWrapper.eq(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
} else {
queryWrapper.gt(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);

28
openhis-server-new/openhis-application/src/main/java/com/openhis/web/paymentmanage/appservice/impl/PaymentRecServiceImpl.java
View File

@@ -213,10 +213,24 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
return R.fail("收费项的就诊类型未统一");
}
// 获取所有的账户id
List<Long> accountIdList = chargeItemList.stream().map(ChargeItem::getAccountId).collect(Collectors.toList());
// 获取所有的账户id（过滤掉null值，防止groupingBy时空指针异常）
List<Long> accountIdList = chargeItemList.stream()
.map(ChargeItem::getAccountId)
.filter(Objects::nonNull)
.collect(Collectors.toList());
// account去重
List<Long> distinctAccountIdList = accountIdList.stream().distinct().collect(Collectors.toList());
// 检查是否存在accountId为null的收费项
long nullAccountIdCount = chargeItemList.stream()
.map(ChargeItem::getAccountId)
.filter(Objects::isNull)
.count();
if (nullAccountIdCount > 0) {
throw new ServiceException("部分收费项缺少账户信息，请检查收费项数据");
}
if (distinctAccountIdList.isEmpty()) {
throw new ServiceException("未找到有效的账户信息");
}
List<Account> accountList = iAccountService.list(new LambdaQueryWrapper<Account>()
.in(Account::getId, distinctAccountIdList).eq(Account::getEncounterId, prePaymentDto.getEncounterId()));
if (accountList.size() != distinctAccountIdList.size()) {
@@ -503,9 +517,15 @@ public class PaymentRecServiceImpl implements IPaymentRecService {
// }
// }
// 收费详情按照收费批次进行分组
// 收费详情按照收费批次进行分组（过滤掉payTransNo为null的记录）
Map<String, List<PaymentRecDetail>> payTransNoMap
= paymentRecDetails.stream().collect(Collectors.groupingBy(PaymentRecDetail::getPayTransNo));
= paymentRecDetails.stream()
.filter(detail -> detail.getPayTransNo() != null)
.collect(Collectors.groupingBy(PaymentRecDetail::getPayTransNo));
if (payTransNoMap.isEmpty()) {
throw new ServiceException("收费详情缺少批次号信息");
}
com.openhis.financial.model.PaymentResult paymentResult;
List<com.openhis.financial.model.PaymentResult> paymentResultList = new ArrayList<>();

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/PendingMedicationDetailsAppServiceImpl.java
View File

@@ -48,10 +48,11 @@ public class PendingMedicationDetailsAppServiceImpl implements IPendingMedicatio
QueryWrapper<PendingMedicationSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(
pendingMedicationSearchParam, searchKey, new HashSet<>(Arrays.asList("medicine_name", "medicine_no", "py_str")), request);
// 查询待发药明细列表
// 查询待发药明细列表（包含待配药、待发药、已配药三种状态，与门诊发药界面一致）
Page<PendingMedicationPageDto> pendingMedicationPage = pendingMedicationDetailsMapper
.selectPendingMedicationDetailsPage(new Page<>(pageNo, pageSize), queryWrapper,
DispenseStatus.IN_PROGRESS.getValue(), EncounterClass.AMB.getValue(), EncounterClass.IMP.getValue());
DispenseStatus.IN_PROGRESS.getValue(), DispenseStatus.PREPARATION.getValue(),
DispenseStatus.PREPARED.getValue(), EncounterClass.AMB.getValue(), EncounterClass.IMP.getValue());
pendingMedicationPage.getRecords().forEach(e -> {
// 发药类型

10
openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/mapper/PendingMedicationDetailsMapper.java
View File

@@ -20,11 +20,19 @@ public interface PendingMedicationDetailsMapper {
* @param page 分页
* @param queryWrapper 查询条件
* @param inProgress 发药类型：待发药
* @param preparation 发药类型：待配药
* @param prepared 发药类型：已配药
* @param amb 门诊类型
* @param imp 住院类型
* @return 待发药明细
*/
Page<PendingMedicationPageDto> selectPendingMedicationDetailsPage(
@Param("page") Page<PendingMedicationPageDto> page,
@Param(Constants.WRAPPER) QueryWrapper<PendingMedicationSearchParam> queryWrapper,
@Param("inProgress") Integer inProgress, @Param("amb") Integer amb, @Param("imp") Integer imp);
@Param("inProgress") Integer inProgress,
@Param("preparation") Integer preparation,
@Param("prepared") Integer prepared,
@Param("amb") Integer amb,
@Param("imp") Integer imp);
}

4
openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/PendingMedicationDetailsMapper.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.web.pharmacymanage.mapper.PendingMedicationDetailsMapper">
<select id="selectPendingMedicationDetailsPage"
<select id="selectPendingMedicationDetailsPage"
resultType="com.openhis.web.pharmacymanage.dto.PendingMedicationPageDto">
SELECT T7.medicine_no, --药品编码
T7.medicine_name, --药品名称
@@ -51,7 +51,7 @@
ON T5.medication_def_id = T6.id
AND T5.delete_flag = '0'
WHERE T1.delete_flag = '0'
AND T1.status_enum = #{inProgress}
AND T1.status_enum IN (#{inProgress}, #{preparation}, #{prepared})
ORDER BY T1.create_time DESC
) AS T7
${ew.customSqlSegment}

25
openhis-ui-vue3/src/utils/request.js
View File

@@ -107,14 +107,31 @@ service.interceptors.request.use(config => {
if (code === 401) {
if (!isRelogin.show) {
isRelogin.show = true;
ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
isRelogin.show = false;
// 判断是否在登录页面
const isLoginPage = window.location.pathname === '/login' || window.location.pathname === '/';
if (isLoginPage) {
// 登录页面直接清理token，不弹窗
useUserStore().logOut().then(() => {
location.href = '/index';
})
isRelogin.show = false;
}).catch(() => {
isRelogin.show = false;
});
return Promise.reject('登录已过期，请重新登录。')
}
// 其他页面：显示提示后自动跳转
ElMessage.warning('登录已过期，正在跳转到登录页面...');
useUserStore().logOut().then(() => {
isRelogin.show = false;
// 跳转到登录页，保留当前路径作为redirect参数
const currentPath = window.location.pathname;
const redirectUrl = currentPath !== '/login' ? `/login?redirect=${encodeURIComponent(currentPath)}` : '/login';
location.href = redirectUrl;
}).catch(() => {
isRelogin.show = false;
location.href = '/login';
});
}
return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
} else if (code === 500) {

4
openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
View File

@@ -714,11 +714,11 @@ function handleNodeClick(data) {
? Math.max(...form.value.diagnosisList.map(item => item.diagSrtNo || 0))
: 0;
form.value.diagnosisList.push({
form.value.diagnosisList.push({
ybNo: data.ybNo,
name: data.name,
verificationStatusEnum: 4,
medTypeCode: '11',
medTypeCode: '初诊诊断',
diagSrtNo: maxSortNo + 1,
definitionId: data.definitionId,
classification: '西医', // 默认为西医

77
openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
View File

@@ -230,6 +230,67 @@
</el-button>
</div>
</template>
<!-- 🔧 Bug #147 修复：耗材类型(adviceType=4)的编辑模板 -->
<template v-else-if="scope.row.adviceType == 4">
<div style="
display: flex;
align-items: center;
margin-bottom: 16px;
gap: 16px;
">
<span class="medicine-title">
{{
scope.row.adviceName +
" " +
(scope.row.volume || '') +
" [" +
(scope.row.unitPrice !== undefined && scope.row.unitPrice !== null && !isNaN(scope.row.unitPrice) &&
isFinite(scope.row.unitPrice) ? Number(scope.row.unitPrice).toFixed(2) : '-') +
" 元" +
"/" +
(scope.row.unitCode_dictText || '个') +
"]"
}}
</span>
<el-form-item label="数量：" prop="quantity" class="required-field" data-prop="quantity">
<el-input-number placeholder="数量" v-model="scope.row.quantity" style="width: 70px"
controls-position="right" :controls="false" :ref="(el) => (inputRefs.quantity = el)"
@keyup.enter.prevent="handleEnter('quantity', scope.row, scope.$index)"
@input="calculateTotalAmount(scope.row, scope.$index)" />
</el-form-item>
<el-form-item>
<el-select v-model="scope.row.unitCode" style="width: 70px; margin-right: 20px" placeholder=" "
@change="calculateTotalAmount(scope.row, scope.$index)">
<template v-for="item in scope.row.unitCodeList" :key="item.value">
<el-option v-if="item.type != unitMap['dose']" :value="item.value" :label="item.label" @click="
() => {
scope.row.unitCode_dictText = item.label;
}
" @keyup.enter.prevent="
handleEnter(
'executeNum',
scope.row,
scope.$index,
prescription.id
)
" style="width: 70px; margin-right: 20px" />
</template>
</el-select>
</el-form-item>
<span class="total-amount">
总金额：{{
(scope.row.totalPrice !== undefined && scope.row.totalPrice !== null && !isNaN(scope.row.totalPrice)
&&
isFinite(scope.row.totalPrice))
? Number(scope.row.totalPrice).toFixed(2) + ' 元'
: '0.00 元'
}}
</span>
</div>
<el-button type="primary" @click="handleSaveSign(scope.row, scope.$index)">
确定
</el-button>
</template>
<template v-else-if="scope.row.adviceType == 2">
<div style="
display: flex;
@@ -2390,7 +2451,9 @@ function setValue(row) {
prescriptionList.value[rowIndex.value].executeNum = 1;
// 库存列表 + 价格列表拼成批次号的下拉框
if (row.adviceType != 3) {
// 🔧 Bug #147 修复：耗材(adviceType=4)和诊疗(adviceType=3, adviceType=5)不检查库存
// 耗材从getDeviceList接口获取，inventoryList为空，但需要设置价格
if (row.adviceType != 3 && row.adviceType != 4 && row.adviceType != 5) {
if (row.inventoryList && row.inventoryList.length == 0) {
expandOrder.value = [];
proxy.$modal.msgWarning(row.adviceName + '无库存');
@@ -2431,6 +2494,18 @@ function setValue(row) {
.toFixed(6);
prescriptionList.value[rowIndex.value].positionName = stock.locationName;
}
} else if (row.adviceType == 4) {
// 🔧 Bug #147 修复：耗材类型(adviceType=4)的专门处理
// 耗材从getDeviceList接口获取，使用priceList中的价格
if (row.priceList && row.priceList.length > 0) {
prescriptionList.value[rowIndex.value].unitPrice = row.priceList[0].price;
prescriptionList.value[rowIndex.value].unitTempPrice = row.priceList[0].price;
prescriptionList.value[rowIndex.value].minUnitPrice = row.priceList[0].price;
prescriptionList.value[rowIndex.value].quantity = 1;
prescriptionList.value[rowIndex.value].totalPrice = row.priceList[0].price;
prescriptionList.value[rowIndex.value].positionName = row.positionName || '';
prescriptionList.value[rowIndex.value].locationId = row.positionId;
}
} else {
getOrgList();
// 会诊类型（adviceType == 5）和诊疗类型（adviceType == 3）的处理

8
openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
View File

@@ -758,7 +758,7 @@ function handleEdit(row) {
loadDoctorList()
}
getSurgeryDetail(row.surgeryNo).then(res => {
getSurgeryDetail(row.id).then(res => {
if (res.code === 200) {
console.log('【编辑手术】完整返回数据:', res.data)
console.log('【编辑手术】手术指征字段值:', res.data.surgeryIndication)
@@ -796,7 +796,7 @@ function handleEdit(row) {
// 查看
function handleView(row) {
viewOpen.value = true
getSurgeryDetail(row.surgeryNo).then(res => {
getSurgeryDetail(row.id).then(res => {
if (res.code === 200) {
console.log('【手术详情】完整返回数据:', res.data)
console.log('【手术详情】手术指征字段值:', res.data.surgeryIndication)
@@ -822,7 +822,7 @@ function handleDelete(row) {
if (row.statusEnum === 0) {
// 新开状态 - 直接删除
proxy.$modal.confirm('是否确认删除手术"' + row.surgeryName + '"?').then(() => {
return deleteSurgery(row.surgeryNo)
return deleteSurgery(row.id)
}).then(() => {
getList()
proxy.$modal.msgSuccess('删除成功')
@@ -833,7 +833,7 @@ function handleDelete(row) {
} else if (row.statusEnum === 1) {
// 已安排状态 - 更新为已取消
proxy.$modal.confirm('是否确认取消手术"' + row.surgeryName + '"?').then(() => {
return updateSurgeryStatus(row.surgeryNo, 4) // 4 = 已取消
return updateSurgeryStatus(row.id, 4) // 4 = 已取消
}).then(() => {
getList()
proxy.$modal.msgSuccess('手术已取消')

13
openhis-ui-vue3/src/views/doctorstation/index.vue
View File

@@ -109,7 +109,8 @@
<el-button type="primary" plain @click.stop="handleLeave(patientInfo.encounterId)">
暂离
</el-button>
<el-button type="primary" plain @click.stop="handleRefund(patientInfo.encounterId)">
<el-button type="primary" plain :disabled="isRefundButtonDisabled"
@click.stop="handleRefund(patientInfo.encounterId)">
退费
</el-button>
<el-button type="primary" plain class="top-layer-btn"
@@ -289,6 +290,16 @@ const isHospitalizationButtonDisabled = computed(() => {
patientInfo.value.encounterId === undefined;
});
// 计算属性：确定退费按钮是否应被禁用（与住院按钮使用相同的逻辑）
const isRefundButtonDisabled = computed(() => {
return !patientInfo.value ||
typeof patientInfo.value !== 'object' ||
!patientInfo.value.encounterId ||
patientInfo.value.encounterId === '' ||
patientInfo.value.encounterId === null ||
patientInfo.value.encounterId === undefined;
});
const prescriptionInfo = ref([]);
const registerTime = ref(formatDate(new Date()));
const patientDrawerRef = ref();

4
openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue
View File

@@ -696,7 +696,9 @@ import {
delProductStocktaking,
getCount,
getDetailInit,
getDispensaryList,
getInit,
getPharmacyList,
getstocktakingDetail,
getStocktakingReceiptBatch,
productStocktakingApproved,
@@ -2295,7 +2297,7 @@ function handleChangePurposeTypeEnum(value, type) {
}
// getinitValue()
});
} else if (numValue === 17) {
} else if (value === 17) {
// 处理耗材库类型
// 参考采购订单模块的实现，硬编码设置中心耗材库信息
purposeTypeListOptions.value = [

40
openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockPart/index.vue
View File

@@ -1174,26 +1174,7 @@ function handleChangePurposeTypeEnum(value, type) {
receiptHeaderForm.purposeLocationId = '';
}
});
}
if (numValue === 16 || numValue === 11) {
console.log('Calling getpharmacyCabinetList for warehouse type:', numValue);
// 使用统一接口获取药房或药库列表
getpharmacyCabinetList().then((res) => {
console.log('getPharmacyCabinetList response:', res);
// 过滤出符合当前类型的仓库列表
const filteredList = res.data.filter(item => item.formEnum === numValue);
purposeTypeListOptions.value = filteredList;
console.log('purposeTypeListOptions set to filtered list:', purposeTypeListOptions.value);
// 设置默认仓库和货位
getinitValue();
}).catch((error) => {
console.error('getPharmacyCabinetList error:', error);
purposeTypeListOptions.value = [];
freightListOptions.value = [];
});
} else if (numValue === 17) {
console.log('Setting hardcoded consumable warehouse');
} else if (value === 17) {
// 处理耗材库类型
// 参考采购订单模块的实现，硬编码设置中心耗材库信息
purposeTypeListOptions.value = [
@@ -1204,16 +1185,31 @@ function handleChangePurposeTypeEnum(value, type) {
children: []
}
];
console.log('purposeTypeListOptions set to:', purposeTypeListOptions.value);
// 设置默认仓库和货位
getinitValue();
} else {
console.log('Unknown value:', value);
console.log('未知的仓库类型值:', value);
purposeTypeListOptions.value = [];
freightListOptions.value = [];
}
}
// 获取默认值
function getinitValue() {
if (purposeTypeListOptions.value.length > 0) {
// 判断是否有盘点仓库
receiptHeaderForm.purposeLocationId = purposeTypeListOptions.value[0].id; // 盘点仓库默认值
if (
purposeTypeListOptions.value[0].children &&
purposeTypeListOptions.value[0].children.length > 0
) {
// 判断盘点仓库内是否有货位
freightListOptions.value = purposeTypeListOptions.value[0].children;
receiptHeaderForm.purposeLocation = purposeTypeListOptions.value[0].children[0].name;
}
}
}
// 切换仓库获取货位列表 -20250414
function handleCabinetChange(value) {
receiptHeaderForm.purposeLocation = '';

8
openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting.js
View File

@@ -114,6 +114,14 @@ export function getDispensaryList() {
})
}
// 获取耗材库列表
export function getWarehouseList() {
return request({
url: '/app-common/warehouse-list',
method: 'get',
})
}
/**
* 审批驳回
*/

51
openhis-ui-vue3/src/views/medicationmanagement/lossReportingManagement/lossReporting/index.vue
View File

@@ -536,6 +536,7 @@ import {
getMedicineList,
getPharmacyCabinetList,
getPharmacyList,
getWarehouseList,
getTransferProductDetail,
lossReportApproved,
reject,
@@ -857,10 +858,26 @@ function handleBlur(row, index) {
row.applicantId = userStore.id;
}
function handleChangeSourceTypeEnum(value) {
// 无论选择哪种仓库类型，都显示药房、药库、耗材库的选项
getPharmacyCabinetList().then((res) => {
// 根据仓库类型获取对应的仓库列表
// 16: 药房, 11: 药库, 17: 耗材库
if (value == 16) {
// 药房
getPharmacyList().then((res) => {
sourceTypeListOptions.value = res.data;
});
} else if (value == 11) {
// 药库
getDispensaryList().then((res) => {
sourceTypeListOptions.value = res.data;
});
} else if (value == 17) {
// 耗材库
getWarehouseList().then((res) => {
sourceTypeListOptions.value = res.data;
});
} else {
sourceTypeListOptions.value = [];
}
}
// 获取详情
function getTransferProductDetails() {
@@ -1242,13 +1259,39 @@ function handleChangePurposeTypeEnum(value) {
}
// 源仓库切换
function handleChangelossTypeEnum(value) {
// 无论选择哪种仓库类型，都显示药房、药库、耗材库的选项
getPharmacyCabinetList().then((res) => {
// 根据仓库类型获取对应的仓库列表
// 16: 药房, 11: 药库, 17: 耗材库
if (value == 16) {
// 药房
getPharmacyList().then((res) => {
sourceTypeListOptions.value = res.data;
if (!route.query.supplyBusNo) {
receiptHeaderForm.lossLocationId = '';
}
});
} else if (value == 11) {
// 药库
getDispensaryList().then((res) => {
sourceTypeListOptions.value = res.data;
if (!route.query.supplyBusNo) {
receiptHeaderForm.lossLocationId = '';
}
});
} else if (value == 17) {
// 耗材库
getWarehouseList().then((res) => {
sourceTypeListOptions.value = res.data;
if (!route.query.supplyBusNo) {
receiptHeaderForm.lossLocationId = '';
}
});
} else {
// 其他情况清空列表
sourceTypeListOptions.value = [];
if (!route.query.supplyBusNo) {
receiptHeaderForm.lossLocationId = '';
}
}
}
// 单位处理
function handleUnitCodeChange(row, index, value) {

4
openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/api.js
View File

@@ -57,7 +57,7 @@ export function submitApproval(busNo) {
return request({
url: '/inventory-manage/purchase/submit-approval',
method: 'put',
data: busNo
data: { busNo }
})
}
@@ -66,7 +66,7 @@ export function withdrawApproval(busNo) {
return request({
url: '/inventory-manage/purchase/withdraw-approval',
method: 'put',
data: busNo
data: { busNo }
})
}

8
openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/components/api.js
View File

@@ -58,7 +58,7 @@ export function submitApproval(busNo) {
url: '/issue-manage/requisition/submit-approval',
// '/inventory-manage/purchase/submit-approval',
method: 'put',
data: busNo
data: { busNo }
})
}
@@ -68,7 +68,7 @@ export function withdrawApproval(busNo) {
url: '/issue-manage/requisition/withdraw-approval',
// '/inventory-manage/purchase/withdraw-approval',
method: 'put',
data: busNo
data: { busNo }
})
}
@@ -173,7 +173,7 @@ export function submitTHApproval(busNo) {
url: '/issue-manage/return/submit-approval',
// '/inventory-manage/purchase/submit-approval',
method: 'put',
data: busNo
data: { busNo }
})
}
@@ -183,7 +183,7 @@ export function withdrawTHApproval(busNo) {
url: '/issue-manage/return/withdraw-approval',
// '/inventory-manage/purchase/withdraw-approval',
method: 'put',
data: busNo
data: { busNo }
})
}
/**

7
openhis-ui-vue3/src/views/medicationmanagement/statisticalManagement/index.vue
View File

@@ -61,10 +61,10 @@
</el-select>
</el-form-item>
<el-form-item label="停供状态" prop="categoryCode">
<el-form-item label="停供状态" prop="inventoryStatusEnum">
<el-select
v-model="queryParams.inventoryStatusEnum"
placeholder="请选择药品类别"
placeholder="请选择停供状态"
clearable
style="width: 150px"
@change="handleQuery"
@@ -525,6 +525,7 @@ const data = reactive({
medCategoryCodes: [],
devCategoryCodes: [],
backUpDate: undefined,
inventoryStatusEnum: undefined,
},
rules: {},
});
@@ -737,8 +738,6 @@ function handleClear() {
// 清空不在 queryParams 中的字段
locationId.value = [];
supplierId.value = [];
// 清空 prop 与 v-model 不匹配的字段
queryParams.value.inventoryStatusEnum = undefined;
getList();
}

63
openhis-ui-vue3/src/views/pharmacymanagement/requisitionOrder/components/orderTable.vue
View File

@@ -1080,27 +1080,70 @@ const handleSave = async () => {
if (localIsAddOrEditOrder.value.isAddOrder) {
addOrEditOrder(editData).then((res) => {
if (res.code === 200) {
proxy.$message.success('新增成功');
proxy.$message.success('新增成功，可以进行审核');
// 更新本地表单数据
localForm.value.busNo = editData[0].busNo;
// 设置订单状态为已编辑
localIsAddOrEditOrder.value = {
isAddOrder: false,
isEditOrder: false,
};
// 设置表格为查看状态
localTableData.value.forEach((item) => {
item.isEditing = false;
item.isViewing = true;
item.busNo = editData[0].busNo;
});
// 更新按钮状态，启用审核按钮
emit('updateButtonState', {
isAuditDisabled: false, // 启用审核按钮
isCancelDisabled: true, // 禁用取消按钮
isDeleteDisabled: true, // 禁用删除按钮
isAddDisabled: true, // 禁用新增按钮
isEditDisabled: true, // 禁用编辑按钮
isAddShow: false, // 隐藏添加行按钮
isDeleteShow: false, // 隐藏删除行按钮
isSaveShow: false, // 隐藏保存按钮
isEditShow: false, // 隐藏编辑按钮
isAlertShow: false, // 隐藏警戒订货按钮
});
// 调用父组件的 getList 方法
emit('getList');
// 清空表单
// resetAllData();
// 清空 父组件 tableFormRef 表单数据
emit('clearForm');
// 关闭加载
loading.value = false;
} else {
loading.value = false;
}
});
} else if (localIsAddOrEditOrder.value.isEditOrder) {
addOrEditOrder(editData).then((res) => {
if (res.code === 200) {
proxy.$message.success('保存成功');
proxy.$message.success('保存成功，可以进行审核');
// 设置订单状态为已编辑
localIsAddOrEditOrder.value = {
isAddOrder: false,
isEditOrder: false,
};
// 设置表格为查看状态
localTableData.value.forEach((item) => {
item.isEditing = false;
item.isViewing = true;
});
// 更新按钮状态，启用审核按钮
emit('updateButtonState', {
isAuditDisabled: false, // 启用审核按钮
isCancelDisabled: true, // 禁用取消按钮
isDeleteDisabled: true, // 禁用删除按钮
isAddDisabled: true, // 禁用新增按钮
isEditDisabled: true, // 禁用编辑按钮
isAddShow: false, // 隐藏添加行按钮
isDeleteShow: false, // 隐藏删除行按钮
isSaveShow: false, // 隐藏保存按钮
isEditShow: false, // 隐藏编辑按钮
isAlertShow: false, // 隐藏警戒订货按钮
});
// 调用父组件的 getList 方法
emit('getList');
// 清空表单
// resetAllData();
// 清空 父组件 tableFormRef 表单数据
emit('clearForm');
} else {
proxy.$message.error('保存失败');
}

3
openhis-ui-vue3/src/views/pharmacymanagement/requisitionOrder/index.vue
View File

@@ -275,6 +275,7 @@ const buttonShow = ref({
isDeleteShow: false,
isSaveShow: false,
isEditShow: false,
isAlertShow: false,
});
const rules = ref({
locationId: [{ required: true, message: '请选择库房', trigger: 'blur' }],
@@ -790,7 +791,7 @@ const handleUpdateButtonState = (buttonState) => {
// 编辑行 按钮显示
buttonShow.value.isEditShow = buttonState.isEditShow;
// 警戒订货 按钮显示
buttonShow.value.isAlertShow = buttonState.isAlertShow;
buttonShow.value.isAlertShow = buttonState.isAlertShow || false;
};
// 监听路由变化
watch(

63
openhis-ui-vue3/src/views/pharmacymanagement/returnToDispensaryOrder/components/orderTable.vue
View File

@@ -1074,27 +1074,70 @@ const handleSave = async () => {
if (localIsAddOrEditOrder.value.isAddOrder) {
addOrEditOrder(editData).then((res) => {
if (res.code === 200) {
proxy.$message.success('新增成功');
proxy.$message.success('新增成功，可以进行审核');
// 更新本地表单数据
localForm.value.busNo = editData[0].busNo;
// 设置订单状态为已编辑
localIsAddOrEditOrder.value = {
isAddOrder: false,
isEditOrder: false,
};
// 设置表格为查看状态
localTableData.value.forEach((item) => {
item.isEditing = false;
item.isViewing = true;
item.busNo = editData[0].busNo;
});
// 更新按钮状态，启用审核按钮
emit('updateButtonState', {
isAuditDisabled: false, // 启用审核按钮
isCancelDisabled: true, // 禁用取消按钮
isDeleteDisabled: true, // 禁用删除按钮
isAddDisabled: true, // 禁用新增按钮
isEditDisabled: true, // 禁用编辑按钮
isAddShow: false, // 隐藏添加行按钮
isDeleteShow: false, // 隐藏删除行按钮
isSaveShow: false, // 隐藏保存按钮
isEditShow: false, // 隐藏编辑按钮
isAlertShow: false, // 隐藏警戒订货按钮
});
// 调用父组件的 getList 方法
emit('getList');
// 清空表单
// resetAllData();
// 清空 父组件 tableFormRef 表单数据
emit('clearForm');
// 关闭加载
loading.value = false;
} else {
loading.value = false;
}
});
} else if (localIsAddOrEditOrder.value.isEditOrder) {
addOrEditOrder(editData).then((res) => {
if (res.code === 200) {
proxy.$message.success('保存成功');
proxy.$message.success('保存成功，可以进行审核');
// 设置订单状态为已编辑
localIsAddOrEditOrder.value = {
isAddOrder: false,
isEditOrder: false,
};
// 设置表格为查看状态
localTableData.value.forEach((item) => {
item.isEditing = false;
item.isViewing = true;
});
// 更新按钮状态，启用审核按钮
emit('updateButtonState', {
isAuditDisabled: false, // 启用审核按钮
isCancelDisabled: true, // 禁用取消按钮
isDeleteDisabled: true, // 禁用删除按钮
isAddDisabled: true, // 禁用新增按钮
isEditDisabled: true, // 禁用编辑按钮
isAddShow: false, // 隐藏添加行按钮
isDeleteShow: false, // 隐藏删除行按钮
isSaveShow: false, // 隐藏保存按钮
isEditShow: false, // 隐藏编辑按钮
isAlertShow: false, // 隐藏警戒订货按钮
});
// 调用父组件的 getList 方法
emit('getList');
// 清空表单
// resetAllData();
// 清空 父组件 tableFormRef 表单数据
emit('clearForm');
} else {
proxy.$message.error('保存失败');
}

3
openhis-ui-vue3/src/views/pharmacymanagement/returnToDispensaryOrder/index.vue
View File

@@ -275,6 +275,7 @@ const buttonShow = ref({
isDeleteShow: false,
isSaveShow: false,
isEditShow: false,
isAlertShow: false,
});
const rules = ref({
locationId: [{ required: true, message: '请选择库房', trigger: 'blur' }],
@@ -790,7 +791,7 @@ const handleUpdateButtonState = (buttonState) => {
// 编辑行 按钮显示
buttonShow.value.isEditShow = buttonState.isEditShow;
// 警戒订货 按钮显示
buttonShow.value.isAlertShow = buttonState.isAlertShow;
buttonShow.value.isAlertShow = buttonState.isAlertShow || false;
};
// 监听路由变化
watch(

30
openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
View File

@@ -608,14 +608,29 @@ function getList() {
}
async function printPrescription() {
// 空值检查 - 防止 tableRef 为空时报错
if (!tableRef.value) {
proxy.$modal.msgWarning("表格组件未初始化，请刷新页面重试");
return;
}
const selectedRows = tableRef.value.getSelectionRows();
if (selectedRows.length === 0) {
if (!selectedRows || selectedRows.length === 0) {
proxy.$modal.msgWarning("未选择要打印的项目，请重新选择，打印失败");
return;
}
try {
let requestIds = selectedRows.map((item) => item.requestId).join(",");
const result = [];
advicePrint({requestIds: requestIds, isPrescription: "1"}).then(async (res) => {
const res = await advicePrint({requestIds: requestIds, isPrescription: "1"});
if (!res || !res.data || !res.data.adviceItemList) {
proxy.$modal.msgWarning("获取打印数据失败，请稍后重试");
return;
}
const groupedRows = {};
res.data.adviceItemList.forEach((row) => {
const prescriptionNo = row.prescriptionNo;
@@ -633,8 +648,13 @@ async function printPrescription() {
// 获取所有选择数据医生的签名信息
const doctorSignatures = {};
for (const doctorId of uniqueDoctorIds) {
try {
const signatureResult = await getDoctorSignature({practitionerId: doctorId});
doctorSignatures[doctorId] = signatureResult?.data || '';
} catch (e) {
console.warn('获取医生签名失败:', doctorId, e);
doctorSignatures[doctorId] = '';
}
}
// 将adviceItemList中的chineseHerbsDoseQuantity字段合并到selectedRows中
@@ -712,8 +732,12 @@ async function printPrescription() {
// 发送任务到打印机失败
hiprintTemplate.on('printError', function (e) {
console.log('打印失败');
proxy.$modal.msgError('打印失败，请检查打印机连接');
});
});
} catch (error) {
console.error('处方打印失败:', error);
proxy.$modal.msgError('处方打印失败: ' + (error.message || '未知错误'));
}
}
// 取消打印机选择