实现科室护士管理患者排队叫号队列，实现患者智能分诊、队列调整、叫号控制等功能

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

@@ -229,11 +229,12 @@
             LEFT JOIN adm_charge_item_definition AS T2
             ON T2.instance_id = T1.ID
             AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
+            AND T2.instance_table = #{activityTableName}
             LEFT JOIN adm_organization_location AS T3 ON T3.activity_definition_id = T1.ID
             AND T3.delete_flag = '0' AND (CURRENT_TIME :: time (6) BETWEEN T3.start_time AND T3.end_time)
             WHERE T1.delete_flag = '0'
             <if test="pricingFlag ==1">
-                AND T1.pricing_flag = #{pricingFlag}
+                AND (T1.pricing_flag = #{pricingFlag} OR T1.pricing_flag IS NULL)
             </if>
             <if test="adviceDefinitionIdParamList != null and !adviceDefinitionIdParamList.isEmpty()">
                 AND T1.id IN
@@ -242,7 +243,6 @@
                 </foreach>
             </if>
             AND T1.status_enum = #{statusEnum}
-            AND T2.instance_table = #{activityTableName}
             )
         </if>
         ) AS abi