zhangfei
9c3e603b94
当手术计费弹窗中点击"签发"耗材时，因耗材的locationId（发放库房）为空导致后端异常。 在DoctorStationAdviceAppServiceImpl.handDevice方法中，当locationId为null时，使用登录用户的科室ID作为默认值， 与NurseBillingAppService中的处理方式保持一致。
27 lines
1.3 KiB
XML
Executable File
27 lines
1.3 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.HealthcareServiceMapper">
|
|
|
|
<select id="searchHealthByIds" resultType="com.openhis.administration.dto.HealthcareDto">
|
|
<!-- 根据项目id数组 加载挂号集合 -->
|
|
SELECT
|
|
health.id as itemId,
|
|
health.offered_org_id as orgId,health.name as name,health.category_code as categoryCode,health.type_code as
|
|
typeCode
|
|
FROM adm_healthcare_service as health
|
|
WHERE health.ID IN
|
|
<foreach collection="itemIds" item="item" open="(" separator="," close=")">
|
|
#{item}
|
|
</foreach>
|
|
</select>
|
|
<!-- 查询所有 挂号数据 -->
|
|
<select id="searchAllHeathData" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
|
|
SELECT heal.id AS targetId,heal.name AS name,cid.price AS originRetailPrice,org.name as orgName
|
|
FROM public.adm_healthcare_service heal
|
|
INNER JOIN adm_charge_item_definition cid ON heal.id = cid.instance_id
|
|
INNER JOIN adm_organization org ON heal.offered_org_id = org.id
|
|
WHERE heal.delete_flag = '0' AND heal.offered_org_id = #{orgId} AND cid.status_enum = #{statusEnum}
|
|
</select>
|
|
</mapper> |