fix(doctorstation): 解决诊疗项目执行科室验证及耗材价格显示问题 bug#220
- 修复诊疗项目执行科室非空校验逻辑,使用effectiveOrgId替代positionId - 添加getEffectiveOrgId方法统一获取执行科室ID的兼容处理 - 修复耗材价格处理逻辑,正确区分price和retailPrice字段避免零值判断错误 - 更新数据库查询映射,优化设备定义表与收费项目定义表关联条件 - 添加调试日志输出便于问题排查
This commit is contained in:
@@ -100,10 +100,11 @@
|
||||
AND T5.instance_table = 'adm_device_definition'
|
||||
) as maximum_retail_price--最高零售价
|
||||
FROM adm_device_definition T1
|
||||
LEFT JOIN adm_charge_item_definition T2 ON T1.id = T2.instance_id
|
||||
LEFT JOIN adm_charge_item_definition T2
|
||||
ON T1.id = T2.instance_id
|
||||
AND T2.instance_table = 'adm_device_definition'
|
||||
<where>
|
||||
T1.delete_flag = '0'
|
||||
AND T2.instance_table = 'adm_device_definition'
|
||||
|
||||
</where>
|
||||
ORDER BY T1.bus_no
|
||||
@@ -170,10 +171,11 @@
|
||||
AND T5.instance_table = 'adm_device_definition'
|
||||
) as maximum_retail_price--最高零售价
|
||||
FROM adm_device_definition T1
|
||||
LEFT JOIN adm_charge_item_definition T2 ON T1.id = T2.instance_id
|
||||
LEFT JOIN adm_charge_item_definition T2
|
||||
ON T1.id = T2.instance_id
|
||||
AND T2.instance_table = 'adm_device_definition'
|
||||
<where>
|
||||
T1.delete_flag = '0'
|
||||
AND T2.instance_table = 'adm_device_definition'
|
||||
|
||||
<if test="id!= null">
|
||||
AND T1.id = #{id}
|
||||
|
||||
Reference in New Issue
Block a user