调用医保接口增加日志

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

@@ -2078,13 +2078,10 @@ public class CtqyyClient extends CommonHttpClient {
         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)) {
                 List<CollectOrderBizResponse> collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList();
-                log.error("collectOrderBizResponseList==="+collectOrderBizResponseList);
 
                 List<Xsck3505Request> xsck3505Requests = new ArrayList<>();
                 for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) {
@@ -2114,7 +2111,6 @@ public class CtqyyClient extends CommonHttpClient {
                                     }
                                 }
                             }
-                            log.error("vInsurNationGoodsPhysic==="+vInsurNationGoodsPhysic);
                             // 医保自费类型
                             if(StringUtils.isEmpty(vInsurNationGoodsPhysic.getMDTRT_SETL_TYPE()) || !"1".equals(vInsurNationGoodsPhysic.getMDTRT_SETL_TYPE())){
                                 vInsurNationGoodsPhysic.setMDTRT_SETL_TYPE("2");
@@ -2164,7 +2160,6 @@ 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);
                         }
@@ -2174,7 +2169,7 @@ public class CtqyyClient extends CommonHttpClient {
                 baseXsck3505Request.setSelinfoDetail(xsck3505Requests);
                 String jsonStr = JSONUtil.toJsonStr(baseXsck3505Request);
                 JSONObject dataJson = JSONObject.parseObject(jsonStr);
-                return ybClient.ybPost("3505A", dataJson);
+                return ybClient.ybPost("3505A", dataJson,ioCollectOrder.getBillNo());
             }
         }else {
             return ResultVOUtils.error(500,"上传医保数据为空请核实");
@@ -2288,7 +2283,7 @@ public class CtqyyClient extends CommonHttpClient {
             baseXsck35051Request.setSelinfoDetail(xsck35051Requests);
             String jsonStr = JSONUtil.toJsonStr(baseXsck35051Request);
             JSONObject dataJson = JSONObject.parseObject(jsonStr);
-            return ybClient.ybPost("35051", dataJson);
+            return ybClient.ybPost("35051", dataJson,ioCollectOrder.getBillNo());
         } else {
             return ResultVOUtils.error(500, "上传医保数据为空请核实");
         }
@@ -2344,7 +2339,7 @@ public class CtqyyClient extends CommonHttpClient {
             basePcsc3501Request.setSelinfoDetail(pcsc3501Requests);
             String jsonStr = JSONUtil.toJsonStr(basePcsc3501Request);
             JSONObject dataJson = JSONObject.parseObject(jsonStr);
-            ybClient.ybPost("3501A", dataJson);
+            ybClient.ybPost("3501A", dataJson,ioCollectOrder.getBillNo());
         }
     }
 
@@ -2422,7 +2417,7 @@ public class CtqyyClient extends CommonHttpClient {
             baseKcbg3502Request.setInvinfoDetail(kcbg3502Requests);
             String jsonStr = JSONUtil.toJsonStr(baseKcbg3502Request);
             JSONObject dataJson = JSONObject.parseObject(jsonStr);
-            return ybClient.ybPost("3502A", dataJson);
+            return ybClient.ybPost("3502A", dataJson,ioCollectOrder.getBillNo());
         }else {
             return ResultVOUtils.error(500,"上传医保数据为空请核实");
         }
@@ -2498,8 +2493,7 @@ public class CtqyyClient extends CommonHttpClient {
         baseXsth3506Request.setSelinfoDetail(xsth3506Requests);
         String jsonStr = JSONUtil.toJsonStr(baseXsth3506Request);
         JSONObject dataJson = JSONObject.parseObject(jsonStr);
-        ybClient.ybPost("3506A", dataJson);
+        return ybClient.ybPost("3506A", dataJson,ioCollectOrder.getBillNo());
-        return ybClient.ybPostScyh("3505A", dataJson);
 
     }
 

src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java

@@ -1862,7 +1862,7 @@ public class YxfyyyClient extends CommonHttpClient {
             baseXsck3505Request.setSelinfoDetail(xsck3505Requests);
             String jsonStr = JSONUtil.toJsonStr(baseXsck3505Request);
             JSONObject dataJson = JSONObject.parseObject(jsonStr);
-            ybClient.ybPost("3505A", dataJson);
+            ybClient.ybPost("3505A", dataJson,ioCollectOrder.getBillNo());
         }
     }
 
@@ -1912,7 +1912,7 @@ public class YxfyyyClient extends CommonHttpClient {
             basePcsc3501Request.setSelinfoDetail(pcsc3501Requests);
             String jsonStr = JSONUtil.toJsonStr(basePcsc3501Request);
             JSONObject dataJson = JSONObject.parseObject(jsonStr);
-            ybClient.ybPost("3501A", dataJson);
+            ybClient.ybPost("3501A", dataJson,ioCollectOrder.getBillNo());
         }
     }
 
@@ -1963,7 +1963,7 @@ public class YxfyyyClient extends CommonHttpClient {
             baseKcbg3502Request.setInvinfoDetail(kcbg3502Requests);
             String jsonStr = JSONUtil.toJsonStr(baseKcbg3502Request);
             JSONObject dataJson = JSONObject.parseObject(jsonStr);
-            ybClient.ybPost("3502A", dataJson);
+            ybClient.ybPost("3502A", dataJson,ioCollectOrder.getBillNo());
         }
     }
 
@@ -2030,7 +2030,7 @@ public class YxfyyyClient extends CommonHttpClient {
         baseXsth3506Request.setSelinfoDetail(xsth3506Requests);
         String jsonStr = JSONUtil.toJsonStr(baseXsth3506Request);
         JSONObject dataJson = JSONObject.parseObject(jsonStr);
-        ybClient.ybPost("3506A", dataJson);
+        ybClient.ybPost("3506A", dataJson,ioCollectOrder.getBillNo());
     }
 
     /**

src/main/java/com/glxp/mipsdl/controller/YbApiController.java

@@ -52,7 +52,7 @@ public class YbApiController {
         String jsonStr = JSONUtil.toJsonStr(baseYljg1201Request);
         log.error("【1201】医药机构信息获取请求参数：" + jsonStr);
         JSONObject dataJson = JSONObject.parseObject(jsonStr);
-        return ResultVOUtils.success(ybClient.ybPost("1201", dataJson));
+        return ResultVOUtils.success(ybClient.ybPost("1201", dataJson,null));
     }
 
 
@@ -64,7 +64,7 @@ public class YbApiController {
         String jsonStr = JSONUtil.toJsonStr(dictRequest.getData());
         log.error("【1301】通用字典下载接口请求参数：" + jsonStr);
         JSONObject dataJson = JSONObject.parseObject(jsonStr);
-        return ResultVOUtils.success(ybClient.ybPost(dictRequest.getApiCode(), dataJson));
+        return ResultVOUtils.success(ybClient.ybPost(dictRequest.getApiCode(), dataJson,null));
     }
 
 
@@ -76,7 +76,7 @@ public class YbApiController {
         String jsonStr = JSONUtil.toJsonStr(dictRequest.getOrder());
         JSONObject dataJson = JSONObject.parseObject(jsonStr);
 //        JSONArray jsonObject = dataJson.getJSONArray("selinfoDetail");
-        return ResultVOUtils.success(ybClient.ybPost(dictRequest.getApiCode(), dataJson));
+        return ResultVOUtils.success(ybClient.ybPost(dictRequest.getApiCode(), dataJson,null));
     }
 
 
@@ -91,7 +91,7 @@ public class YbApiController {
         String jsonStr = JSONUtil.toJsonStr(baseYbRequest);
         log.error("【9001】医药机构信息获取请求参数：" + jsonStr);
         JSONObject dataJson = JSONObject.parseObject(jsonStr);
-        return ResultVOUtils.success(ybClient.ybPost("9001", dataJson));
+        return ResultVOUtils.success(ybClient.ybPost("9001", dataJson,null));
     }
 
     @PostMapping("/udiwms/erp/yb/test")
@@ -218,7 +218,7 @@ public class YbApiController {
                     baseXsck3505Request.setSelinfoDetail(xsck3505Requests);
                     String jsonStr = JSONUtil.toJsonStr(baseXsck3505Request);
                     JSONObject dataJson = JSONObject.parseObject(jsonStr);
-                    ybClient.ybPost("3505A", dataJson);
+                    ybClient.ybPost("3505A", dataJson,ioCollectOrder.getBillNo());
                 }
             }
         }

src/main/java/com/glxp/mipsdl/dao/yb/YbUploadingLogMapper.java

@@ -0,0 +1,9 @@
+package com.glxp.mipsdl.dao.yb;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.mipsdl.entity.yb.YbUploadingLog;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface YbUploadingLogMapper extends BaseMapper<YbUploadingLog> {
+}

src/main/java/com/glxp/mipsdl/entity/yb/YbUploadingLog.java

@@ -0,0 +1,43 @@
+package com.glxp.mipsdl.entity.yb;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Data;
+
+@Data
+@TableName(value = "yb_uploading_log")
+public class YbUploadingLog {
+    @TableId(value = "id", type = IdType.INPUT)
+    private Integer id;
+
+    /**
+     * 医保入参
+     */
+    @TableField(value = "ybParam")
+    private String ybParam;
+
+    /**
+     * 医保返回
+     */
+    @TableField(value = "ybReturn")
+    private String ybReturn;
+
+    /**
+     * 单据号
+     */
+    @TableField(value = "billNo")
+    private String billNo;
+    /**
+     * 医保接口号
+     */
+    @TableField(value = "apiNo")
+    private String apiNo;
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    private Date updateTime;
+}

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

@@ -12,8 +12,10 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.glxp.mipsdl.dao.yb.YbUploadingLogMapper;
 import com.glxp.mipsdl.entity.system.ThrYbSetup;
 import com.glxp.mipsdl.entity.system.ThrYbSetupMapper;
+import com.glxp.mipsdl.entity.yb.YbUploadingLog;
 import com.glxp.mipsdl.res.BaseResponse;
 import com.glxp.mipsdl.service.basic.RelCodeDetailService;
 import com.glxp.mipsdl.service.system.ThrYbSetupService;
@@ -38,7 +40,7 @@ public class YbClient {
     @Resource
     ThrYbSetupMapper thrYbSetupMapper;
     @Resource
-    RelCodeDetailService relCodeDetailService;
+    YbUploadingLogMapper YbUploadingLogMapper;
 
     /**
      * 易联众
@@ -47,7 +49,7 @@ public class YbClient {
      * @param data
      * @return
      */
-    public BaseResponse ybPost(String apiNo, JSONObject data) {
+    public BaseResponse ybPost(String apiNo, JSONObject data,String billNo) {
 
 //        log.info("[" + apiNo + "]医保接口请求参数：" + data);
         ThrYbSetup thrYbSetup = thrYbSetupService.getSetUp();
@@ -58,6 +60,9 @@ public class YbClient {
         SignTypeEnum signType = SignTypeEnum.SM3;
         EncryptionModeEnum encType = EncryptionModeEnum.SM4;
         String msgId = thrYbSetup.getFixmedins_code() + DateUtil.formatYbDateTime(new Date()) + thrYbSetup.getSequenceNum();
+        String reqStr =null;
+        String respStr =null;
+
         try {
 
             ZephyrMedicalClient client = new ZephyrMedicalClient(thrYbSetup.getUrl(), infno, thrYbSetup.getAppId(), thrYbSetup.getAppSecret(),
@@ -75,9 +80,14 @@ public class YbClient {
 
             req.setInput(data);
             req.setSignNo(thrYbSetup.getSignNo());
-            log.error("【" + apiNo + "】医保接口请求参数：" + JSONObject.toJSONString(req));
+            reqStr =JSONObject.toJSONString(req);
+
+            log.error("【" + apiNo + "】医保接口请求参数：" + reqStr);
             ChsMedicalResponse resp = client.execute(req);
-            log.error("【" + apiNo + "】医保接口返回结果：" + JSONObject.toJSONString(resp));
+            respStr = JSONObject.toJSONString(resp);
+
+            log.error("【" + apiNo + "】医保接口返回结果：" +respStr);
+
 //              ChsMedicalResponse resp = new ChsMedicalResponse();
 
             if(resp.getIsSuccess() == true
@@ -98,7 +108,16 @@ public class YbClient {
             return ResultVOUtils.error(500,"【" + apiNo + "】上传医保失败==="+resp.getErrMsg());
 
         } catch (Exception e) {
+            respStr = e.getMessage();
             return ResultVOUtils.error(500,"【" + apiNo + "】上传医保失败"+e.getMessage());
+        }finally {
+                YbUploadingLog ybUploadingLog = new YbUploadingLog();
+                ybUploadingLog.setYbParam(reqStr);
+                ybUploadingLog.setYbReturn(respStr);
+                ybUploadingLog.setBillNo(billNo);
+                ybUploadingLog.setApiNo(apiNo);
+                ybUploadingLog.setUpdateTime(new Date());
+                YbUploadingLogMapper.insert(ybUploadingLog);
         }
     }
 

src/main/resources/mybatis/mapper/master/drugcabinet/YbUploadingLogMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.mipsdl.dao.yb.YbUploadingLogMapper">
+  <resultMap id="BaseResultMap" type="com.glxp.mipsdl.entity.yb.YbUploadingLog">
+    <!--@mbg.generated-->
+    <!--@Table yb_uploading_log-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="ybParam" jdbcType="LONGVARCHAR" property="ybparam" />
+    <result column="ybReturn" jdbcType="LONGVARCHAR" property="ybreturn" />
+    <result column="billNo" jdbcType="VARCHAR" property="billno" />
+    <result column="updateTime" jdbcType="TIMESTAMP" property="updatetime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, ybParam, ybReturn, billNo, updateTime
+  </sql>
+</mapper>