湖里妇幼上传更新

src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java

@@ -2064,17 +2064,18 @@ public class HlfyyyClient extends CommonHttpClient {
 
 
     public BaseResponse optionUploadCollectOrder3502(IoCollectOrder ioCollectOrder) {
+//        List<CollectOrderBizResponse> bizList = ioCollectOrder.getCollectOrderBizResponseList();
         List<CollectOrderBizResponse> bizList = ioCollectOrder.getCollectOrderBizResponseList();
+
         if (CollUtil.isNotEmpty(bizList)) {
-            List<CollectOrderBizResponse> collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList();
             List<Kcbg3502Request> kcbg3502Requests = new ArrayList<>();
-            for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) {
-                BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId());
-                String itemCode = basicUdirelEntity.getMainId();
             for (CollectOrderBizResponse item : bizList) {
-                    if (item.getYbbm().equals(itemCode)) {
+                BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(item.getRelId());
-                        String[] codes = collectOrderBizResponse.getFinishUdiCode().split(",");
+                String itemCode = basicUdirelEntity.getMainId();
-                        String nameCode = collectOrderBizResponse.getNameCode();
+//                for (CollectOrderBizResponse item : collectOrderBizResponseList) {
+//                    if (item.getYbbm().equals(itemCode)) {
+                        String[] codes = item.getFinishUdiCode().split(",");
+                        String nameCode = item.getNameCode();
                         BasicProductsEntity basicProductsEntity  = basicProductsDao.selectOne(
                                 new QueryWrapper<BasicProductsEntity>().eq("nameCode",nameCode).last("limit 1")
                         );
@@ -2097,7 +2098,7 @@ public class HlfyyyClient extends CommonHttpClient {
                                 }
                                 // 级别为2的产品码不可能只有一个
                                 if(packLevel >1 && codeList.size() <2){
-                                    return ResultVOUtils.error(500,"大包装码关联关系拉取不到请检查");
+                                    return ResultVOUtils.error(500,"大包装码关联关系拉取不到请检查"+code);
                                 }
                             }
                         }
@@ -2128,8 +2129,8 @@ public class HlfyyyClient extends CommonHttpClient {
                                 .trdn_flag("0")
                                 .drugtracinfo(drugTraceList).build();
                         kcbg3502Requests.add(kcbg3502Request);
-                    }
+//                    }
-                }
+//                }
             }
             BaseKcbg3502Request baseKcbg3502Request = new BaseKcbg3502Request();
             baseKcbg3502Request.setInvinfoDetail(kcbg3502Requests);

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

@@ -76,9 +76,9 @@ public class YbClient {
             req.setInput(data);
             req.setSignNo(thrYbSetup.getSignNo());
             log.error("【" + apiNo + "】医保接口请求参数：" + JSONObject.toJSONString(req));
-//            ChsMedicalResponse resp = client.execute(req);
+            ChsMedicalResponse resp = client.execute(req);
-//            log.error("【" + apiNo + "】医保接口返回结果：" + JSONObject.toJSONString(resp));
+            log.error("【" + apiNo + "】医保接口返回结果：" + JSONObject.toJSONString(resp));
-              ChsMedicalResponse resp = new ChsMedicalResponse();
+//              ChsMedicalResponse resp = new ChsMedicalResponse();
             log.error("aaaa");
 
             if(resp.getIsSuccess() == true