Commit 382a2963b212d0ad0efa08190a93b103537ef8e9
1 parent
b5d8b86414
Exists in
master
and in
6 other branches
隆化11月需求-两癌
Showing 4 changed files with 184 additions and 1 deletions
- platform-common/src/main/java/com/lyms/platform/common/enums/LhUltrasoundContent.java
- platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CancerScreeningResult.java
platform-common/src/main/java/com/lyms/platform/common/enums/LhUltrasoundContent.java
View file @
382a296
1 | +package com.lyms.platform.common.enums; | |
2 | + | |
3 | +import com.lyms.platform.common.utils.StringUtils; | |
4 | + | |
5 | +/** | |
6 | + * 隆化-妇女健康管理-两癌-乳腺-乳腺彩超检查-超声所见 | |
7 | + * @Author: shiy | |
8 | + * @Date: 2021/11/18 | |
9 | + */ | |
10 | +public enum LhUltrasoundContent { | |
11 | + CSlevel1("1", "1级:阴性,超声上无异常发现。"), | |
12 | + CSlevel2("2", "2级:良性发现,本质上是非恶性的。"), | |
13 | + CSlevel3("3", "3级:可能良性发现,建议短期随访"), | |
14 | + CSlevel41("41", "4A级:属于低度可疑恶性;"), | |
15 | + CSlevel42("42", "4B级:有中度可能恶性的病灶;"), | |
16 | + CSlevel43("43", "4C级:恶性可能较大,但不像5级那样典型的恶性;"), | |
17 | + CSlevel5("5", "5级:高度提示恶性"), | |
18 | + CSlevel6("6", "6级:活检证实的恶性"); | |
19 | + | |
20 | + LhUltrasoundContent(String id, String name) { | |
21 | + this.id = id; | |
22 | + this.name = name; | |
23 | + } | |
24 | + | |
25 | + | |
26 | + public static String getName(String id) { | |
27 | + if(StringUtils.isEmpty(id)) { | |
28 | + return null; | |
29 | + } | |
30 | + LhUltrasoundContent[] values = LhUltrasoundContent.values(); | |
31 | + for (LhUltrasoundContent value : values) { | |
32 | + if (value.getId().equals(id)) { | |
33 | + return value.getName(); | |
34 | + } | |
35 | + } | |
36 | + return null; | |
37 | + } | |
38 | + private String id; | |
39 | + private String name; | |
40 | + | |
41 | + public String getId() { | |
42 | + return id; | |
43 | + } | |
44 | + | |
45 | + public void setId(String id) { | |
46 | + this.id = id; | |
47 | + } | |
48 | + | |
49 | + public String getName() { | |
50 | + return name; | |
51 | + } | |
52 | + | |
53 | + public void setName(String name) { | |
54 | + this.name = name; | |
55 | + } | |
56 | + | |
57 | +} |
platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
View file @
382a296
... | ... | @@ -49,7 +49,7 @@ |
49 | 49 | private String number; |
50 | 50 | //(一)病史情况 |
51 | 51 | //月经情况 |
52 | - //月经初潮年龄(岁) | |
52 | + //月经初潮年龄(岁)//隆化前端是以“,”分割的数据保存 | |
53 | 53 | private String bsYjage; |
54 | 54 | //最近一次末次月经 |
55 | 55 | private String bsZjyj; |
... | ... | @@ -230,6 +230,118 @@ |
230 | 230 | private String otherAbnormity; |
231 | 231 | //乳腺癌异常name |
232 | 232 | private String breastAbnormityName; |
233 | + | |
234 | + //哺乳史//原id展示。改为手写月份。历史数据展示:前端判断newYcFrs有没值。没有还用以前ycFrs字段展示 | |
235 | + private String newYcFrs; | |
236 | + | |
237 | + /** | |
238 | + * 既往史,原既往史改为5个类别。如果5个类别都为空,前端展示历史数据。 | |
239 | + */ | |
240 | + //1乳腺癌0,1;1的时候需要写情况 | |
241 | + private String nxa; | |
242 | + //乳腺癌注明情况 | |
243 | + private String nxaQk; | |
244 | + //2乳腺包块0,1;1的时候需要写情况 | |
245 | + private String nxbk; | |
246 | + //乳腺包块注明情况 | |
247 | + private String nxbkQk; | |
248 | + //3有无乳腺手术史 | |
249 | + private String ynNxsss; | |
250 | + //4有无激素替代治疗史0,1;1的时候需要写情况 | |
251 | + private String ynJstdzls; | |
252 | + //有无激素替代治疗史注明情况 | |
253 | + private String ynJstdzlsQk; | |
254 | + //5其他,请注明 | |
255 | + private String previousOther; | |
256 | + | |
257 | + /** | |
258 | + * 乳腺彩超检查 | |
259 | + * 超声所见 | |
260 | + *原文字展示。改为单选。newRxCssj展示用到enum(LhUltrasoundContent); | |
261 | + *历史数据展示:前端判断newRxCssj有没值。没有还用以前rxCssj字段展示 | |
262 | + */ | |
263 | + private String newRxCssj; | |
264 | + | |
265 | + | |
266 | + public String getNxa() { | |
267 | + return nxa; | |
268 | + } | |
269 | + | |
270 | + public void setNxa(String nxa) { | |
271 | + this.nxa = nxa; | |
272 | + } | |
273 | + | |
274 | + public String getNxaQk() { | |
275 | + return nxaQk; | |
276 | + } | |
277 | + | |
278 | + public void setNxaQk(String nxaQk) { | |
279 | + this.nxaQk = nxaQk; | |
280 | + } | |
281 | + | |
282 | + public String getNxbk() { | |
283 | + return nxbk; | |
284 | + } | |
285 | + | |
286 | + public void setNxbk(String nxbk) { | |
287 | + this.nxbk = nxbk; | |
288 | + } | |
289 | + | |
290 | + public String getNxbkQk() { | |
291 | + return nxbkQk; | |
292 | + } | |
293 | + | |
294 | + public void setNxbkQk(String nxbkQk) { | |
295 | + this.nxbkQk = nxbkQk; | |
296 | + } | |
297 | + | |
298 | + public String getYnNxsss() { | |
299 | + return ynNxsss; | |
300 | + } | |
301 | + | |
302 | + public void setYnNxsss(String ynNxsss) { | |
303 | + this.ynNxsss = ynNxsss; | |
304 | + } | |
305 | + | |
306 | + public String getYnJstdzls() { | |
307 | + return ynJstdzls; | |
308 | + } | |
309 | + | |
310 | + public void setYnJstdzls(String ynJstdzls) { | |
311 | + this.ynJstdzls = ynJstdzls; | |
312 | + } | |
313 | + | |
314 | + public String getYnJstdzlsQk() { | |
315 | + return ynJstdzlsQk; | |
316 | + } | |
317 | + | |
318 | + public void setYnJstdzlsQk(String ynJstdzlsQk) { | |
319 | + this.ynJstdzlsQk = ynJstdzlsQk; | |
320 | + } | |
321 | + | |
322 | + public String getPreviousOther() { | |
323 | + return previousOther; | |
324 | + } | |
325 | + | |
326 | + public void setPreviousOther(String previousOther) { | |
327 | + this.previousOther = previousOther; | |
328 | + } | |
329 | + | |
330 | + public String getNewRxCssj() { | |
331 | + return newRxCssj; | |
332 | + } | |
333 | + | |
334 | + public void setNewRxCssj(String newRxCssj) { | |
335 | + this.newRxCssj = newRxCssj; | |
336 | + } | |
337 | + | |
338 | + public String getNewYcFrs() { | |
339 | + return newYcFrs; | |
340 | + } | |
341 | + | |
342 | + public void setNewYcFrs(String newYcFrs) { | |
343 | + this.newYcFrs = newYcFrs; | |
344 | + } | |
233 | 345 | |
234 | 346 | public String getBreastAbnormityName() { |
235 | 347 | return breastAbnormityName; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
View file @
382a296
... | ... | @@ -303,6 +303,10 @@ |
303 | 303 | BaseResponse baseResponse = new BaseResponse(); |
304 | 304 | CancerScreeningModel cancerScreeningModel = cancerScreenService.findOneById(id); |
305 | 305 | CancerScreeningResult result = new CancerScreeningResult(); |
306 | + //超声所见内容翻译字段 | |
307 | + if(StringUtils.isNotEmpty(cancerScreeningModel.getNewRxCssj())){ | |
308 | + result.setNewRxCssjName(LhUltrasoundContent.getName(cancerScreeningModel.getNewRxCssj())); | |
309 | + } | |
306 | 310 | org.springframework.beans.BeanUtils.copyProperties(cancerScreeningModel,result); |
307 | 311 | //隆化-两癌-翻译乳腺癌名称 |
308 | 312 | result.setBreastAbnormityName(RxaZdycEnums.getName(null!=cancerScreeningModel.getBreastAbnormity()?cancerScreeningModel.getBreastAbnormity().toString():null)); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CancerScreeningResult.java
View file @
382a296
... | ... | @@ -12,6 +12,16 @@ |
12 | 12 | private String levelTypeStr; |
13 | 13 | |
14 | 14 | private String addressStr; |
15 | + //超声所见内容翻译字段 | |
16 | + private String newRxCssjName; | |
17 | + | |
18 | + public String getNewRxCssjName() { | |
19 | + return newRxCssjName; | |
20 | + } | |
21 | + | |
22 | + public void setNewRxCssjName(String newRxCssjName) { | |
23 | + this.newRxCssjName = newRxCssjName; | |
24 | + } | |
15 | 25 | |
16 | 26 | public String getNationStr() { |
17 | 27 | return nationStr; |