From 49b4527ecb4ee0842beafd021b25320fc0793ce0 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 14 Jan 2025 09:30:53 +0800 Subject: [PATCH] =?UTF-8?q?1/14=20=E5=8F=82=E6=95=B0=E4=BC=98=E5=8C=961.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 36 ------------------- .../req/base/UdiwmsOrderDetailRequest.java | 1 - .../mipsdl/req/base/UdiwmsProductRequest.java | 15 +------- .../com/glxp/mipsdl/util/SubmitOrderUtil.java | 10 +++--- 4 files changed, 6 insertions(+), 56 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 401fc04..2e487d3 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -235,39 +235,6 @@ public class CtqyyClient extends CommonHttpClient { */ @Override public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) { - if (udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DEVICE)) { - CtqyyRequest ctqyyRequest = new CtqyyRequest(); - ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialDict")); - ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsProductRequest)); - String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PI_QUERY_URL), ctqyyRequest); - response = parserResult(response); - try { - BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - Map map = (Map) baseResponse.getData(); - List zzzyyProductsResponse = JSON.parseArray(map.get("list") + "", ZzzyyProductsResponse.class); - for (ZzzyyProductsResponse productsResponse : zzzyyProductsResponse) { - //判断要是规格和型号一致就是取规格 不一致就合并 - if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isNotEmpty(productsResponse.getStandard())) { - if (productsResponse.getModel_number().equals(productsResponse.getStandard())) { - productsResponse.setStandard(productsResponse.getStandard()); - } else { - productsResponse.setStandard(productsResponse.getStandard() + productsResponse.getModel_number()); - } - } else if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isBlank(productsResponse.getStandard())) { - productsResponse.setStandard(productsResponse.getModel_number()); - } - productsResponse.setProductType(1); - } - map.put("list", JSON.toJSON(zzzyyProductsResponse)); - baseResponse.setData(""); - baseResponse.setData(map); - return baseResponse; - } catch (Exception e) { - log.error("解析长泰区医院智业接口返回产品信息字典数据异常，返回结果：{}", response); - log.error("异常信息：{}", e); - return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")"); - } - } else if (udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); //补充其他查询条件 wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()), VYpzsPhysicDict::getPHYSIC_CODE, udiwmsProductRequest.getCode()); @@ -311,9 +278,6 @@ public class CtqyyClient extends CommonHttpClient { pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(thrProductsEntityList); return ResultVOUtils.success(pageSimpleResponse); - } - log.error("解析长泰区医院医疗类型，返回结果：{}", udiwmsProductRequest.getProductType()); - return ResultVOUtils.error(500, "医疗类型不正确，productType：" + udiwmsProductRequest.getProductType()); } @Override diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsOrderDetailRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsOrderDetailRequest.java index 5d30b57..52054cc 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsOrderDetailRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsOrderDetailRequest.java @@ -141,7 +141,6 @@ public class UdiwmsOrderDetailRequest { private String cplb; private String diCode; private String hslb; - private String ybbm; /** * 码明细 diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java index 30ffef2..565dede 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java @@ -67,20 +67,7 @@ public class UdiwmsProductRequest extends ListPageRequest { */ private String remark3; - /** - * 产品类型 器械 1 药品 2 - */ - private Integer productType; - /** - * 为空默认 器械 1 - * @return - */ - public Integer getProductType() { - if(productType == null){ - return Constants.PRODUCT_TYPE_DEVICE; - } - return productType; - } + } diff --git a/src/main/java/com/glxp/mipsdl/util/SubmitOrderUtil.java b/src/main/java/com/glxp/mipsdl/util/SubmitOrderUtil.java index 84afcac..cd2a503 100644 --- a/src/main/java/com/glxp/mipsdl/util/SubmitOrderUtil.java +++ b/src/main/java/com/glxp/mipsdl/util/SubmitOrderUtil.java @@ -152,11 +152,11 @@ public class SubmitOrderUtil { item.setRemark3(detailBizEntity.getRemark3()); } - if (StrUtil.isEmpty(basicProducts.getYbbm())){ - item.setYbbm(""); - }else { - item.setYbbm(basicProducts.getYbbm()); - } +// if (StrUtil.isEmpty(basicProducts.getYbbm())){ +// item.setYbbm(""); +// }else { +// item.setYbbm(basicProducts.getYbbm()); +// } // item.setAllowNoBatch(IntUtil.value(basicProducts.getAllowNoBatch())); //是否允许无批次号 // item.setManufactoryCode(thrProductsEntity.getManufactoryCode());