UDI
/
udi-wms-third-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
hlfyyy
qiuyt 7 months ago
parent c28a03bfb6
commit c67e3be0e7
2 changed files with 49 additions and 46 deletions
Show Stats Download Patch File Download Diff File

87
src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java
Unescape Escape View File

@ -802,7 +802,7 @@ public class HlfyyyClient extends CommonHttpClient {
// if(StringUtils.isEmpty(udiwmsOrderDetailHlfyRequest.getExpireDate())){ // if(StringUtils.isEmpty(udiwmsOrderDetailHlfyRequest.getExpireDate())){
// udiwmsOrderDetailHlfyRequest.setExpireDate("2099-01-01 00:00:00"); // udiwmsOrderDetailHlfyRequest.setExpireDate("2099-01-01 00:00:00");
// } // }
// 发票号必填
if (udiwmsOrderDetailRequest.getCodeList() != null && udiwmsOrderDetailRequest.getCodeList().size() > 0) { if (udiwmsOrderDetailRequest.getCodeList() != null && udiwmsOrderDetailRequest.getCodeList().size() > 0) {
List<UdiwmsOrderDetailHlfyRequest.CodeDetailEntity> list = new ArrayList<>(); List<UdiwmsOrderDetailHlfyRequest.CodeDetailEntity> list = new ArrayList<>();
for (UdiwmsOrderDetailRequest.CodeDetailEntity codeDetailEntity : udiwmsOrderDetailRequest.getCodeList()) { for (UdiwmsOrderDetailRequest.CodeDetailEntity codeDetailEntity : udiwmsOrderDetailRequest.getCodeList()) {
@ -823,7 +823,13 @@ public class HlfyyyClient extends CommonHttpClient {
} }
// 药品先写死为是 // 药品先写死为是
if(orderEntity.getProductType() == 2){
zaxzyyOrderHlfyRequest.setPhysicFlag("Y"); zaxzyyOrderHlfyRequest.setPhysicFlag("Y");
}else {
zaxzyyOrderHlfyRequest.setPhysicFlag("N");
}
//构造诏安接口参数 //构造诏安接口参数
ZzzyyRequest zaZyRequest = new ZzzyyRequest(); ZzzyyRequest zaZyRequest = new ZzzyyRequest();
zaZyRequest.setMsgHeader(getMsgHeader("saveBuyApplyInfo")); zaZyRequest.setMsgHeader(getMsgHeader("saveBuyApplyInfo"));
@ -1713,7 +1719,7 @@ public class HlfyyyClient extends CommonHttpClient {
} else if (matchBusType(busType, buyType_3505)) { } else if (matchBusType(busType, buyType_3505)) {
return optionUploadCollectOrder3505(ioCollectOrder); return optionUploadCollectOrder3505(ioCollectOrder);
} else if (matchBusType(busType, buyType_3506)) { } else if (matchBusType(busType, buyType_3506)) {
optionUploadCollectOrder3506(ioCollectOrder); return optionUploadCollectOrder3506(ioCollectOrder);
} else if (matchBusType(busType, buyType_35051)) { } else if (matchBusType(busType, buyType_35051)) {
return optionUploadCollectOrder35051(ioCollectOrder); return optionUploadCollectOrder35051(ioCollectOrder);
} else { } else {
@ -1944,6 +1950,9 @@ public class HlfyyyClient extends CommonHttpClient {
collectOrderBiz.setNameCode(entity.getHiltstCode()); collectOrderBiz.setNameCode(entity.getHiltstCode());
collectOrderBiz.setTagStatus(1); collectOrderBiz.setTagStatus(1);
collectOrderBiz.setUnTagCount(0); collectOrderBiz.setUnTagCount(0);
ioCollectOrder.setRemark(entity.getRemark());
bizList.add(collectOrderBiz); bizList.add(collectOrderBiz);
}); });
@ -2326,12 +2335,12 @@ public class HlfyyyClient extends CommonHttpClient {
List<VA011Mx> list = va011MxMapper.selectList(new LambdaQueryWrapper<VA011Mx>().eq(VA011Mx::getCodefk, va011.getCode())); List<VA011Mx> list = va011MxMapper.selectList(new LambdaQueryWrapper<VA011Mx>().eq(VA011Mx::getCodefk, va011.getCode()));
if (CollUtil.isNotEmpty(list)) { if (CollUtil.isNotEmpty(list)) {
List<CollectOrderBizResponse> collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList(); List<CollectOrderBizResponse> collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList();
List<Xsck3505Request> xsck3505Requests = new ArrayList<>(); List<Xsth3506Request> xsck3506Requests = new ArrayList<>();
for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) { for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) {
BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId()); BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId());
String itemCode = basicUdirelEntity.getMainId(); String itemCode = basicUdirelEntity.getMainId();
for (VA011Mx va011Mx : list) { for (VA011Mx item : list) {
if (va011Mx.getHiltstCode().equals(itemCode)) { if (item.getHiltstCode().equals(itemCode)) {
String[] codes = collectOrderBizResponse.getFinishUdiCode().split(","); String[] codes = collectOrderBizResponse.getFinishUdiCode().split(",");
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
@ -2350,45 +2359,32 @@ public class HlfyyyClient extends CommonHttpClient {
} }
} }
Xsck3505Request xsck3505Request = Xsck3505Request.builder() // // TODO: 2024/9/10 字段未完全正确对应
.med_list_codg(va011Mx.getHiltstCode()) // Xsth3506Request xsth3506Request = Xsth3506Request.builder()
.fixmedins_hilist_id(va011Mx.getItemcode()) // .med_list_codg(vInsurNationGoodsPhysic.getMED_LIST_CODG())
.fixmedins_hilist_name(va011Mx.getItemname()) // .fixmedins_hilist_id(vInsurNationGoodsPhysic.getFIXMEDINS_HILIST_ID())
.fixmedins_bchno(va011Mx.getCodefk()) // .fixmedins_hilist_name(vInsurNationGoodsPhysic.getFIXMEDINS_HILIST_NAME())
.prsc_dr_cert_type(null) // .fixmedins_bchno(vInsurNationGoodsPhysic.getFIXMEDINS_BCHNO())
.prsc_dr_certno(null) // .setl_id(vInsurNationGoodsPhysic.getSETL_ID())
.prsc_dr_name(va011.getCreatedr()) // .psn_no(vInsurNationGoodsPhysic.getPSN_NO())
.phar_cert_type(null) // .psn_cert_type(vInsurNationGoodsPhysic.getPSN_CERT_TYPE())
.phar_certno(null) // .certno(vInsurNationGoodsPhysic.getCERTNO())
.phar_name(null) // .psn_name(vInsurNationGoodsPhysic.getPSN_NAME())
.phar_prac_cert_no(null) // .manu_lotnum(vInsurNationGoodsPhysic.getMANU_LOTNUM())
.hi_feesetl_type(null) // .manu_date(vInsurNationGoodsPhysic.getMANU_DATE())
.setl_id(null) // .expy_end(vInsurNationGoodsPhysic.getEXPY_END())
.mdtrt_sn(null) // .rx_flag(vInsurNationGoodsPhysic.getRX_FLAG())
.psn_no(va011.getSickcode()) // .trdn_flag(vInsurNationGoodsPhysic.getTRDN_FLAG())
.psn_cert_type(null) // .finl_trns_pric(vInsurNationGoodsPhysic.getFINL_TRNS_PRIC())
.certno(null) // .sel_retn_cnt(vInsurNationGoodsPhysic.getSEL_RETN_CNT())
.psn_name(va011.getSickname()) // .sel_retn_time(vInsurNationGoodsPhysic.getSEL_RETN_TIME())
.manu_lotnum(null) // .sel_retn_opter_name(vInsurNationGoodsPhysic.getSEL_RETN_OPTER_NAME())
.manu_date(null) // .memo(item.getRemark())
.expy_end(null) // .medins_prod_sel_no(vInsurNationGoodsPhysic.getMEDINS_PROL_SEL_NO())
.rx_flag("1") // .mdtrt_sn(vInsurNationGoodsPhysic.getMDTRT_SN())
.trdn_flag(null) // .drugtracinfo(drugTraceList).build();
.finl_trns_pric(new BigDecimal(va011Mx.getAmount())) //
.rxno(null) // xsck3506Requests.add(xsth3506Request);
.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);
} }
} }
} }
@ -2659,6 +2655,9 @@ public class HlfyyyClient extends CommonHttpClient {
collectOrderBiz.setNameCode(entity.getItemcode()); collectOrderBiz.setNameCode(entity.getItemcode());
collectOrderBiz.setTagStatus(1); collectOrderBiz.setTagStatus(1);
collectOrderBiz.setUnTagCount(0); collectOrderBiz.setUnTagCount(0);
bizList.add(collectOrderBiz); bizList.add(collectOrderBiz);
}); });

6
src/main/java/com/glxp/mipsdl/entity/inout/IoOrderEntity.java
Unescape Escape View File

@ -272,5 +272,9 @@ public class IoOrderEntity {
@TableField(value = "confirmTime") @TableField(value = "confirmTime")
private Date confirmTime; private Date confirmTime;
/**
* 单据产品类型 1:器械;2:药品
*/
@TableField(value = "productType")
private Integer productType;
} }

Write Preview
Loading…
Cancel
Save