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

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

@@ -18,6 +18,7 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
@@ -40,6 +41,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -237,13 +239,12 @@ public class WmDaDrugEntDrugtableController {
 
 		}
 
-		// 查询积分包的推广药品
+		// 查询积分包的推广药品id
 		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);
+		if (ArrayUtil.isNotEmpty(scorePackage.getDrugtable())) {
+			List<WmDaDrugEntDrugtable> drugEntDrugtables =
+					wmDaDrugEntDrugtableService.listByIds(Arrays.stream(scorePackage.getDrugtable()).collect(Collectors.toSet()));
+			return R.ok(drugEntDrugtables.stream().map(WmDaDrugEntDrugtable::getDrugname).collect(Collectors.toList()));
 		}
 
 		return R.ok();

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

@@ -497,10 +497,9 @@ public class WmScorePackage extends Model<WmScorePackage> {
 	private BigDecimal entTaskLimit;
 
 	/**
-	 * 推广药品
+	 * 推广药品id
 	 */
-	@TableField(typeHandler = FastjsonTypeHandler.class)
-	private List<Map<String, String>> drugtable;
+	private String[] drugtable;
 
 	/**
 	 * 获取积分包的关联试卷

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -94,7 +94,7 @@
 		<result property="drugProducerList" column="drug_producer"/>
 		<result property="omsOrderSn" column="oms_order_sn"/>
 		<result property="packageSn" column="pkg_sn"/>
-		<result property="drugtable" column="drugtable" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+		<result property="drugtable" column="drugtable"/>
 	</resultMap>
 
 	<select id="listWmScorePackageAndTask" resultMap="wmScorePackageMap">