|
|
@@ -49,15 +49,20 @@ public class DrugService {
|
|
|
: drugRepository.findByIsActiveTrue(pageable);
|
|
|
|
|
|
var items = result.getContent().stream()
|
|
|
- .map(d -> Map.<String, Object>of(
|
|
|
- "drug_id", d.getDrugId(),
|
|
|
- "name", d.getName(),
|
|
|
- "name_en", d.getNameEn() != null ? d.getNameEn() : "",
|
|
|
- "category", d.getCategory() != null ? d.getCategory() : "",
|
|
|
- "subcategory", d.getSubcategory() != null ? d.getSubcategory() : "",
|
|
|
- "source_version", d.getSourceVersion() != null ? d.getSourceVersion() : "",
|
|
|
- "is_active", d.getIsActive()
|
|
|
- ))
|
|
|
+ .map(d -> {
|
|
|
+ Map<String, Object> m = new java.util.LinkedHashMap<>();
|
|
|
+ m.put("drug_id", d.getDrugId());
|
|
|
+ m.put("name", d.getName());
|
|
|
+ m.put("name_en", d.getNameEn() != null ? d.getNameEn() : "");
|
|
|
+ m.put("pinyin", d.getPinyin() != null ? d.getPinyin() : "");
|
|
|
+ m.put("category", d.getCategory() != null ? d.getCategory() : "");
|
|
|
+ m.put("subcategory", d.getSubcategory() != null ? d.getSubcategory() : "");
|
|
|
+ m.put("source_version", d.getSourceVersion() != null ? d.getSourceVersion() : "");
|
|
|
+ m.put("source_volume", d.getSourceVolume() != null ? d.getSourceVolume() : "");
|
|
|
+ m.put("source_page", d.getSourcePage() != null ? d.getSourcePage() : "");
|
|
|
+ m.put("is_active", d.getIsActive());
|
|
|
+ return m;
|
|
|
+ })
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
return Map.of(
|