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

长泰预验收扫码报错

Browse Source
datasource
yewj 4 months ago
parent 6474f6887e
commit 8191ec7324
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File

32
src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
Unescape Escape View File

@ -195,12 +195,13 @@ public class CtqyyClient extends CommonHttpClient {
/** /**
* 器械从三方拉取 * 器械从三方拉取
* 药品从视图拉取 * 药品从视图拉取
*
* @param udiwmsProductRequest * @param udiwmsProductRequest
* @return * @return
*/ */
@Override @Override
public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) { public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) {
if(udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DEVICE)){ if (udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DEVICE)) {
CtqyyRequest ctqyyRequest = new CtqyyRequest(); CtqyyRequest ctqyyRequest = new CtqyyRequest();
ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialDict")); ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialDict"));
ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsProductRequest)); ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsProductRequest));
@ -231,16 +232,16 @@ public class CtqyyClient extends CommonHttpClient {
log.error("异常信息：{}", e); log.error("异常信息：{}", e);
return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")"); return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")");
} }
}else if(udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)){ } else if (udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)) {
LambdaQueryWrapper<PhysicDictEntity> wrapper = new LambdaQueryWrapper(); LambdaQueryWrapper<PhysicDictEntity> wrapper = new LambdaQueryWrapper();
//补充其他查询条件 //补充其他查询条件
wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()),PhysicDictEntity::getPhysicCode,udiwmsProductRequest.getCode()); wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), PhysicDictEntity::getPhysicCode, udiwmsProductRequest.getCode());
wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()),PhysicDictEntity::getPhysicName,udiwmsProductRequest.getName()); wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()), PhysicDictEntity::getPhysicName, udiwmsProductRequest.getName());
wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()),PhysicDictEntity::getPhysicNo,udiwmsProductRequest.getRegisterNo()); wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()), PhysicDictEntity::getPhysicNo, udiwmsProductRequest.getRegisterNo());
IPage<PhysicDictEntity> page = physicDictMapper.selectPage(new Page<PhysicDictEntity>(udiwmsProductRequest.getPage(),udiwmsProductRequest.getLimit()),wrapper); IPage<PhysicDictEntity> page = physicDictMapper.selectPage(new Page<PhysicDictEntity>(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper);
List<PhysicDictEntity> physicDictEntities = page.getRecords(); List<PhysicDictEntity> physicDictEntities = page.getRecords();
List<ThrProductsEntity> thrProductsEntityList = null; List<ThrProductsEntity> thrProductsEntityList = null;
if(CollUtil.isNotEmpty(physicDictEntities)){ if (CollUtil.isNotEmpty(physicDictEntities)) {
//数据处理以thr_products 返回 //数据处理以thr_products 返回
thrProductsEntityList = physicDictEntities.stream().map(dict -> { thrProductsEntityList = physicDictEntities.stream().map(dict -> {
ThrProductsEntity products = new ThrProductsEntity(); ThrProductsEntity products = new ThrProductsEntity();
@ -258,7 +259,7 @@ public class CtqyyClient extends CommonHttpClient {
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }
log.error("解析长泰区医院医疗类型，返回结果：{}", udiwmsProductRequest.getProductType()); log.error("解析长泰区医院医疗类型，返回结果：{}", udiwmsProductRequest.getProductType());
return ResultVOUtils.error(500,"医疗类型不正确，medicalType："+udiwmsProductRequest.getProductType()); return ResultVOUtils.error(500, "医疗类型不正确，medicalType：" + udiwmsProductRequest.getProductType());
} }
@Override @Override
@ -1325,7 +1326,8 @@ public class CtqyyClient extends CommonHttpClient {
code = code.substring(1, code.length() - 1); code = code.substring(1, code.length() - 1);
} }
itemDTO.setCode(code); itemDTO.setCode(code);
itemDTO.setNameCode(code.substring(0, 16)); if (StrUtil.isNotEmpty(code) && code.length() > 16)
itemDTO.setNameCode(code.substring(0, 16));
if (IntUtil.value(codeDetaiEntity.getCount()) > 1) { if (IntUtil.value(codeDetaiEntity.getCount()) > 1) {
for (int i = 0; i < codeDetaiEntity.getCount(); i++) { for (int i = 0; i < codeDetaiEntity.getCount(); i++) {
@ -1350,6 +1352,7 @@ public class CtqyyClient extends CommonHttpClient {
/** /**
* 处方拉取视图 * 处方拉取视图
*
* @param udiwmsBasicSkPrescribeRequest * @param udiwmsBasicSkPrescribeRequest
* @return * @return
*/ */
@ -1357,10 +1360,10 @@ public class CtqyyClient extends CommonHttpClient {
public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) {
LambdaQueryWrapper<PresInfoEntity> wrapper = new LambdaQueryWrapper(); LambdaQueryWrapper<PresInfoEntity> wrapper = new LambdaQueryWrapper();
//补充其他查询条件 //补充其他查询条件
IPage<PresInfoEntity> page = presInfoMapper.selectPage(new Page<PresInfoEntity>(udiwmsBasicSkPrescribeRequest.getPage(),udiwmsBasicSkPrescribeRequest.getLimit()),wrapper); IPage<PresInfoEntity> page = presInfoMapper.selectPage(new Page<PresInfoEntity>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), wrapper);
List<PresInfoEntity> presInfoEntities = page.getRecords(); List<PresInfoEntity> presInfoEntities = page.getRecords();
List<BasicSkPrescribeResponse> basicSkPrescribeResponses = null; List<BasicSkPrescribeResponse> basicSkPrescribeResponses = null;
if(CollUtil.isNotEmpty(presInfoEntities)){ if (CollUtil.isNotEmpty(presInfoEntities)) {
//数据处理以basic_sk_prescribe，basic_sk_prescribe_item 主子返回 //数据处理以basic_sk_prescribe，basic_sk_prescribe_item 主子返回
basicSkPrescribeResponses = presInfoEntities.stream().map(pres -> { basicSkPrescribeResponses = presInfoEntities.stream().map(pres -> {
BasicSkPrescribeResponse basicSkPrescribeResponse = new BasicSkPrescribeResponse(); BasicSkPrescribeResponse basicSkPrescribeResponse = new BasicSkPrescribeResponse();
@ -1383,6 +1386,7 @@ public class CtqyyClient extends CommonHttpClient {
/** /**
* 采购计划拉取视图 * 采购计划拉取视图
*
* @param udiwmsThrOrderRequest * @param udiwmsThrOrderRequest
* @return * @return
*/ */
@ -1390,12 +1394,12 @@ public class CtqyyClient extends CommonHttpClient {
public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) { public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) {
LambdaQueryWrapper<PlanInfoEntity> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PlanInfoEntity> wrapper = new LambdaQueryWrapper<>();
//补充其他查询条件 //补充其他查询条件
IPage<PlanInfoEntity> page = planInfoMapper.selectPage(new Page<PlanInfoEntity>(udiwmsThrOrderRequest.getPage(),udiwmsThrOrderRequest.getLimit()),wrapper); IPage<PlanInfoEntity> page = planInfoMapper.selectPage(new Page<PlanInfoEntity>(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper);
List<PlanInfoEntity> planInfoEntities = page.getRecords(); List<PlanInfoEntity> planInfoEntities = page.getRecords();
List<ThrOrderResponse> thrOrderResponses = null; List<ThrOrderResponse> thrOrderResponses = null;
if(CollUtil.isNotEmpty(planInfoEntities)){ if (CollUtil.isNotEmpty(planInfoEntities)) {
//数据处理以thr_order，thr_order_detail 主子返回 //数据处理以thr_order，thr_order_detail 主子返回
thrOrderResponses = planInfoEntities.stream().map(plan->{ thrOrderResponses = planInfoEntities.stream().map(plan -> {
ThrOrderResponse thrOrderResponse = new ThrOrderResponse(); ThrOrderResponse thrOrderResponse = new ThrOrderResponse();
List<ThrOrderDetailEntity> detailList = new ArrayList<>(); List<ThrOrderDetailEntity> detailList = new ArrayList<>();
ThrOrderDetailEntity detail = new ThrOrderDetailEntity(); ThrOrderDetailEntity detail = new ThrOrderDetailEntity();

Write Preview
Loading…
Cancel
Save