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 529bde7..137a95c 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -2109,7 +2109,17 @@ public class CtqyyClient extends CommonHttpClient { } } log.error("vInsurNationGoodsPhysic==="+vInsurNationGoodsPhysic); + // 医保自费类型 + if(StringUtils.isEmpty(vInsurNationGoodsPhysic.getMDTRT_SETL_TYPE()) || !"1".equals(vInsurNationGoodsPhysic.getMDTRT_SETL_TYPE())){ + vInsurNationGoodsPhysic.setMDTRT_SETL_TYPE("2"); + if(StringUtils.isEmpty(vInsurNationGoodsPhysic.getMDTRT_SN())){ + vInsurNationGoodsPhysic.setMDTRT_SN(ioCollectOrder.getBillNo()); + } + } + if(StringUtils.isEmpty(vInsurNationGoodsPhysic.getFIXMEDINS_BCHNO())){ + vInsurNationGoodsPhysic.setFIXMEDINS_BCHNO(ioCollectOrder.getBillNo()); + } Xsck3505Request xsck3505Request = Xsck3505Request.builder() .med_list_codg(vInsurNationGoodsPhysic.getMED_LIST_CODG()) .fixmedins_hilist_id(vInsurNationGoodsPhysic.getFIXMEDINS_HILIST_ID()) @@ -2167,6 +2177,8 @@ public class CtqyyClient extends CommonHttpClient { return ResultVOUtils.error(500,"上传医保数据为空请核实"); } + + public BaseResponse optionUploadCollectOrder35051(IoCollectOrder ioCollectOrder) { List bizList = ioCollectOrder.getCollectOrderBizResponseList(); diff --git a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java index 91dffc4..a9c5459 100644 --- a/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java +++ b/src/main/java/com/glxp/mipsdl/service/yb/YbClient.java @@ -86,7 +86,7 @@ public class YbClient { ){ - if(apiNo.equals("3505A") && "成功".equals(resp.getErrMsg())){ + if((apiNo.equals("3505A") || apiNo.equals("35051")) && "成功".equals(resp.getErrMsg())){ return ResultVOUtils.success("【" + apiNo + "】上传医保成功"); }else if(apiNo.equals("3502A") && org.apache.commons.lang3.StringUtils.isEmpty(resp.getErrMsg())){