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

215 系统管理-》门诊划价：点击【新增】项目字段检索不出收费项目

Browse Source
This commit is contained in:
Ranyunqiao
2026-03-25 14:35:54 +08:00
parent 20eb020071
commit 77b054a86c
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
View File

@@ -98,7 +98,7 @@
LEFT JOIN adm_organization_location AS T6 ON T6.distribution_category_code = t1.category_code AND T6.delete_flag = '0' AND T6.item_code = '1' AND T6.organization_id = #{organizationId} AND (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time) LEFT JOIN adm_organization_location AS T6 ON T6.distribution_category_code = t1.category_code AND T6.delete_flag = '0' AND T6.item_code = '1' AND T6.organization_id = #{organizationId} AND (CURRENT_TIME :: time (6) BETWEEN T6.start_time AND T6.end_time)
WHERE t1.delete_flag = '0' WHERE t1.delete_flag = '0'
AND T2.status_enum = #{statusEnum} AND T2.status_enum = #{statusEnum}
<if test="pricingFlag ==1"> <if test="pricingFlag == 1">
AND 1 = 2 AND 1 = 2
</if> </if>
<if test="searchKey != null and searchKey != ''"> <if test="searchKey != null and searchKey != ''">
@@ -110,7 +110,9 @@
#{itemId} #{itemId}
</foreach> </foreach>
</if> </if>
AND T5.instance_table = #{medicationTableName} <if test="medicationTableName != null">
AND (T5.instance_table = #{medicationTableName} OR T5.instance_table IS NULL)
</if>
) )
<if test="adviceTypes.contains(2) or adviceTypes.contains(3)">UNION ALL</if> <if test="adviceTypes.contains(2) or adviceTypes.contains(3)">UNION ALL</if>
</if> </if>
@@ -119,7 +121,7 @@
(SELECT (SELECT
DISTINCT ON (T1.ID) DISTINCT ON (T1.ID)
T1.tenant_id, T1.tenant_id,
4 AS advice_type, 2 AS advice_type,
T1.bus_no AS bus_no, T1.bus_no AS bus_no,
T1.category_code AS category_code, T1.category_code AS category_code,
'' AS pharmacology_category_code, '' AS pharmacology_category_code,
@@ -172,7 +174,9 @@
#{itemId} #{itemId}
</foreach> </foreach>
</if> </if>
AND T4.instance_table = #{deviceTableName} <if test="deviceTableName != null">
AND (T4.instance_table = #{deviceTableName} OR T4.instance_table IS NULL)
</if>
AND T1.status_enum = #{statusEnum} AND T1.status_enum = #{statusEnum}
) )
<if test="adviceTypes.contains(3)">UNION ALL</if> <if test="adviceTypes.contains(3)">UNION ALL</if>

6
openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue
View File

@@ -112,12 +112,6 @@ function getList() {
return; return;
} }
// 必须有 adviceType 才查询，避免查询所有类型的数据
if (!queryParams.value.adviceType) {
console.log('[adviceBaseList] getList() 跳过：adviceType 未设置，当前值:', queryParams.value.adviceType);
return;
}
queryParams.value.organizationId = props.patientInfo.orgId; queryParams.value.organizationId = props.patientInfo.orgId;
console.log('[adviceBaseList] getList() 请求参数:', JSON.stringify(queryParams.value)); console.log('[adviceBaseList] getList() 请求参数:', JSON.stringify(queryParams.value));