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

医嘱查询调整

Browse Source
This commit is contained in:
Wang.Huan
2025-03-19 15:56:06 +08:00
parent b6bcc4c56e
commit eb64bcc962
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java
View File

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
public class AdviceBaseDto { public class AdviceBaseDto {
/** 医嘱类型 */ /** 医嘱类型 */
private String adviceType; // 1:药品 , 2: 耗材 , 3:项目 private Integer adviceType; // 1:药品 , 2: 耗材 , 3:项目
/** 医嘱定义ID */ /** 医嘱定义ID */
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)

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

@@ -30,7 +30,7 @@
abi.advice_table_name abi.advice_table_name
from ( from (
SELECT T1.tenant_id, SELECT T1.tenant_id,
'1' AS advice_type, 1 AS advice_type,
T1.ID AS advice_definition_id, T1.ID AS advice_definition_id,
T1.NAME AS advice_name, T1.NAME AS advice_name,
T1.bus_no AS advice_bus_no, T1.bus_no AS advice_bus_no,
@@ -65,7 +65,7 @@
WHERE T1.delete_flag = '0' WHERE T1.delete_flag = '0'
UNION ALL UNION ALL
SELECT T1.tenant_id, SELECT T1.tenant_id,
'2' AS advice_type, 2 AS advice_type,
T1.ID AS advice_definition_id, T1.ID AS advice_definition_id,
T1.NAME AS advice_name, T1.NAME AS advice_name,
T1.bus_no AS advice_bus_no, T1.bus_no AS advice_bus_no,
@@ -98,7 +98,7 @@
WHERE T1.delete_flag = '0' WHERE T1.delete_flag = '0'
UNION ALL UNION ALL
SELECT T1.tenant_id, SELECT T1.tenant_id,
'3' AS advice_type, 3 AS advice_type,
T1.ID AS advice_definition_id, T1.ID AS advice_definition_id,
T1.NAME AS advice_name, T1.NAME AS advice_name,
T1.bus_no AS advice_bus_no, T1.bus_no AS advice_bus_no,