Commit 9197dab36cae4e80f6d51a0d851fc7acd326e2ab
1 parent
eb5b3150f9
Exists in
master
and in
6 other branches
服务名称修改
Showing 4 changed files with 12 additions and 6 deletions
- platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
- platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java
- platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java
platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
View file @
9197dab
1 | 1 | package com.lyms.platform.common.enums; |
2 | 2 | |
3 | +import com.lyms.platform.common.utils.SystemConfig; | |
4 | + | |
3 | 5 | import java.util.ArrayList; |
4 | 6 | import java.util.HashMap; |
5 | 7 | import java.util.List; |
... | ... | @@ -13,7 +15,7 @@ |
13 | 15 | public class PatientSerEnums { |
14 | 16 | //服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询) |
15 | 17 | public enum SerTypeEnums { |
16 | - bzfw(6, "围产小助理"),//以前是:标准服务 | |
18 | + bzfw(6, (SystemConfig.HIS_VERSION != null && "4".equals(SystemConfig.HIS_VERSION)) ? "孕期产检提醒服务": "围产小助理"),//以前是:标准服务 | |
17 | 19 | yqjzzd(1, "精准医疗指导"), |
18 | 20 | tz(2, "体重管理"), |
19 | 21 | xt(3, "血糖管理"), |
platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java
View file @
9197dab
1 | 1 | package com.lyms.platform.common.enums; |
2 | 2 | |
3 | +import com.lyms.platform.common.utils.SystemConfig; | |
4 | + | |
3 | 5 | import java.util.ArrayList; |
4 | 6 | import java.util.HashMap; |
5 | 7 | import java.util.List; |
... | ... | @@ -13,7 +15,8 @@ |
13 | 15 | |
14 | 16 | ALL_SERVICE(100,"全部"), |
15 | 17 | |
16 | - STANDARD_SERVICE(0,"围产小助理"), | |
18 | + //秦皇岛区域围产小助理显示孕期产检提醒服务 | |
19 | + STANDARD_SERVICE(0, (SystemConfig.HIS_VERSION != null && "4".equals(SystemConfig.HIS_VERSION)) ? "孕期产检提醒服务": "围产小助理"), | |
17 | 20 | |
18 | 21 | ADD_SERVICE(1,"增值服务"); |
19 | 22 |
platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java
View file @
9197dab
platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/TokenValidateInteceptor.java
View file @
9197dab
... | ... | @@ -49,13 +49,11 @@ |
49 | 49 | { |
50 | 50 | String referer = request.getHeader("Referer"); |
51 | 51 | String url = request.getRequestURL().toString(); |
52 | - System.out.println("referer====="+referer); | |
53 | - System.out.println("url====="+url); | |
54 | - if (StringUtils.isNotEmpty(referer) && !referer.contains("area-xtrm-api.healthbaby.com.cn")) | |
52 | + if (StringUtils.isNotEmpty(referer) && !referer.contains("area-xtrm.healthbaby.com.cn")) | |
55 | 53 | { |
56 | 54 | throw new ForbiddenException(); |
57 | 55 | } |
58 | - else if (StringUtils.isEmpty(referer) && !url.contains("area-xtrm-api.healthbaby.com.cn")) | |
56 | + else if (StringUtils.isNotEmpty(url) && !url.contains("area-xtrm-api.healthbaby.com.cn")) | |
59 | 57 | { |
60 | 58 | throw new ForbiddenException(); |
61 | 59 | } |