diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java index a5ca27d..bbdd0cf 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java @@ -1,5 +1,7 @@ package com.lyms.platform.common.enums; +import com.lyms.platform.common.utils.SystemConfig; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -13,7 +15,7 @@ import java.util.Map; public class PatientSerEnums { //服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询) public enum SerTypeEnums { - bzfw(6, "围产小助理"),//以前是:标准服务 + bzfw(6, (SystemConfig.HIS_VERSION != null && "4".equals(SystemConfig.HIS_VERSION)) ? "孕期产检提醒服务": "围产小助理"),//以前是:标准服务 yqjzzd(1, "精准医疗指导"), tz(2, "体重管理"), xt(3, "血糖管理"), diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java index 0a6a685..9c51000 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java @@ -1,5 +1,7 @@ package com.lyms.platform.common.enums; +import com.lyms.platform.common.utils.SystemConfig; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -13,7 +15,8 @@ public enum ServiceTypeEnums { ALL_SERVICE(100,"全部"), - STANDARD_SERVICE(0,"围产小助理"), + //秦皇岛区域围产小助理显示孕期产检提醒服务 + STANDARD_SERVICE(0, (SystemConfig.HIS_VERSION != null && "4".equals(SystemConfig.HIS_VERSION)) ? "孕期产检提醒服务": "围产小助理"), ADD_SERVICE(1,"增值服务"); diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java index a6ee488..5a6dc00 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java @@ -5,6 +5,9 @@ package com.lyms.platform.common.utils; */ public class SystemConfig { + + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); + // 地址类型 public static final String CHINA_TYPE_ID = "b7ea005c-dfac-4c2a-bdae-25239b3f44fd"; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java index aec85bc..b92eb94 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java @@ -49,13 +49,11 @@ public class TokenValidateInteceptor extends HandlerInterceptorAdapter { { String referer = request.getHeader("Referer"); String url = request.getRequestURL().toString(); - System.out.println("referer====="+referer); - System.out.println("url====="+url); - if (StringUtils.isNotEmpty(referer) && !referer.contains("area-xtrm-api.healthbaby.com.cn")) + if (StringUtils.isNotEmpty(referer) && !referer.contains("area-xtrm.healthbaby.com.cn")) { throw new ForbiddenException(); } - else if (StringUtils.isEmpty(referer) && !url.contains("area-xtrm-api.healthbaby.com.cn")) + else if (StringUtils.isNotEmpty(url) && !url.contains("area-xtrm-api.healthbaby.com.cn")) { throw new ForbiddenException(); }