From 4349b2d5acc7b7827d88a46a8c1f88f5ebdcc583 Mon Sep 17 00:00:00 2001 From: liuhongrui Date: Mon, 24 Mar 2025 15:02:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=AF=E5=93=81=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/datadictionary/dto/MedicationManageDto.java | 3 +++ .../datadictionary/MedicationManageSearchMapper.xml | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java index c85e7c0c..0e47901c 100644 --- a/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java +++ b/openhis-server/openhis-application/src/main/java/com/openhis/web/datadictionary/dto/MedicationManageDto.java @@ -35,6 +35,7 @@ public class MedicationManageDto { private String statusEnum_enumText; /** 所属科室 */ + @JsonSerialize(using = ToStringSerializer.class) private Long orgId; /** 剂型 */ @@ -160,9 +161,11 @@ public class MedicationManageDto { private Integer injectFlag; /** 生产厂家 */ + @JsonSerialize(using = ToStringSerializer.class) private Long manufacturerId; /** 供应商 */ + @JsonSerialize(using = ToStringSerializer.class) private Long supplyId; /** 是否限制使用 */ diff --git a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml index 0648bec3..0546ef98 100644 --- a/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml +++ b/openhis-server/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml @@ -53,13 +53,13 @@ T1.characteristic, T1.national_drug_code, T1.part_attribute, - T1.antibiotic_code - T1.restricted_enum - T1.self_flag - T1.antibiotic_flag - T1.basic_flag + T1.antibiotic_code, + T1.restricted_enum, + T1.self_flag, + T1.antibiotic_flag, + T1.basic_flag, T1.remark, - T3.manufacturer_name, + T3.name AS manufacturer_name, T4.base_unit_code, T4.base_quantity, T4.min_unit_code,