云霄医保上传问题

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -1693,7 +1693,7 @@ public class CtqyyClient extends CommonHttpClient {
                     log.error("开始上传医保");
                     return optionUploadCollectOrder3502(ioCollectOrder);
                 } else if (matchBusType(busType, buyType_3505)) {
-                    optionUploadCollectOrder3505(ioCollectOrder);
+                    return optionUploadCollectOrder3505(ioCollectOrder);
                 } else if (matchBusType(busType, buyType_3506)) {
                     optionUploadCollectOrder3506(ioCollectOrder);
                 } else {
@@ -2061,20 +2061,28 @@ public class CtqyyClient extends CommonHttpClient {
     }
 
 
-    public void optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder) {
+    public BaseResponse optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder) {
         //摆药流水号
-        String stoout_no = StringUtils.isNotEmpty(ioCollectOrder.getBackupOrderRemark1()) ? ioCollectOrder.getBackupOrderRemark1() :ioCollectOrder.getBackupOrderRemark2();
+//        String stoout_no = StringUtils.isNotEmpty(ioCollectOrder.getBackupOrderRemark1()) ? ioCollectOrder.getBackupOrderRemark1() :ioCollectOrder.getBackupOrderRemark2();
-        log.error("stoout_no===",stoout_no);
+//        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())
+                );
+        if ( CollUtil.isNotEmpty(list)) {
+            String stoout_no = list.get(0).getSTOOUT_NO();
             List<VInsurNationGoodsPhysic> vInsurNationGoodsPhysics = goodsPhysicMapper.selectList(new LambdaQueryWrapper<VInsurNationGoodsPhysic>().eq(VInsurNationGoodsPhysic::getSTOOUT_NO, stoout_no));
-
+            log.error("vInsurNationGoodsPhysics==="+vInsurNationGoodsPhysics);
-        if (CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) {
+            if ( CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) {
                 List<CollectOrderBizResponse> collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList();
+                log.error("collectOrderBizResponseList==="+collectOrderBizResponseList);
+
                 List<Xsck3505Request> xsck3505Requests = new ArrayList<>();
                 for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) {
                     BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId());
                     String itemCode = basicUdirelEntity.getMainId();
                     for (VInsurNationGoodsPhysic vInsurNationGoodsPhysic : vInsurNationGoodsPhysics) {
-                    if (vInsurNationGoodsPhysic.getFIXMEDINS_HILIST_ID().equals(itemCode)) {
+                        if (vInsurNationGoodsPhysic.getMED_LIST_CODG().equals(itemCode)) {
                             String[] codes = collectOrderBizResponse.getFinishUdiCode().split(",");
                             List<DrugInfoRequest> drugTraceList = new ArrayList<>();
                             // 遍历fruits数组
@@ -2088,6 +2096,8 @@ public class CtqyyClient extends CommonHttpClient {
                                     }
                                 }
                             }
+                        log.error("vInsurNationGoodsPhysic==="+vInsurNationGoodsPhysic);
+
                         Xsck3505Request xsck3505Request = Xsck3505Request.builder()
                                     .med_list_codg(vInsurNationGoodsPhysic.getMED_LIST_CODG())
                                     .fixmedins_hilist_id(vInsurNationGoodsPhysic.getFIXMEDINS_HILIST_ID())
@@ -2126,6 +2136,8 @@ public class CtqyyClient extends CommonHttpClient {
                                     .memo(vInsurNationGoodsPhysic.getMEMO())
                                     .mdtrt_setl_type(vInsurNationGoodsPhysic.getMDTRT_SETL_TYPE())
                                     .drugtracinfo(drugTraceList).build();
+                        log.error("xsck3505Request==="+xsck3505Request);
+
                         xsck3505Requests.add(xsck3505Request);
                         }
                     }
@@ -2134,8 +2146,14 @@ public class CtqyyClient extends CommonHttpClient {
                 baseXsck3505Request.setSelinfoDetail(xsck3505Requests);
                 String jsonStr = JSONUtil.toJsonStr(baseXsck3505Request);
                 JSONObject dataJson = JSONObject.parseObject(jsonStr);
-            ybClient.ybPost("3505A", dataJson);
+                return ybClient.ybPost("3505A", dataJson);
             }
+        }else {
+            return ResultVOUtils.error(500,"上传医保数据为空请核实");
+
+        }
+        return ResultVOUtils.error(500,"上传医保数据为空请核实");
+
     }
 
 

src/main/java/com/glxp/mipsdl/service/yb/YbClient.java

@@ -81,7 +81,7 @@ public class YbClient {
             if(resp.getIsSuccess() == true
                 && org.apache.commons.lang3.StringUtils.isNotEmpty(resp.getAppid())
                     && "0".equals(resp.getInfCode())
-                    && org.apache.commons.lang3.StringUtils.isEmpty(resp.getErrMsg())
+                    && "成功".equals(resp.getErrMsg())
 
             ){
                 return ResultVOUtils.success("【" + apiNo + "】上传医保成功");