修复 loadMethodPackageDetails 函数中套餐明细 API 地址错误（/system/package/ → /system/check-type/package/），导致套餐明细加载失败返回 404
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
移除else分支中对orgId和positionName的条件判断，确保诊疗类医嘱的执行科室
始终使用患者就诊科室，不被诊疗目录配置的positionId覆盖。
之前的if (!orgId)条件导致目录已配置positionId时不会被覆盖，
若目录配置的ID不在机构树中则显示原始ID。
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Root cause: In getInpatientAdvicePage(), encounterIds and exeStatus were nullified
before buildQueryWrapper to prevent auto-generated SQL conditions, but requestStatus
was NOT nullified. HisQueryUtils.buildQueryWrapper uses reflection to add eq conditions
for ALL non-null fields, so requestStatus: 3 became an extra SQL filter
"AND request_status = 3" that was not intended for the 医嘱执行 page.
The 医嘱执行 page uses exeStatus (not requestStatus) for execution state filtering.
The SQL already handles verified/unverified order filtering via a CASE condition
on status_enum and performer_check_id. The requestStatus parameter is only meant
for frontend tab selection and should not be used as a SQL filter here.
Fix: Nullify requestStatus before buildQueryWrapper, same as encounterIds/exeStatus.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
@@ -1131,15 +1131,15 @@ function handleLocationClick(item, row, index) {
.then((res)=>{
.then((res)=>{
constlist=res.data||[];
constlist=res.data||[];
constd=pickBestOrgQuantityRow(list);
constd=pickBestOrgQuantityRow(list);
conststrictOk=d&&Number(d.orgQuantity??0)>0;
// 严格批号查询有库存（orgQuantity > 0）
if(strictOk){
if(d&&Number(d.orgQuantity??0)>0){
applyFromDto(d,false);
applyFromDto(d,false);
if(Number(r.totalQuantity)<=0){
proxy.$message.warning('仓库数量为0，无法调用！');
}
persistStore();
persistStore();
return;
return;
}
}
// 严格查询无库存或数量为0 → 回退到非严格查询（查同仓库其他批号）
if(lotTrimmed){
if(lotTrimmed){
returnrunGet(false).then((res2)=>{
returnrunGet(false).then((res2)=>{
constlist2=res2.data||[];
constlist2=res2.data||[];
@@ -1157,8 +1157,6 @@ function handleLocationClick(item, row, index) {
persistStore();
persistStore();
});
});
}
}
// 没有指定批号，直接提示
r.totalQuantity=0;
r.totalQuantity=0;
r.price=0;
r.price=0;
proxy.$message.warning('仓库数量为0，无法调用！');
proxy.$message.warning('仓库数量为0，无法调用！');
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
