药品目录

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;
 
     /** 是否限制使用 */

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,