lighter преди 2 месеца
родител
ревизия
2d11fc8054

+ 1 - 1
src/main/java/thyyxxk/wxservice_server/controller/api/PowersiMiPayPlugin.java

@@ -400,7 +400,7 @@
 //        } else {
 //            params.put("medRefdId", setlinfo.getMedRefdId());
 //        }
-//        params.put("orgCodg", "H43010500370");
+//        params.put("orgCodg", "H32132200561");
 //        JSONObject raw = JSONObject.parseObject(JSONObject.toJSONString(params));
 //        String body = dataHandler.buildReqData(raw);
 //        String url = "http://webhis.thyy.cn:8077/powersiMipRefundQuery";

+ 1 - 1
src/main/java/thyyxxk/wxservice_server/entity/medinsmobilepay/frompowersiplugin/request/OrderQueryRequest.java

@@ -12,7 +12,7 @@ public class OrderQueryRequest {
     /**
      * 医疗机构编号
      * */
-    private String orgCodg = "H43010500370";
+    private String orgCodg = "H32132200561";
 
     private String idType = "01";
     private String idNo;

+ 1 - 1
src/main/java/thyyxxk/wxservice_server/entity/medinsmobilepay/frompowersiplugin/request/RevokeSettleRequest.java

@@ -14,7 +14,7 @@ public class RevokeSettleRequest {
     /**
      * 医疗机构编号
      * */
-    private String orgCodg = "H43010500370";
+    private String orgCodg = "H32132200561";
 
     /**
      * 医疗机构退款编号(每次请求唯一)

+ 1 - 1
src/main/java/thyyxxk/wxservice_server/entity/medinsmobilepay/frompowersiplugin/response/Upload6201.java

@@ -10,7 +10,7 @@ public class Upload6201 {
     /**
      * 机构编码
      */
-    private String orgCodg = "H43010500370";
+    private String orgCodg = "H32132200561";
 
     private String mdtrtCertType = "02";
 

+ 4 - 3
src/main/java/thyyxxk/wxservice_server/service/IdCardAnalyzeService.java

@@ -27,9 +27,10 @@ import java.util.HashMap;
 @Slf4j
 @Service
 public class IdCardAnalyzeService {
-    private static final String APP_ID = "23575691";
-    private static final String API_KEY = "vORX44kXQ4EyecWmDKCMwzoT";
-    private static final String SECRET_KEY = "oDTPg0yC2a6hDhe63o5TgzuQMpZbkRDp";
+    // 百度OCR应用信息
+    private static final String APP_ID = "";
+    private static final String API_KEY = "";
+    private static final String SECRET_KEY = "";
     private final PatientCardsDao cardsDao;
     private final PushWxMessageService pushWxMessageService;
     private final ThmzService thmzService;

+ 1 - 1
src/main/java/thyyxxk/wxservice_server/utils/PhysicalCheckPDFUtil.java

@@ -142,7 +142,7 @@ public class PhysicalCheckPDFUtil {
 
     private static Paragraph getTitleParagraph(Font font) {
         Paragraph titleParagraph = new Paragraph();
-        Chunk titleChunkLine1 = new Chunk("长 沙 泰 和 医 院");
+        Chunk titleChunkLine1 = new Chunk("沭 阳 铭 和 医 院");
         titleChunkLine1.setFont(font);
         titleChunkLine1.setTextRise(-70);
         titleParagraph.add(titleChunkLine1);

+ 15 - 50
src/main/resources/application-dev.yml

@@ -4,13 +4,13 @@ server:
     context-path: /wxserver
 spring:
   application:
-    name: wxservice-server
+    name: wxservice-server-dev
   thymeleaf:
     cache: false
   datasource:
-    url: "jdbc:sqlserver://130.150.161.71:1433;databaseName=hisdb"
+    url: "jdbc:sqlserver://172.16.32.179:1433;databaseName=thxyhisdb"
     username: "sa"
-    password: "Symhyy@123"
+    password:
     driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
     druid:
       initial-size: 40
@@ -37,58 +37,23 @@ spring:
     format:
       date: yyyy-MM-dd
       date-time: yyyy-MM-dd HH:mm:ss
-
 mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
-management:
-  server:
-    port: 9092
-  endpoints:
-    web:
-      base-path: /actuator
-      exposure:
-        include: '*'
-  metrics:
-    export:
-      simple:
-        enabled: true
-      jmx:
-        enabled: true
-      prometheus:
-        enabled: true
-    distribution:
-      percentiles-histogram:
-        http:
-          server:
-            requests: false
-      minimum-expected-value:
-        http:
-          server:
-            requests: 20ms
-      maximum-expected-value:
-        http:
-          server:
-            requests: 200ms
-  endpoint:
-    metrics:
-      enabled: true
-    health:
-      show-details: always
-      probes:
-        enabled: true
-    prometheus:
-      enabled: true
 
 thyy:
   api-addr:
-    his-mip-api: http://130.150.161.72:1100/mobilePayApi
-    thmz-api: http://130.150.161.72:8089/thmz
-    chronic-api: http://130.150.161.72:8077/chronicDisease
-    physical-check-api: http://130.150.161.72:8888/bdp/dataservice/api
-    add-face-api: http://130.150.161.72:20923/thyy/api/haikang/door/addFaceRecognition
-  config:
-    dzfpdir: D:\wx-business\files\dzfp
+    his-mip-api: http://172.16.30.26:1100/mobilePayApi
+    thmz-api: http://demo.hnthyy.cn:8089//thmz
+    chronic-api: http://172.16.32.160:8077/chronicDisease
+    physical-check-api: http://172.16.32.183:8888/bdp/dataservice/api
+    add-face-api: http://172.16.30.66:20923/thyy/api/haikang/door/addFaceRecognition
+  dzfp-config:
+    dzfpdir: D:\\
     dzfpurl: https://staticweb.hnthyy.cn/dzfp
+  online-hosp:
+    app-key: csthyygv
+    app-secret: 91eRBXt2vlPYh8rM
+    app-url: https://weixin.ngarihealth.com/weixin/third/index
 
-production: false
+production: false

+ 1 - 1
src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: prod
+    active: dev