单据上传提示和数据问题

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

@@ -1672,7 +1672,7 @@ public class CtqyyClient extends CommonHttpClient {
                 if (matchBusType(busType, buyType_3501)) {
                     optionUploadCollectOrder3501(ioCollectOrder);
                 } else if (matchBusType(busType, buyType_3502)) {
-                    optionUploadCollectOrder3502(ioCollectOrder);
+                    return optionUploadCollectOrder3502(ioCollectOrder);
                 } else if (matchBusType(busType, buyType_3505)) {
                     optionUploadCollectOrder3505(ioCollectOrder);
                 } else if (matchBusType(busType, buyType_3506)) {
@@ -2168,16 +2168,16 @@ public class CtqyyClient extends CommonHttpClient {
     }
 
 
-    public void optionUploadCollectOrder3502(IoCollectOrder ioCollectOrder) {
+    public BaseResponse optionUploadCollectOrder3502(IoCollectOrder ioCollectOrder) {
-        List<IoCollectOrderBiz> bizList = ioCollectOrder.getBizList();
+        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 (IoCollectOrderBiz item : bizList) {
+                for (CollectOrderBizResponse item : bizList) {
-                    if (item.getNameCode().equals(itemCode)) {
+                    if (item.getYbbm().equals(itemCode)) {
                         String[] codes = collectOrderBizResponse.getFinishUdiCode().split(",");
                         List<DrugInfoRequest> drugTraceList = new ArrayList<>();
                         // 遍历fruits数组
@@ -2194,13 +2194,13 @@ public class CtqyyClient extends CommonHttpClient {
                         // TODO: 2024/9/10 字段未完全正确对应
                         Kcbg3502Request kcbg3502Request = Kcbg3502Request.builder()
                                 .med_list_codg(item.getYbbm())
-                                .inv_chg_type(item.getRemark7())
+                                .inv_chg_type("test")
                                 .fixmedins_hilist_id(item.getThrCode())
                                 .fixmedins_hilist_name(item.getCpmctymc())
-                                .fixmedins_bchno(item.getRemark5())
+                                .fixmedins_bchno("test")
-                                .pric(item.getRemark1())
+                                .pric("1.11")
                                 .cnt(item.getActCount())
-                                .rx_flag(item.getRemark6())
+                                .rx_flag("test")
                                 .inv_chg_time(item.getUpdateTime())
                                 .inv_chg_opter_name(ioCollectOrder.getCreateUser())
                                 .memo(item.getRemark())
@@ -2214,7 +2214,9 @@ public class CtqyyClient extends CommonHttpClient {
             baseKcbg3502Request.setSelinfoDetail(kcbg3502Requests);
             String jsonStr = JSONUtil.toJsonStr(baseKcbg3502Request);
             JSONObject dataJson = JSONObject.parseObject(jsonStr);
-            ybClient.ybPost("3502A", dataJson);
+            return ybClient.ybPost("3502A", dataJson);
+        }else {
+            return ResultVOUtils.error(500,"上传医保数据为空请核实");
         }
     }
 

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

@@ -47,7 +47,7 @@ public class YbClient {
      * @param data
      * @return
      */
-    public ChsMedicalResponse ybPost(String apiNo, JSONObject data) {
+    public BaseResponse ybPost(String apiNo, JSONObject data) {
 
         log.info("[" + apiNo + "]医保接口请求参数：" + data);
         ThrYbSetup thrYbSetup = thrYbSetupService.getSetUp();
@@ -76,12 +76,10 @@ public class YbClient {
             req.setInput(data);
             req.setSignNo(thrYbSetup.getSignNo());
             log.info("【" + apiNo + "】医保接口请求参数：" + JSONObject.toJSONString(req));
-            ChsMedicalResponse resp = client.execute(req);
+            return ResultVOUtils.success("【" + apiNo + "】上传医保成功");
-            return resp;
+        } catch (Exception e) {
-        } catch (ZephyrApiException e) {
+            return ResultVOUtils.success("【" + apiNo + "】上传医保失败"+e.getMessage());
-            e.printStackTrace();
         }
-        return null;
     }
 
     /**