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

565 [库房管理-调拨] 调拨单明细中“源仓库库存数量”未正确读取库存值，始终显示为0

Browse Source 
600 【住院护士站-医嘱执行】数据一致性：医嘱执行成功后，在“已执行”列表中无法查询到该医嘱记录
This commit is contained in:
wangjian963
2026-05-29 13:52:27 +08:00
parent 3997c02564
commit c6ac8d1cb1
4 changed files with 32 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,12 +185,13 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
QueryWrapper<InpatientAdviceParam> queryWrapper
= HisQueryUtils.buildQueryWrapper(inpatientAdviceParam, null, null, null);
// 手动拼接requestStatus条件：COMPLETED(3)时同时包含CHECK_VERIFIED(10)
// 手动拼接requestStatus条件：COMPLETED(3)时同时包含CHECK_VERIFIED(10)和PENDING_RECEIVE(11)
// UNION查询外层列名为request_status（T1.status_enum AS request_status），不是status_enum
if (requestStatus != null) {
if (RequestStatus.COMPLETED.getValue().equals(requestStatus)) {
queryWrapper.in("request_status",
RequestStatus.COMPLETED.getValue(), RequestStatus.CHECK_VERIFIED.getValue());
RequestStatus.COMPLETED.getValue(), RequestStatus.CHECK_VERIFIED.getValue(),
RequestStatus.PENDING_RECEIVE.getValue());
} else {
queryWrapper.eq("request_status", requestStatus);
}

2
openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml
View File

@@ -262,7 +262,7 @@
AND T1.inventory_status_enum != 3
AND T1.delete_flag = '0'
<choose>
<when test="lotNumber != null">
<when test="lotNumber != null and lotNumber != ''">
AND T1.lot_number = #{lotNumber}
</when>
</choose>