UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调用阿里关联关系优化

Browse Source 
选入药品查国家库加厂商条件查询
dev_unify
qiuyt 4 months ago
parent 1192f815da
commit 30f6bca31e
5 changed files with 82 additions and 59 deletions
Show Stats Download Patch File Download Diff File

114
src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java
Unescape Escape View File

@ -45,10 +45,11 @@ public class AlihealthBusController extends BaseController {
private String alihealthUrl;
@Value("${UDI_SERVER_URL}")
private String udiUrl;
@PostMapping("/spms/alihealth/relCodeInsert")
@Log(title = "阿里健康自动赋码关联关系", businessType = BusinessType.OTHER)
public BaseResponse relCodeInsert(@RequestBody AlihealthRelCodeInsertReqeust alihealthRelCodeInsertReqeust) {
if(StringUtils.isEmpty(alihealthRelCodeInsertReqeust.getRefEntId())){
if (StringUtils.isEmpty(alihealthRelCodeInsertReqeust.getRefEntId())) {
AlihealthKytGetentinfoResponse alihealthKytGetentinfoResponse = null;
try {
AlihealthKytGetentinfoReqeust alihealthKytGetentinfoReqeust = new AlihealthKytGetentinfoReqeust();
@ -76,12 +77,12 @@ public class AlihealthBusController extends BaseController {
BaseResponse baseResponse = alihealthUtils.relCodeInsert(alihealthRelCodeInsertReqeust);
if(baseResponse.getCode() == 20000){
if (baseResponse.getCode() == 20000) {
// 插入成功返回
return baseResponse;
}else {
log.error("调用阿里码获取关联关系接口==="+baseResponse.getMessage());
return ResultVOUtils.error("调用阿里码获取关联关系接口==="+baseResponse.getMessage());
} else {
log.error("调用阿里码获取关联关系接口===" + baseResponse.getMessage());
return ResultVOUtils.error("调用阿里码获取关联关系接口===" + baseResponse.getMessage());
}
}
@ -89,66 +90,69 @@ public class AlihealthBusController extends BaseController {
@PostMapping("/spms/alihealth/thirdAliDrugList")
@Log(title = "获取阿里药品码段信息列表包括查询国家库", businessType = BusinessType.OTHER)
public BaseResponse<List<ThirdAliDrug>> thirdAliDrugList(@RequestBody AlihealthThirdAliDrugInsertReqeust alihealthThirdAliDrugInsertReqeust) {
AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = alihealthThirdAliDrugInsertReqeust.getAlihealthKytDrugrescodeReqeust();
AlihealthKytDrugrescodeReqeust alihealthKytDrugrescodeReqeust = alihealthThirdAliDrugInsertReqeust.getAlihealthKytDrugrescodeReqeust();
Map map = new HashMap();
if(com.glxp.api.util.StringUtils.isNotEmpty(alihealthKytDrugrescodeReqeust.getPhysic_name())){
map.put("cpmctymc",alihealthKytDrugrescodeReqeust.getPhysic_name());
Map map = new HashMap();
if (com.glxp.api.util.StringUtils.isNotEmpty(alihealthKytDrugrescodeReqeust.getPhysic_name())) {
map.put("cpmctymc", alihealthKytDrugrescodeReqeust.getPhysic_name());
}
if(com.glxp.api.util.StringUtils.isNotEmpty(alihealthKytDrugrescodeReqeust.getApproval_licence_no())){
map.put("approvalNum",alihealthKytDrugrescodeReqeust.getApproval_licence_no());
}
if (com.glxp.api.util.StringUtils.isNotEmpty(alihealthKytDrugrescodeReqeust.getApproval_licence_no())) {
map.put("approvalNum", alihealthKytDrugrescodeReqeust.getApproval_licence_no());
}
List<ThirdAliDrug> thirdAliDrugsListGjk = null;
}
if (com.glxp.api.util.StringUtils.isNotEmpty(alihealthThirdAliDrugInsertReqeust.getManufactory())) {
map.put("manufacturer", alihealthThirdAliDrugInsertReqeust.getManufactory());
try {
String response = HttpUtil.get(udiUrl+"/udiwms/aliDrug/getDrugLevelList",map);
BaseResponse<PageSimpleResponse<ThirdAliDrug>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ThirdAliDrug>>>() {
});
if (udiDlDeviceResponse != null
) {
// 查询国家库是否有值 有值直接返回没值查询阿里接口
thirdAliDrugsListGjk = udiDlDeviceResponse.getData().getList();
}
} catch (Exception e) {
log.error("国家库查询阿里产品访问出现错误==="+e.getMessage());
}
List<ThirdAliDrug> thirdAliDrugsListGjk = null;
try {
String response = HttpUtil.get(udiUrl + "/udiwms/aliDrug/getDrugLevelList", map);
BaseResponse<PageSimpleResponse<ThirdAliDrug>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ThirdAliDrug>>>() {
});
if (udiDlDeviceResponse != null
) {
// 查询国家库是否有值 有值直接返回没值查询阿里接口
thirdAliDrugsListGjk = udiDlDeviceResponse.getData().getList();
}
} catch (Exception e) {
log.error("国家库查询阿里产品访问出现错误===" + e.getMessage());
if(thirdAliDrugsListGjk!= null && thirdAliDrugsListGjk.size() >0){
return ResultVOUtils.success(thirdAliDrugsListGjk);
}else {
List<ThirdAliDrug> thirdAliDrugListNew;
BaseResponse<List<ThirdAliDrug>> baseResponse = alihealthUtils.thirdAliDrugInsertAll(alihealthThirdAliDrugInsertReqeust);
if(baseResponse.getCode() == 20000){
thirdAliDrugListNew = baseResponse.getData();
}else {
log.error("阿里接口未查到产品信息==="+baseResponse.getMessage());
return ResultVOUtils.error("阿里接口未查到产品信息==="+baseResponse.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) {
log.error("国家库上传阿里产品访问出现错误==="+e.getMessage());
}
return ResultVOUtils.success(thirdAliDrugListNew);
if (thirdAliDrugsListGjk != null && thirdAliDrugsListGjk.size() > 0) {
return ResultVOUtils.success(thirdAliDrugsListGjk);
} else {
List<ThirdAliDrug> thirdAliDrugListNew;
BaseResponse<List<ThirdAliDrug>> baseResponse = alihealthUtils.thirdAliDrugInsertAll(alihealthThirdAliDrugInsertReqeust);
if (baseResponse.getCode() == 20000) {
thirdAliDrugListNew = baseResponse.getData();
} else {
log.error("阿里接口未查到产品信息===" + baseResponse.getMessage());
return ResultVOUtils.error("阿里接口未查到产品信息===" + baseResponse.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) {
log.error("国家库上传阿里产品访问出现错误===" + e.getMessage());
}
return ResultVOUtils.success(thirdAliDrugListNew);
}
// udiProductService.insertUdiInfo(udiProductEntity);
}
@Resource
AlihealthBusService alihealthBusService;
@Resource
@ -156,6 +160,7 @@ public class AlihealthBusController extends BaseController {
/**
* 阿里的采购单查询接口
*
* @param aliYljgSearchbillReqeust
* @return
*/
@ -167,7 +172,7 @@ public class AlihealthBusController extends BaseController {
List<AliYljgSearchbill> list = alihealthBusService.aliYljgSearchbillPage(aliYljgSearchbillReqeust);
List<AliYljgSearchbill> listResp = new ArrayList<>();
if (CollUtil.isEmpty(list)){
if (CollUtil.isEmpty(list)) {
PageInfo<AliYljgSearchbill> pageInfo = new PageInfo<>(listResp);
return ResultVOUtils.page(pageInfo);
}
@ -186,7 +191,7 @@ public class AlihealthBusController extends BaseController {
//如果查得到就不可以再次选入
String billNo = orderService.selectAliYljgSearchbillByAliBillNo(key);
AliYljgSearchbill aliYljgSearchbill = group.get(0);
if (StringUtils.isNotEmpty(billNo)){
if (StringUtils.isNotEmpty(billNo)) {
aliYljgSearchbill.setCheckBillNO(true);
}
listResp.add(aliYljgSearchbill);
@ -200,13 +205,14 @@ public class AlihealthBusController extends BaseController {
/**
* 阿里的采购单码明细查询接口
*
* @param aliYljgSearchbillReqeust
* @return
*/
@PostMapping("/spms/alihealth/aliYljgBillDetail")
@Log(title = "获取阿里药品的采购单码明细", businessType = BusinessType.OTHER)
public BaseResponse aliYljgBillDetail(@RequestBody AliYljgSearchbillReqeust aliYljgSearchbillReqeust) {
AliYljgBillDetail aliYljgBillDetail= alihealthBusService.aliYljgBillDetail(aliYljgSearchbillReqeust);
AliYljgBillDetail aliYljgBillDetail = alihealthBusService.aliYljgBillDetail(aliYljgSearchbillReqeust);
return ResultVOUtils.success(aliYljgBillDetail);
}

1
src/main/java/com/glxp/api/req/alihealth/AlihealthKytCommonParametersReqeust.java
Unescape Escape View File

@ -47,7 +47,6 @@ public class AlihealthKytCommonParametersReqeust {
// */
// private boolean simplify;
public AlihealthKytCommonParametersReqeust(){
this.timestamp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
this.v = "2.0";
this.sign_method = "md5";
this.format = "json";

20
src/main/java/com/glxp/api/res/alihealth/AlihealthYljgSinglerelationResponse.java
Unescape Escape View File

@ -55,18 +55,28 @@ public class AlihealthYljgSinglerelationResponse extends AlihealthKytCommonParam
this.setProduce_info_list(codeRelationDto.getJSONObject("produce_info_list"));
}
}
public List<RelCodeBatch> disposeRelCodeBatch(String customerId){
public List<RelCodeBatch> disposeRelCodeBatch(String customerId,String code){
JSONArray jsonArrayBaseInfoDto = this.getBase_infos_dto().getJSONObject("base_info_list").getJSONArray("base_info_dto");
JSONObject jsonObject = (JSONObject) jsonArrayBaseInfoDto.get(0);
// RelCodeBatch relCodeBatch = new RelCodeBatch();
List<Map<String, String>> jsonArray = (List) this.getCode_relation_list().get("code_info");
List<String> list = new ArrayList<>();
Collections.reverse(jsonArray);
if (jsonArray != null && jsonArray.size() > 0) {
for (Map<String, String> map : jsonArray) {
// 倒叙判断级别 进行处理小查大就不加对象了
if((map.get("code").equals(code) && "1".equals(map.get("code_pack_level")))
|| map.get("code").equals(code)
){
continue;
}
list.add(map.get("parent_code"));
}
}
// 循环判断获取父级编码
Set<String> set = new HashSet<>(list);
List<RelCodeBatch> batchList = new ArrayList<>();
for (String parentCode : set) {
@ -76,7 +86,12 @@ public class AlihealthYljgSinglerelationResponse extends AlihealthKytCommonParam
Integer twoLevelCount = 0;
Integer threeLevelCount = 0;
for (Map<String, String> map : jsonArray) {
if(map.get("parent_code").equals("86540770000062502347") && map.get("code").equals("86193260002250549251")){
System.out.println();
}
if(parentCode.equals(map.get("code")) && StringUtils.isNotEmpty(map.get("parent_code"))){
relCodeBatch.setParentCode(map.get("parent_code"));
}
if(!parentCode.equals(map.get("code")) && parentCode.equals(map.get("parent_code"))){
switch (map.get("code_pack_level")) {
case "1":
@ -111,7 +126,6 @@ public class AlihealthYljgSinglerelationResponse extends AlihealthKytCommonParam
relCodeBatch.setUpdateUser(customerId);
relCodeBatch.setUploadFlagUp(0);
relCodeBatch.setUploadFlagDown(0);
relCodeBatch.setParentCode(null);
relCodeBatch.setErpId(customerId);
relCodeBatch.setOneLevelCount(oneLevelCount);

4
src/main/java/com/glxp/api/service/basic/UdiContrastService.java
Unescape Escape View File

@ -338,6 +338,10 @@ public class UdiContrastService {
if (StringUtils.isNotEmpty(udiProductEntity.getZczbhhzbapzbh())) {
map.put("approvalNum", udiProductEntity.getZczbhhzbapzbh());
}
if (StringUtils.isNotEmpty(udiProductEntity.getManufactory())) {
map.put("manufacturer", udiProductEntity.getManufactory());
}
List<ThirdAliDrug> thirdAliDrugsListGjk = null;

2
src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
Unescape Escape View File

@ -714,7 +714,7 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
if (baseResponse.getCode() == 20000) {
AlihealthYljgSinglerelationResponse alihealthKytSinglerelationResponse = baseResponse.getData();
// 返回的码关联关系进行插入
List<RelCodeBatch> batchList = alihealthKytSinglerelationResponse.disposeRelCodeBatch(erpId);
List<RelCodeBatch> batchList = alihealthKytSinglerelationResponse.disposeRelCodeBatch(erpId,code);
for (RelCodeBatch relCodeBatch : batchList) {
RelCodeBatch relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper<RelCodeBatch>().eq("curCode", relCodeBatch.getCurCode())
.last("limit 1")

Write Preview
Loading…
Cancel
Save