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 73d4d50..7c1ab67 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1391,7 +1391,8 @@ public class CtqyyClient extends CommonHttpClient { ); wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsPhysic::getPSN_NAME, fromCorpName)); - IPage page =goodsPhysicMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), + // TODO: 2024/9/19 拉取处方时,改成拉取v_ypzs_pres_info + IPage page = goodsPhysicMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, page); } else { @@ -1412,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)); - - IPage page =vInsurNationGoodsReturnMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), + // TODO: 2024/9/19 拉取处方退货时,改成拉取v_ypzs_pres_info_return + IPage page = vInsurNationGoodsReturnMapper.selectGroupedWithPagination(new Page(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), udiwmsBasicSkPrescribeRequest); return this.covertReturnOrder(udiwmsBasicSkPrescribeRequest, page); } @@ -1654,10 +1655,11 @@ public class CtqyyClient extends CommonHttpClient { if (CollUtil.isNotEmpty(presInfoEntities)) { List collect = presInfoEntities.stream().map(VInsurNationGoodsPhysic::getRXNO).collect(Collectors.toList()); LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.in(VInsurNationGoodsPhysic::getRXNO,collect); + wrapper1.in(VInsurNationGoodsPhysic::getRXNO, collect); vInsurNationGoodsPhysics = goodsPhysicMapper.selectList(wrapper1); } + // TODO: 2024/9/19 这边在转换的时候就不能用VInsurNationGoodsPhysic if (CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) { Map> groupedByPrescribeNumber = vInsurNationGoodsPhysics.stream() .collect(Collectors.groupingBy(VInsurNationGoodsPhysic::getRXNO)); @@ -1733,7 +1735,7 @@ public class CtqyyClient extends CommonHttpClient { wrapper1.in(VInsurNationGoodsReturn::getAPPLY_NO, collect); vInsurNationGoodsReturns = vInsurNationGoodsReturnMapper.selectList(wrapper1); } - + // TODO: 2024/9/19 这边在转换的时候就不能用vInsurNationGoodsReturns if (CollUtil.isNotEmpty(vInsurNationGoodsReturns)) { Map> groupedByPrescribeNumber = vInsurNationGoodsReturns.stream() .collect(Collectors.groupingBy(VInsurNationGoodsReturn::getAPPLY_NO));