|
|
|
@ -2069,10 +2069,13 @@ public class yxfyClient extends CommonHttpClient {
|
|
|
|
|
// log.error("stoout_no===",stoout_no);
|
|
|
|
|
List<VYpzsPresInfo> list = vYpzsPresInfoMapper
|
|
|
|
|
.selectList(
|
|
|
|
|
new QueryWrapper<VYpzsPresInfo>().eq("STOOUT_NO",ioCollectOrder.getBillNo()).or().eq("PRESCRIBE_NUMBER",ioCollectOrder.getBillNo())
|
|
|
|
|
new QueryWrapper<VYpzsPresInfo>().eq("STOOUT_NO",ioCollectOrder.getBillNo())
|
|
|
|
|
);
|
|
|
|
|
if ( CollUtil.isNotEmpty(list)) {
|
|
|
|
|
|
|
|
|
|
String stoout_no = list.get(0).getSTOOUT_NO();
|
|
|
|
|
log.error("stoout_no==="+stoout_no);
|
|
|
|
|
|
|
|
|
|
List<VInsurNationGoodsPhysic> vInsurNationGoodsPhysics = goodsPhysicMapper.selectList(new LambdaQueryWrapper<VInsurNationGoodsPhysic>().eq(VInsurNationGoodsPhysic::getSTOOUT_NO, stoout_no));
|
|
|
|
|
log.error("vInsurNationGoodsPhysics==="+vInsurNationGoodsPhysics);
|
|
|
|
|
if ( CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) {
|
|
|
|
@ -2085,7 +2088,11 @@ public class yxfyClient extends CommonHttpClient {
|
|
|
|
|
String itemCode = basicUdirelEntity.getMainId();
|
|
|
|
|
for (VInsurNationGoodsPhysic vInsurNationGoodsPhysic : vInsurNationGoodsPhysics) {
|
|
|
|
|
if (vInsurNationGoodsPhysic.getMED_LIST_CODG().equals(itemCode)) {
|
|
|
|
|
String[] codes = collectOrderBizResponse.getFinishUdiCode().split(",");
|
|
|
|
|
String[] codes = new String[0];
|
|
|
|
|
if(StringUtils.isNotEmpty(collectOrderBizResponse.getFinishUdiCode())){
|
|
|
|
|
codes = collectOrderBizResponse.getFinishUdiCode().split(",");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
List<DrugInfoRequest> drugTraceList = new ArrayList<>();
|
|
|
|
|
// 遍历fruits数组
|
|
|
|
|
for (String code : codes) {
|
|
|
|
@ -2101,9 +2108,19 @@ public class yxfyClient extends CommonHttpClient {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
log.error("vInsurNationGoodsPhysic==="+vInsurNationGoodsPhysic);
|
|
|
|
|
log.error("vInsurNationGoodsPhysic==="+vInsurNationGoodsPhysic);
|
|
|
|
|
// 医保自费类型
|
|
|
|
|
if(StringUtils.isEmpty(vInsurNationGoodsPhysic.getMDTRT_SETL_TYPE()) || !"1".equals(vInsurNationGoodsPhysic.getMDTRT_SETL_TYPE())){
|
|
|
|
|
vInsurNationGoodsPhysic.setMDTRT_SETL_TYPE("2");
|
|
|
|
|
|
|
|
|
|
Xsck3505Request xsck3505Request = Xsck3505Request.builder()
|
|
|
|
|
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())
|
|
|
|
|
.fixmedins_hilist_name(vInsurNationGoodsPhysic.getFIXMEDINS_HILIST_NAME())
|
|
|
|
@ -2141,9 +2158,9 @@ public class yxfyClient extends CommonHttpClient {
|
|
|
|
|
.memo(vInsurNationGoodsPhysic.getMEMO())
|
|
|
|
|
.mdtrt_setl_type(vInsurNationGoodsPhysic.getMDTRT_SETL_TYPE())
|
|
|
|
|
.drugtracinfo(drugTraceList).build();
|
|
|
|
|
log.error("xsck3505Request==="+xsck3505Request);
|
|
|
|
|
log.error("xsck3505Request==="+xsck3505Request);
|
|
|
|
|
|
|
|
|
|
xsck3505Requests.add(xsck3505Request);
|
|
|
|
|
xsck3505Requests.add(xsck3505Request);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -2160,6 +2177,8 @@ public class yxfyClient extends CommonHttpClient {
|
|
|
|
|
return ResultVOUtils.error(500,"上传医保数据为空请核实");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public BaseResponse optionUploadCollectOrder35051(IoCollectOrder ioCollectOrder) {
|
|
|
|
|
List<CollectOrderBizResponse> bizList = ioCollectOrder.getCollectOrderBizResponseList();
|
|
|
|
|
|
|
|
|
@ -2213,10 +2232,6 @@ public class yxfyClient extends CommonHttpClient {
|
|
|
|
|
String formattedDate = sdf.format(ioCollectOrder.getBillTime());
|
|
|
|
|
//todo 处方药标志先写死 后面要商量怎么获得
|
|
|
|
|
String rxFlag ="1";
|
|
|
|
|
// 云霄妇幼没有外网所有写成空
|
|
|
|
|
if(StringUtils.isEmpty(item.getBatchNo())){
|
|
|
|
|
item.setBatchNo("null");
|
|
|
|
|
}
|
|
|
|
|
log.error("optionUploadCollectOrder35051===item==="+item);
|
|
|
|
|
Xsck35051Request xsck35051Request = Xsck35051Request.builder()
|
|
|
|
|
.med_list_codg(item.getYbbm())
|
|
|
|
@ -2252,7 +2267,7 @@ public class yxfyClient extends CommonHttpClient {
|
|
|
|
|
.shelf_posi(null)
|
|
|
|
|
.sel_retn_cnt(item.getCount())
|
|
|
|
|
.sel_retn_time(formattedDate)
|
|
|
|
|
.sel_retn_opter_name(ioCollectOrder.getCreateUser())
|
|
|
|
|
.sel_retn_opter_name(ioCollectOrder.getShipperName())
|
|
|
|
|
.memo(null)
|
|
|
|
|
.mdtrt_setl_type(null)
|
|
|
|
|
.drugtracinfo(drugTraceList).build();
|
|
|
|
|