From f5f42a3bf396a302447e4a7106c25c8e8dcbc93c Mon Sep 17 00:00:00 2001 From: qiuyt Date: Mon, 24 Mar 2025 13:53:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/client/hlfyyy/HlfyyyClient.java | 95 ++++++++++--------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java index f9f3282..45dcb0a 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -94,10 +94,12 @@ public class HlfyyyClient extends CommonHttpClient { private final String[] buyType_3501 = {}; private final String[] buyType_3502 = {"SC73650724355678"}; + private final String[] buyType_3504 = {}; + // private final String[] buyType_3505 = {"QXCF001", "YPCF002"}; - private final String[] buyType_3505 = {}; + private final String[] buyType_3505 = {"YPCF002","YPCF003"}; - private final String[] buyType_3506 = {}; + private final String[] buyType_3506 = {"YPCFTF002","YPCFTF003"}; private final String[] buyType_35051 = {"SC72197936495755"}; @@ -1708,9 +1710,9 @@ public class HlfyyyClient extends CommonHttpClient { } else if (matchBusType(busType, buyType_3502)) { return optionUploadCollectOrder3502(ioCollectOrder); } else if (matchBusType(busType, buyType_3505)) { - optionUploadCollectOrder3505(ioCollectOrder); + return optionUploadCollectOrder3505(ioCollectOrder); } else if (matchBusType(busType, buyType_3506)) { - optionUploadCollectOrder3506(ioCollectOrder); + optionUploadCollectOrder3506(ioCollectOrder); } else if (matchBusType(busType, buyType_35051)) { return optionUploadCollectOrder35051(ioCollectOrder); } else { @@ -1952,16 +1954,16 @@ public class HlfyyyClient extends CommonHttpClient { public BaseResponse optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder) { //摆药流水号 // String stoout_no = ioCollectOrder.getBackupOrderRemark1(); - String stoout_no = StringUtils.isBlank(ioCollectOrder.getBackupOrderRemark1()) ? ioCollectOrder.getBackupOrderRemark2() : ioCollectOrder.getBackupOrderRemark1(); - List vInsurNationGoodsPhysics = goodsPhysicMapper.selectList(new LambdaQueryWrapper().eq(VInsurNationGoodsPhysic::getSTOOUT_NO, stoout_no)); - if (CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) { + VA010 va010 = va010Service.getOne(new LambdaQueryWrapper().eq(VA010::getCode, ioCollectOrder.getBillNo())); + List list = va010MxMapper.selectList(new LambdaQueryWrapper().eq(VA010Mx::getCodefk, va010.getCode())); + if (CollUtil.isNotEmpty(list)) { List collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList(); List xsck3505Requests = new ArrayList<>(); for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) { BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId()); String itemCode = basicUdirelEntity.getMainId(); - for (VInsurNationGoodsPhysic vInsurNationGoodsPhysic : vInsurNationGoodsPhysics) { - if (vInsurNationGoodsPhysic.getFIXMEDINS_HILIST_ID().equals(itemCode)) { + for (VA010Mx va010Mx : list) { + if (va010Mx.getHiltstCode().equals(itemCode)) { String[] codes = collectOrderBizResponse.getFinishUdiCode().split(","); List drugTraceList = new ArrayList<>(); // 遍历fruits数组 @@ -1981,42 +1983,42 @@ public class HlfyyyClient extends CommonHttpClient { } Xsck3505Request xsck3505Request = Xsck3505Request.builder() - .med_list_codg(vInsurNationGoodsPhysic.getMED_LIST_CODG()) - .fixmedins_hilist_id(vInsurNationGoodsPhysic.getFIXMEDINS_HILIST_ID()) - .fixmedins_hilist_name(vInsurNationGoodsPhysic.getFIXMEDINS_HILIST_NAME()) - .fixmedins_bchno(vInsurNationGoodsPhysic.getFIXMEDINS_BCHNO()) - .prsc_dr_cert_type(vInsurNationGoodsPhysic.getPRSC_DR_CERT_TYPE()) - .prsc_dr_certno(vInsurNationGoodsPhysic.getPRSC_DR_CERTNO()) - .prsc_dr_name(vInsurNationGoodsPhysic.getPRSC_DR_NAME()) - .phar_cert_type(vInsurNationGoodsPhysic.getPHAR_CERT_TYPE()) - .phar_certno(vInsurNationGoodsPhysic.getPHAR_CERTNO()) - .phar_name(vInsurNationGoodsPhysic.getPHAR_NAME()) - .phar_prac_cert_no(vInsurNationGoodsPhysic.getPHAR_PRAC_CERT_NO()) - .hi_feesetl_type(vInsurNationGoodsPhysic.getHI_FEESETL_TYPE()) - .setl_id(vInsurNationGoodsPhysic.getSETL_ID()) - .mdtrt_sn(vInsurNationGoodsPhysic.getMDTRT_SN()) - .psn_no(vInsurNationGoodsPhysic.getPSN_NO()) - .psn_cert_type(vInsurNationGoodsPhysic.getPSN_CERT_TYPE()) - .certno(vInsurNationGoodsPhysic.getCERTNO()) - .psn_name(vInsurNationGoodsPhysic.getPSN_NAME()) - .manu_lotnum(vInsurNationGoodsPhysic.getMANU_LOTNUM()) - .manu_date(vInsurNationGoodsPhysic.getMANU_DATE()) - .expy_end(vInsurNationGoodsPhysic.getEXPY_END()) - .rx_flag(vInsurNationGoodsPhysic.getRX_FLAG()) - .trdn_flag(vInsurNationGoodsPhysic.getTRDN_FLAG()) - .finl_trns_pric(vInsurNationGoodsPhysic.getFINL_TRNS_PRIC()) - .rxno(vInsurNationGoodsPhysic.getRXNO()) - .rx_circ_flag(vInsurNationGoodsPhysic.getRX_CIRC_FLAG()) - .rtal_docno(vInsurNationGoodsPhysic.getRTAL_DOCNO()) - .stoout_no(vInsurNationGoodsPhysic.getSTOOUT_NO()) - .bchno(vInsurNationGoodsPhysic.getBCHNO()) - .drug_prod_barc(vInsurNationGoodsPhysic.getRUG_PROD_BARC()) - .shelf_posi(vInsurNationGoodsPhysic.getSHELF_POSI()) - .sel_retn_cnt(vInsurNationGoodsPhysic.getSEL_RETN_CNT()) - .sel_retn_time(vInsurNationGoodsPhysic.getSEL_RETN_TIME()) - .sel_retn_opter_name(vInsurNationGoodsPhysic.getSEL_RETN_OPTER_NAME()) - .memo(vInsurNationGoodsPhysic.getMEMO()) - .mdtrt_setl_type(vInsurNationGoodsPhysic.getMDTRT_SETL_TYPE()) + .med_list_codg(va010Mx.getHiltstCode()) + .fixmedins_hilist_id(va010Mx.getItemcode()) + .fixmedins_hilist_name(va010Mx.getItemname()) + .fixmedins_bchno(va010Mx.getCodefk()) + .prsc_dr_cert_type(null) + .prsc_dr_certno(null) + .prsc_dr_name(va010.getCreatedr()) + .phar_cert_type(null) + .phar_certno(null) + .phar_name(null) + .phar_prac_cert_no(null) + .hi_feesetl_type(null) + .setl_id(null) + .mdtrt_sn(null) + .psn_no(va010.getSickcode()) + .psn_cert_type(null) + .certno(null) + .psn_name(va010.getSickname()) + .manu_lotnum(null) + .manu_date(null) + .expy_end(null) + .rx_flag("1") + .trdn_flag(null) + .finl_trns_pric(new BigDecimal(va010Mx.getAmount())) + .rxno(null) + .rx_circ_flag(null) + .rtal_docno(null) + .stoout_no(null) + .bchno(null) + .drug_prod_barc(null) + .shelf_posi(null) + .sel_retn_cnt(Integer.valueOf(va010Mx.getCount())) + .sel_retn_time(va010.getPrescribedate()) + .sel_retn_opter_name(null) + .memo(null) + .mdtrt_setl_type(null) .drugtracinfo(drugTraceList).build(); xsck3505Requests.add(xsck3505Request); } @@ -2372,10 +2374,11 @@ public class HlfyyyClient extends CommonHttpClient { @Override public BaseResponse getBuyType() { Map buyTypeMap = new HashMap<>(); - buyTypeMap.put("buyType_3501", buyType_3501); buyTypeMap.put("buyType_3502", buyType_3502); + buyTypeMap.put("buyType_3504", buyType_3504); buyTypeMap.put("buyType_3505", buyType_3505); buyTypeMap.put("buyType_3506", buyType_3506); + buyTypeMap.put("buyType_35051", buyType_35051); return ResultVOUtils.success(buyTypeMap); }