Commit 5a015c1b0937be374fae6ee7458fdfc8308867e0
1 parent
d3412ff4b2
Exists in
master
and in
6 other branches
服务名称修改
Showing 3 changed files with 91 additions and 17 deletions
platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java
View file @
5a015c1
... | ... | @@ -23,7 +23,7 @@ |
23 | 23 | zjzx(5, "专家咨询服务"), |
24 | 24 | tw(7, "体温管理服务"), |
25 | 25 | //YFDC(8, "孕妇单次服务"), |
26 | - babyjzzz(10, "精准指导服务"), | |
26 | + babyjzzz(10, (SystemConfig.HIS_VERSION != null && "50".equals(SystemConfig.HIS_VERSION)) ? "健康咨询": "精准指导服务"), | |
27 | 27 | babyBzfw(11, "儿保小助理服务");//以前是:标准服务 |
28 | 28 | private Integer id; |
29 | 29 | private String title; |
... | ... | @@ -60,6 +60,47 @@ |
60 | 60 | } |
61 | 61 | |
62 | 62 | |
63 | + //周口 | |
64 | + public enum SerTypeZkEnums { | |
65 | + yqjzzd(1, "健康咨询"), | |
66 | + tz(2, "营养状况评估与咨询"), | |
67 | + babyjzzz(10, "健康咨询"), | |
68 | + babyBzfw(11, "儿保小助理服务");//以前是:标准服务 | |
69 | + private Integer id; | |
70 | + private String title; | |
71 | + | |
72 | + private SerTypeZkEnums(Integer id, String title) { | |
73 | + this.id = id; | |
74 | + this.title = title; | |
75 | + } | |
76 | + | |
77 | + public static String getTitle(Integer id) { | |
78 | + for (SerTypeZkEnums e : values()) { | |
79 | + if (e.getId() == id) { | |
80 | + return e.getTitle(); | |
81 | + } | |
82 | + } | |
83 | + return ""; | |
84 | + } | |
85 | + | |
86 | + public Integer getId() { | |
87 | + return id; | |
88 | + } | |
89 | + | |
90 | + public void setId(Integer id) { | |
91 | + this.id = id; | |
92 | + } | |
93 | + | |
94 | + public String getTitle() { | |
95 | + return title; | |
96 | + } | |
97 | + | |
98 | + public void setTitle(String title) { | |
99 | + this.title = title; | |
100 | + } | |
101 | + } | |
102 | + | |
103 | + | |
63 | 104 | //服务状态(1-开通、2-退订、3-过期、4-暂停) |
64 | 105 | public enum SerStatusEnums { |
65 | 106 | kt(1, "开通"), |
66 | 107 | |
67 | 108 | |
68 | 109 | |
69 | 110 | |
70 | 111 | |
... | ... | @@ -117,31 +158,64 @@ |
117 | 158 | //全部服务类型 |
118 | 159 | public static List getSerTypeAll() { |
119 | 160 | List<Object> list = new ArrayList<>(); |
120 | - for (SerTypeEnums enums : SerTypeEnums.values()) { | |
121 | - Map<String, Object> resultMap = new HashMap<>(); | |
122 | - resultMap.put("id", enums.getId()); | |
123 | - if (enums.getId() < 10) { | |
124 | - resultMap.put("name", "(孕妇)"+enums.getTitle()); | |
125 | - }else{ | |
126 | - resultMap.put("name", "(儿童)"+enums.getTitle()); | |
161 | + if ("50".equals(SystemConfig.HIS_VERSION)) | |
162 | + { | |
163 | + for (SerTypeZkEnums enums : SerTypeZkEnums.values()) { | |
164 | + Map<String, Object> resultMap = new HashMap<>(); | |
165 | + resultMap.put("id", enums.getId()); | |
166 | + if (enums.getId() < 10) { | |
167 | + resultMap.put("name", "(孕妇)"+enums.getTitle()); | |
168 | + }else{ | |
169 | + resultMap.put("name", "(儿童)"+enums.getTitle()); | |
170 | + } | |
171 | + | |
172 | + list.add(resultMap); | |
127 | 173 | } |
174 | + } | |
175 | + else | |
176 | + { | |
177 | + for (SerTypeEnums enums : SerTypeEnums.values()) { | |
178 | + Map<String, Object> resultMap = new HashMap<>(); | |
179 | + resultMap.put("id", enums.getId()); | |
180 | + if (enums.getId() < 10) { | |
181 | + resultMap.put("name", "(孕妇)"+enums.getTitle()); | |
182 | + }else{ | |
183 | + resultMap.put("name", "(儿童)"+enums.getTitle()); | |
184 | + } | |
128 | 185 | |
129 | - list.add(resultMap); | |
186 | + list.add(resultMap); | |
187 | + } | |
130 | 188 | } |
189 | + | |
131 | 190 | return list; |
132 | 191 | } |
133 | 192 | |
134 | 193 | //孕妇服务类型 |
135 | 194 | public static List getSerType() { |
136 | 195 | List<Object> list = new ArrayList<>(); |
137 | - for (SerTypeEnums enums : SerTypeEnums.values()) { | |
138 | - if (enums.getId() < 10) { | |
139 | - Map<String, Object> resultMap = new HashMap<>(); | |
140 | - resultMap.put("id", enums.getId()); | |
141 | - resultMap.put("name", enums.getTitle()); | |
142 | - list.add(resultMap); | |
196 | + if ("50".equals(SystemConfig.HIS_VERSION)) | |
197 | + { | |
198 | + for (SerTypeZkEnums enums : SerTypeZkEnums.values()) { | |
199 | + if (enums.getId() < 10) { | |
200 | + Map<String, Object> resultMap = new HashMap<>(); | |
201 | + resultMap.put("id", enums.getId()); | |
202 | + resultMap.put("name", enums.getTitle()); | |
203 | + list.add(resultMap); | |
204 | + } | |
143 | 205 | } |
144 | 206 | } |
207 | + else | |
208 | + { | |
209 | + for (SerTypeEnums enums : SerTypeEnums.values()) { | |
210 | + if (enums.getId() < 10) { | |
211 | + Map<String, Object> resultMap = new HashMap<>(); | |
212 | + resultMap.put("id", enums.getId()); | |
213 | + resultMap.put("name", enums.getTitle()); | |
214 | + list.add(resultMap); | |
215 | + } | |
216 | + } | |
217 | + } | |
218 | + | |
145 | 219 | return list; |
146 | 220 | } |
147 | 221 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
View file @
5a015c1
... | ... | @@ -46,7 +46,7 @@ |
46 | 46 | // urls.put("rp-hbnq-api.healthbaby.com.cn:18019","内丘"); |
47 | 47 | // urls.put("area-kaifeng-api.healthbaby.com.cn:12356","开封"); |
48 | 48 | // urls.put("area-weixian-api.healthbaby.com.cn:12356","威县"); |
49 | - // urls.put("rp-zk-api.healthbaby.com.cn","周口市妇幼保健院"); | |
49 | + urls.put("rp-zk-api.healthbaby.com.cn:8094","周口市妇幼保健院"); | |
50 | 50 | // urls.put("area-huaiyang-api.healthbaby.com.cn:12356","淮阳县人民医院"); |
51 | 51 | // urls.put("area-changyi-api.healthbaby.com.cn:12356","昌邑"); |
52 | 52 | // urls.put("area-xtrm-api.healthbaby.com.cn:12356","邢台人民医院系统"); |
platform-operate-api/src/main/resources/config.properties
View file @
5a015c1
... | ... | @@ -5,7 +5,7 @@ |
5 | 5 | #区域平台访问短信中心的token |
6 | 6 | center_token=e0c56363-00d6-42ee-bbe0-23c553583062 |
7 | 7 | |
8 | -#His系统版本 0:未使用,1:桓台,2:新乐,3:青龙县医院,4:秦皇岛妇幼,5:抚宁妇幼, 6: 德州妇幼,7:南充中心医院 30 衡水 | |
8 | +#His系统版本 0:未使用,1:桓台,2:新乐,3:青龙县医院,4:秦皇岛妇幼,5:抚宁妇幼, 6: 德州妇幼,7:南充中心医院 30 衡水 50周口妇幼 | |
9 | 9 | his_version=0 |
10 | 10 | |
11 | 11 | xt_version= |