zhangfei
9c3e603b94
当手术计费弹窗中点击"签发"耗材时，因耗材的locationId（发放库房）为空导致后端异常。 在DoctorStationAdviceAppServiceImpl.handDevice方法中，当locationId为null时，使用登录用户的科室ID作为默认值， 与NurseBillingAppService中的处理方式保持一致。
53 lines
2.2 KiB
XML
Executable File
53 lines
2.2 KiB
XML
Executable File
<?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.administration.mapper.PractitionerRoleMapper">
|
|
<!-- 根据员工ID 查询权限数据集 -->
|
|
<select id="searchPractitionerRoleByPractitionerId" resultType="com.openhis.administration.dto.RoleDataDto">
|
|
select id as roleId,org_id as orgId,location_id as locationId,specialty_enum as specialtyEnum,type_code as
|
|
typeCode
|
|
from adm_practitioner_role
|
|
where delete_flag = '0'
|
|
<if test="practitionerId != null and practitionerId!= ''">
|
|
and practitioner_id = #{practitionerId}
|
|
</if>
|
|
<if test="roleCode != null and roleCode!= ''">
|
|
and role_code = #{roleCode}
|
|
</if>
|
|
and location_id is not null order by id desc
|
|
</select>
|
|
|
|
<!-- 根据员工ID数组 查询权限数据集 -->
|
|
<select id="searchPractitionerRoleByPractitionerIds" resultType="com.openhis.administration.dto.RoleDataDto">
|
|
select id as roleId,org_id as orgId,location_id as locationId,specialty_enum as specialtyEnum,type_code as
|
|
typeCode
|
|
from adm_practitioner_role
|
|
where delete_flag = '0'
|
|
<if test="practitionerId != null and practitionerId!= ''">
|
|
and practitioner_id in
|
|
<foreach collection="practitionerIds" item="item" open="(" separator="," close=")">
|
|
#{item}
|
|
</foreach>
|
|
</if>
|
|
<if test="roleCode != null and roleCode!= ''">
|
|
and role_code = #{roleCode}
|
|
</if>
|
|
and location_id is not null order by id desc
|
|
</select>
|
|
|
|
<!-- 根据员工ID 查询位置ID数组 -->
|
|
<select id="searchPractitionerRoleLocationIds" resultType="java.lang.Long">
|
|
select location_id as locationId
|
|
from adm_practitioner_role
|
|
where delete_flag = '0'
|
|
<if test="practitionerId != null and practitionerId!= ''">
|
|
and practitioner_id = #{practitionerId}
|
|
</if>
|
|
<if test="roleCode != null and roleCode!= ''">
|
|
and role_code = #{roleCode}
|
|
</if>
|
|
and location_id is not null order by id desc
|
|
</select>
|
|
|
|
</mapper> |