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

feat(invoice): 完善发票管理权限控制和检验申请功能

Browse Source 
- 超级管理员可以编辑操作员字段，普通用户不可编辑
- 修改权限判断逻辑，只有用户名等于 'admin' 的用户才是超级管理员
- 非超级管理员用户只能查询自己的发票数据
- 添加根据员工ID更新操作员名称功能
- 新增行时根据用户权限填充信息
- 严格检查权限，超级管理员可以删除所有记录，普通用户只能删除自己维护的记录
- 在 bargain 组件中验证患者选择
- 添加检验申请单相关API接口
- 在医生工作站中添加检验申请tab页
- 实现检验申请单的增删改查功能
- 添加公告通知已读记录相关功能
- 实现用户未读公告数量统计和标记已读功能
This commit is contained in:
chenqi
2025-12-30 13:52:15 +08:00
parent 49b8a975a8
commit 1c16d6ba0f
10 changed files with 443 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ActivityDefinitionManageMapper.xml
View File

@@ -29,9 +29,9 @@
T3.price_code,
T3.retail_price,
T3.maximum_retail_price,
T3.chrgitm_lv,--医保等级
T3.children_json,--子项json
T3.pricing_flag--划价标记
T3.chrgitm_lv,
T3.children_json,
T3.pricing_flag
FROM
(
SELECT
@@ -54,18 +54,18 @@
T1.description_text,
T1.rule_id,
T1.tenant_id,
T1.chrgitm_lv,--医保等级
T1.chrgitm_lv,
T2.type_code as item_type_code,
T2.yb_type,
T2.price_code,
T2.price as retail_price,--零售价
T4.amount as maximum_retail_price,--最高零售价
T1.children_json,--子项json
T1.pricing_flag--划价标记
T2.price as retail_price,
T4.amount as maximum_retail_price,
T1.children_json,
T1.pricing_flag
FROM wor_activity_definition T1
LEFT JOIN adm_charge_item_definition T2 ON T1.id = T2.instance_id
LEFT JOIN adm_charge_item_definition T5 ON T5.instance_id = T1.id AND T5.instance_table = 'wor_activity_definition'
LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T5.id AND T4.condition_code = '4'--4:限制
LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T5.id AND T4.condition_code = '4'
<where>
T1.delete_flag = '0'
AND T2.instance_table = 'wor_activity_definition'
@@ -81,6 +81,7 @@
</if>
</where>
ORDER BY T1.bus_no DESC
) T3
</select>
@@ -108,22 +109,23 @@
T2.type_code as item_type_code,
T2.yb_type,
T2.price_code,
T2.price as retail_price,--零售价,
( SELECT T4.amount
FROM adm_charge_item_definition T5
LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T5.id
WHERE T4.condition_code = '4'--4:限制
AND T5.instance_id = T1.id
AND T5.instance_table = 'wor_activity_definition'
) as maximum_retail_price,--最高零售价
T1.chrgitm_lv,--医保等级
T1.children_json,--子项json
T1.pricing_flag--划价标记
T2.price as retail_price,
(
SELECT T4.amount
FROM adm_charge_item_definition T5
LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T5.id
WHERE T4.condition_code = '4'
AND T5.instance_id = T1.id
AND T5.instance_table = 'wor_activity_definition'
) as maximum_retail_price,
T1.chrgitm_lv,
T1.children_json,
T1.pricing_flag
FROM wor_activity_definition T1
LEFT JOIN adm_charge_item_definition T2 ON T1.id = T2.instance_id
<where>
T1.delete_flag = '0'
AND T2.instance_table = 'wor_activity_definition'
AND T2.instance_table = 'wor_activity_definition'
<if test="id!= null">
AND T1.id = #{id}
@@ -134,4 +136,4 @@
</where>
</select>
</mapper>
</mapper>