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

参与者改造

Browse Source
This commit is contained in:
Wang.Huan
2025-03-28 17:33:32 +08:00
parent 5adb6a8490
commit 22e46a0545
6 changed files with 55 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openhis-server/openhis-application/src/main/resources/mapper/basedatamanage/PractitionerAppMapper.xml
View File

@@ -48,6 +48,7 @@
<select id="getPractitionerRolesDtoList" resultType="com.openhis.web.basedatamanage.dto.PractitionerRolesDto">
SELECT
sr.role_id,
sr.role_key AS role_code,
sr.role_name,
ap.ID AS practitioner_id
FROM

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

@@ -9,6 +9,7 @@
abi.advice_type,
abi.category_code,
abi.part_percent,
abi.part_attribute_enum,
abi.advice_definition_id,
abi.advice_name,
abi.advice_bus_no,
@@ -32,30 +33,31 @@
abi.advice_table_name
from (
SELECT T1.tenant_id,
1 AS advice_type,
T1.category_code AS category_code,
T1.part_percent AS part_percent,
T1.ID AS advice_definition_id,
T1.NAME AS advice_name,
T1.bus_no AS advice_bus_no,
T1.py_str AS py_str,
T1.wb_str AS wb_str,
T1.yb_no AS yb_no,
T1.merchandise_name AS product_name,
0 AS activity_type,
T1.unit_code AS unit_code,
T1.min_unit_code AS min_unit_code,
T2.total_volume AS volume,
T2.method_code AS method_code,
T2.rate_code AS rate_code,
T2.org_id AS org_id,
T2.location_id AS location_id,
CAST(T2.dose AS TEXT) AS dose,
T2.dose_unit_code AS dose_unit_code,
T3.NAME AS supplier,
T4.NAME AS manufacturer,
T5.id AS charge_item_definition_id,
T5.instance_table AS advice_table_name
1 AS advice_type,
T1.category_code AS category_code,
T1.part_percent AS part_percent,
T1.part_attribute_enum AS part_attribute_enum,
T1.ID AS advice_definition_id,
T1.NAME AS advice_name,
T1.bus_no AS advice_bus_no,
T1.py_str AS py_str,
T1.wb_str AS wb_str,
T1.yb_no AS yb_no,
T1.merchandise_name AS product_name,
0 AS activity_type,
T1.unit_code AS unit_code,
T1.min_unit_code AS min_unit_code,
T2.total_volume AS volume,
T2.method_code AS method_code,
T2.rate_code AS rate_code,
T2.org_id AS org_id,
T2.location_id AS location_id,
CAST(T2.dose AS TEXT) AS dose,
T2.dose_unit_code AS dose_unit_code,
T3.NAME AS supplier,
T4.NAME AS manufacturer,
T5.id AS charge_item_definition_id,
T5.instance_table AS advice_table_name
FROM med_medication_definition AS t1
LEFT JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
AND T2.delete_flag = '0'
@@ -72,6 +74,7 @@
2 AS advice_type,
T1.category_code AS category_code,
T1.part_percent AS part_percent,
null AS part_attribute_enum,
T1.ID AS advice_definition_id,
T1.NAME AS advice_name,
T1.bus_no AS advice_bus_no,
@@ -108,6 +111,7 @@
3 AS advice_type,
'' AS category_code,
1 AS part_percent,
null AS part_attribute_enum,
T1.ID AS advice_definition_id,
T1.NAME AS advice_name,
T1.bus_no AS advice_bus_no,