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

高值普耗相关修改

Browse Source
dtxyy
anthonywj 1 year ago
parent eb96a965ad
commit 8500678805
8 changed files with 125 additions and 10 deletions
Show Stats Download Patch File Download Diff File

15
src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java
Unescape Escape View File

@ -232,8 +232,19 @@ public interface BaseHttpClient {
*/
BaseResponse getHsfl(FilterThrHslbRequest hslbRequest);
/**
* B001 查询指定科室高值/普耗库存
* B001 查询指定科室高值库存
*
* @param forInvProductsFilter
* @return
*/
BaseResponse queryUdiHighInvProductsFilter(ForInvProductsFilter forInvProductsFilter);
/**
* B001 查询指定普耗库存
*
* @param forInvProductsFilter
* @return
*/
@ -241,6 +252,7 @@ public interface BaseHttpClient {
/**
* B002 查询耗材字典
*
* @param forBasicProductsSearchFilter
* @return
*/
@ -248,6 +260,7 @@ public interface BaseHttpClient {
/**
* B003 高值耗材实时出库/退库
*
* @param forInvOutScanCodeFilter
* @return
*/

5
src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java
Unescape Escape View File

@ -223,6 +223,11 @@ public abstract class CommonHttpClient implements BaseHttpClient {
return null;
}
@Override
public BaseResponse queryUdiHighInvProductsFilter(ForInvProductsFilter forInvProductsFilter) {
return null;
}
@Override
public BaseResponse queryUdiInvProductsFilter(ForInvProductsFilter forInvProductsFilter) {
return null;

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

@ -42,6 +42,7 @@ import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity;
import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;
import com.glxp.mipsdl.http.HttpClient;
import com.glxp.mipsdl.req.base.*;
import com.glxp.mipsdl.req.base.forthird.ForInvProductsFilter;
import com.glxp.mipsdl.req.ctqyy.*;
import com.glxp.mipsdl.req.post.*;
import com.glxp.mipsdl.req.zaxyy.ZaxzyyOrderRequest;
@ -461,6 +462,11 @@ public class CtqyyClient extends CommonHttpClient {
}
}
@Override
public BaseResponse queryUdiHighInvProductsFilter(ForInvProductsFilter forInvProductsFilter) {
return null;
}
@Override
public BaseResponse getOrders(UdiwmsOrderQueryRequest udiwmsOrderQueryRequest) {

26
src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java
Unescape Escape View File

@ -224,8 +224,32 @@ public class NjxyyClient extends CommonHttpClient {
newPageSimpleResponse.setTotal(pageSimpleResponse.getTotal());
newPageSimpleResponse.setList(newList);
baseResponse.setData(newPageSimpleResponse);
} else {
}
return baseResponse;
}
@Override
public BaseResponse queryUdiHighInvProductsFilter(ForInvProductsFilter forInvProductsFilter) {
//入参业务系统字段控制
FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
BeanUtils.copyProperties(forInvProductsFilter, filterInvProductRequest);
//调用业务系统http
String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvHighProductsFilterUrl(), filterInvProductRequest);
//业务系统返回参数 字段控制
BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
if (baseResponse.getCode() == 20000) {
PageSimpleResponse<InvProductResponse> pageSimpleResponse =
JSONObject.parseObject(String.valueOf(baseResponse.getData()), PageSimpleResponse.class);
List<InvProductResponse> list = pageSimpleResponse.getList();
//处理list字段 进行实体转换 过滤掉不必要字段
String json = JSON.toJSONString(list);
List<ForInvProductsResponse> newList = JSON.parseArray(json, ForInvProductsResponse.class);
PageSimpleResponse<ForInvProductsResponse> newPageSimpleResponse = new PageSimpleResponse<>();
newPageSimpleResponse.setTotal(pageSimpleResponse.getTotal());
newPageSimpleResponse.setList(newList);
baseResponse.setData(newPageSimpleResponse);
}
return baseResponse;
}

5
src/main/java/com/glxp/mipsdl/config/ThirdSysConfig.java
Unescape Escape View File

@ -100,6 +100,11 @@ public class ThirdSysConfig {
return udiWmsUrl + Constants.URL_NAME_FOR_INV_PRODUCTS_FILTER_URL;
}
public String getPostInvHighProductsFilterUrl() {
return udiWmsUrl + Constants.URL_NAME_FOR_INV_HIGH_PRODUCTS_FILTER_URL;
}
/**
* B002 查询耗材字典
*

6
src/main/java/com/glxp/mipsdl/constant/Constants.java
Unescape Escape View File

@ -119,6 +119,11 @@ public interface Constants {
*/
String URL_NAME_FOR_INV_PRODUCTS_FILTER_URL = "/forThirdSysApi/inv/products/filter";
/**
* B001 查询指定科室高值
*/
String URL_NAME_FOR_INV_HIGH_PRODUCTS_FILTER_URL = "/forThirdSysApi/inv/high/products/filter";
/**
* B002 查询耗材字典
@ -132,7 +137,6 @@ public interface Constants {
String URL_NAME_FOR_INV_OUT_SCANCODE_URL = "/forThirdSysApi/inv/out/scanCode";
//往来单位类型
/**

62
src/main/java/com/glxp/mipsdl/controller/ExNjxyyController.java
Unescape Escape View File

@ -1,8 +1,12 @@
package com.glxp.mipsdl.controller;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.glxp.mipsdl.client.ClientProcessor;
import com.glxp.mipsdl.dao.basic.BasicUdirelDao;
import com.glxp.mipsdl.entity.basic.BasicUdirelEntity;
import com.glxp.mipsdl.req.base.UdiwmsQueryUdiInvProductsRequest;
import com.glxp.mipsdl.req.base.forthird.ForBasicProductsSearchFilter;
import com.glxp.mipsdl.req.base.forthird.ForInvOutScanCodeFilter;
@ -14,7 +18,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.List;
/**
* 南靖县医院--提供给第三方系统调用的接口
@ -23,50 +29,92 @@ import javax.validation.Valid;
@RestController
public class ExNjxyyController {
@Resource
BasicUdirelDao basicUdirelDao;
/**
* B001 查询指定科室高值/普耗库存
*
* @param forInvProductsFilter
* @return
*/
@PostMapping("/ex/udiwms/inv/products/filter")
public BaseResponse invProductsFilter(@RequestBody @Valid ForInvProductsFilter forInvProductsFilter) {
public BaseResponse invProductsFilter(@RequestBody ForInvProductsFilter forInvProductsFilter) {
if (ObjectUtil.isNull(forInvProductsFilter)) {
return ResultVOUtils.error(500, "查询条件不能为空");
}
if (StrUtil.isEmpty(forInvProductsFilter.getUdiCode()) &&
StrUtil.isEmpty(forInvProductsFilter.getNameCode()) &&
StrUtil.isEmpty(forInvProductsFilter.getCpmctymc()) &&
StrUtil.isEmpty(forInvProductsFilter.getBatchNo())&&
StrUtil.isEmpty(forInvProductsFilter.getInvCode())&&
StrUtil.isEmpty(forInvProductsFilter.getBatchNo()) &&
StrUtil.isEmpty(forInvProductsFilter.getInvCode()) &&
StrUtil.isEmpty(forInvProductsFilter.getSupName())) {
return ResultVOUtils.error(500, "查询条件不能为空！");
}
return ClientProcessor.getHttpClient().queryUdiInvProductsFilter(forInvProductsFilter);
if (forInvProductsFilter.getPage() == null) {
forInvProductsFilter.setPage(1);
forInvProductsFilter.setLimit(20);
}
ForInvProductsFilter newRequest = new ForInvProductsFilter();
if (StrUtil.isNotEmpty(forInvProductsFilter.getUdiCode())) {
newRequest.setPage(forInvProductsFilter.getPage());
newRequest.setLimit(forInvProductsFilter.getLimit());
newRequest.setUdiCode(forInvProductsFilter.getUdiCode());
return ClientProcessor.getHttpClient().queryUdiHighInvProductsFilter(newRequest);
} else {
if (StrUtil.isEmpty(forInvProductsFilter.getXmbm())) {
return ResultVOUtils.error(500, "项目编码不能为空！");
}
List<BasicUdirelEntity> basicUdirelEntityList = basicUdirelDao.selectList(new QueryWrapper<BasicUdirelEntity>().eq("mainId", forInvProductsFilter.getXmbm()));
if (CollUtil.isNotEmpty(basicUdirelEntityList)) {
newRequest.setRelIdFk(basicUdirelEntityList.get(0).getId() + "");
} else {
return ResultVOUtils.error(500, "项目编码未对照！");
}
newRequest.setPage(forInvProductsFilter.getPage());
newRequest.setLimit(forInvProductsFilter.getLimit());
newRequest.setBatchNo(forInvProductsFilter.getBatchNo());
newRequest.setCpmctymc(forInvProductsFilter.getCpmctymc());
newRequest.setInvCode(forInvProductsFilter.getInvCode());
newRequest.setNameCode(forInvProductsFilter.getNameCode());
newRequest.setSupName(forInvProductsFilter.getSupName());
// newRequest.setUdiCode(forInvProductsFilter.getUdiCode());
return ClientProcessor.getHttpClient().queryUdiInvProductsFilter(newRequest);
}
}
/**
* B002 查询耗材字典
*
* @param forBasicProductsSearchFilter
* @return
*/
@PostMapping("/ex/basic/products/search")
public BaseResponse basicProductsSearch(@RequestBody @Valid ForBasicProductsSearchFilter forBasicProductsSearchFilter) {
@PostMapping("/ex/udiwms/basic/products/search")
public BaseResponse basicProductsSearch(@RequestBody ForBasicProductsSearchFilter forBasicProductsSearchFilter) {
if (ObjectUtil.isNull(forBasicProductsSearchFilter)) {
return ResultVOUtils.error(500, "查询条件不能为空");
}
if (StrUtil.isEmpty(forBasicProductsSearchFilter.getUdiCode()) &&
StrUtil.isEmpty(forBasicProductsSearchFilter.getNameCode()) &&
StrUtil.isEmpty(forBasicProductsSearchFilter.getCpmctymc()) &&
StrUtil.isEmpty(forBasicProductsSearchFilter.getMainId())&&
StrUtil.isEmpty(forBasicProductsSearchFilter.getMainId()) &&
StrUtil.isEmpty(forBasicProductsSearchFilter.getGgxh())) {
return ResultVOUtils.error(500, "查询条件不能为空！");
}
if (forBasicProductsSearchFilter.getPage() == null) {
forBasicProductsSearchFilter.setPage(1);
forBasicProductsSearchFilter.setLimit(20);
}
return ClientProcessor.getHttpClient().queryUdiBasicProductsSearch(forBasicProductsSearchFilter);
}
/**
* B003 高值耗材实时出库/退库
*
* @param forInvOutScanCodeFilter
* @return
*/

10
src/main/java/com/glxp/mipsdl/req/base/forthird/ForInvProductsFilter.java
Unescape Escape View File

@ -39,6 +39,11 @@ public class ForInvProductsFilter {
*/
private String supName;
/**
* 收费项目编码
*/
private String xmbm;
/**
* 页码
@ -52,4 +57,9 @@ public class ForInvProductsFilter {
@Min(value = 1, message = "分页参数不能小于1")
@Max(value = 500, message = "分页参数不能大于500")
private Integer limit;
/**
* 耗材字典ID
*/
private String relIdFk;
}

Write Preview
Loading…
Cancel
Save