lighter 4 anni fa
parent
commit
cce04a0e16

+ 1 - 1
src/main/java/thyyxxk/webserver/controller/yibao/YiBaoController.java

@@ -129,7 +129,7 @@ public class YiBaoController {
         }
         int count = routines.selectNotAllowedCount(param.getInpatientNo(), param.getAdmissTimes(), param.getLedgerSn());
         if (count > 0) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "此患者有已上传的医保失效药品,撤销上传将导致此药品无法重新上传!");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "此患者有已上传的医保失效药品,撤销上传将导致此药品无法重新上传!");
         }
         param.setStaffId(TokenUtil.getTokenUserId());
         return httpPost("cancelUploadFee", param, param.getResponceType());

+ 10 - 0
src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -74,6 +74,16 @@
       "name": "si-tj-url",
       "type": "java.lang.String",
       "description": "Description for si-tj-url."
+    },
+    {
+      "name": "si-readcard-url",
+      "type": "java.lang.String",
+      "description": "Description for si-readcard-url."
+    },
+    {
+      "name": "si-qrcode-url",
+      "type": "java.lang.String",
+      "description": "Description for si-qrcode-url."
     }
   ]
 }

+ 3 - 4
src/main/resources/application.yml

@@ -75,14 +75,13 @@ CSSYB_MT_PRE_CAL: http://172.16.32.159:1000/mzsyb/mzPreCalculate
 PROOFREAD: http://172.16.32.163:1111/proofread/start
 
 si-api-url: http://10.90.0.11:8081/isp/powercsb/1101
+si-readcard-url: http://10.90.0.23:8085/hsa-hgs-adapt/api/card/ initDll
+si-qrcode-url: http://10.136.2.127:20004/localcfc/api/hsecfc/localQrCodeQuery
 #hrg-api-url: http://webhis.thyy.cn:81/thmz/api/v1
 hrg-api-url: http://172.16.30.33:8089/thmz/api/v1
 powersi-api-url: http://172.16.32.183:8916/mmg-gateway
 triage-notify-url: http://localhost:8083/triage/roomScreen/pushMsg
 si-tj-url: http://jkglcsx.server.zhongmeihealth.com/openInter
-#si-tj-url: http://113.247.254.86:9022/openOnter
-#logging:
-#  level:
-#    thyyxxk.webserver.dao: debug
+