From eb64bcc9629a081fcac765f23bf1fd6679d2d18e Mon Sep 17 00:00:00 2001 From: "Wang.Huan" Date: Wed, 19 Mar 2025 15:56:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E5=98=B1=E6=9F=A5=E8=AF=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/openhis/web/doctorstation/dto/AdviceBaseDto.java | 2 +- .../mapper/doctorstation/DoctorStationAdviceAppMapper.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java index 4e3d9793..fff3c1d8 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/AdviceBaseDto.java @@ -17,7 +17,7 @@ import lombok.experimental.Accessors; public class AdviceBaseDto { /** 医嘱类型 */ - private String adviceType; // 1:药品 , 2: 耗材 , 3:项目 + private Integer adviceType; // 1:药品 , 2: 耗材 , 3:项目 /** 医嘱定义ID */ @JsonSerialize(using = ToStringSerializer.class) diff --git a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml index 4b523c32..a60215c2 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml @@ -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,