diff --git a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java index 3b694772..a129396d 100644 --- a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java +++ b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java @@ -18,7 +18,9 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.entity.alihealth.AliYljgBillDetail; import com.glxp.api.entity.alihealth.AliYljgBillDetailDrugCode; import com.glxp.api.entity.alihealth.AliYljgSearchbill; +import com.glxp.api.entity.thrsys.CodeRel; import com.glxp.api.entity.thrsys.ThirdAliDrug; +import com.glxp.api.entity.thrsys.YbDrug; import com.glxp.api.req.alihealth.AliYljgSearchbillReqeust; import com.glxp.api.req.alihealth.AlihealthKytDrugrescodeReqeust; import com.glxp.api.req.alihealth.AlihealthKytGetentinfoReqeust; @@ -27,8 +29,11 @@ import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.alihealth.AlihealthKytGetentinfoResponse; import com.glxp.api.service.alihealth.AlihealthBusService; +import com.glxp.api.service.basic.UdiContrastService; import com.glxp.api.service.inout.IoOrderService; +import com.glxp.api.util.JsonUtils; import com.glxp.api.util.alihealth.AlihealthUtils; +import com.google.api.client.json.Json; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -92,10 +97,37 @@ public class AlihealthBusController extends BaseController { } } - + @Resource + private UdiContrastService udiContrastService; @PostMapping("/spms/alihealth/thirdAliDrugList") @Log(title = "获取阿里药品码段信息列表包括查询国家库", businessType = BusinessType.OTHER) public BaseResponse> thirdAliDrugList(@RequestBody AlihealthThirdAliDrugInsertReqeust alihealthThirdAliDrugInsertReqeust) { + List thirdAliDrugsListGjk = null; + // 本地查询和新增都先注释了 到时候加到这边来 + YbDrug ybDrug = alihealthThirdAliDrugInsertReqeust.getYbDrug(); + if(StringUtils.isNotEmpty(ybDrug.getGoodsCode())){ + // 用医保编码查询国家库药品信息 + try { + CodeRel codeReNew = new CodeRel(); + codeReNew.setYbbm(ybDrug.getGoodsCode()); + String response = HttpUtil.post(udiUrl + "/udchs/codeRel/listAndAliDrug", JSONUtil.toJsonStr(codeReNew)); + BaseResponse> responseListAndAliDrug = + JSONObject.parseObject(response, new TypeReference>>() { + + }); + if(responseListAndAliDrug.getCode() == 20000){ + thirdAliDrugsListGjk = responseListAndAliDrug.getData(); + if(thirdAliDrugsListGjk != null && thirdAliDrugsListGjk.size() >0){ + return ResultVOUtils.success(thirdAliDrugsListGjk); + } + } + } catch (Exception e) { + log.error("国家库===用医保编码查询国家库药品信息===出现错误===" + e.getMessage()); + + } + } + + // 查询国家库药品信息 并且要插入到多玛融合表 AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = alihealthThirdAliDrugInsertReqeust.getAlihealthKytDrugrescodeReqeust(); Map map = new HashMap(); @@ -111,7 +143,14 @@ public class AlihealthBusController extends BaseController { map.put("manufacturer", alihealthThirdAliDrugInsertReqeust.getManufactory()); } - List thirdAliDrugsListGjk = null; + if (com.glxp.api.util.StringUtils.isNotEmpty(alihealthThirdAliDrugInsertReqeust.getFormSpec())) { + map.put("formSpec", alihealthThirdAliDrugInsertReqeust.getFormSpec()); + + } + if (com.glxp.api.util.StringUtils.isNotEmpty(alihealthThirdAliDrugInsertReqeust.getBzgg())) { + map.put("bzgg", alihealthThirdAliDrugInsertReqeust.getBzgg()); + + } if(alihealthThirdAliDrugInsertReqeust.getGjkSwitch()){ try { String response = HttpUtil.get(udiUrl + "/udiwms/aliDrug/getDrugLevelList", map); @@ -125,38 +164,70 @@ public class AlihealthBusController extends BaseController { thirdAliDrugsListGjk = udiDlDeviceResponse.getData().getList(); } } catch (Exception e) { - log.error("国家库查询阿里产品访问出现错误===" + e.getMessage()); + log.error("国家库===查询药品信息===出现错误===" + e.getMessage()); } } - if (thirdAliDrugsListGjk != null && thirdAliDrugsListGjk.size() > 0) { - return ResultVOUtils.success(thirdAliDrugsListGjk); + } else { - List thirdAliDrugListNew; - BaseResponse> baseResponse = alihealthUtils.thirdAliDrugInsertAll(alihealthThirdAliDrugInsertReqeust); - if (baseResponse.getCode() == 20000) { - thirdAliDrugListNew = baseResponse.getData(); - } else { - log.error("阿里接口未查到产品信息===" + baseResponse.getMessage()); - return ResultVOUtils.error("阿里接口未查到产品信息===" + baseResponse.getMessage()); +// BaseResponse> baseResponse = alihealthUtils.thirdAliDrugInsertAll(alihealthThirdAliDrugInsertReqeust); +// if (baseResponse.getCode() == 20000) { +// thirdAliDrugsListGjk = baseResponse.getData(); +// } else { +// log.error("阿里接口未查到产品信息===" + baseResponse.getMessage()); +// return ResultVOUtils.error("阿里接口未查到产品信息===" + baseResponse.getMessage()); +// +// } +// // 上传到国家库 +// try { +// Map mapNew = new HashMap(); +// mapNew.put("list", thirdAliDrugsListGjk); +// String response = HttpUtil.post(udiUrl + "/udiwms/aliDrug/addThirdAliDrug", JSONUtil.toJsonStr(mapNew)); +// BaseResponse baseResponseAdd = JSONUtil.toBean(response, BaseResponse.class); +// log.info("成功上传国家库阿里产品数据"); +// } catch (Exception e) { +// +// log.error("国家库上传阿里产品访问出现错误===" + e.getMessage()); +// } - } - // 上传到国家库 - try { - Map mapNew = new HashMap(); - mapNew.put("list", thirdAliDrugListNew); - String response = HttpUtil.post(udiUrl + "/udiwms/aliDrug/addThirdAliDrug", JSONUtil.toJsonStr(mapNew)); - BaseResponse baseResponseAdd = JSONUtil.toBean(response, BaseResponse.class); - log.info("成功上传国家库阿里产品数据"); - } catch (Exception e) { + } + // 上传多玛关系于处理规则在插入到融合表 + if(StringUtils.isNotEmpty(ybDrug.getGoodsCode()) + ){ + // 规则匹配 + thirdAliDrugsListGjk = udiContrastService.disposeYbDrugList(thirdAliDrugsListGjk,ybDrug); + if(thirdAliDrugsListGjk!=null && thirdAliDrugsListGjk.size()>0){ + List list = new ArrayList<>(); + for (ThirdAliDrug thirdAliDrug : thirdAliDrugsListGjk) { + CodeRel codeRel = new CodeRel(); + codeRel.setDrugCode(thirdAliDrug.getNameCode()); + codeRel.setYbbm(ybDrug.getGoodsCode()); + codeRel.setUpdateTime(new Date()); + list.add(codeRel); + } + try { + String response = HttpUtil.post(udiUrl + "/udchs/codeRel/updateBatch", JSONUtil.toJsonStr(list)); + BaseResponse baseResponse = JSONUtil.toBean(response,BaseResponse.class); + + if(baseResponse.getCode() == 2000){ + log.error("国家库===上传多码关系===成功==="); + + }else { + log.error("国家库===上传多码关系===出现错误===" + baseResponse.getMessage()); + + } - log.error("国家库上传阿里产品访问出现错误===" + e.getMessage()); + } catch (Exception e) { + log.error("国家库===上传多码关系===出现错误===" + e.getMessage()); + + } } - return ResultVOUtils.success(thirdAliDrugListNew); } + return ResultVOUtils.success(thirdAliDrugsListGjk); + // udiProductService.insertUdiInfo(udiProductEntity); } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java index ee85c975..35e4e33f 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java @@ -102,12 +102,16 @@ public class ThirdAliDrugController extends BaseController { alihealthThirdAliDrugInsertReqeust.setErpId(authAliUser.getErpid()); alihealthThirdAliDrugInsertReqeust.setAppSecret(authAliUser.getAppsecret()); alihealthThirdAliDrugInsertReqeust.setManufactory(thirdAliDrug.getManufacturer()); - alihealthThirdAliDrugInsertReqeust.setGjkSwitch(false); + alihealthThirdAliDrugInsertReqeust.setBzgg(thirdAliDrug.getBzgg()); + alihealthThirdAliDrugInsertReqeust.setFormSpec(thirdAliDrug.getFormSpec()); + + alihealthThirdAliDrugInsertReqeust.setGjkSwitch(true); AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = new AlihealthKytDrugrescodeReqeust(); alihealthKytDrugrescodeReqeust.setPhysic_name(thirdAliDrug.getCpmctymc()); alihealthKytDrugrescodeReqeust.setApproval_licence_no(thirdAliDrug.getApprovalNum()); - alihealthKytDrugrescodeReqeust.setPackage_spec(thirdAliDrug.getBzgg()); - alihealthKytDrugrescodeReqeust.setPrepn_spec(thirdAliDrug.getFormSpec()); +// alihealthKytDrugrescodeReqeust.setEnt_name(thirdAliDrug.getManufacturer()); +// alihealthKytDrugrescodeReqeust.setPackage_spec(thirdAliDrug.getBzgg()); +// alihealthKytDrugrescodeReqeust.setPrepn_spec(thirdAliDrug.getFormSpec()); alihealthKytDrugrescodeReqeust.setPage_size(200); alihealthKytDrugrescodeReqeust.setPage(1); @@ -123,13 +127,13 @@ public class ThirdAliDrugController extends BaseController { list = thirdAliDrugService.filterList(thirdAliDrug); } else { - log.info("供应商平台获取阿里和国家库码段信息===未查到产品信息"); + log.error("获取阿里和国家库码段信息===未查到产品信息"); } } else { - log.info("供应商平台获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage()); + log.error("获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage()); // udiProductEntity.setBasicPrductRemak8("供应商平台获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage()); // error = "供应商平台获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage(); @@ -137,7 +141,7 @@ public class ThirdAliDrugController extends BaseController { } } catch (Exception e) { - log.info("供应商平台获取阿里和国家库码段信息出现错误===" + e.getMessage()); + log.error("获取阿里和国家库码段信息出现错误===" + e.getMessage()); } } diff --git a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java index 0ceaee2f..b5cc639e 100644 --- a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthThirdAliDrugInsertReqeust.java @@ -1,5 +1,6 @@ package com.glxp.api.req.alihealth.local; +import com.glxp.api.entity.thrsys.YbDrug; import com.glxp.api.req.alihealth.AlihealthKytDrugrescodeReqeust; import lombok.Data; @@ -9,6 +10,9 @@ public class AlihealthThirdAliDrugInsertReqeust { private String appSecret; private String manufactory; private Boolean gjkSwitch = true; + private YbDrug ybDrug; + private String formSpec; + private String bzgg; private AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust; } diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 83516169..ab1b42c0 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -10,6 +10,7 @@ import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.ConstantStatus; +import com.glxp.api.controller.alihealth.AlihealthBusController; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.auth.AuthAliUser; import com.glxp.api.entity.basic.UdiProductEntity; @@ -231,7 +232,8 @@ public class UdiContrastService { @Resource ThirdAliDrugService thirdAliDrugService; - + @Resource + private AlihealthBusController alihealthBusController; // @Transactional public void createOnlyMainId(String mainId) { FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); @@ -322,112 +324,80 @@ public class UdiContrastService { if (StrUtil.isEmpty(udiProductEntity.getZczbhhzbapzbh()) || StrUtil.isEmpty(udiProductEntity.getCpmctymc())) { return; } - List thirdAliDrugList = thirdAliDrugService.list( - new QueryWrapper() - .eq(StringUtils.isNotEmpty(udiProductEntity.getCpmctymc()), "cpmctymc", udiProductEntity.getCpmctymc()) - .eq(StringUtils.isNotEmpty(udiProductEntity.getZczbhhzbapzbh()), "approvalNum", udiProductEntity.getZczbhhzbapzbh()) - .eq(StringUtils.isNotEmpty(udiProductEntity.getManufactory()), "manufacturer", udiProductEntity.getManufactory()) - - ); - if (CollUtil.isNotEmpty(thirdAliDrugList)) { - - } else { - Map map = new HashMap(); - if (StringUtils.isNotEmpty(udiProductEntity.getCpmctymc())) { - map.put("cpmctymc", udiProductEntity.getCpmctymc()); - - } - if (StringUtils.isNotEmpty(udiProductEntity.getZczbhhzbapzbh())) { - map.put("approvalNum", udiProductEntity.getZczbhhzbapzbh()); - - } - if (StringUtils.isNotEmpty(udiProductEntity.getManufactory())) { - map.put("manufacturer", udiProductEntity.getManufactory()); - - } - List thirdAliDrugsListGjk = null; - + // 本地查询先注释了 + List thirdAliDrugList = new ArrayList<>(); + +// List thirdAliDrugList = thirdAliDrugService.list( +// new QueryWrapper() +// .eq(StringUtils.isNotEmpty(udiProductEntity.getCpmctymc()), "cpmctymc", udiProductEntity.getCpmctymc()) +// .eq(StringUtils.isNotEmpty(udiProductEntity.getZczbhhzbapzbh()), "approvalNum", udiProductEntity.getZczbhhzbapzbh()) +// .eq(StringUtils.isNotEmpty(udiProductEntity.getManufactory()), "manufacturer", udiProductEntity.getManufactory()) +// +// ); +// if (CollUtil.isNotEmpty(thirdAliDrugList)) { +// +// } else { + + AuthAliUser authAliUser = authAliUserService.getOne(); + AlihealthThirdAliDrugInsertReqeust alihealthThirdAliDrugInsertReqeust = new AlihealthThirdAliDrugInsertReqeust(); + alihealthThirdAliDrugInsertReqeust.setErpId(authAliUser.getErpid()); + alihealthThirdAliDrugInsertReqeust.setAppSecret(authAliUser.getAppsecret()); +// alihealthThirdAliDrugInsertReqeust.setManufactory(udiProductEntity.getManufactory()); + alihealthThirdAliDrugInsertReqeust.setYbDrug(ybDrug); + AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = new AlihealthKytDrugrescodeReqeust(); + alihealthKytDrugrescodeReqeust.setPhysic_name(udiProductEntity.getCpmctymc()); + alihealthKytDrugrescodeReqeust.setApproval_licence_no(udiProductEntity.getZczbhhzbapzbh()); + alihealthKytDrugrescodeReqeust.setPage_size(200); + alihealthKytDrugrescodeReqeust.setPage(1); + alihealthKytDrugrescodeReqeust.setApp_key(authAliUser.getAppkey()); + alihealthKytDrugrescodeReqeust.setRef_ent_id(authAliUser.getRefentid()); + alihealthThirdAliDrugInsertReqeust.setAlihealthKytDrugrescodeReqeust(alihealthKytDrugrescodeReqeust); try { - String response = HttpUtil.get(udiUrl + "/udiwms/aliDrug/getDrugLevelList", map); - BaseResponse> udiDlDeviceResponse = - JSONObject.parseObject(response, new TypeReference>>() { - - }); - if (udiDlDeviceResponse != null) { - // 查询国家库是否有值 有值直接返回没值查询阿里接口 - thirdAliDrugsListGjk = udiDlDeviceResponse.getData().getList(); - + BaseResponse baseResponse = alihealthBusController.thirdAliDrugList(alihealthThirdAliDrugInsertReqeust); + if (baseResponse.getCode() == 20000) { + thirdAliDrugList = (List) baseResponse.getData(); + +// if (thirdAliDrugService.addOrUpdate((List) baseResponse.getData())) { +// thirdAliDrugList = thirdAliDrugService.list( +// new QueryWrapper() +// .eq(StringUtils.isNotEmpty(udiProductEntity.getCpmctymc()), "cpmctymc", udiProductEntity.getCpmctymc()) +// .eq(StringUtils.isNotEmpty(udiProductEntity.getZczbhhzbapzbh()), "approvalNum", udiProductEntity.getZczbhhzbapzbh()) +// .eq(StringUtils.isNotEmpty(udiProductEntity.getManufactory()), "manufacturer", udiProductEntity.getManufactory()) +// +// ); +// } else { +// log.info("供应商平台获取阿里和国家库码段信息===未查到产品信息"); +// udiProductService.insertUdiInfo(udiProductEntity); +// +// } - } - } catch (Exception e) { - log.error("国家库查询阿里产品访问出现错误===" + e.getMessage()); - } - if (thirdAliDrugService.addOrUpdate(thirdAliDrugsListGjk)) { - - } else { - List thirdAliDrugListNew = null; - AuthAliUser authAliUser = authAliUserService.getOne(); - - AlihealthThirdAliDrugInsertReqeust alihealthThirdAliDrugInsertReqeust = new AlihealthThirdAliDrugInsertReqeust(); - alihealthThirdAliDrugInsertReqeust.setErpId(authAliUser.getErpid()); - alihealthThirdAliDrugInsertReqeust.setAppSecret(authAliUser.getAppsecret()); - alihealthThirdAliDrugInsertReqeust.setManufactory(udiProductEntity.getManufactory()); - AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = new AlihealthKytDrugrescodeReqeust(); - alihealthKytDrugrescodeReqeust.setPhysic_name(udiProductEntity.getCpmctymc()); - alihealthKytDrugrescodeReqeust.setApproval_licence_no(udiProductEntity.getZczbhhzbapzbh()); - alihealthKytDrugrescodeReqeust.setPage_size(200); - alihealthKytDrugrescodeReqeust.setPage(1); - alihealthKytDrugrescodeReqeust.setApp_key(authAliUser.getAppkey()); - alihealthKytDrugrescodeReqeust.setRef_ent_id(authAliUser.getRefentid()); - alihealthThirdAliDrugInsertReqeust.setAlihealthKytDrugrescodeReqeust(alihealthKytDrugrescodeReqeust); - try { - BaseResponse> baseResponse = alihealthUtils.thirdAliDrugInsertAll(alihealthThirdAliDrugInsertReqeust); - if (baseResponse.getCode() == 20000) { - thirdAliDrugListNew = baseResponse.getData(); - if (thirdAliDrugService.addOrUpdate(thirdAliDrugListNew)) { - - } else { - log.error("阿里接口未查到产品信息==="); - udiProductService.insertUdiInfo(udiProductEntity); - } + } else { + log.error("供应商平台获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage()); +// udiProductEntity.setBasicPrductRemak8("供应商平台获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage()); +// error = "供应商平台获取阿里和国家库码段信息出现错误===" + baseResponse.getMessage(); - } else { - log.error("阿里接口未查到产品信息===" + baseResponse.getMessage()); - udiProductService.insertUdiInfo(udiProductEntity); -// throw new JsonException(500, "阿里接口未查到产品信息"); - } - } catch (Exception e) { - log.error("阿里接口查询产品信息出现错误===" + e.getMessage()); udiProductService.insertUdiInfo(udiProductEntity); - } - if (thirdAliDrugListNew != null && thirdAliDrugListNew.size() > 0) { - try { - // 上传到国家库 - Map mapNew = new HashMap(); - mapNew.put("list", thirdAliDrugListNew); - String response = HttpUtil.post(udiUrl + "/udiwms/aliDrug/addThirdAliDrug", JSONUtil.toJsonStr(mapNew)); - BaseResponse baseResponseAdd = JSONUtil.toBean(response, BaseResponse.class); - log.info("成功上传国家库阿里产品数据"); - } catch (Exception e) { - log.error("国家库上传阿里产品访问出现错误===" + e.getMessage()); - } } + } catch (Exception e) { + log.error("供应商平台获取阿里和国家库码段信息出现错误===" + e.getMessage()); +// udiProductEntity.setBasicPrductRemak8("供应商平台获取阿里和国家库码段信息出现错误===" + e.getMessage()); +// error = "供应商平台获取阿里和国家库码段信息出现错误===" + e.getMessage(); + udiProductService.insertUdiInfo(udiProductEntity); + } - thirdAliDrugList = thirdAliDrugService.list( - new QueryWrapper() - .eq(StringUtils.isNotEmpty(udiProductEntity.getCpmctymc()), "cpmctymc", udiProductEntity.getCpmctymc()) - .eq(StringUtils.isNotEmpty(udiProductEntity.getZczbhhzbapzbh()), "approvalNum", udiProductEntity.getZczbhhzbapzbh()) - .eq(StringUtils.isNotEmpty(udiProductEntity.getManufactory()), "manufacturer", udiProductEntity.getManufactory()) - ); +// thirdAliDrugList = thirdAliDrugService.list( +// new QueryWrapper() +// .eq(StringUtils.isNotEmpty(udiProductEntity.getCpmctymc()), "cpmctymc", udiProductEntity.getCpmctymc()) +// .eq(StringUtils.isNotEmpty(udiProductEntity.getZczbhhzbapzbh()), "approvalNum", udiProductEntity.getZczbhhzbapzbh()) +// .eq(StringUtils.isNotEmpty(udiProductEntity.getManufactory()), "manufacturer", udiProductEntity.getManufactory()) +// ); // udiProductService.insertUdiInfo(udiProductEntity); - } +// } if (thirdAliDrugList != null && thirdAliDrugList.size() > 0) { - thirdAliDrugList = disposeYbDrugList(thirdAliDrugList,ybDrug); - if (thirdAliDrugList != null && thirdAliDrugList.size() > 0) { for (int i = 0; i < thirdAliDrugList.size(); i++) { ThirdAliDrug thirdAliDrug = thirdAliDrugList.get(i); @@ -489,10 +459,6 @@ public class UdiContrastService { udiProductEntity.setId(IdUtil.getSnowflakeNextId()); udiProductService.insertUdiInfo(udiProductEntity); } - }else { - udiProductService.insertUdiInfo(udiProductEntity); - - } try { udiRelevanceEntity.setDetailSort(Integer.valueOf(thirdAliDrugList.get(0).getPhysicDetailType())); @@ -604,23 +570,26 @@ public class UdiContrastService { } public List disposeYbDrugList(List thirdAliDrugList,YbDrug ybDrug){ List list1 = new ArrayList<>(); - List list2 = new ArrayList<>(); - for (ThirdAliDrug thirdAliDrug : thirdAliDrugList) { - String str = drugRulesVerify(ybDrug,thirdAliDrug); - if(StringUtils.isNotEmpty(str)){ - if(str.equals("1")){ - list1.add(thirdAliDrug); - }else if(str.equals("2")){ - list2.add(thirdAliDrug); + if(thirdAliDrugList!=null && thirdAliDrugList.size() >0){ + // List list2 = new ArrayList<>(); + for (ThirdAliDrug thirdAliDrug : thirdAliDrugList) { + String str = drugRulesVerify(ybDrug,thirdAliDrug); + if(StringUtils.isNotEmpty(str)){ + if(str.equals("1")){ + list1.add(thirdAliDrug); + }else if(str.equals("2")){ + list1.add(thirdAliDrug); + } } } +// if(list1 !=null && list1.size() >0){ +// return list1; +// }else if(list2 !=null && list2.size() >0){ +// return list2; +// } } - if(list1 !=null && list1.size() >0){ - return list1; - }else if(list2 !=null && list2.size() >0){ - return list2; - } - return new ArrayList<>(); + + return list1; } public String drugRulesVerify(YbDrug ybDrug,ThirdAliDrug thirdAliDrug ){ try { diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 445c46f2..97eba344 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -3,6 +3,8 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpUtil; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; @@ -12,6 +14,7 @@ import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.thrsys.CodeRel; import com.glxp.api.entity.thrsys.ThirdAliDrug; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.YbDrug; @@ -42,6 +45,7 @@ import org.jfree.util.Log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; @@ -274,6 +278,8 @@ public class UdiProductServiceImpl implements UdiProductService { String di = FilterUdiUtils.getDiStr(nameCode); return udiProductDao.selectAllowNoBatch(di); } + @Value("${UDI_SERVER_URL}") + private String udiUrl; @Override @@ -297,6 +303,7 @@ public class UdiProductServiceImpl implements UdiProductService { if (addProductRequest.getRelId() != null) { udiRelevanceEntity = udiRelevanceDao.selectById(addProductRequest.getRelId()); List udiProductEntities = udiProductDao.findByUuids(udiRelevanceEntity.getUuid()); + List list = new ArrayList<>(); for (UdiProductEntity udiProductEntity : udiProductEntities) { addProductRequest.setNameCode(udiProductEntity.getNameCode()); addProductRequest.setId(udiProductEntity.getId()); @@ -310,11 +317,38 @@ public class UdiProductServiceImpl implements UdiProductService { if (IntUtil.value(udiProductEntity.getPackLevel()) == 1) { udiProductEntity.setDiType(1); } + CodeRel codeRel = new CodeRel(); + codeRel.setDrugCode(udiProductEntity.getNameCode()); + codeRel.setYbbm(udiProductEntity.getYbbm()); + codeRel.setUpdateTime(new Date()); + list.add(codeRel); int i = udiProductDao.updateById(udiProductEntity); if (i == 0) { throw new JsonException(500, "更新错误"); } } + if(list!=null && list.size() >0){ + // 上传多玛关系 + if( list!=null && list.size()>0 + ){ + try { + String response = HttpUtil.post(udiUrl + "/udchs/codeRel/updateBatch", JSONUtil.toJsonStr(list)); + BaseResponse baseResponse = JSONUtil.toBean(response,BaseResponse.class); + + if(baseResponse.getCode() == 2000){ + log.error("国家库===上传多码关系===成功==="); + + }else { + log.error("国家库===上传多码关系===出现错误===" + baseResponse.getMessage()); + + } + + } catch (Exception e) { + log.error("国家库===上传多码关系===出现错误===" + e.getMessage()); + + } + } + } //修改关联表 // udiRelevanceEntity.setUseLeverCount(addProductRequest.getUseLeverCount());