云霄中医院修改

scpwxyy
yewj 7 months ago
parent b33018134d
commit a724e3afbe

@ -1391,6 +1391,7 @@ public class CtqyyClient extends CommonHttpClient {
);
wrapper.and(StrUtil.isNotEmpty(fromCorpName), t -> t.eq(VInsurNationGoodsPhysic::getPSN_NAME, fromCorpName));
// TODO: 2024/9/19 拉取处方时改成拉取v_ypzs_pres_info
IPage<VInsurNationGoodsPhysic> page = goodsPhysicMapper.selectGroupedWithPagination(new Page<VInsurNationGoodsPhysic>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()),
udiwmsBasicSkPrescribeRequest);
return this.covertSellOrder(udiwmsBasicSkPrescribeRequest, page);
@ -1412,7 +1413,7 @@ 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<VInsurNationGoodsReturn> page = vInsurNationGoodsReturnMapper.selectGroupedWithPagination(new Page<VInsurNationGoodsReturn>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()),
udiwmsBasicSkPrescribeRequest);
return this.covertReturnOrder(udiwmsBasicSkPrescribeRequest, page);
@ -1658,6 +1659,7 @@ public class CtqyyClient extends CommonHttpClient {
vInsurNationGoodsPhysics = goodsPhysicMapper.selectList(wrapper1);
}
// TODO: 2024/9/19 这边在转换的时候就不能用VInsurNationGoodsPhysic
if (CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) {
Map<String, List<VInsurNationGoodsPhysic>> 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<String, List<VInsurNationGoodsReturn>> groupedByPrescribeNumber = vInsurNationGoodsReturns.stream()
.collect(Collectors.groupingBy(VInsurNationGoodsReturn::getAPPLY_NO));

Loading…
Cancel
Save