|
@@ -17,6 +17,8 @@
|
|
|
|
|
|
package com.qunzhixinxi.hnqz.admin.controller;
|
|
package com.qunzhixinxi.hnqz.admin.controller;
|
|
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
|
import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
@@ -39,6 +41,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -218,4 +221,27 @@ public class WmDaDrugEntDrugtableController {
|
|
return R.ok(wmDaDrugEntDrugtableService.listDrugProducerByDeptId(deptId));
|
|
return R.ok(wmDaDrugEntDrugtableService.listDrugProducerByDeptId(deptId));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 获取药品列表
|
|
|
|
+ *
|
|
|
|
+ * @param drugEntName 部门id
|
|
|
|
+ * @return 名称列表
|
|
|
|
+ */
|
|
|
|
+ @GetMapping(value = "/list-drug-table")
|
|
|
|
+ public R listDrugByDrugEntName(@RequestParam(value = "drugEntName") String drugEntName) {
|
|
|
|
+
|
|
|
|
+ if (StrUtil.isNotEmpty(drugEntName)){
|
|
|
|
+ List<String> split = StrUtil.split(drugEntName, StrUtil.COMMA).stream().filter(StrUtil::isNotEmpty).collect(Collectors.toList());
|
|
|
|
+ if (CollUtil.isNotEmpty(split)){
|
|
|
|
+ return R.ok(wmDaDrugEntDrugtableService.list(Wrappers.<WmDaDrugEntDrugtable>lambdaQuery().in(WmDaDrugEntDrugtable::getDrugEntName, split))
|
|
|
|
+ .stream().map(WmDaDrugEntDrugtable::getDrugname).collect(Collectors.toList()));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ return R.ok();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|