fix: 打卡关联积分包推广药品获取问题

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

@@ -44,6 +44,7 @@ import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -229,19 +230,15 @@ public class WmDaDrugEntDrugtableController {
 	public R listDrugByDrugEntName(@RequestParam(value = "drugEntName", required = false) String drugEntName,
 								   @RequestParam(value = "packageId") String packageId) {
 
-		// 兼容历史数据(通过推广药品企业查询药品)
-		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()));
-			}
-
-		}
-
-		// 查询积分包的推广药品id
 		WmScorePackage scorePackage = wmScorePackageService.getById(packageId);
-		if (ArrayUtil.isNotEmpty(scorePackage.getDrugtable())) {
+
+		// 兼容历史数据(通过推广药品企业查询药品)
+		if (ArrayUtil.isNotEmpty(scorePackage.getDrugProducerList())) {
+			return R.ok(wmDaDrugEntDrugtableService.list(Wrappers.<WmDaDrugEntDrugtable>lambdaQuery()
+							.in(WmDaDrugEntDrugtable::getDrugEntName, Stream.of(scorePackage.getDrugProducerList()).collect(Collectors.toList())))
+					.stream().map(WmDaDrugEntDrugtable::getDrugname).collect(Collectors.toList()));
+		} else if (ArrayUtil.isNotEmpty(scorePackage.getDrugtable())) {
+			// 查询积分包的推广药品id
 			List<WmDaDrugEntDrugtable> drugEntDrugtables =
 					wmDaDrugEntDrugtableService.listByIds(Arrays.stream(scorePackage.getDrugtable()).collect(Collectors.toSet()));
 			return R.ok(drugEntDrugtables.stream().map(WmDaDrugEntDrugtable::getDrugname).collect(Collectors.toList()));

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmScorePackage.java

@@ -473,7 +473,6 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	/**
 	 * 关联药品的生产厂商列表
 	 */
-	@Deprecated
 	@TableField(value = "drug_producer")
 	private String[] drugProducerList;