zhangfei
9c3e603b94
当手术计费弹窗中点击"签发"耗材时，因耗材的locationId（发放库房）为空导致后端异常。 在DoctorStationAdviceAppServiceImpl.handDevice方法中，当locationId为null时，使用登录用户的科室ID作为默认值， 与NurseBillingAppService中的处理方式保持一致。
32 lines
1.1 KiB
XML
Executable File
32 lines
1.1 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.EncounterDiagnosisMapper">
|
|
|
|
<delete id="deleteByEncounterId">
|
|
DELETE
|
|
FROM adm_encounter_diagnosis
|
|
WHERE encounter_id = #{encounterId}
|
|
AND tcm_flag = 0
|
|
</delete>
|
|
|
|
<delete id="deleteTcmByEncounterId">
|
|
DELETE
|
|
FROM adm_encounter_diagnosis
|
|
WHERE encounter_id = #{encounterId}
|
|
AND tcm_flag = 0
|
|
</delete>
|
|
<select id="getEncounterDiagnosisByEncounterConDefId"
|
|
resultType="com.openhis.administration.domain.EncounterDiagnosis">
|
|
SELECT *
|
|
FROM adm_encounter_diagnosis T1
|
|
INNER JOIN cli_condition T2 ON T1.condition_id = T2.id
|
|
WHERE T1.encounter_id = #{encounterId}
|
|
AND T2.definition_id = #{conditionDefId}
|
|
AND T1.delete_flag = '0'
|
|
AND T2.delete_flag = '0'
|
|
AND T1.tenant_id = #{tenantId}
|
|
</select>
|
|
|
|
</mapper> |