diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml index c67fdff4..9e69c007 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml @@ -238,7 +238,11 @@ AND T3.organization_id = #{organizationId} WHERE t1.delete_flag = '0' - AND (t1.pricing_flag = 1 OR t1.pricing_flag IS NULL) + + + AND (t1.pricing_flag = #{pricingFlag} OR t1.pricing_flag IS NULL) + AND (t1.name ILIKE '%' || #{searchKey} || '%' OR t1.py_str ILIKE '%' || #{searchKey} || '%')