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 6cb7d6c..44553b5 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -802,7 +802,7 @@ public class HlfyyyClient extends CommonHttpClient { // if(StringUtils.isEmpty(udiwmsOrderDetailHlfyRequest.getExpireDate())){ // udiwmsOrderDetailHlfyRequest.setExpireDate("2099-01-01 00:00:00"); // } - + // 发票号必填 if (udiwmsOrderDetailRequest.getCodeList() != null && udiwmsOrderDetailRequest.getCodeList().size() > 0) { List list = new ArrayList<>(); for (UdiwmsOrderDetailRequest.CodeDetailEntity codeDetailEntity : udiwmsOrderDetailRequest.getCodeList()) { @@ -823,7 +823,13 @@ public class HlfyyyClient extends CommonHttpClient { } // 药品先写死为是 - zaxzyyOrderHlfyRequest.setPhysicFlag("Y"); + if(orderEntity.getProductType() == 2){ + zaxzyyOrderHlfyRequest.setPhysicFlag("Y"); + + }else { + zaxzyyOrderHlfyRequest.setPhysicFlag("N"); + + } //构造诏安接口参数 ZzzyyRequest zaZyRequest = new ZzzyyRequest(); zaZyRequest.setMsgHeader(getMsgHeader("saveBuyApplyInfo")); @@ -1713,7 +1719,7 @@ public class HlfyyyClient extends CommonHttpClient { } else if (matchBusType(busType, buyType_3505)) { return optionUploadCollectOrder3505(ioCollectOrder); } else if (matchBusType(busType, buyType_3506)) { - optionUploadCollectOrder3506(ioCollectOrder); + return optionUploadCollectOrder3506(ioCollectOrder); } else if (matchBusType(busType, buyType_35051)) { return optionUploadCollectOrder35051(ioCollectOrder); } else { @@ -1944,6 +1950,9 @@ public class HlfyyyClient extends CommonHttpClient { collectOrderBiz.setNameCode(entity.getHiltstCode()); collectOrderBiz.setTagStatus(1); collectOrderBiz.setUnTagCount(0); + + ioCollectOrder.setRemark(entity.getRemark()); + bizList.add(collectOrderBiz); }); @@ -2326,12 +2335,12 @@ public class HlfyyyClient extends CommonHttpClient { List list = va011MxMapper.selectList(new LambdaQueryWrapper().eq(VA011Mx::getCodefk, va011.getCode())); if (CollUtil.isNotEmpty(list)) { List collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList(); - List xsck3505Requests = new ArrayList<>(); + List xsck3506Requests = new ArrayList<>(); for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) { BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId()); String itemCode = basicUdirelEntity.getMainId(); - for (VA011Mx va011Mx : list) { - if (va011Mx.getHiltstCode().equals(itemCode)) { + for (VA011Mx item : list) { + if (item.getHiltstCode().equals(itemCode)) { String[] codes = collectOrderBizResponse.getFinishUdiCode().split(","); List drugTraceList = new ArrayList<>(); // 遍历fruits数组 @@ -2350,45 +2359,32 @@ public class HlfyyyClient extends CommonHttpClient { } } - Xsck3505Request xsck3505Request = Xsck3505Request.builder() - .med_list_codg(va011Mx.getHiltstCode()) - .fixmedins_hilist_id(va011Mx.getItemcode()) - .fixmedins_hilist_name(va011Mx.getItemname()) - .fixmedins_bchno(va011Mx.getCodefk()) - .prsc_dr_cert_type(null) - .prsc_dr_certno(null) - .prsc_dr_name(va011.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(va011.getSickcode()) - .psn_cert_type(null) - .certno(null) - .psn_name(va011.getSickname()) - .manu_lotnum(null) - .manu_date(null) - .expy_end(null) - .rx_flag("1") - .trdn_flag(null) - .finl_trns_pric(new BigDecimal(va011Mx.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(va011Mx.getCount())) - .sel_retn_time(va011.getPrescribedate()) - .sel_retn_opter_name(null) - .memo(null) - .mdtrt_setl_type(null) - .drugtracinfo(drugTraceList).build(); - xsck3505Requests.add(xsck3505Request); +// // TODO: 2024/9/10 字段未完全正确对应 +// Xsth3506Request xsth3506Request = Xsth3506Request.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()) +// .setl_id(vInsurNationGoodsPhysic.getSETL_ID()) +// .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()) +// .sel_retn_cnt(vInsurNationGoodsPhysic.getSEL_RETN_CNT()) +// .sel_retn_time(vInsurNationGoodsPhysic.getSEL_RETN_TIME()) +// .sel_retn_opter_name(vInsurNationGoodsPhysic.getSEL_RETN_OPTER_NAME()) +// .memo(item.getRemark()) +// .medins_prod_sel_no(vInsurNationGoodsPhysic.getMEDINS_PROL_SEL_NO()) +// .mdtrt_sn(vInsurNationGoodsPhysic.getMDTRT_SN()) +// .drugtracinfo(drugTraceList).build(); +// +// xsck3506Requests.add(xsth3506Request); } } } @@ -2659,6 +2655,9 @@ public class HlfyyyClient extends CommonHttpClient { collectOrderBiz.setNameCode(entity.getItemcode()); collectOrderBiz.setTagStatus(1); collectOrderBiz.setUnTagCount(0); + + + bizList.add(collectOrderBiz); }); diff --git a/src/main/java/com/glxp/mipsdl/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/mipsdl/entity/inout/IoOrderEntity.java index ff77d4d..398e53a 100644 --- a/src/main/java/com/glxp/mipsdl/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/mipsdl/entity/inout/IoOrderEntity.java @@ -272,5 +272,9 @@ public class IoOrderEntity { @TableField(value = "confirmTime") private Date confirmTime; - + /** + * 单据产品类型 1:器械;2:药品 + */ + @TableField(value = "productType") + private Integer productType; }