|
|
@ -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()
|
|
|
|