feat: 获取积分包药品生产企业

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

@@ -307,8 +307,7 @@ public class ApiController {
 					}
 
 					dictMap.put(config.getDictGroupName(), listMap);
-				}
-				else if ("package_drug_list".equals(config.getDictGroupName())) {
+				} else if ("package_drug_list".equals(config.getDictGroupName())) {
 					// 前端自动获取
 					dictMap.put(config.getDictGroupName(), "package_drug_list");
 				}
@@ -508,7 +507,7 @@ public class ApiController {
 		}
 
 		//获取小程序openid
-		Map<String, Object> opemMap = GetOpenIDUtil.oauth2GetOpenid(code,upmsConfig.getWechatEnv());
+		Map<String, Object> opemMap = GetOpenIDUtil.oauth2GetOpenid(code, upmsConfig.getWechatEnv());
 		System.out.println("opemMap:" + opemMap);
 		if (null != opemMap) {
 			String openid = opemMap.get("openid") + "";
@@ -811,7 +810,7 @@ public class ApiController {
 	public R saveTaskContent(@RequestBody WmTaskContent wmTaskContent) {
 		R r = wmTaskContentService.saveTaskContent(wmTaskContent);
 
-		if (r.getCode() == CommonConstants.SUCCESS){
+		if (r.getCode() == CommonConstants.SUCCESS) {
 			HnqzUser user = SecurityUtils.getUser();
 			String key = String.format(CacheConstants.TASK_CONTENT_DRAFT, wmTaskContent.getTemp30(), user.getId());
 			redisTemplate.delete(key);
@@ -857,11 +856,10 @@ public class ApiController {
 
 		String o = (String) redisTemplate.opsForValue().get(key);
 
-		return R.ok(StringUtils.isNotEmpty(o) ? JSONUtil.toBean(o, WmTaskContent.class) : null );
+		return R.ok(StringUtils.isNotEmpty(o) ? JSONUtil.toBean(o, WmTaskContent.class) : null);
 	}
 
 
-
 	/**
 	 * 修改任务内容表
 	 *
@@ -2386,7 +2384,7 @@ public class ApiController {
 
 		SysDept sysDept = sysDeptService.getById(sysUser.getDeptId());
 
-		Map<SubjectTypeEnum,String> errorMap = new HashMap<>(2);
+		Map<SubjectTypeEnum, String> errorMap = new HashMap<>(2);
 
 		// 开启认证
 		if (CollectionUtils.isNotEmpty(userUpdateInput.getSubList())) {
@@ -2516,7 +2514,7 @@ public class ApiController {
 		}
 
 		// 两家都失败了,就中止
-		if (errorMap.size() == 2){
+		if (errorMap.size() == 2) {
 			return R.failed(errorMap);
 		}
 
@@ -2944,6 +2942,8 @@ public class ApiController {
 					Map<String, Object> map = new HashMap<>();
 					map.put("label", wmScorePackage.getScorePackageName());
 					map.put("value", wmScorePackage.getId());
+					String drugProducer = ArrayUtils.isEmpty(wmScorePackage.getDrugProducerList()) ? "" : String.join(StrUtil.COMMA, wmScorePackage.getDrugProducerList());
+					map.put("drugProducer", drugProducer);
 					listMap.add(map);
 				}
 
@@ -3056,7 +3056,7 @@ public class ApiController {
 	private String getReaderOpenId(String authCode) {
 		//获取小程序openid
 		log.info("小程序登录AUTH_CODE:{}", authCode);
-		Map<String, Object> resultMap = GetOpenIDUtil.oauth2GetOpenid(authCode.trim(),upmsConfig.getWechatEnv());
+		Map<String, Object> resultMap = GetOpenIDUtil.oauth2GetOpenid(authCode.trim(), upmsConfig.getWechatEnv());
 		log.warn("小程序登录结果信息:{}", resultMap);
 		return (String) resultMap.get("openid");
 	}