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

fix: Bug #432 门诊手术安排新增保存报错 - 修复登录用户null校验缺失导致NPE

Browse Source
This commit is contained in:
guanyu
2026-04-24 15:17:17 +08:00
parent 1242d41499
commit dc7e3c1de8
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java
View File

@@ -136,9 +136,11 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
} }
} }
LoginUser loginUser = new LoginUser(); // Bug #432 修复：获取当前登录用户信息，增加null校验防止NPE
//获取当前登录用户信息 LoginUser loginUser = SecurityUtils.getLoginUser();
loginUser = SecurityUtils.getLoginUser(); if (loginUser == null) {
return R.fail("用户未登录或登录已过期");
}
// 当前登录用户ID // 当前登录用户ID
Long userId = loginUser.getUserId(); Long userId = loginUser.getUserId();

6
openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ItemDefinitionAppMapper.xml
View File

@@ -34,13 +34,13 @@
AND T2.delete_flag = '0' AND T2.delete_flag = '0'
WHERE WHERE
T1.delete_flag = '0' T1.delete_flag = '0'
<if test="chargeItemContext == 1 "> <if test="chargeItemContext == 1">
AND T1.instance_table = #{MED_MEDICATION_DEFINITION} AND T1.instance_table = #{MED_MEDICATION_DEFINITION}
</if> </if>
<if test="chargeItemContext == 2 "> <if test="chargeItemContext == 2">
AND T1.instance_table = #{ADM_DEVICE_DEFINITION} AND T1.instance_table = #{ADM_DEVICE_DEFINITION}
</if> </if>
<if test="chargeItemContext == 3 "> <if test="chargeItemContext == 3">
AND (T1.instance_table = #{WOR_ACTIVITY_DEFINITION} OR T1.instance_table = #{ADM_HEALTHCARE_SERVICE}) AND (T1.instance_table = #{WOR_ACTIVITY_DEFINITION} OR T1.instance_table = #{ADM_HEALTHCARE_SERVICE})
</if> </if>
GROUP BY T1.tenant_id, GROUP BY T1.tenant_id,