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 d0ddf5b8..082f4e07 100644 --- a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java +++ b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java @@ -122,7 +122,7 @@ public class AlihealthBusController extends BaseController { return ResultVOUtils.success(thirdAliDrugsListGjk); }else { List thirdAliDrugListNew; - BaseResponse> baseResponse = alihealthUtils.thirdAliDrugInsert(alihealthThirdAliDrugInsertReqeust,true); + BaseResponse> baseResponse = alihealthUtils.thirdAliDrugInsertAll(alihealthThirdAliDrugInsertReqeust); if(baseResponse.getCode() == 20000){ thirdAliDrugListNew = baseResponse.getData(); }else { diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 8e6536dc..2394b33b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -17,6 +17,7 @@ import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.controller.BaseController; +import com.glxp.api.dao.inout.IoCodeDao; import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.CustomerInfoEntity; @@ -136,7 +137,7 @@ public class IoOrderReviewController extends BaseController { @Resource private RelCodeDetailService relCodeDetailService; @Resource - private IoCodeTempDao ioCodeTempDao; + private IoCodeDao ioCodeDao; //前端二次审核 @AuthRuleAnnotation("") @PostMapping("/spms/inout/order/web/updateStatus") @@ -480,35 +481,31 @@ public class IoOrderReviewController extends BaseController { alihealthYljgUploadinoutbillReqeust.setPhysic_type(3); alihealthYljgUploadinoutbillReqeust.setClient_type("2"); // 查询改单据传的码 - List ioCodeEntityList = ioCodeTempDao.selectList(new QueryWrapper().eq("orderId", orderEntity.getBillNo())); + List ioCodeEntityList = ioCodeDao.selectList(new QueryWrapper().eq("orderId", orderEntity.getBillNo())); if(ioCodeEntityList!=null && ioCodeEntityList.size() >0){ List codeList = new ArrayList<>(); - for (IoCodeTempEntity ioCodeEntity : ioCodeEntityList) { + for (IoCodeEntity ioCodeEntity : ioCodeEntityList) { codeList.add(ioCodeEntity.getCode()); } + Set set = new HashSet<>(codeList); + alihealthYljgUploadinoutbillReqeust.setTrace_codes( String.join(",", codeList)); BaseResponse baseResponseUploadinoutbill = alihealthYljgUtils.yljgUploadinoutbill(alihealthYljgUploadinoutbillReqeust,orderEntity.getFromCorp()); - if(baseResponseUploadinoutbill.getCode() == 20000){ +// if(baseResponseUploadinoutbill.getCode() == 20000){ try { Thread.sleep(1000); - for (IoCodeTempEntity ioCodeEntity : ioCodeEntityList) { - AlihealthYljgSinglerelationReqeust alihealthYljgSinglerelationReqeust = new AlihealthYljgSinglerelationReqeust(); - alihealthYljgSinglerelationReqeust.setCode(ioCodeEntity.getCode()); - BaseResponse baseResponse = alihealthYljgUtils.relCodeInsert(alihealthYljgSinglerelationReqeust); - if (baseResponse.getCode() == 20000) { - relCodeBatchService.addRelCodeAli(baseResponse, orderEntity.getFromCorp()); - } else { - log.error("阿里调用码关联关系失败==="+baseResponse.getMessage()); - } - } + relCodeBatchService.addRelCodeAli(set, orderEntity.getFromCorp()); + + + + } catch (InterruptedException e) { } - //2.下载关联关系存到关联关系表 - }else { - log.error("阿里调用上传单据失败==="+baseResponseUploadinoutbill.getMessage()); - - } +// }else { +// log.error("阿里调用上传单据失败==="+baseResponseUploadinoutbill.getMessage()); +// +// } } }); diff --git a/src/main/java/com/glxp/api/controller/test/TestCodeController.java b/src/main/java/com/glxp/api/controller/test/TestCodeController.java index 5f4c45e7..1f1a3fb6 100644 --- a/src/main/java/com/glxp/api/controller/test/TestCodeController.java +++ b/src/main/java/com/glxp/api/controller/test/TestCodeController.java @@ -105,7 +105,7 @@ public class TestCodeController { alihealthKytDrugrescodeReqeust.setApp_key("31721223"); alihealthKytDrugrescodeReqeust.setRef_ent_id("ef99b78bd9c54c1284f813149c858fb0"); alihealthThirdAliDrugInsertReqeust.setAlihealthKytDrugrescodeReqeust(alihealthKytDrugrescodeReqeust); - BaseResponse> baseResponse = alihealthUtils.thirdAliDrugInsert(alihealthThirdAliDrugInsertReqeust,true); + BaseResponse> baseResponse = alihealthUtils.thirdAliDrugInsertAll(alihealthThirdAliDrugInsertReqeust); if(baseResponse.getCode() == 20000){ List list = baseResponse.getData(); if(list!=null && list.size() >0){ diff --git a/src/main/java/com/glxp/api/res/alihealth/AlihealthYljgSinglerelationResponse.java b/src/main/java/com/glxp/api/res/alihealth/AlihealthYljgSinglerelationResponse.java index 716a3d25..20ef6763 100644 --- a/src/main/java/com/glxp/api/res/alihealth/AlihealthYljgSinglerelationResponse.java +++ b/src/main/java/com/glxp/api/res/alihealth/AlihealthYljgSinglerelationResponse.java @@ -55,59 +55,76 @@ public class AlihealthYljgSinglerelationResponse extends AlihealthKytCommonParam this.setProduce_info_list(codeRelationDto.getJSONObject("produce_info_list")); } } - public RelCodeBatch disposeRelCodeBatch(String customerId){ + public List disposeRelCodeBatch(String customerId){ JSONArray jsonArrayBaseInfoDto = this.getBase_infos_dto().getJSONObject("base_info_list").getJSONArray("base_info_dto"); JSONObject jsonObject = (JSONObject) jsonArrayBaseInfoDto.get(0); - RelCodeBatch relCodeBatch = new RelCodeBatch(); +// RelCodeBatch relCodeBatch = new RelCodeBatch(); List> jsonArray = (List) this.getCode_relation_list().get("code_info"); - Integer oneLevelCount = 0; - Integer twoLevelCount = 0; - Integer threeLevelCount = 0; - String parentCode = null; - if (jsonArray != null && jsonArray.size() > 0) { - parentCode = jsonArray.get(0).get("parent_code"); - relCodeBatch.setCurCode(parentCode); + List list = new ArrayList<>(); + if (jsonArray != null && jsonArray.size() > 0) { for (Map map : jsonArray) { - switch (map.get("code_level")) { - case "1": - oneLevelCount++; - break; - case "2": - twoLevelCount++; - break; - case "3": - threeLevelCount++; - break; - } + list.add(map.get("parent_code")); } } -// relCodeBatch.setId(); - relCodeBatch.setProductCode(FilterUdiUtils.getUdi(parentCode).getUdi()); - relCodeBatch.setSubTypeNo(this.getCode_active_info_dto().getStr("relation_type")); - relCodeBatch.setCascadeRatio(jsonObject.getStr("pkg_ratio")); - relCodeBatch.setPackageSpec(jsonObject.getStr("pkg_spec")); + Set set = new HashSet<>(list); + List batchList = new ArrayList<>(); + for (String parentCode : set) { + if(StringUtils.isNotEmpty(parentCode)){ + RelCodeBatch relCodeBatch = new RelCodeBatch(); + Integer oneLevelCount = 0; + Integer twoLevelCount = 0; + Integer threeLevelCount = 0; + for (Map map : jsonArray) { + + if(!parentCode.equals(map.get("code")) && parentCode.equals(map.get("parent_code"))){ + switch (map.get("code_level")) { + case "1": + oneLevelCount++; + break; + case "2": + twoLevelCount++; + break; + case "3": + threeLevelCount++; + break; + } + } + + } + relCodeBatch.setCurCode(parentCode); + + relCodeBatch.setProductCode(FilterUdiUtils.getUdi(parentCode).getUdi()); + relCodeBatch.setSubTypeNo(this.getCode_active_info_dto().getStr("relation_type")); + relCodeBatch.setCascadeRatio(jsonObject.getStr("pkg_ratio")); + relCodeBatch.setPackageSpec(jsonObject.getStr("pkg_spec")); // relCodeBatch.setComment(); - relCodeBatch.setBatchNo(jsonObject.getStr("produce_batch_no")); - relCodeBatch.setMadeDate(jsonObject.getStr("produce_date")); - relCodeBatch.setValidateDate(jsonObject.getStr("exprie_date")); - relCodeBatch.setWorkShop(jsonObject.getStr("exprie_date")); + relCodeBatch.setBatchNo(jsonObject.getStr("produce_batch_no")); + relCodeBatch.setMadeDate(jsonObject.getStr("produce_date")); + relCodeBatch.setValidateDate(jsonObject.getStr("exprie_date")); + relCodeBatch.setWorkShop(jsonObject.getStr("exprie_date")); // relCodeBatch.setLineName(); - relCodeBatch.setLineManager(jsonObject.getStr("oper_ic_name")); + relCodeBatch.setLineManager(jsonObject.getStr("oper_ic_name")); // relCodeBatch.setCreateTime(); // relCodeBatch.setCreateUser(); - relCodeBatch.setUpdateTime(new Date()); - relCodeBatch.setUpdateUser(customerId); - relCodeBatch.setUploadFlagUp(0); - relCodeBatch.setUploadFlagDown(0); - relCodeBatch.setParentCode(null); - relCodeBatch.setErpId(customerId); - - relCodeBatch.setOneLevelCount(oneLevelCount); - relCodeBatch.setTwoLevelCount(twoLevelCount); - relCodeBatch.setThreeLevelCount(threeLevelCount); - - return relCodeBatch; + relCodeBatch.setUpdateTime(new Date()); + relCodeBatch.setUpdateUser(customerId); + relCodeBatch.setUploadFlagUp(0); + relCodeBatch.setUploadFlagDown(0); + relCodeBatch.setParentCode(null); + relCodeBatch.setErpId(customerId); + + relCodeBatch.setOneLevelCount(oneLevelCount); + relCodeBatch.setTwoLevelCount(twoLevelCount); + relCodeBatch.setThreeLevelCount(threeLevelCount); + batchList.add(relCodeBatch); + } + + } +// relCodeBatch.setId(); + + + return batchList; } @@ -116,7 +133,7 @@ public class AlihealthYljgSinglerelationResponse extends AlihealthKytCommonParam List> jsonArray = (List) this.getCode_relation_list().get("code_info"); if (jsonArray != null && jsonArray.size() > 0) { for (Map map : jsonArray) { - if (!Objects.isNull(map)) { + if (!Objects.isNull(map) && StringUtils.isNotEmpty(map.get("parent_code"))) { RelCodeDetail relCodeDetail = new RelCodeDetail(); relCodeDetail.setCurCode(map.get("code")); relCodeDetail.setPackLayer(Integer.valueOf(map.get("code_level"))); 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 ae4475ec..217924bf 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -324,6 +324,8 @@ public class UdiContrastService { 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)) { @@ -374,7 +376,7 @@ public class UdiContrastService { alihealthKytDrugrescodeReqeust.setRef_ent_id(authAliUser.getRefentid()); alihealthThirdAliDrugInsertReqeust.setAlihealthKytDrugrescodeReqeust(alihealthKytDrugrescodeReqeust); try { - BaseResponse> baseResponse = alihealthUtils.thirdAliDrugInsert(alihealthThirdAliDrugInsertReqeust, true); + BaseResponse> baseResponse = alihealthUtils.thirdAliDrugInsertAll(alihealthThirdAliDrugInsertReqeust); if (baseResponse.getCode() == 20000) { thirdAliDrugListNew = baseResponse.getData(); if (thirdAliDrugService.addOrUpdate(thirdAliDrugListNew)) { @@ -413,6 +415,7 @@ public class UdiContrastService { 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); } diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index 6089cbcb..8fbbdc89 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -30,6 +30,7 @@ import com.glxp.api.entity.sync.SyncDataSetEntity; import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.alihealth.AlihealthYljgCodedetailReqeust; +import com.glxp.api.req.alihealth.AlihealthYljgSinglerelationReqeust; import com.glxp.api.req.alihealth.local.AlihealthRelCodeInsertReqeust; import com.glxp.api.req.alihealth.local.AlihealthYljgLocaCodedetailReqeust; import com.glxp.api.req.collect.RelCodeBatchRequest; @@ -45,6 +46,7 @@ import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.service.system.CompanyService; import com.glxp.api.util.HttpClient; +import com.glxp.api.util.StringUtils; import com.glxp.api.util.alihealth.AlihealthUtils; import com.glxp.api.util.alihealth.AlihealthYljgUtils; import com.glxp.api.util.udi.FilterUdiUtils; @@ -698,33 +700,81 @@ public class RelCodeBatchService extends ServiceImpl baseResponse, String erpId){ - AlihealthYljgSinglerelationResponse alihealthKytSinglerelationResponse = baseResponse.getData(); - // 返回的码关联关系进行插入 - RelCodeBatch relCodeBatch = alihealthKytSinglerelationResponse.disposeRelCodeBatch(erpId); - RelCodeBatch relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("productCode", relCodeBatch.getProductCode()) - .last("limit 1") - ); - if (Objects.isNull(relCodeBatchOne)) { - relCodeBatch.setCreateUser(erpId); - relCodeBatch.setCreateTime(new Date()); - relCodeBatchService.save(relCodeBatch); + public void addRelCodeAli( Set set, String erpId){ + try { + List relCodeBatchList =new ArrayList<>(); + //2.下载关联关系存到关联关系表 + for (String code : set) { + AlihealthYljgSinglerelationReqeust alihealthYljgSinglerelationReqeust = new AlihealthYljgSinglerelationReqeust(); + alihealthYljgSinglerelationReqeust.setCode(code); + BaseResponse baseResponse = alihealthYljgUtils.relCodeInsert(alihealthYljgSinglerelationReqeust); + if (baseResponse.getCode() == 20000) { + AlihealthYljgSinglerelationResponse alihealthKytSinglerelationResponse = baseResponse.getData(); + // 返回的码关联关系进行插入 + List batchList = alihealthKytSinglerelationResponse.disposeRelCodeBatch(erpId); + for (RelCodeBatch relCodeBatch : batchList) { + RelCodeBatch relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("curCode", relCodeBatch.getCurCode()) + .last("limit 1") + ); + if (Objects.isNull(relCodeBatchOne)) { + relCodeBatch.setCreateUser(erpId); + relCodeBatch.setCreateTime(new Date()); + relCodeBatchService.save(relCodeBatch); - } else { - relCodeBatchService.update(relCodeBatch, new QueryWrapper().eq("productCode", relCodeBatch.getProductCode())); - } - Integer id = Objects.isNull(relCodeBatch.getId()) ? relCodeBatchOne.getId() : relCodeBatch.getId(); - // 进行查询 - List list = alihealthKytSinglerelationResponse.disposeRelRodeDetailList(id); - if (list != null && list.size() > 0) { - List curCodeList = new ArrayList(); - for (RelCodeDetail relCodeDetail : list) { - curCodeList.add(relCodeDetail.getCurCode()); - } - relCodeDetailService.remove(new QueryWrapper().in("curCode", curCodeList)); + } else { + if(relCodeBatchOne.getOneLevelCount()!=null){ + relCodeBatch.setOneLevelCount(relCodeBatchOne.getOneLevelCount() +relCodeBatch.getOneLevelCount() ); + } + if(relCodeBatchOne.getTwoLevelCount()!=null){ + relCodeBatch.setTwoLevelCount(relCodeBatchOne.getTwoLevelCount() +relCodeBatch.getTwoLevelCount() ); + } + if(relCodeBatchOne.getThreeLevelCount()!=null){ + relCodeBatch.setThreeLevelCount(relCodeBatchOne.getThreeLevelCount() +relCodeBatch.getThreeLevelCount() ); + } + relCodeBatchService.update(relCodeBatch, new QueryWrapper().eq("curCode", relCodeBatch.getCurCode())); + } + relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper().eq("curCode", relCodeBatch.getCurCode())); + + Integer id = relCodeBatchOne.getId(); + relCodeBatchList.add(relCodeBatchOne.getCurCode()); - relCodeDetailService.saveBatch(list); + // 进行查询 + List list = alihealthKytSinglerelationResponse.disposeRelRodeDetailList(id); + if (list != null && list.size() > 0) { + List curCodeList = new ArrayList(); + for (RelCodeDetail relCodeDetail : list) { + curCodeList.add(relCodeDetail.getCurCode()); + } + relCodeDetailService.remove(new QueryWrapper().in("curCode", curCodeList)); + + relCodeDetailService.saveBatch(list); + } + } + + } else { + log.error("阿里调用码关联关系失败==="+baseResponse.getMessage()); + } + } + }catch (Exception E){ + E.printStackTrace(); } + + // 父级编码 +// if(relCodeBatchList!=null && relCodeBatchList.size() >0){ +// List list = relCodeDetailService.list( +// new QueryWrapper().in("curCode",relCodeBatchList) +// ); +// if(list!=null && list.size() >0){ +// RelCodeBatch relCodeBatch =new RelCodeBatch(); +// relCodeBatchService.update(relCodeBatch, new QueryWrapper().eq("productCode", relCodeBatch.getProductCode())); +// +// } +// } + + + } } diff --git a/src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java b/src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java index 7da3b662..321ace26 100644 --- a/src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java +++ b/src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java @@ -101,13 +101,69 @@ public class AlihealthUtils { } } + public BaseResponse> thirdAliDrugInsertAll(AlihealthThirdAliDrugInsertReqeust alihealthThirdAliDrugInsertReqeust){ + AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = alihealthThirdAliDrugInsertReqeust.getAlihealthKytDrugrescodeReqeust(); + String physicName = alihealthKytDrugrescodeReqeust.getPhysic_name(); + List list = new ArrayList<>(); + BaseResponse> baseResponse = thirdAliDrugInsert(alihealthThirdAliDrugInsertReqeust); + if(baseResponse.getCode() == 20000){ + List thirdAliDrugList = baseResponse.getData(); + list.addAll(thirdAliDrugList); + } + if ( (physicName.contains("(") || physicName.contains("（"))) { + if (physicName.contains("(")) { + physicName = physicName.replace("(", "（").replace(")", "）"); + + } else if (physicName.contains("（")) { + physicName = physicName.replace("（", "(").replace("）", ")"); + + } + alihealthKytDrugrescodeReqeust.setPhysic_name(physicName); + baseResponse = thirdAliDrugInsert(alihealthThirdAliDrugInsertReqeust); + if(baseResponse.getCode() == 20000){ + List thirdAliDrugList = baseResponse.getData(); + list.addAll(thirdAliDrugList); + } + } + physicName = alihealthKytDrugrescodeReqeust.getPhysic_name(); + + if ( physicName.contains("Ⅰ") || physicName.contains("I") + || physicName.contains("Ⅱ") || physicName.contains("II") + || physicName.contains("Ⅲ") || physicName.contains("III")) + { + if (physicName.contains("Ⅰ") + || physicName.contains("Ⅱ") + || physicName.contains("Ⅲ")) { + physicName = physicName.replaceAll("Ⅰ", "I") + .replace("Ⅱ", "II") + .replace("Ⅲ", "III"); + + } else if (physicName.contains("I") + || physicName.contains("II") + || physicName.contains("III")) { + physicName = physicName.replaceAll("I", "Ⅰ") + .replace("II", "Ⅱ") + .replace("III", "Ⅲ"); + } + alihealthKytDrugrescodeReqeust.setPhysic_name(physicName); + baseResponse = thirdAliDrugInsert(alihealthThirdAliDrugInsertReqeust); + if(baseResponse.getCode() == 20000){ + List thirdAliDrugList = baseResponse.getData(); + list.addAll(thirdAliDrugList); + } + } + if(list!=null && list.size() >0){ + baseResponse.setData(list); + } + return baseResponse; + } /** * 查询药品码段信息 * * @param alihealthThirdAliDrugInsertReqeust */ - public BaseResponse> thirdAliDrugInsert(AlihealthThirdAliDrugInsertReqeust alihealthThirdAliDrugInsertReqeust, Boolean callBool) { + public BaseResponse> thirdAliDrugInsert(AlihealthThirdAliDrugInsertReqeust alihealthThirdAliDrugInsertReqeust) { if (alihealthThirdAliDrugInsertReqeust.getAlihealthKytDrugrescodeReqeust() == null) { return ResultVOUtils.error("入参不能为空"); } @@ -132,31 +188,38 @@ public class AlihealthUtils { } else { return ResultVOUtils.error("阿里健康接口调用失败===用户找不到或者key和秘钥为空"); } + String physicName = alihealthKytDrugrescodeReqeust.getPhysic_name(); - if (alihealthKytDrugrescodeResponse.judgeCall(alihealthThirdAliDrugInsertReqeust.getManufactory()) ) { - List list = alihealthKytDrugrescodeResponse.disposeThirdAliDrugList(alihealthThirdAliDrugInsertReqeust.getErpId()); - return ResultVOUtils.success(list); + if (alihealthKytDrugrescodeResponse.judgeCall() ) { + List listNew = alihealthKytDrugrescodeResponse.disposeThirdAliDrugList(alihealthThirdAliDrugInsertReqeust.getErpId()); + return ResultVOUtils.success(listNew); } else { - String physicName = alihealthKytDrugrescodeReqeust.getPhysic_name(); - - // 重新上传标识为true就改变一下 - if ("未查询到相关信息".equals(alihealthKytDrugrescodeResponse.getMsg_info()) - && callBool && (physicName.contains("(") || physicName.contains("（"))) { - if (physicName.contains("(")) { - physicName = physicName.replace("(", "（").replace(")", "）"); - - } else if (physicName.contains("（")) { - physicName = physicName.replace("（", "(").replace("）", ")"); - - } - alihealthKytDrugrescodeReqeust.setPhysic_name(physicName); - alihealthThirdAliDrugInsertReqeust.setAlihealthKytDrugrescodeReqeust(alihealthKytDrugrescodeReqeust); - thirdAliDrugInsert(alihealthThirdAliDrugInsertReqeust, false); - } +// +// // 重新上传标识为true就改变一下 +// if ("未查询到相关信息".equals(alihealthKytDrugrescodeResponse.getMsg_info()) +// && callBool && (physicName.contains("(") || physicName.contains("（"))) { +// if (physicName.contains("(")) { +// physicName = physicName.replace("(", "（").replace(")", "）"); +// +// } else if (physicName.contains("（")) { +// physicName = physicName.replace("（", "(").replace("）", ")"); +// +// } +// alihealthKytDrugrescodeReqeust.setPhysic_name(physicName); +// alihealthThirdAliDrugInsertReqeust.setAlihealthKytDrugrescodeReqeust(alihealthKytDrugrescodeReqeust); +// thirdAliDrugInsert(alihealthThirdAliDrugInsertReqeust, false); +// } return ResultVOUtils.error("阿里健康接口调用失败===" + alihealthKytDrugrescodeResponse.getMsg_info()); } + +// if(physicName.equals("(")){ +// thirdAliDrugInsert(); +// } +// if(physicName.equals("")){ +// thirdAliDrugInsert(); +// } } //TODO 调用阿里接口用码进行批量处理只测试了两个包装层级的 暂时没有三个包装层级的数据做测试 到时候有数据之后要好好测试一下