|
|
|
@ -301,19 +301,19 @@ public class UdiContrastService {
|
|
|
|
|
|
|
|
|
|
List<ThirdAliDrug> thirdAliDrugList = thirdAliDrugService.list(
|
|
|
|
|
new QueryWrapper<ThirdAliDrug>()
|
|
|
|
|
.eq(StringUtils.isNotEmpty(thrProductsEntity.getName()),"cpmctymc",thrProductsEntity.getName())
|
|
|
|
|
.eq(StringUtils.isNotEmpty(thrProductsEntity.getZczbhhzbapzbh()),"approvalNum",thrProductsEntity.getZczbhhzbapzbh())
|
|
|
|
|
.eq(StringUtils.isNotEmpty(ybDrug.getRegisteredProductName()),"cpmctymc",ybDrug.getRegisteredProductName())
|
|
|
|
|
.eq(StringUtils.isNotEmpty(ybDrug.getApprovalCode()),"approvalNum",ybDrug.getApprovalCode())
|
|
|
|
|
);
|
|
|
|
|
if (CollUtil.isNotEmpty(thirdAliDrugList)) {
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
Map map = new HashMap();
|
|
|
|
|
if(StringUtils.isNotEmpty(thrProductsEntity.getName())){
|
|
|
|
|
map.put("cpmctymc",thrProductsEntity.getName());
|
|
|
|
|
if(StringUtils.isNotEmpty(ybDrug.getRegisteredProductName())){
|
|
|
|
|
map.put("cpmctymc",ybDrug.getRegisteredProductName());
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
if(StringUtils.isNotEmpty(thrProductsEntity.getZczbhhzbapzbh())){
|
|
|
|
|
map.put("approvalNum",thrProductsEntity.getZczbhhzbapzbh());
|
|
|
|
|
if(StringUtils.isNotEmpty(ybDrug.getApprovalCode())){
|
|
|
|
|
map.put("approvalNum",ybDrug.getApprovalCode());
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
List<ThirdAliDrug> thirdAliDrugsListGjk = null;
|
|
|
|
@ -346,8 +346,8 @@ public class UdiContrastService {
|
|
|
|
|
alihealthThirdAliDrugInsertReqeust.setErpId("73157692795424");
|
|
|
|
|
alihealthThirdAliDrugInsertReqeust.setAppSecret("5231c601505706a9d49823c3dfe2cb01");
|
|
|
|
|
AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = new AlihealthKytDrugrescodeReqeust();
|
|
|
|
|
alihealthKytDrugrescodeReqeust.setPhysic_name(thrProductsEntity.getName());
|
|
|
|
|
alihealthKytDrugrescodeReqeust.setApproval_licence_no(thrProductsEntity.getZczbhhzbapzbh());
|
|
|
|
|
alihealthKytDrugrescodeReqeust.setPhysic_name(ybDrug.getRegisteredProductName());
|
|
|
|
|
alihealthKytDrugrescodeReqeust.setApproval_licence_no(ybDrug.getApprovalCode());
|
|
|
|
|
alihealthKytDrugrescodeReqeust.setPage_size(100);
|
|
|
|
|
alihealthKytDrugrescodeReqeust.setPage(1);
|
|
|
|
|
alihealthKytDrugrescodeReqeust.setApp_key("31721223");
|
|
|
|
@ -379,8 +379,8 @@ public class UdiContrastService {
|
|
|
|
|
}
|
|
|
|
|
thirdAliDrugList = thirdAliDrugService.list(
|
|
|
|
|
new QueryWrapper<ThirdAliDrug>()
|
|
|
|
|
.eq(StringUtils.isNotEmpty(thrProductsEntity.getName()),"cpmctymc",thrProductsEntity.getName())
|
|
|
|
|
.eq(StringUtils.isNotEmpty(thrProductsEntity.getZczbhhzbapzbh()),"approvalNum",thrProductsEntity.getZczbhhzbapzbh())
|
|
|
|
|
.eq(StringUtils.isNotEmpty(ybDrug.getRegisteredProductName()),"cpmctymc",ybDrug.getRegisteredProductName())
|
|
|
|
|
.eq(StringUtils.isNotEmpty(ybDrug.getApprovalCode()),"approvalNum",ybDrug.getApprovalCode())
|
|
|
|
|
);
|
|
|
|
|
for (int i = 0; i < thirdAliDrugList.size(); i++) {
|
|
|
|
|
ThirdAliDrug thirdAliDrug = thirdAliDrugList.get(i);
|
|
|
|
|