feat: 积分包加推广药品字段2

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -421,7 +421,6 @@ public class ApiController {
 											String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage
 													.getDrugProducerList());
 											map.put("drugProducer", drugProducer);
-											map.put("drugtable", wmScorePackage.getDrugtable());
 											listMap.add(map);
 										}
 
@@ -445,7 +444,6 @@ public class ApiController {
 											String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage
 													.getDrugProducerList());
 											map.put("drugProducer", drugProducer);
-											map.put("drugtable", wmScorePackage.getDrugtable());
 											listMap.add(map);
 										}
 									}

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmDaDrugEntDrugtableController.java

@@ -25,7 +25,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaDrugEnt;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaPharmacy;
+import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
+import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.admin.entity.WmDaDrugEntDrugtable;
@@ -55,6 +57,7 @@ public class WmDaDrugEntDrugtableController {
 
 	private final WmDaDrugEntDrugtableService wmDaDrugEntDrugtableService;
 	private final WmDaDrugEntService wmDaDrugEntService;
+	private final WmScorePackageService wmScorePackageService;
 
 	/**
 	 * 分页查询
@@ -202,7 +205,7 @@ public class WmDaDrugEntDrugtableController {
 	}
 
 	/**
-	 * 获取药品生产企业名称列表
+	 * 获取药品生产企业名称列表(已废弃,改为接口/list-drug-table直接获取药品, 兼容历史数据需要用到)
 	 *
 	 * @param deptId 部门id
 	 * @return 名称列表
@@ -217,12 +220,15 @@ public class WmDaDrugEntDrugtableController {
 	 * 获取药品列表
 	 *
 	 * @param drugEntName 部门id
+	 * @param packageId 积分包id
 	 * @return 名称列表
 	 */
 	@GetMapping(value = "/list-drug-table")
-	public R listDrugByDrugEntName(@RequestParam(value = "drugEntName") String drugEntName) {
+	public R listDrugByDrugEntName(@RequestParam(value = "drugEntName", required = false) String drugEntName,
+								   @RequestParam(value = "packageId") String packageId) {
 
-		if (StrUtil.isNotEmpty(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))
@@ -230,6 +236,16 @@ public class WmDaDrugEntDrugtableController {
 			}
 
 		}
+
+		// 查询积分包的推广药品
+		WmScorePackage scorePackage = wmScorePackageService.getById(packageId);
+		if (scorePackage.getDrugtable() != null) {
+			List<String> drugNameList = scorePackage.getDrugtable().stream()
+					.map(map -> map.get("drug_name"))
+					.collect(Collectors.toList());
+			return R.ok(drugNameList);
+		}
+
 		return R.ok();
 	}