diff --git a/pom.xml b/pom.xml index 9ee875e..494932b 100644 --- a/pom.xml +++ b/pom.xml @@ -108,19 +108,13 @@ com.alibaba fastjson 2.0.4 - - - com.alibaba.fastjson2 - fastjson2 - - - - com.alibaba.fastjson2 - fastjson2 - 2.0.24 - + + + + + @@ -162,6 +156,11 @@ yb zephyr1.7.0 + + org.bouncycastle + bcprov-jdk15to18 + 1.69 + diff --git a/src/main/java/com/glxp/mipsdl/aspect/LogAspect.java b/src/main/java/com/glxp/mipsdl/aspect/LogAspect.java index b2cc8d0..27e7555 100644 --- a/src/main/java/com/glxp/mipsdl/aspect/LogAspect.java +++ b/src/main/java/com/glxp/mipsdl/aspect/LogAspect.java @@ -2,7 +2,7 @@ package com.glxp.mipsdl.aspect; import cn.hutool.core.exceptions.ExceptionUtil; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson.JSONObject; import com.glxp.mipsdl.service.system.SysErpLogService; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java index f0fa86c..6d7cd52 100644 --- a/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java @@ -1,7 +1,7 @@ package com.glxp.mipsdl.client; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson.JSONObject; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.Constants; import com.glxp.mipsdl.dao.auth.AuthWarehouseDao; 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 c82fb9f..b0f75f0 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -7,9 +7,9 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; -import com.alibaba.fastjson2.TypeReference; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -66,6 +66,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -195,12 +197,13 @@ public class CtqyyClient extends CommonHttpClient { /** * 器械从三方拉取 * 药品从视图拉取 + * * @param udiwmsProductRequest * @return */ @Override 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.setMsgHeader(getMsgHeader("getMaterialDict")); ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsProductRequest)); @@ -221,6 +224,7 @@ public class CtqyyClient extends CommonHttpClient { } 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(""); @@ -231,16 +235,16 @@ public class CtqyyClient extends CommonHttpClient { log.error("异常信息：{}", e); return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")"); } - }else if(udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)){ + } else if (udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); //补充其他查询条件 - 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.getRegisterNo()),PhysicDictEntity::getPhysicNo,udiwmsProductRequest.getRegisterNo()); - IPage page = physicDictMapper.selectPage(new Page(udiwmsProductRequest.getPage(),udiwmsProductRequest.getLimit()),wrapper); + 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.getRegisterNo()), PhysicDictEntity::getPhysicNo, udiwmsProductRequest.getRegisterNo()); + IPage page = physicDictMapper.selectPage(new Page(udiwmsProductRequest.getPage(), udiwmsProductRequest.getLimit()), wrapper); List physicDictEntities = page.getRecords(); List thrProductsEntityList = null; - if(CollUtil.isNotEmpty(physicDictEntities)){ + if (CollUtil.isNotEmpty(physicDictEntities)) { //数据处理以thr_products 返回 thrProductsEntityList = physicDictEntities.stream().map(dict -> { ThrProductsEntity products = new ThrProductsEntity(); @@ -249,6 +253,7 @@ public class CtqyyClient extends CommonHttpClient { products.setMeasname(dict.getPhysicUnit()); products.setSpec(dict.getPhysicSpec()); products.setRegisterNo(dict.getPhysicNo()); + products.setProductType(2); return products; }).collect(Collectors.toList()); } @@ -258,7 +263,7 @@ public class CtqyyClient extends CommonHttpClient { return ResultVOUtils.success(pageSimpleResponse); } log.error("解析长泰区医院医疗类型，返回结果：{}", udiwmsProductRequest.getProductType()); - return ResultVOUtils.error(500,"医疗类型不正确，medicalType："+udiwmsProductRequest.getProductType()); + return ResultVOUtils.error(500, "医疗类型不正确，medicalType：" + udiwmsProductRequest.getProductType()); } @Override @@ -1350,39 +1355,73 @@ public class CtqyyClient extends CommonHttpClient { /** * 处方拉取视图 + * * @param udiwmsBasicSkPrescribeRequest * @return */ @Override public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + String code = udiwmsBasicSkPrescribeRequest.getCode(); + if (StrUtil.isNotEmpty(code)) { + wrapper.or( + innerWrapper -> { + innerWrapper.eq(PresInfoEntity::getStooutNo, code); + innerWrapper.eq(PresInfoEntity::getPrescribeNumber, code); + } + ); + } //补充其他查询条件 - IPage page = presInfoMapper.selectPage(new Page(udiwmsBasicSkPrescribeRequest.getPage(),udiwmsBasicSkPrescribeRequest.getLimit()),wrapper); + IPage page = presInfoMapper + .selectPage(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), wrapper); List presInfoEntities = page.getRecords(); - List basicSkPrescribeResponses = null; - if(CollUtil.isNotEmpty(presInfoEntities)){ + if (CollUtil.isNotEmpty(presInfoEntities)) { //数据处理以basic_sk_prescribe，basic_sk_prescribe_item 主子返回 - basicSkPrescribeResponses = presInfoEntities.stream().map(pres -> { + Map> groupedByPrescribeNumber = presInfoEntities.stream() + .collect(Collectors.groupingBy(PresInfoEntity::getPrescribeNumber)); + List basicSkPrescribeResponses = new ArrayList<>(); + List finalBasicSkPrescribeResponses = basicSkPrescribeResponses; + groupedByPrescribeNumber.forEach((key, value) -> { + PresInfoEntity presInfoEntity = value.get(0); BasicSkPrescribeResponse basicSkPrescribeResponse = new BasicSkPrescribeResponse(); + basicSkPrescribeResponse.setSickCode(presInfoEntity.getSickId()); + basicSkPrescribeResponse.setCode(presInfoEntity.getPrescribeNumber()); + basicSkPrescribeResponse.setStooutNo(presInfoEntity.getStooutNo()); + basicSkPrescribeResponse.setAddr("YPCF002"); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + LocalDateTime dateTime = LocalDateTime.parse(presInfoEntity.getLayPhysicTime(), formatter); + basicSkPrescribeResponse.setPrescribeDate(dateTime); + finalBasicSkPrescribeResponses.add(basicSkPrescribeResponse); List itemList = new ArrayList<>(); - BasicSkPrescribeItemEntity item = new BasicSkPrescribeItemEntity(); - //TODO 封装数据 + value.forEach(entity -> + { + BasicSkPrescribeItemEntity basicSkPrescribeItemEntity = new BasicSkPrescribeItemEntity(); + basicSkPrescribeItemEntity.setItemCode(entity.getPhysicCode()); + BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper().eq(BasicUdirelEntity::getMainId, entity.getPhysicCode())); + if (basicUdirelEntity != null) { + basicSkPrescribeItemEntity.setRelId(basicUdirelEntity.getId()); + } + basicSkPrescribeItemEntity.setItemName(entity.getPhysicName()); + basicSkPrescribeItemEntity.setGgxh(entity.getPackSpec()); + basicSkPrescribeItemEntity.setMeasureCount(entity.getLayPhysicQuantity()); + basicSkPrescribeItemEntity.setMeasureUnit(entity.getPhysicUnit()); + itemList.add(basicSkPrescribeItemEntity); + }); + }); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(page.getTotal()); + pageSimpleResponse.setList(basicSkPrescribeResponses); + return ResultVOUtils.success(pageSimpleResponse); + } else + return ResultVOUtils.error(500, "下载失败!"); - itemList.add(item); - basicSkPrescribeResponse.setItemList(itemList); - return basicSkPrescribeResponse; - }).collect(Collectors.toList()); - } - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal(page.getTotal()); - pageSimpleResponse.setList(basicSkPrescribeResponses); - return ResultVOUtils.success(pageSimpleResponse); } /** * 采购计划拉取视图 + * * @param udiwmsThrOrderRequest * @return */ @@ -1390,12 +1429,12 @@ public class CtqyyClient extends CommonHttpClient { public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); //补充其他查询条件 - IPage page = planInfoMapper.selectPage(new Page(udiwmsThrOrderRequest.getPage(),udiwmsThrOrderRequest.getLimit()),wrapper); + IPage page = planInfoMapper.selectPage(new Page(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper); List planInfoEntities = page.getRecords(); List thrOrderResponses = null; - if(CollUtil.isNotEmpty(planInfoEntities)){ + if (CollUtil.isNotEmpty(planInfoEntities)) { //数据处理以thr_order，thr_order_detail 主子返回 - thrOrderResponses = planInfoEntities.stream().map(plan->{ + thrOrderResponses = planInfoEntities.stream().map(plan -> { ThrOrderResponse thrOrderResponse = new ThrOrderResponse(); List detailList = new ArrayList<>(); ThrOrderDetailEntity detail = new ThrOrderDetailEntity(); diff --git a/src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java b/src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java index 8bc8787..cd7fcae 100644 --- a/src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/dsxyy/DsxyyClient.java @@ -5,8 +5,8 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONObject; -import com.alibaba.fastjson2.TypeReference; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java b/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java index c8411eb..4787ae1 100644 --- a/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java @@ -6,8 +6,8 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java b/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java index 40c264e..3715ada 100644 --- a/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java @@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java index 8b1b0cd..1c59b7d 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java @@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONObject; -import com.alibaba.fastjson2.TypeReference; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyHisClient.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyHisClient.java index afe6176..0c903dc 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyHisClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyHisClient.java @@ -3,8 +3,8 @@ package com.glxp.mipsdl.client.ptxhyy; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONObject; -import com.alibaba.fastjson2.TypeReference; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.client.ptxhyy.entity.HisFyRequest; diff --git a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java index 24f579a..2c927c1 100644 --- a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java @@ -7,9 +7,9 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; -import com.alibaba.fastjson2.TypeReference; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java b/src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java index 5db7e8d..ad601e9 100644 --- a/src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/yxzyy/YxzyyClient.java @@ -2,7 +2,7 @@ package com.glxp.mipsdl.client.yxzyy; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.glxp.mipsdl.client.CommonHttpClient; import com.glxp.mipsdl.config.ThirdSysConfig; diff --git a/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java b/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java index d724393..ac4d9c4 100644 --- a/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/zaxyy/ZaxyyClient.java @@ -6,8 +6,8 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java index d3aa0c0..1a4bd09 100644 --- a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient1.java b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient1.java index 9a6546b..7a8565b 100644 --- a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient1.java +++ b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient1.java @@ -5,8 +5,8 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/com/glxp/mipsdl/controller/YbApiController.java b/src/main/java/com/glxp/mipsdl/controller/YbApiController.java index 021f408..0c786cf 100644 --- a/src/main/java/com/glxp/mipsdl/controller/YbApiController.java +++ b/src/main/java/com/glxp/mipsdl/controller/YbApiController.java @@ -1,7 +1,9 @@ package com.glxp.mipsdl.controller; -import cn.hutool.json.JSONObject; +import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; +import com.glxp.mipsdl.entity.inout.IoCollectOrder; +import com.glxp.mipsdl.req.post.PostCollectOrderRequest; import com.glxp.mipsdl.req.yb.DictRequest; import com.glxp.mipsdl.req.yb.Yljg1201Request; import com.glxp.mipsdl.res.BaseResponse; @@ -13,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; @Slf4j @RestController @@ -45,4 +48,25 @@ public class YbApiController { } + /** + * 通用字典下载接口 + */ + @PostMapping("/udiwms/erp/yb/postOrder") + public BaseResponse postOrder(@RequestBody PostCollectOrderRequest postCollectOrderRequest) { + + + List collectOrderList = postCollectOrderRequest.getCollectOrderList(); + + if (CollUtil.isNotEmpty(collectOrderList)) { + for (IoCollectOrder ioCollectOrder : collectOrderList) { + //摆药流水号 + String stoout_no = ioCollectOrder.getBackupOrderRemark1(); + + } + } +//ybClient.ybPost(dictRequest.getApiCode(), jsonStr) + return ResultVOUtils.success(); + } + + } diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/PresInfoEntity.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/PresInfoEntity.java index 6e32d69..2f777e1 100644 --- a/src/main/java/com/glxp/mipsdl/entity/ctqyy/PresInfoEntity.java +++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/PresInfoEntity.java @@ -37,5 +37,10 @@ public class PresInfoEntity { private String physicUnit; @TableField("COST") private String cost; + @TableField("PACK_SPEC") + private String packSpec; + @TableField("STOOUT_NO") + private String stooutNo; + } diff --git a/src/main/java/com/glxp/mipsdl/entity/inout/CollectOrderBizResponse.java b/src/main/java/com/glxp/mipsdl/entity/inout/CollectOrderBizResponse.java new file mode 100644 index 0000000..718e01a --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/inout/CollectOrderBizResponse.java @@ -0,0 +1,130 @@ +package com.glxp.mipsdl.entity.inout; + +import lombok.Data; + +import java.util.Date; + +@Data +public class CollectOrderBizResponse { + + + private Long id; + /** + * 单据号外键 + */ + private String orderIdFk; + + + /** + * 院内编码（第三方编码） + */ + private String thrCode; + + /** + * 医保编码 + */ + private String ybbm; + + /** + * 收费编码 + */ + private String payFeeCode; + + /** + * 产品通用名称 + */ + private String cpmctymc; + + /** + * 产品标识 + */ + private String nameCode; + + /** + * 规格型号 + */ + private String ggxh; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 单据数量 + */ + private Integer count; + + /** + * 实际数量 + */ + private Integer actCount; + + /** + * 扫码数量 + */ + private Integer scanCount; + + /** + * 扫码实际数量 + */ + private Integer scanActCount; + + /** + * 计量单位 + */ + private String measureUnit; + + /** + * 单据明细赋码状态 1:未赋码；2：部分赋码；3：已赋码 + */ + private Integer tagStatus; + + /** + * 赋码错误信息 + */ + private String tagMsg; + + /** + * 备注 + */ + private String remark; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 绑定的UDI码 + */ + private String udiCode; + private Long relId; + private Integer unTagCount; + + + private String scanUdiCode; + private String splitUdiCode; + private String unSplitUdiCode; + private String finishUdiCode; + private String bzgg; + + + private Integer autoResCount; + private String replaceCode; +} diff --git a/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java b/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java new file mode 100644 index 0000000..943ad5b --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java @@ -0,0 +1,196 @@ +package com.glxp.mipsdl.entity.inout; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 采集点单据主表 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "io_collect_order") +public class IoCollectOrder implements Serializable { + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 单据号 + */ + @TableField(value = "billNo") + private String billNo; + + /** + * 单据类型 + */ + @TableField(value = "busType") + private String busType; + + /** + * 来源业务 + */ + @TableField(value = "fromType") + private String fromType; + + /** + * 来源业务说明 + */ + @TableField(value = "fromTypeDesc") + private String fromTypeDesc; + + /** + * 往来信息 + */ + @TableField(value = "fromCorp") + private String fromCorp; + + /** + * 单据时间 + */ + @TableField(value = "billTime") + private Date billTime; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 采集时间 + */ + @TableField(value = "collectTime") + private Date collectTime; + + /** + * 采集点编码 + */ + @TableField(value = "collectCode") + private String collectCode; + + /** + * 工位编码 + */ + @TableField(value = "workPlaceCode") + private Long workPlaceCode; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private Long updateUser; + /** + * 赋码状态 0:原始单据未处理，1:已分配工位待处理；2：处理中；3：已完成；4：处理异常,-1:草稿，挂起状态，5：库存不足 + */ + @TableField(value = "tagStatus") + private Integer tagStatus; + + /** + * 拆零状态：0：未拆零，1，正在拆零；2,已完成；3.拆零失败 + */ + @TableField(value = "splitStatus") + private Integer splitStatus; + + /** + * 拆零异常信息 + */ + @TableField(value = "splitMsg") + private String splitMsg; + + + /** + * 处方赋码信息 + */ + @TableField(value = "tagMsg") + private String tagMsg; + + /** + * 单据流通方式： 1:配送流通; 2:出库使用 + */ + @TableField(value = "orderCirType") + private Integer orderCirType; + + + /** + * 单据备注1 + */ + @TableField(value = "backupOrderRemark1") + private String backupOrderRemark1; + + /** + * 单据备注2 + */ + @TableField(value = "backupOrderRemark2") + private String backupOrderRemark2; + + /** + * 单据备注3 + */ + @TableField(value = "backupOrderRemark3") + private String backupOrderRemark3; + + /** + * 单据备注4 + */ + @TableField(value = "backupOrderRemark4") + private String backupOrderRemark4; + + /** + * 单据备注5 + */ + @TableField(value = "backupOrderRemark5") + private String backupOrderRemark5; + + /** + * 单据备注6 + */ + @TableField(value = "backupOrderRemark6") + private String backupOrderRemark6; + + /** + * 排序时间 + */ + @TableField(value = "orderTime") + private Date orderTime; + + + /** + * 库存预警： 1:上锁正常; 2:上锁不足；3:已释放锁 + */ + @TableField(value = "invAlert") + private Integer invAlert; + + @TableField(exist = false) + private List collectOrderBizResponseList; + + private static final long serialVersionUID = 1L; +} diff --git a/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrProductsEntity.java b/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrProductsEntity.java index 64c4ecf..818404b 100644 --- a/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrProductsEntity.java +++ b/src/main/java/com/glxp/mipsdl/entity/thrsys/ThrProductsEntity.java @@ -196,4 +196,7 @@ public class ThrProductsEntity extends Model { @TableField("prcitmcode") private String prcitmcode; + @TableField("productType") + private Integer productType; + } diff --git a/src/main/java/com/glxp/mipsdl/http/HttpClient.java b/src/main/java/com/glxp/mipsdl/http/HttpClient.java index 4fb44d6..302ccf8 100644 --- a/src/main/java/com/glxp/mipsdl/http/HttpClient.java +++ b/src/main/java/com/glxp/mipsdl/http/HttpClient.java @@ -1,8 +1,8 @@ package com.glxp.mipsdl.http; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONObject; -import com.alibaba.fastjson2.JSONWriter; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.JSONWriter; import com.glxp.mipsdl.config.HospConfig; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.ConstantType; @@ -64,7 +64,7 @@ public class HttpClient { //请求时间 Date date = new Date(); //转json字符串时，将空属性转换为空字符串 - String json = JSONObject.toJSONString(object, JSONWriter.Feature.WriteNullStringAsEmpty); + String json = JSONObject.toJSONString(object); log.info(url + "\n" + json); String response = ""; Integer status; @@ -95,7 +95,7 @@ public class HttpClient { status = ConstantType.LOG_STATUS_ERROR; } long time = System.currentTimeMillis() - date.getTime(); - erpLogService.addThirdErpLog(date, url, "get", JSONObject.toJSONString(params, JSONWriter.Feature.WriteNullStringAsEmpty), response, time, status); + erpLogService.addThirdErpLog(date, url, "get", JSONObject.toJSONString(params), response, time, status); log.error(response); return response; } @@ -111,7 +111,7 @@ public class HttpClient { //请求时间 Date date = new Date(); //转json字符串时，将空属性转换为空字符串 - String json = JSONObject.toJSONString(object, JSONWriter.Feature.WriteNullStringAsEmpty); + String json = JSONObject.toJSONString(object); log.info(url + "\n" + json); String response = ""; diff --git a/src/main/java/com/glxp/mipsdl/http/UCloudHttpClient.java b/src/main/java/com/glxp/mipsdl/http/UCloudHttpClient.java index a1b6b5a..e188d8e 100644 --- a/src/main/java/com/glxp/mipsdl/http/UCloudHttpClient.java +++ b/src/main/java/com/glxp/mipsdl/http/UCloudHttpClient.java @@ -1,9 +1,9 @@ package com.glxp.mipsdl.http; -import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; -import com.alibaba.fastjson2.JSONWriter; -import com.alibaba.fastjson2.TypeReference; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.JSONWriter; +import com.alibaba.fastjson.TypeReference; import com.glxp.mipsdl.constant.ConstantType; import com.glxp.mipsdl.dao.pzhzd.YyUcloudV31SetDao; import com.glxp.mipsdl.entity.pzhzd.YyUcloudV31SetEntity; @@ -68,7 +68,7 @@ public class UCloudHttpClient { Date date = new Date(); RestTemplate restTemplate = new RestTemplate(); - String params = JSONObject.toJSONString(uPurchaseinRequest, JSONWriter.Feature.WriteNullStringAsEmpty); + String params = JSONObject.toJSONString(uPurchaseinRequest); HttpEntity httpEntity = new HttpEntity<>(params, getHeaders()); String url = u8Url + "/u8cloud/api/ic/purchasein/query"; log.info(url + "\n" + params); @@ -99,12 +99,12 @@ public class UCloudHttpClient { * @param uSaleoutQueryRequest * @return */ - public UBaseResponse saleoutQuery(USaleoutQueryRequest uSaleoutQueryRequest) { + public UBaseResponse saleoutQuery(USaleoutQueryRequest uSaleoutQueryRequest) { //请求开始时间 Date date = new Date(); RestTemplate restTemplate = new RestTemplate(); - String params = JSONObject.toJSONString(uSaleoutQueryRequest, JSONWriter.Feature.WriteNullStringAsEmpty); + String params = JSONObject.toJSONString(uSaleoutQueryRequest); HttpEntity httpEntity = new HttpEntity<>(params, getHeaders()); String url = u8Url + "/u8cloud/api/ic/saleout/query"; log.info(url + "\n" + params); @@ -140,7 +140,7 @@ public class UCloudHttpClient { Date date = new Date(); RestTemplate restTemplate = new RestTemplate(); - String params = JSONObject.toJSONString(modifyPruchaseinRequest, JSONWriter.Feature.WriteNullStringAsEmpty); + String params = JSONObject.toJSONString(modifyPruchaseinRequest); HttpEntity httpEntity = new HttpEntity<>(params, getHeaders()); String url = u8Url + "/u8cloud/api/ic/purchasein/update"; @@ -187,7 +187,7 @@ public class UCloudHttpClient { Date date = new Date(); RestTemplate restTemplate = new RestTemplate(); - String params = JSONObject.toJSONString(modifyPruchaseinRequest, JSONWriter.Feature.WriteNullStringAsEmpty); + String params = JSONObject.toJSONString(modifyPruchaseinRequest); HttpEntity httpEntity = new HttpEntity<>(params, getHeaders()); String url = u8Url + "/u8cloud/api/ic/saleout/update"; log.info(url + "\n" + params); @@ -232,7 +232,7 @@ public class UCloudHttpClient { Date date = new Date(); RestTemplate restTemplate = new RestTemplate(); - String params = JSONObject.toJSONString(purhaseinSignRequest, JSONWriter.Feature.WriteNullStringAsEmpty); + String params = JSONObject.toJSONString(purhaseinSignRequest); HttpEntity httpEntity = new HttpEntity<>(params, getHeaders()); String url = u8Url + "/u8cloud/api/ic/purchasein/sign"; log.info(url + "\n" + params); @@ -276,7 +276,7 @@ public class UCloudHttpClient { Date date = new Date(); RestTemplate restTemplate = new RestTemplate(); - String params = JSONObject.toJSONString(saleoutSignRequest, JSONWriter.Feature.WriteNullStringAsEmpty); + String params = JSONObject.toJSONString(saleoutSignRequest); HttpEntity httpEntity = new HttpEntity<>(params, getHeaders()); String url = u8Url + "/u8cloud/api/ic/saleout/sign"; log.info(url + "\n" + params); @@ -318,7 +318,7 @@ public class UCloudHttpClient { Date date = new Date(); RestTemplate restTemplate = new RestTemplate(); - String params = JSONObject.toJSONString(onhandQueryRequest, JSONWriter.Feature.WriteNullStringAsEmpty); + String params = JSONObject.toJSONString(onhandQueryRequest); HttpEntity httpEntity = new HttpEntity<>(params, getHeaders()); String url = u8Url + "/u8cloud/api/ic/onhand/query"; log.info("请求参数" + url + "\n" + params); @@ -356,7 +356,7 @@ public class UCloudHttpClient { Date date = new Date(); RestTemplate restTemplate = new RestTemplate(); - String params = JSONObject.toJSONString(onhandQueryRequest, JSONWriter.Feature.WriteNullStringAsEmpty); + String params = JSONObject.toJSONString(onhandQueryRequest); HttpEntity httpEntity = new HttpEntity<>(params, getHeaders()); String url = u8Url + "/u8cloud/api/ic/onhand/query"; log.info(url + "\n" + params); @@ -393,7 +393,7 @@ public class UCloudHttpClient { Date date = new Date(); RestTemplate restTemplate = new RestTemplate(); - String params = JSONObject.toJSONString(custmandocRequest, JSONWriter.Feature.WriteNullStringAsEmpty); + String params = JSONObject.toJSONString(custmandocRequest); HttpEntity httpEntity = new HttpEntity<>(params, getHeaders()); String url = u8Url + "/u8cloud/api/uapbd/custmandoc/query"; log.info(url + "\n" + params); @@ -431,7 +431,7 @@ public class UCloudHttpClient { Date date = new Date(); RestTemplate restTemplate = new RestTemplate(); - String params = JSONObject.toJSONString(uInvmandocRequest, JSONWriter.Feature.WriteNullStringAsEmpty); + String params = JSONObject.toJSONString(uInvmandocRequest); HttpEntity httpEntity = new HttpEntity<>(params, getHeaders()); String url = u8Url + "/u8cloud/api/uapbd/invmandoc/query"; diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java index 096e5b3..149a1c0 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java @@ -6,7 +6,7 @@ import java.math.BigDecimal; import java.util.Date; @Data -public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest{ +public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest { /** * */ @@ -112,5 +112,7 @@ public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest{ */ private String addr; + private String stooutNo; + } diff --git a/src/main/java/com/glxp/mipsdl/req/post/PostCollectOrderRequest.java b/src/main/java/com/glxp/mipsdl/req/post/PostCollectOrderRequest.java new file mode 100644 index 0000000..3a1a1a5 --- /dev/null +++ b/src/main/java/com/glxp/mipsdl/req/post/PostCollectOrderRequest.java @@ -0,0 +1,14 @@ +package com.glxp.mipsdl.req.post; + +import com.glxp.mipsdl.entity.inout.IoCollectOrder; +import lombok.Data; + +import java.util.List; + +@Data +public class PostCollectOrderRequest { + + List collectOrderList; + + +} diff --git a/src/main/java/com/glxp/mipsdl/req/ucloud/ModifyPruchaseinRequest.java b/src/main/java/com/glxp/mipsdl/req/ucloud/ModifyPruchaseinRequest.java index 2b5080c..76b65a2 100644 --- a/src/main/java/com/glxp/mipsdl/req/ucloud/ModifyPruchaseinRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/ucloud/ModifyPruchaseinRequest.java @@ -1,6 +1,6 @@ package com.glxp.mipsdl.req.ucloud; -import com.alibaba.fastjson2.annotation.JSONField; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/mipsdl/req/ucloud/ModifySaleRequest.java b/src/main/java/com/glxp/mipsdl/req/ucloud/ModifySaleRequest.java index 7c4306b..460204e 100644 --- a/src/main/java/com/glxp/mipsdl/req/ucloud/ModifySaleRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/ucloud/ModifySaleRequest.java @@ -1,7 +1,7 @@ package com.glxp.mipsdl.req.ucloud; -import com.alibaba.fastjson2.annotation.JSONField; +import com.alibaba.fastjson.annotation.JSONField; import java.util.List; diff --git a/src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkPrescribeResponse.java b/src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkPrescribeResponse.java index a848536..2245d18 100644 --- a/src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkPrescribeResponse.java +++ b/src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkPrescribeResponse.java @@ -65,12 +65,18 @@ public class BasicSkPrescribeResponse { * 更新人 */ private String updateUser; + private String addr; /** * 更新时间 */ private LocalDateTime updateTime; + /** + * 流水号 + */ + private String stooutNo; + private List itemList; diff --git a/src/main/java/com/glxp/mipsdl/res/udiwms/ZzzyyProductsResponse.java b/src/main/java/com/glxp/mipsdl/res/udiwms/ZzzyyProductsResponse.java index 364bf44..7303207 100644 --- a/src/main/java/com/glxp/mipsdl/res/udiwms/ZzzyyProductsResponse.java +++ b/src/main/java/com/glxp/mipsdl/res/udiwms/ZzzyyProductsResponse.java @@ -55,4 +55,5 @@ public class ZzzyyProductsResponse { private String model_number; private String prcitmcode; + private Integer productType; } diff --git a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java index d3dcb17..587ce89 100644 --- a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java +++ b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java @@ -6,7 +6,7 @@ import cn.hsa.zephyr.apisdk.internal.util.encrypt.EncryptionModeEnum; import cn.hsa.zephyr.apisdk.internal.util.encrypt.SignTypeEnum; import cn.hsa.zephyr.apisdk.request.ZephyrMedicalRequest; import cn.hsa.zephyr.apisdk.response.ChsMedicalResponse; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson.JSONObject; import com.glxp.mipsdl.entity.system.ThrYbSetup; import com.glxp.mipsdl.service.system.ThrYbSetupService; import com.glxp.mipsdl.util.DateUtil; diff --git a/src/main/java/com/glxp/mipsdl/util/SubmitOrderUtil.java b/src/main/java/com/glxp/mipsdl/util/SubmitOrderUtil.java index 29ce8ba..7d8912d 100644 --- a/src/main/java/com/glxp/mipsdl/util/SubmitOrderUtil.java +++ b/src/main/java/com/glxp/mipsdl/util/SubmitOrderUtil.java @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.glxp.mipsdl.config.ThirdSysConfig; import com.glxp.mipsdl.constant.Constants;