上传医保提示优化

src/main/java/com/glxp/api/http/ErpBasicClient.java

@@ -280,7 +280,7 @@ public class ErpBasicClient {
             return listBaseResponse;
         } catch (Exception e) {
             log.error("获取医保单据信息", e);
-            return ResultVOUtils.error(500, "连接第三方系统接口服务出错");
+            return ResultVOUtils.error(500, "连接第三方系统接口服务出错"+e.getMessage());
         }
     }
 

src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java

@@ -163,5 +163,8 @@ public class CollectOrderBizResponse {
     private String workplaceQueueCode;
 
     private String spec;
-
+//    /**
+//     * 未赋码数量
+//     */
+//    private Integer uncodedCount;
 }

src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java

@@ -242,7 +242,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             List<IoCollectOrderBackup> collectOrderList = new ArrayList<>();
             collectOrderList.add(collectOrder);
             orderRequest.setCollectOrderList(collectOrderList);
-            BaseResponse<BasicSkPrescribeResponse> baseResponse = erpBasicClient.postOrder(orderRequest);
             // 判断此单据 有没有码已经上传过了一个有上传就进行错误返回
             String paramValue = systemParamConfigService.selectValueByParamKey("checkCodeUploading");
             if (StrUtil.isNotEmpty(paramValue) && paramValue.equals("0")) {
@@ -269,14 +268,14 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
                     List listCheckCode = baseResponseCheckCode.getData();
                     if (listCheckCode == null || listCheckCode.size() > 0) {
                         log.error("单据的所有码有已经传输过医保的，请核实");
-                        throw new JsonException("此单据的所有码有已经传输过医保的，请核实" + baseResponse.getMessage());
+                        throw new JsonException("此单据的所有码有已经传输过医保的，请核实" + baseResponseCheckCode.getMessage());
                     }
                 } else {
-                    throw new JsonException("查询码关联关系服务出差，" + baseResponse.getMessage());
+                    throw new JsonException("查询码关联关系服务出错，" + baseResponseCheckCode.getMessage());
                 }
             }
-
-
+            // 医保上传
+            BaseResponse<BasicSkPrescribeResponse> baseResponse = erpBasicClient.postOrder(orderRequest);
             log.debug("单据返回=========" + baseResponse);
             if (baseResponse.getCode() == 20000) {
                 // 触发上传 转发至中继服务 到外网 再到国家同步库

src/main/resources/mybatis/mapper/collect/IoCollectOrderBizBackupMapper.xml

@@ -7,7 +7,9 @@
         bp.nameCode                   diCode,
         bp.zczbhhzbapzbh,
         bp.manufactory,
-        COALESCE(bp.bzgg,icobb.ggxh) AS spec
+        COALESCE(bp.bzgg,icobb.ggxh) AS specm
+<!--        ,-->
+<!--        icobb.count - scanActCount as uncodedCount-->
         FROM io_collect_order_biz_backup icobb
         left join basic_udirel bu on icobb.relId = bu.id
         left join basic_products bp on bu.uuid = bp.uuid