所有医保接口都加上通过关联关系获取下级码

scpwxyy
qiuyt 8 months ago
parent 4e665643ca
commit ca86297063

@ -51,6 +51,7 @@ import com.glxp.mipsdl.res.ctqyy.CtBaseResponse;
import com.glxp.mipsdl.res.ctqyy.ThrOrderResponse; import com.glxp.mipsdl.res.ctqyy.ThrOrderResponse;
import com.glxp.mipsdl.res.udiwms.*; import com.glxp.mipsdl.res.udiwms.*;
import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.auth.AuthWarehouseService;
import com.glxp.mipsdl.service.basic.RelCodeDetailService;
import com.glxp.mipsdl.service.order.OrderUploadLogService; import com.glxp.mipsdl.service.order.OrderUploadLogService;
import com.glxp.mipsdl.service.system.SysParamConfigService; import com.glxp.mipsdl.service.system.SysParamConfigService;
import com.glxp.mipsdl.service.thrsys.ThrCorpService; import com.glxp.mipsdl.service.thrsys.ThrCorpService;
@ -147,6 +148,8 @@ public class CtqyyClient extends CommonHttpClient {
VInsurNationGoodsReturnMapper vInsurNationGoodsReturnMapper; VInsurNationGoodsReturnMapper vInsurNationGoodsReturnMapper;
@Resource @Resource
private ThrProductsDao thrProductsDao; private ThrProductsDao thrProductsDao;
@Resource
private RelCodeDetailService relCodeDetailService;
/** /**
* xml * xml
@ -668,7 +671,7 @@ public class CtqyyClient extends CommonHttpClient {
.selectList(Wrappers.lambdaQuery(IoOrderInvoiceEntity.class).eq(IoOrderInvoiceEntity::getOrderIdFk, orderEntity.getBillNo()) .selectList(Wrappers.lambdaQuery(IoOrderInvoiceEntity.class).eq(IoOrderInvoiceEntity::getOrderIdFk, orderEntity.getBillNo())
.eq(IoOrderInvoiceEntity::getBindRlFk, i.getBindRlFk()) .eq(IoOrderInvoiceEntity::getBindRlFk, i.getBindRlFk())
.eq(StrUtil.isNotEmpty(i.getBatchNo()), IoOrderInvoiceEntity::getBatchNo, i.getBatchNo()). .eq(StrUtil.isNotEmpty(i.getBatchNo()), IoOrderInvoiceEntity::getBatchNo, i.getBatchNo()).
groupBy(IoOrderInvoiceEntity::getInvoiceEncode)); groupBy(IoOrderInvoiceEntity::getInvoiceEncode));
if (CollectionUtil.isNotEmpty(invoiceList)) { if (CollectionUtil.isNotEmpty(invoiceList)) {
fphm = invoiceList.stream().map(IoOrderInvoiceEntity::getInvoiceEncode).collect(Collectors.joining(",")); fphm = invoiceList.stream().map(IoOrderInvoiceEntity::getInvoiceEncode).collect(Collectors.joining(","));
if (invoiceList.get(0).getInvoiceDate() != null) if (invoiceList.get(0).getInvoiceDate() != null)
@ -1974,9 +1977,14 @@ public class CtqyyClient extends CommonHttpClient {
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
for (String code : codes) { for (String code : codes) {
DrugInfoRequest request = new DrugInfoRequest(); if (StrUtil.isNotBlank(code)) {
request.setDrug_trac_codg(code); List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
drugTraceList.add(request); if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
DrugInfoRequest request = new DrugInfoRequest();
request.setDrug_trac_codg(code);
drugTraceList.add(request);
}
}
} }
Xsck3505Request xsck3505Request = Xsck3505Request.builder() Xsck3505Request xsck3505Request = Xsck3505Request.builder()
.med_list_codg(vInsurNationGoodsPhysic.getMED_LIST_CODG()) .med_list_codg(vInsurNationGoodsPhysic.getMED_LIST_CODG())
@ -2043,9 +2051,14 @@ public class CtqyyClient extends CommonHttpClient {
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
for (String code : codes) { for (String code : codes) {
DrugInfoRequest request = new DrugInfoRequest(); if (StrUtil.isNotBlank(code)) {
request.setDrug_trac_codg(code); List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
drugTraceList.add(request); if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
DrugInfoRequest request = new DrugInfoRequest();
request.setDrug_trac_codg(code);
drugTraceList.add(request);
}
}
} }
// TODO: 2024/9/10 字段未完全正确对应 // TODO: 2024/9/10 字段未完全正确对应
Pcsc3501Request pcsc3501Request = Pcsc3501Request.builder() Pcsc3501Request pcsc3501Request = Pcsc3501Request.builder()
@ -2088,9 +2101,14 @@ public class CtqyyClient extends CommonHttpClient {
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
for (String code : codes) { for (String code : codes) {
DrugInfoRequest request = new DrugInfoRequest(); if (StrUtil.isNotBlank(code)) {
request.setDrug_trac_codg(code); List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
drugTraceList.add(request); if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
DrugInfoRequest request = new DrugInfoRequest();
request.setDrug_trac_codg(code);
drugTraceList.add(request);
}
}
} }
// TODO: 2024/9/10 字段未完全正确对应 // TODO: 2024/9/10 字段未完全正确对应
Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder() Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder()
@ -2138,9 +2156,14 @@ public class CtqyyClient extends CommonHttpClient {
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
for (String code : codes) { for (String code : codes) {
DrugInfoRequest request = new DrugInfoRequest(); if (StrUtil.isNotBlank(code)) {
request.setDrug_trac_codg(code); List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
drugTraceList.add(request); if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
DrugInfoRequest request = new DrugInfoRequest();
request.setDrug_trac_codg(code);
drugTraceList.add(request);
}
}
} }
// TODO: 2024/9/10 字段未完全正确对应 // TODO: 2024/9/10 字段未完全正确对应
Xsth3506Request xsth3506Request = Xsth3506Request.builder() Xsth3506Request xsth3506Request = Xsth3506Request.builder()

@ -1815,7 +1815,7 @@ public class ScpwxyyClient extends CommonHttpClient {
for (String code : codes) { for (String code : codes) {
if (StrUtil.isNotBlank(code)) { if (StrUtil.isNotBlank(code)) {
List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code); List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
if(relCodeDetailList!=null && relCodeDetailList.size() >0 ){ if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
for (RelCodeDetail relCodeDetail : relCodeDetailList) { for (RelCodeDetail relCodeDetail : relCodeDetailList) {
DrugInfoRequest request = new DrugInfoRequest(); DrugInfoRequest request = new DrugInfoRequest();
request.setDrug_trac_codg(relCodeDetail.getCurCode()); request.setDrug_trac_codg(relCodeDetail.getCurCode());
@ -1875,10 +1875,10 @@ public class ScpwxyyClient extends CommonHttpClient {
JSONObject dataJson = JSONObject.parseObject(jsonStr); JSONObject dataJson = JSONObject.parseObject(jsonStr);
return ybClient.ybPostScyh("3505A", dataJson); return ybClient.ybPostScyh("3505A", dataJson);
}else { } else {
return ResultVOUtils.error(500,"未上传医保视图数据查不到"); return ResultVOUtils.error(500, "未上传医保视图数据查不到");
} }
} }
@ -1898,9 +1898,14 @@ public class ScpwxyyClient extends CommonHttpClient {
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
for (String code : codes) { for (String code : codes) {
DrugInfoRequest request = new DrugInfoRequest(); if (StrUtil.isNotBlank(code)) {
request.setDrug_trac_codg(code); List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
drugTraceList.add(request); if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
DrugInfoRequest request = new DrugInfoRequest();
request.setDrug_trac_codg(code);
drugTraceList.add(request);
}
}
} }
// TODO: 2024/9/10 字段未完全正确对应 // TODO: 2024/9/10 字段未完全正确对应
Pcsc3501Request pcsc3501Request = Pcsc3501Request.builder() Pcsc3501Request pcsc3501Request = Pcsc3501Request.builder()
@ -1943,9 +1948,14 @@ public class ScpwxyyClient extends CommonHttpClient {
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
for (String code : codes) { for (String code : codes) {
DrugInfoRequest request = new DrugInfoRequest(); if (StrUtil.isNotBlank(code)) {
request.setDrug_trac_codg(code); List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
drugTraceList.add(request); if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
DrugInfoRequest request = new DrugInfoRequest();
request.setDrug_trac_codg(code);
drugTraceList.add(request);
}
}
} }
// TODO: 2024/9/10 字段未完全正确对应 // TODO: 2024/9/10 字段未完全正确对应
Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder() Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder()
@ -1993,9 +2003,14 @@ public class ScpwxyyClient extends CommonHttpClient {
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
for (String code : codes) { for (String code : codes) {
DrugInfoRequest request = new DrugInfoRequest(); if (StrUtil.isNotBlank(code)) {
request.setDrug_trac_codg(code); List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
drugTraceList.add(request); if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
DrugInfoRequest request = new DrugInfoRequest();
request.setDrug_trac_codg(code);
drugTraceList.add(request);
}
}
} }
// TODO: 2024/9/10 字段未完全正确对应 // TODO: 2024/9/10 字段未完全正确对应
Xsth3506Request xsth3506Request = Xsth3506Request.builder() Xsth3506Request xsth3506Request = Xsth3506Request.builder()
@ -2028,7 +2043,6 @@ public class ScpwxyyClient extends CommonHttpClient {
} }
BaseXsth3506Request baseXsth3506Request = new BaseXsth3506Request(); BaseXsth3506Request baseXsth3506Request = new BaseXsth3506Request();
baseXsth3506Request.setSelinfoDetail(xsth3506Requests); baseXsth3506Request.setSelinfoDetail(xsth3506Requests);
String jsonStr = JSONUtil.toJsonStr(baseXsth3506Request); String jsonStr = JSONUtil.toJsonStr(baseXsth3506Request);

@ -52,6 +52,7 @@ import com.glxp.mipsdl.res.PageSimpleResponse;
import com.glxp.mipsdl.res.ctqyy.CtBaseResponse; import com.glxp.mipsdl.res.ctqyy.CtBaseResponse;
import com.glxp.mipsdl.res.udiwms.*; import com.glxp.mipsdl.res.udiwms.*;
import com.glxp.mipsdl.service.auth.AuthWarehouseService; import com.glxp.mipsdl.service.auth.AuthWarehouseService;
import com.glxp.mipsdl.service.basic.RelCodeDetailService;
import com.glxp.mipsdl.service.order.OrderUploadLogService; import com.glxp.mipsdl.service.order.OrderUploadLogService;
import com.glxp.mipsdl.service.system.SysParamConfigService; import com.glxp.mipsdl.service.system.SysParamConfigService;
import com.glxp.mipsdl.service.thrsys.ThrCorpService; import com.glxp.mipsdl.service.thrsys.ThrCorpService;
@ -132,7 +133,8 @@ public class YxfyyyClient extends CommonHttpClient {
private VYpzsIoInfoMapper vYpzsIoInfoMapper; private VYpzsIoInfoMapper vYpzsIoInfoMapper;
@Resource @Resource
private YbClient ybClient; private YbClient ybClient;
@Resource
private RelCodeDetailService relCodeDetailService;
/** /**
* xml * xml
* *
@ -1803,9 +1805,14 @@ public class YxfyyyClient extends CommonHttpClient {
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
for (String code : codes) { for (String code : codes) {
DrugInfoRequest request = new DrugInfoRequest(); if (StrUtil.isNotBlank(code)) {
request.setDrug_trac_codg(code); List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
drugTraceList.add(request); if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
DrugInfoRequest request = new DrugInfoRequest();
request.setDrug_trac_codg(code);
drugTraceList.add(request);
}
}
} }
Xsck3505Request xsck3505Request = Xsck3505Request.builder() Xsck3505Request xsck3505Request = Xsck3505Request.builder()
.med_list_codg(vInsurNationGoodsPhysic.getMED_LIST_CODG()) .med_list_codg(vInsurNationGoodsPhysic.getMED_LIST_CODG())
@ -1872,9 +1879,14 @@ public class YxfyyyClient extends CommonHttpClient {
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
for (String code : codes) { for (String code : codes) {
DrugInfoRequest request = new DrugInfoRequest(); if (StrUtil.isNotBlank(code)) {
request.setDrug_trac_codg(code); List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
drugTraceList.add(request); if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
DrugInfoRequest request = new DrugInfoRequest();
request.setDrug_trac_codg(code);
drugTraceList.add(request);
}
}
} }
// TODO: 2024/9/10 字段未完全正确对应 // TODO: 2024/9/10 字段未完全正确对应
Pcsc3501Request pcsc3501Request = Pcsc3501Request.builder() Pcsc3501Request pcsc3501Request = Pcsc3501Request.builder()
@ -1917,9 +1929,14 @@ public class YxfyyyClient extends CommonHttpClient {
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
for (String code : codes) { for (String code : codes) {
DrugInfoRequest request = new DrugInfoRequest(); if (StrUtil.isNotBlank(code)) {
request.setDrug_trac_codg(code); List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
drugTraceList.add(request); if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
DrugInfoRequest request = new DrugInfoRequest();
request.setDrug_trac_codg(code);
drugTraceList.add(request);
}
}
} }
// TODO: 2024/9/10 字段未完全正确对应 // TODO: 2024/9/10 字段未完全正确对应
Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder() Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder()
@ -1967,9 +1984,14 @@ public class YxfyyyClient extends CommonHttpClient {
List<DrugInfoRequest> drugTraceList = new ArrayList<>(); List<DrugInfoRequest> drugTraceList = new ArrayList<>();
// 遍历fruits数组 // 遍历fruits数组
for (String code : codes) { for (String code : codes) {
DrugInfoRequest request = new DrugInfoRequest(); if (StrUtil.isNotBlank(code)) {
request.setDrug_trac_codg(code); List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
drugTraceList.add(request); if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
DrugInfoRequest request = new DrugInfoRequest();
request.setDrug_trac_codg(code);
drugTraceList.add(request);
}
}
} }
// TODO: 2024/9/10 字段未完全正确对应 // TODO: 2024/9/10 字段未完全正确对应
Xsth3506Request xsth3506Request = Xsth3506Request.builder() Xsth3506Request xsth3506Request = Xsth3506Request.builder()

@ -46,4 +46,6 @@ public class RelCodeDetailService extends ServiceImpl<RelCodeDetailMapper, RelCo
} }
} }
} }
} }

Loading…
Cancel
Save