From d1cd3f84b4fa3de6036388ba87655241701536db Mon Sep 17 00:00:00 2001 From: yewj Date: Thu, 5 Sep 2024 16:08:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 13 +++-- .../base/UdiwmsBasicSkPrescribeRequest.java | 4 +- src/main/resources/app-test.yml | 51 +++++++++++++++++++ 3 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/app-test.yml diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 0b15e85..8e2aab7 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -252,7 +252,10 @@ public class CtqyyClient extends CommonHttpClient { products.setName(dict.getPHYSIC_NAME()); products.setMeasname(dict.getPHYSIC_UNIT()); products.setSpec(dict.getPHYSIC_SPEC()); - products.setRegisterNo(dict.getPHYSIC_NO()); + products.setYbbm(dict.getCOUNTRY_CODE()); +// todo 少了制剂规格，制剂单位 dict.getPHYSIC_SPEC() +// dict.getPHYSIC_UNIT() +// products.setRegisterNo(dict.getPHYSIC_NO()); products.setProductType(2); return products; }).collect(Collectors.toList()); @@ -1416,7 +1419,7 @@ public class CtqyyClient extends CommonHttpClient { // } else { // return ResultVOUtils.error(500, "下载失败!"); // } - return this.ioCollectOrder(udiwmsBasicSkPrescribeRequest,page); + return this.ioCollectOrder(udiwmsBasicSkPrescribeRequest, page); } @@ -1456,11 +1459,12 @@ public class CtqyyClient extends CommonHttpClient { /** + * 中间表 * * @param udiwmsBasicSkPrescribeRequest * @return */ - private BaseResponse basicSkPrescribe(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest,IPage page){ + private BaseResponse basicSkPrescribe(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest, IPage page) { List presInfoEntities = page.getRecords(); if (CollUtil.isNotEmpty(presInfoEntities)) { //数据处理以basic_sk_prescribe，basic_sk_prescribe_item 主子返回 @@ -1506,7 +1510,8 @@ public class CtqyyClient extends CommonHttpClient { } /** - * 视图转为单据 + * 单据 + * * @param udiwmsBasicSkPrescribeRequest * @return */ diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java index 0380df4..2e1e6d7 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java @@ -90,12 +90,12 @@ public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest { /** * 处方赋码状态 1:未赋码；2：赋码中；3：已赋码 */ - private Byte tagStatus; + private Integer tagStatus; /** * 处方下载转换状态 1:未转换；2：部分转换；3：已转换 */ - private Byte trDiStatus; + private Integer trDiStatus; /** * 处方赋码错误信息 diff --git a/src/main/resources/app-test.yml b/src/main/resources/app-test.yml new file mode 100644 index 0000000..a22f7ea --- /dev/null +++ b/src/main/resources/app-test.yml @@ -0,0 +1,51 @@ +spring: + datasource: + dynamic: + primary: master + strict: false + datasource: + master: + url: jdbc:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: Glxp@6066 + driver-class-name: com.mysql.cj.jdbc.Driver + njsql: + # url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy + # username: SD_UDIJK + # password: SD_UDIJK + # driver-class-name: oracle.jdbc.driver.OracleDrive + url: jdbc:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: Glxp@6066 + driver-class-name: com.mysql.cj.jdbc.Driver + # thirdSql: + # url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + # username: root + # password: Glxp@6066 + # driver-class-name: com.mysql.cj.jdbc.Driver + ptxhSql: + # url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy + # username: SD_UDIJK + # password: SD_UDIJK + # driver-class-name: oracle.jdbc.driver.OracleDrive + url: jdbc:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: Glxp@6066 + driver-class-name: com.mysql.cj.jdbc.Driver + ctqyySql: + # url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy + # username: SD_UDIJK + # password: SD_UDIJK + # driver-class-name: oracle.jdbc.driver.OracleDrive + url: jdbc:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + username: root + password: Glxp@6066 + driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10 + hikari: + connection-timeout: 60000 + maximum-pool-size: 60 + minimum-idle: 10