平潭收费明细

src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java

@@ -456,7 +456,7 @@ public class PtxhyyClient extends CommonHttpClient {
         } catch (IOException e) {
             e.printStackTrace();
         }
-//        String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(null) + "/CKCX", ptxhyyInvRequest);
+//        response = httpClient.postJson(thrSystemDetailService.getUrlExclude(null) + "/CKCX", ptxhyyInvRequest);
 //        String response = "{\"code\": 20000,\"data\": {\"list\": [{\"zsl\": 1,\"fyxh\": 30274,\"dw\": \"根\",\"lb\": \"住院\",\"fymc\": \"一次性使用避光压力延长管/根\",\"fydj\": 13,\"rq\": 1709222400000,\"zxks\": \"新10区\"},{\"zsl\": 3,\"fyxh\": 35550,\"dw\": \"个\",\"lb\": \"住院\",\"fymc\": \"静脉林华留置针（苏州林华）/个\",\"fydj\": 3.12,\"rq\": 1709222400000,\"zxks\": \"精神科病区\"},{\"zsl\": 2,\"fyxh\": 29290,\"dw\": \"支\",\"lb\": \"住院\",\"fymc\": \"一次性采血针/支 (100.000%)\",\"fydj\": 0.28,\"rq\": 1709222400000,\"zxks\": \"精神科病区\"},{\"zsl\": 6,\"fyxh\": 29976,\"dw\": \"个\",\"lb\": \"住院\",\"fymc\": \"雾化面罩（口含式）/个 (100.000%)\",\"fydj\": 14.4,\"rq\": 1709222400000,\"zxks\": \"新11区\"},{\"zsl\": 1,\"fyxh\": 29298,\"dw\": \"支\",\"lb\": \"住院\",\"fymc\": \"一次性无菌注射器(1ml 带针)/支\",\"fydj\": 0.27,\"rq\": 1709222400000,\"zxks\": \"03区\"},{\"zsl\": 1,\"fyxh\": 29291,\"dw\": \"支\",\"lb\": \"住院\",\"fymc\": \"一次性使用静脉输液针（头皮针）/支 (100.000%)\",\"fydj\": 0.14,\"rq\": 1709222400000,\"zxks\": \"03区\"},{\"zsl\": 62,\"fyxh\": 29292,\"dw\": \"副\",\"lb\": \"住院\",\"fymc\": \"一次性使用代贴输液器（带针）/副 (100.000%)\",\"fydj\": 0.95,\"rq\": 1709222400000,\"zxks\": \"16区\"},{\"zsl\": 9,\"fyxh\": 30621,\"dw\": \"个\",\"lb\": \"住院\",\"fymc\": \"一次性使用真空采血管（促凝剂）/个\",\"fydj\": 0.58,\"rq\": 1709222400000,\"zxks\": \"05区\"},{\"zsl\": 66,\"fyxh\": 29294,\"dw\": \"支\",\"lb\": \"住院\",\"fymc\": \"一次性无菌注射器（5ml 带针)/支\",\"fydj\": 0.28,\"rq\": 1709222400000,\"zxks\": \"16区\"},{\"zsl\": 4,\"fyxh\": 29278,\"dw\": \"个\",\"lb\": \"住院\",\"fymc\": \"一次性使用负压引流袋/个\",\"fydj\": 5.8,\"rq\": 1709222400000,\"zxks\": \"04区\"}]}}";
         BaseResponse<PageSimpleResponse<PtxhInvResponse>> baseResponse =
                 JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<PtxhInvResponse>>>() {
@@ -491,7 +491,7 @@ public class PtxhyyClient extends CommonHttpClient {
                                 thrInvResultResponse.setType(ptxhInvResponse.getLb());
                                 thrInvResultResponse.setOutCount(ptxhInvResponse.getZsl());
                                 thrInvResultResponse.setReCount(ptxhInvResponse.getZsl());
-                                thrInvResultResponse.setBatchNo("/");
+                                thrInvResultResponse.setBatchNo(null);
                                 thrInvResultResponse.setSickerName(ptxhInvResponse.getBrxm());
                                 thrInvResultResponse.setSickerCode(ptxhInvResponse.getJzhm());
                                 if (StrUtil.isNotEmpty(ptxhInvResponse.getRq())) {

src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java

@@ -301,7 +301,7 @@ public class ZzzyyClient extends CommonHttpClient {
         uploadLog.setSubmitTime(new Date());
         uploadLog.setBillNo(orderEntity.getBillNo());
         uploadLog.setFromType(Constants.THIRD_ORDER_UPLOAD);
-        String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_ORDER_SUBMIT_URL), zaZyRequest);
+        String response = httpClient.postJson(thrSystemDetailService.getUrl(Constants.URL_NAME_ORDER_SUBMIT_URL), zaZyRequest);
         if (StrUtil.isNotBlank(response)) {
             try {
                 BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);

src/main/java/com/glxp/mipsdl/entity/ptxhyy/KsckEntity.java

@@ -0,0 +1,44 @@
+package com.glxp.mipsdl.entity.ptxhyy;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName("PORTAL_HIS.UDI_CKCX")
+public class KsckEntity {
+
+    @TableField("FYDJ")
+    private String fydj;
+    @TableField("FYXM")
+    private String fyxm;
+    @TableField("ZXKS")
+    private String zxks;
+    @TableField("ZSL")
+    private String zsl;
+    @TableField("FYXH")
+    private String fyxh;
+    @TableField("DW")
+    private String dw;
+    @TableField("JZHM")
+    private String jzhm;
+    @TableField("FYMC")
+    private String fymc;
+    @TableField("JZH")
+    private String jzh;
+    @TableField("SL")
+    private String sl;
+    @TableField("BRXM")
+    private String brxm;
+    @TableField("RQ")
+    private String rq;
+    @TableField("LB")
+    private String lb;
+    @TableField("ZXKSDM")
+    private String zxksdm;
+    @TableField("SSCK")
+    private String ssck;
+    @TableField("SSCKMC")
+    private String ssckmc;
+
+}

src/main/java/com/glxp/mipsdl/res/ptxhyy/PtxhInvResponse.java

@@ -1,21 +1,40 @@
 package com.glxp.mipsdl.res.ptxhyy;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 @Data
 public class PtxhInvResponse {
+    @TableField("FYDJ")
     private String fydj;
+    @TableField("FYXM")
     private String fyxm;
+    @TableField("ZXKS")
     private String zxks;
+    @TableField("ZSL")
     private String zsl;
+    @TableField("FYXH")
     private String fyxh;
+    @TableField("DW")
     private String dw;
+    @TableField("JZHM")
     private String jzhm;
+    @TableField("FYMC")
     private String fymc;
+    @TableField("JZH")
     private String jzh;
+    @TableField("SL")
     private String sl;
+    @TableField("BRXM")
     private String brxm;
+    @TableField("RQ")
     private String rq;
+    @TableField("LB")
     private String lb;
+    @TableField("ZXKSDM")
     private String zxksdm;
+    @TableField("SSCK")
+    private String ssck;
+    @TableField("SSCKMC")
+    private String ssckmc;
 }

src/main/java/com/glxp/mipsdl/service/thrsys/ThrCorpService.java

@@ -41,11 +41,11 @@ public class ThrCorpService {
                     .eq(BasicCorpEntity::getErpId, corpId));
             try {
                 //获取本服务配置的thirdId对应的第三方系统的往来单位名称和编码
-                String thirdCorpId = (String) ReflectUtil.getFieldValue(basicCorpEntity, basicCorpEntity.getClass().getField(thirdSysConfig.getThirdId()));
+//                String thirdCorpId = (String) ReflectUtil.getFieldValue(basicCorpEntity, basicCorpEntity.getClass().getField(thirdSysConfig.getThirdId()));
-                String thirdCorpName = (String) ReflectUtil.getFieldValue(basicCorpEntity, basicCorpEntity.getClass().getField(thirdSysConfig.getThirdName()));
+//                String thirdCorpName = (String) ReflectUtil.getFieldValue(basicCorpEntity, basicCorpEntity.getClass().getField(thirdSysConfig.getThirdName()));
-                thrCorpEntity.setUnitId(thirdCorpId);
+                thrCorpEntity.setUnitId(basicCorpEntity.getThirdId());
-                thrCorpEntity.setName(thirdCorpName);
+                thrCorpEntity.setName(basicCorpEntity.getName());
-                log.info("获取第三方系统往来单位成功，往来单位编码：{}，第三方系统往来单位编码：{}，名称：{}", corpId, thirdCorpId, thirdCorpName);
+//                log.info("获取第三方系统往来单位成功，往来单位编码：{}，第三方系统往来单位编码：{}，名称：{}", corpId, thirdCorpId, thirdCorpName);
                 return thrCorpEntity;
             } catch (Exception e) {
                 log.error("查询第三方系统往来单位异常，往来单位编码：{}, 异常信息：{}", corpId, e);

src/main/java/com/glxp/mipsdl/thirddao/ptxhyy/KsckMapper.java

@@ -0,0 +1,11 @@
+package com.glxp.mipsdl.thirddao.ptxhyy;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.mipsdl.entity.ptxhyy.KsckEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+@DS("ptxhSql")
+public interface KsckMapper extends BaseMapper<KsckEntity> {
+}

src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
       strict: false
       datasource:
         master:
-          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt2?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
           username: root
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver

src/main/resources/application-pro.yml

@@ -10,19 +10,19 @@ spring:
           password: Glxp@6066
           driver-class-name: com.mysql.cj.jdbc.Driver
         njsql:
-          url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
+          url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-          username: SD_UDIJK
+          username: root
-          password: SD_UDIJK
+          password: Glxp@6066
-          driver-class-name: oracle.jdbc.driver.OracleDriver
+          driver-class-name: com.mysql.cj.jdbc.Driver
         ptxhSql:
-          url: jdbc:oracle:thin:@55.55.0.1:1521/dbrac
+          url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-          username: udi
+          username: root
-          password: udi@2024.
+          password: Glxp@6066
-          driver-class-name: oracle.jdbc.driver.OracleDriver
+          driver-class-name: com.mysql.cj.jdbc.Driver
-      hikari:
+        hikari:
-        connection-timeout: 60000
+          connection-timeout: 60000
-        maximum-pool-size: 60
+          maximum-pool-size: 60
-        minimum-idle: 10
+          minimum-idle: 10
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 60