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 a6c6bf5..cad465d 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -124,6 +124,8 @@ public class CtqyyClient extends CommonHttpClient { @Resource private VYpzsPresInfoMapper vYpzsPresInfoMapper; @Resource + private VYpzsPresInfoReturnMapper vYpzsPresInfoReturnMapper; + @Resource private VYpzsPlanInfoMapper vYpzsPlanInfoMapper; @Resource private VYpzsIoInfoMapper vYpzsIoInfoMapper; @@ -142,8 +144,6 @@ public class CtqyyClient extends CommonHttpClient { @Resource VInsurNationGoodsReturnMapper vInsurNationGoodsReturnMapper; @Resource - VYpzsPresInfoReturnMapper vYpzsPresInfoReturnMapper; - @Resource private ThrProductsDao thrProductsDao; /** @@ -1390,10 +1390,10 @@ public class CtqyyClient extends CommonHttpClient { .or().like(VInsurNationGoodsPhysic::getPSN_NO, key) ); wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsPhysic::getPSN_NAME, fromCorpName)); - - // TODO: 2024/9/19 拉取处方时，改成拉取v_ypzs_pres_info - IPage page = goodsPhysicMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), + // 拉取处方时，改成拉取v_ypzs_pres_info + IPage page = vYpzsPresInfoMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); + return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, page); } else { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -1413,8 +1413,8 @@ public class CtqyyClient extends CommonHttpClient { ); wrapper.and(StrUtil.isNotEmpty(code), t -> t.eq(VInsurNationGoodsReturn::getAPPLY_NO, code)); wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsReturn::getPSN_NAME, fromCorpName)); - // TODO: 2024/9/19 拉取处方退货时，改成拉取v_ypzs_pres_info_return - IPage page = vInsurNationGoodsReturnMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), + //拉取处方退货时，改成拉取v_ypzs_pres_info_return + IPage page = vYpzsPresInfoReturnMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); return this.covertReturnOrder(udiwmsBasicSkPrescribeRequest, page); } @@ -1649,23 +1649,23 @@ public class CtqyyClient extends CommonHttpClient { * @param udiwmsBasicSkPrescribeRequest * @return */ - private BaseResponse covertSellOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage page) { - List presInfoEntities = page.getRecords(); - List vInsurNationGoodsPhysics = new ArrayList<>(); + private BaseResponse covertSellOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage page) { + List presInfoEntities = page.getRecords(); + List vInsurNationGoodsPhysics = new ArrayList<>(); if (CollUtil.isNotEmpty(presInfoEntities)) { - List collect = presInfoEntities.stream().map(VInsurNationGoodsPhysic::getRXNO).collect(Collectors.toList()); - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.in(VInsurNationGoodsPhysic::getRXNO, collect); - vInsurNationGoodsPhysics = goodsPhysicMapper.selectList(wrapper1); + List collect = presInfoEntities.stream().map(VYpzsPresInfo::getPHYSIC_CODE).collect(Collectors.toList()); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.in(VYpzsPresInfo::getPHYSIC_CODE, collect); + vInsurNationGoodsPhysics = vYpzsPresInfoMapper.selectList(wrapper1); } // TODO: 2024/9/19 这边在转换的时候就不能用VInsurNationGoodsPhysic if (CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) { - Map> groupedByPrescribeNumber = vInsurNationGoodsPhysics.stream() - .collect(Collectors.groupingBy(VInsurNationGoodsPhysic::getRXNO)); + Map> groupedByPrescribeNumber = vInsurNationGoodsPhysics.stream() + .collect(Collectors.groupingBy(VYpzsPresInfo::getPHYSIC_CODE)); List ioCollectOrders = new ArrayList<>(); groupedByPrescribeNumber.forEach((key, value) -> { - VInsurNationGoodsPhysic presInfoEntity = value.get(0); + VYpzsPresInfo presInfoEntity = value.get(0); StringBuilder errorMsg = new StringBuilder(); IoCollectOrder ioCollectOrder = new IoCollectOrder(); ioCollectOrder.setBillNo(presInfoEntity.getRXNO()); @@ -1728,22 +1728,22 @@ public class CtqyyClient extends CommonHttpClient { } } - private BaseResponse covertReturnOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage page) { - List presInfoEntities = page.getRecords(); - List vInsurNationGoodsReturns = new ArrayList<>(); + private BaseResponse covertReturnOrder(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage page) { + List presInfoEntities = page.getRecords(); + List vInsurNationGoodsReturns = new ArrayList<>(); if (CollUtil.isNotEmpty(presInfoEntities)) { - List collect = presInfoEntities.stream().map(VInsurNationGoodsReturn::getAPPLY_NO).collect(Collectors.toList()); - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.in(VInsurNationGoodsReturn::getAPPLY_NO, collect); - vInsurNationGoodsReturns = vInsurNationGoodsReturnMapper.selectList(wrapper1); + List collect = presInfoEntities.stream().map(VYpzsPresInfoReturn::getAPPLY_NO).collect(Collectors.toList()); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.in(VYpzsPresInfoReturn::getAPPLY_NO, collect); + vInsurNationGoodsReturns = vYpzsPresInfoReturnMapper.selectList(wrapper1); } // TODO: 2024/9/19 这边在转换的时候就不能用vInsurNationGoodsReturns if (CollUtil.isNotEmpty(vInsurNationGoodsReturns)) { - Map> groupedByPrescribeNumber = vInsurNationGoodsReturns.stream() - .collect(Collectors.groupingBy(VInsurNationGoodsReturn::getAPPLY_NO)); + Map> groupedByPrescribeNumber = vInsurNationGoodsReturns.stream() + .collect(Collectors.groupingBy(VYpzsPresInfoReturn::getAPPLY_NO)); List ioCollectOrders = new ArrayList<>(); groupedByPrescribeNumber.forEach((key, value) -> { - VInsurNationGoodsReturn presInfoEntity = value.get(0); + VYpzsPresInfoReturn presInfoEntity = value.get(0); StringBuilder errorMsg = new StringBuilder(); IoCollectOrder ioCollectOrder = new IoCollectOrder(); ioCollectOrder.setBillNo(presInfoEntity.getAPPLY_NO()); diff --git a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoMapper.java index 8a34dfc..3a4c7d0 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoMapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoMapper.java @@ -2,10 +2,18 @@ package com.glxp.mipsdl.thirddao.ctqyy; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsPhysic; import com.glxp.mipsdl.entity.ctqyy.VYpzsPresInfo; +import com.glxp.mipsdl.req.base.UdiwmsBasicSkPrescribeRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @DS("ctqyySql") @Mapper public interface VYpzsPresInfoMapper extends BaseMapper { + IPage selectGroupedWithPagination(Page vYpzsPresInfoPage,@Param("udiwmsBasicSkPrescribeRequest") UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); + + } \ No newline at end of file diff --git a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoReturnMapper.java b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoReturnMapper.java index 97e01ec..d0a55e7 100644 --- a/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoReturnMapper.java +++ b/src/main/java/com/glxp/mipsdl/thirddao/ctqyy/VYpzsPresInfoReturnMapper.java @@ -2,10 +2,17 @@ package com.glxp.mipsdl.thirddao.ctqyy; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.glxp.mipsdl.entity.ctqyy.VInsurNationGoodsReturn; import com.glxp.mipsdl.entity.ctqyy.VYpzsPresInfoReturn; +import com.glxp.mipsdl.req.base.UdiwmsBasicSkPrescribeRequest; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @DS("ctqyySql") @Mapper public interface VYpzsPresInfoReturnMapper extends BaseMapper { + IPage selectGroupedWithPagination(Page vYpzsPresInfoReturnPage, @Param("udiwmsBasicSkPrescribeRequest")UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest); + } \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsPhysicMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsPhysicMapper.xml index f355870..8c27cc7 100644 --- a/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsPhysicMapper.xml +++ b/src/main/resources/mybatis/mapper/other/ctqyy/VInsurNationGoodsPhysicMapper.xml @@ -57,7 +57,7 @@ \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml index fcbdc2a..7a350d8 100644 --- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml +++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoMapper.xml @@ -23,4 +23,39 @@ LAY_TIME, STOOUT_NO, PRESCRIBE_NUMBER, PHYSIC_CODE, PHYSIC_NAME, BATCH_NUMBER, PACK_SPEC, LAY_PHYSIC_QUANTITY, PHYSIC_UNIT, SICK_ID, RESIDENCE_NO, COUNTRY_CODE, CONFECT_MAN + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoReturnMapper.xml b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoReturnMapper.xml index 7cf60f3..f247c3e 100644 --- a/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoReturnMapper.xml +++ b/src/main/resources/mybatis/mapper/other/ctqyy/VYpzsPresInfoReturnMapper.xml @@ -27,4 +27,41 @@ PHYSIC_CODE, PHYSIC_NAME, PHYSIC_SPEC, QUANTITY, PHYSIC_UNIT, PRICE, COST, BATCH_NUMBER, FEE_SEQUENCE_NO + + + \ No newline at end of file