zhangfei
9c3e603b94
当手术计费弹窗中点击"签发"耗材时，因耗材的locationId（发放库房）为空导致后端异常。 在DoctorStationAdviceAppServiceImpl.handDevice方法中，当locationId为null时，使用登录用户的科室ID作为默认值， 与NurseBillingAppService中的处理方式保持一致。
33 lines
1.5 KiB
XML
Executable File
33 lines
1.5 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.workflow.mapper.ActivityDefinitionMapper">
|
||
|
||
<select id="getAppointActivityDefinitionId" resultType="long">
|
||
SELECT ID
|
||
FROM wor_activity_definition
|
||
WHERE delete_flag = '0'
|
||
AND status_enum = #{status}
|
||
AND NAME = #{activityName} LIMIT 1
|
||
</select>
|
||
|
||
<!-- 根据项目id数组 加载诊疗集合 -->
|
||
<select id="searchActivityDefinitionByIds" resultType="com.openhis.workflow.dto.ActivityDto">
|
||
SELECT id as itemId, bus_no as busNo, name as name
|
||
FROM wor_activity_definition
|
||
WHERE id IN
|
||
<foreach collection="itemIds" item="item" open="(" separator="," close=")">
|
||
#{item}
|
||
</foreach>
|
||
</select>
|
||
<!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
|
||
<select id="searchActivityListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
|
||
SELECT cid.price AS originRetailPrice, ad.id AS targetId, ad.bus_no AS busNo, ad.name AS name
|
||
FROM wor_activity_definition ad
|
||
inner join adm_charge_item_definition cid on ad.id = cid.instance_id
|
||
WHERE ad.delete_flag = '0'
|
||
AND (name LIKE concat('%', #{keyWord}, '%') or py_str LIKE concat('%', #{keyWord}, '%') or
|
||
wb_str LIKE concat('%', #{keyWord}, '%'))
|
||
</select>
|
||
</mapper> |