Yajentine/his
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

Browse Source
This commit is contained in:
Zhang.WH
2025-03-19 16:09:06 +08:00
parent 4ad61d3c3c eb64bcc962
commit 414a576d9a
17 changed files with 267 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@
abi.advice_table_name
from (
SELECT T1.tenant_id,
'1' AS advice_type,
1 AS advice_type,
T1.ID AS advice_definition_id,
T1.NAME AS advice_name,
T1.bus_no AS advice_bus_no,
@@ -65,7 +65,7 @@
WHERE T1.delete_flag = '0'
UNION ALL
SELECT T1.tenant_id,
'2' AS advice_type,
2 AS advice_type,
T1.ID AS advice_definition_id,
T1.NAME AS advice_name,
T1.bus_no AS advice_bus_no,
@@ -98,7 +98,7 @@
WHERE T1.delete_flag = '0'
UNION ALL
SELECT T1.tenant_id,
'3' AS advice_type,
3 AS advice_type,
T1.ID AS advice_definition_id,
T1.NAME AS advice_name,
T1.bus_no AS advice_bus_no,
@@ -162,6 +162,7 @@
<select id="getChildCharge" resultType="com.openhis.web.doctorstation.dto.AdvicePriceDto">
SELECT
T1.definition_id,
T1.id AS definition_detail_id,
T2.charge_name,
T1.condition_value,
T1.condition_code,