Browse Source

add his对接版本号

A17404李放 3 năm trước cách đây
mục cha
commit
0fab731a88

+ 2 - 1
nb-framework/src/main/java/com/nb/framework/config/SaTokenConfig.java

@@ -32,7 +32,7 @@ public class SaTokenConfig {
     private static final List<String> IGNORE_URL = Lists.newArrayList();
 
     static {
-        IGNORE_URL.add("/bus/app/page");
+        IGNORE_URL.add("/bus/version/page");
         IGNORE_URL.add("/druid/**");
         IGNORE_URL.add("/favicon.ico");
         IGNORE_URL.add("/sys/app/get");
@@ -48,6 +48,7 @@ public class SaTokenConfig {
         IGNORE_URL.add("/webjars/**");
         IGNORE_URL.add("/v2/api-docs/*");
         IGNORE_URL.add("/v2/api-docs");
+        IGNORE_URL.add("/v1/**");
         IGNORE_URL.add("/authority/captcha/**");
         IGNORE_URL.add("/system/curl/**");
         IGNORE_URL.add("/system/sysConfig/getTime");

+ 4 - 1
nb-system/src/main/java/com/nb/bus/service/LocalBusPatientService.java

@@ -119,7 +119,10 @@ public class LocalBusPatientService extends BaseService<BusPatientMapper, BusPat
         HisScriptSession hisScriptSession = hospitalManager.getScriptSession();
         HisStrategyEnum strategy = hospital.getStrategy();
         if (null == strategy || HisStrategyEnum.NONE.equals(strategy)) {
-            throw new CustomException("医院未对接his,请到【信息维护】->【HIS对接】配置his策略");
+            throw new CustomException("医院系统未对接,请到【信息维护】->【系统对接】配置对接策略");
+        }
+        if(hospital.getScript()==null||StrUtil.isEmpty(hospital.getScript().getContent())){
+            throw new CustomException("医院系统对接未配置【对接脚本】,请到【信息维护】->【系统对接】配置对接脚本并发布");
         }
         log.info("医院【{}】,开始拉取病号【{}】信息,拉取方式【{}】", hospitalId, patientCode, sync ? "同步" : "异步");
         return sync ? hisScriptSession.syncGetPatientInfo(patientCode, timeout, TimeUnit.SECONDS) : hisScriptSession.asyncGetPatientInfo(patientCode, timeout, TimeUnit.SECONDS, true);