|
@@ -5,8 +5,8 @@ import cn.hutool.core.util.StrUtil;
|
|
|
import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEntDrugtable;
|
|
|
import com.qunzhixinxi.hnqz.common.core.constant.CacheConstants;
|
|
|
import com.qunzhixinxi.hnqz.common.core.util.R;
|
|
|
-import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
|
|
|
import java.util.Collections;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -31,9 +31,8 @@ public class WmDrugControllerV2 {
|
|
|
|
|
|
@Resource private RedisTemplate redisTemplate;
|
|
|
|
|
|
- @Inner(value = false)
|
|
|
@GetMapping(value = "/avail")
|
|
|
- public R<Map<String, List<WmDaDrugEntDrugtable>>> listAvail(
|
|
|
+ public R<Map<String, List<Map<String, String>>>> listAvail(
|
|
|
@RequestParam(value = "mah", required = false) String mah) {
|
|
|
|
|
|
List<WmDaDrugEntDrugtable> range =
|
|
@@ -43,18 +42,27 @@ public class WmDrugControllerV2 {
|
|
|
return R.ok(Collections.emptyMap());
|
|
|
}
|
|
|
|
|
|
- if (StrUtil.isBlank(mah)) {
|
|
|
+ if (StrUtil.isNotBlank(mah)) {
|
|
|
range =
|
|
|
range.stream()
|
|
|
.filter(drug -> StrUtil.contains(drug.getDrugEntName(), mah))
|
|
|
.collect(Collectors.toList());
|
|
|
}
|
|
|
|
|
|
- Map<String, List<WmDaDrugEntDrugtable>> collect = range.stream()
|
|
|
- .collect(Collectors.groupingBy(WmDaDrugEntDrugtable::getDrugEntName));
|
|
|
-
|
|
|
- return R.ok(collect);
|
|
|
+ Map<String, List<Map<String, String>>> collect =
|
|
|
+ range.stream()
|
|
|
+ .map(
|
|
|
+ drugtable -> {
|
|
|
+ Map<String, String> map = new HashMap<>(4);
|
|
|
+ map.put("id", drugtable.getId());
|
|
|
+ map.put("entName", drugtable.getDrugEntName());
|
|
|
+ map.put("drugName", drugtable.getDrugname());
|
|
|
+ map.put("drugNameTy", drugtable.getDrugnameTy());
|
|
|
|
|
|
+ return map;
|
|
|
+ })
|
|
|
+ .collect(Collectors.groupingBy(m -> m.get("entName")));
|
|
|
|
|
|
+ return R.ok(collect);
|
|
|
}
|
|
|
}
|