From 4b7886c76fd7ebceaee80558f6ff6d59d8974793 Mon Sep 17 00:00:00 2001 From: qiuyt Date: Wed, 2 Apr 2025 21:20:16 +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 | 115 ++++++++++-------- .../com/glxp/mipsdl/entity/hlfyyy/VA012.java | 3 +- .../com/glxp/mipsdl/entity/hlfyyy/VA013.java | 2 +- 3 files changed, 65 insertions(+), 55 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 502881a..8d7a9b7 100644 --- a/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java @@ -1991,12 +1991,16 @@ public class HlfyyyClient extends CommonHttpClient { ); if ( CollUtil.isNotEmpty(list)) { - String stoout_no = list.get(0).getCode(); - log.error("stoout_no==="+stoout_no); + VA010 va010 = list.get(0); - List va012List = va012Mapper.selectList(new LambdaQueryWrapper().eq(VA012::getSTOOUT_NO, stoout_no)); - log.error("va012==="+va012List); - if ( CollUtil.isNotEmpty(va012List)) { + List va013List = va013Mapper.selectList( + new LambdaQueryWrapper() + .eq(VA013::getSICK_ID, va010.getSickcode()) + .eq(VA013::getSETTLE_NO, va010.getCode()) + + ); + log.error("va012==="+va013List); + if ( CollUtil.isNotEmpty(va013List)) { List collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList(); log.error("collectOrderBizResponseList==="+collectOrderBizResponseList); @@ -2004,8 +2008,8 @@ public class HlfyyyClient extends CommonHttpClient { for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) { BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId()); String itemCode = basicUdirelEntity.getMainId(); - for (VA012 va012 : va012List) { - if (va012.getMED_LIST_CODG().equals(itemCode)) { + for (VA013 va013 : va013List) { + if (va013.getMED_LIST_CODG().equals(itemCode)) { String[] codes = new String[0]; if(StringUtils.isNotEmpty(collectOrderBizResponse.getFinishUdiCode())){ codes = collectOrderBizResponse.getFinishUdiCode().split(","); @@ -2026,55 +2030,55 @@ public class HlfyyyClient extends CommonHttpClient { } } } - log.error("va012==="+va012); + log.error("va013==="+va013); // 医保自费类型 - if(StringUtils.isEmpty(va012.getMDTRT_SETL_TYPE()) || !"1".equals(va012.getMDTRT_SETL_TYPE())){ - va012.setMDTRT_SETL_TYPE("2"); + if(StringUtils.isEmpty(va013.getMDTRT_SETL_TYPE()) || !"1".equals(va013.getMDTRT_SETL_TYPE())){ + va013.setMDTRT_SETL_TYPE("2"); - if(StringUtils.isEmpty(va012.getMDTRT_SN())){ - va012.setMDTRT_SN(ioCollectOrder.getBillNo()); + if(StringUtils.isEmpty(va013.getMDTRT_SN())){ + va013.setMDTRT_SN(ioCollectOrder.getBillNo()); } } - if(StringUtils.isEmpty(va012.getFIXMEDINS_BCHNO())){ - va012.setFIXMEDINS_BCHNO(ioCollectOrder.getBillNo()); + if(StringUtils.isEmpty(va013.getFIXMEDINS_BCHNO())){ + va013.setFIXMEDINS_BCHNO(ioCollectOrder.getBillNo()); } Xsck3505Request xsck3505Request = Xsck3505Request.builder() - .med_list_codg(va012.getMED_LIST_CODG()) - .fixmedins_hilist_id(va012.getFIXMEDINS_HILIST_ID()) - .fixmedins_hilist_name(va012.getFIXMEDINS_HILIST_NAME()) - .fixmedins_bchno(va012.getFIXMEDINS_BCHNO()) - .prsc_dr_cert_type(va012.getPRSC_DR_CERT_TYPE()) - .prsc_dr_certno(va012.getPRSC_DR_CERTNO()) - .prsc_dr_name(va012.getPRSC_DR_NAME()) - .phar_cert_type(va012.getPHAR_CERT_TYPE()) - .phar_certno(va012.getPHAR_CERTNO()) - .phar_name(va012.getPHAR_NAME()) - .phar_prac_cert_no(va012.getPHAR_PRAC_CERT_NO()) - .hi_feesetl_type(va012.getHI_FEESETL_TYPE()) - .setl_id(va012.getSETL_ID()) - .mdtrt_sn(va012.getMDTRT_SN()) - .psn_no(va012.getPSN_NO()) - .psn_cert_type(va012.getPSN_CERT_TYPE()) - .certno(va012.getCERTNO()) - .psn_name(va012.getPSN_NAME()) - .manu_lotnum(va012.getMANU_LOTNUM()) - .manu_date(va012.getMANU_DATE()) - .expy_end(va012.getEXPY_END()) - .rx_flag(va012.getRX_FLAG()) - .trdn_flag(va012.getTRDN_FLAG()) - .finl_trns_pric(va012.getFINL_TRNS_PRIC()) - .rxno(va012.getRXNO()) - .rx_circ_flag(va012.getRX_CIRC_FLAG()) - .rtal_docno(va012.getRTAL_DOCNO()) - .stoout_no(va012.getSTOOUT_NO()) - .bchno(va012.getBCHNO()) - .drug_prod_barc(va012.getRUG_PROD_BARC()) - .shelf_posi(va012.getSHELF_POSI()) - .sel_retn_cnt(va012.getSEL_RETN_CNT()) - .sel_retn_time(va012.getSEL_RETN_TIME()) - .sel_retn_opter_name(va012.getSEL_RETN_OPTER_NAME()) - .memo(va012.getMEMO()) - .mdtrt_setl_type(va012.getMDTRT_SETL_TYPE()) + .med_list_codg(va013.getMED_LIST_CODG()) + .fixmedins_hilist_id(va013.getFIXMEDINS_HILIST_ID()) + .fixmedins_hilist_name(va013.getFIXMEDINS_HILIST_NAME()) + .fixmedins_bchno(va013.getFIXMEDINS_BCHNO()) + .prsc_dr_cert_type(va013.getPRSC_DR_CERT_TYPE()) + .prsc_dr_certno(va013.getPRSC_DR_CERTNO()) + .prsc_dr_name(va013.getPRSC_DR_NAME()) + .phar_cert_type(va013.getPHAR_CERT_TYPE()) + .phar_certno(va013.getPHAR_CERTNO()) + .phar_name(va013.getPHAR_NAME()) + .phar_prac_cert_no(va013.getPHAR_PRAC_CERT_NO()) + .hi_feesetl_type(va013.getHI_FEESETL_TYPE()) + .setl_id(va013.getSETL_ID()) + .mdtrt_sn(va013.getMDTRT_SN()) + .psn_no(va013.getPSN_NO()) + .psn_cert_type(va013.getPSN_CERT_TYPE()) + .certno(va013.getCERTNO()) + .psn_name(va013.getPSN_NAME()) + .manu_lotnum(va013.getMANU_LOTNUM()) + .manu_date(va013.getMANU_DATE()) + .expy_end(va013.getEXPY_END()) + .rx_flag(va013.getRX_FLAG()) + .trdn_flag(va013.getTRDN_FLAG()) + .finl_trns_pric(va013.getFINL_TRNS_PRIC()) + .rxno(va013.getRXNO()) + .rx_circ_flag(va013.getRX_CIRC_FLAG()) + .rtal_docno(va013.getRTAL_DOCNO()) + .stoout_no(va013.getSTOOUT_NO()) + .bchno(va013.getBCHNO()) + .drug_prod_barc(va013.getRUG_PROD_BARC()) + .shelf_posi(va013.getSHELF_POSI()) + .sel_retn_cnt(va013.getSEL_RETN_CNT()) + .sel_retn_time(va013.getSEL_RETN_TIME()) + .sel_retn_opter_name(va013.getSEL_RETN_OPTER_NAME()) + .memo(va013.getMEMO()) + .mdtrt_setl_type(va013.getMDTRT_SETL_TYPE()) .drugtracinfo(drugTraceList).build(); log.error("xsck3505Request==="+xsck3505Request); @@ -2367,14 +2371,19 @@ public class HlfyyyClient extends CommonHttpClient { public BaseResponse optionUploadCollectOrder3506(IoCollectOrder ioCollectOrder) { VA011 va011 = va011Service.getOne(new LambdaQueryWrapper().eq(VA011::getCode, ioCollectOrder.getBillNo())); - List list = va013Mapper.selectList(new LambdaQueryWrapper().eq(VA013::getSTOOUT_NO, va011.getCode())); + List list = va012Mapper.selectList( + new LambdaQueryWrapper() + .eq(VA012::getSICK_ID, va011.getSickcode()) + .eq(VA012::getSETTLE_NO, va011.getCode()) + + ); if (CollUtil.isNotEmpty(list)) { List collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList(); List xsck3506Requests = new ArrayList<>(); for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) { BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId()); String itemCode = basicUdirelEntity.getMainId(); - for (VA013 item : list) { + for (VA012 item : list) { if (item.getMED_LIST_CODG().equals(itemCode)) { String[] codes = collectOrderBizResponse.getFinishUdiCode().split(","); List drugTraceList = new ArrayList<>(); @@ -2430,7 +2439,7 @@ public class HlfyyyClient extends CommonHttpClient { JSONObject dataJson = JSONObject.parseObject(jsonStr); - return ybClient.ybPostScyh("3505A", dataJson); + return ybClient.ybPost("3506", dataJson); } @Override diff --git a/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA012.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA012.java index 88b9585..43d7abf 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA012.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA012.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; @TableName(value = "v_a012") @Data @@ -108,7 +109,7 @@ public class VA012 { private Integer SEL_RETN_CNT; @TableField(value = "SEL_RETN_TIME") - private String SEL_RETN_TIME; + private Date SEL_RETN_TIME; @TableField(value = "SEL_RETN_OPTER_NAME") private String SEL_RETN_OPTER_NAME; diff --git a/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA013.java b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA013.java index ea16094..50fa0cd 100644 --- a/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA013.java +++ b/src/main/java/com/glxp/mipsdl/entity/hlfyyy/VA013.java @@ -109,7 +109,7 @@ public class VA013 { private Integer SEL_RETN_CNT; @TableField(value = "SEL_RETN_TIME") - private Date SEL_RETN_TIME; + private String SEL_RETN_TIME; @TableField(value = "SEL_RETN_OPTER_NAME") private String SEL_RETN_OPTER_NAME;