Commit 512a5889c0953a761e932b8eec6becade15a9a0f
1 parent
b5546ca242
Exists in
master
and in
6 other branches
儿童高危不展示修改
Showing 3 changed files with 26 additions and 3 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
View file @
512a588
... | ... | @@ -8,6 +8,7 @@ |
8 | 8 | import org.springframework.data.mongodb.core.mapping.Document; |
9 | 9 | |
10 | 10 | import java.util.Date; |
11 | +import java.util.List; | |
11 | 12 | import java.util.Map; |
12 | 13 | |
13 | 14 | /** |
14 | 15 | |
... | ... | @@ -194,9 +195,13 @@ |
194 | 195 | |
195 | 196 | //是否高危儿童 0 非高危 1高危 |
196 | 197 | private Integer highRisk; |
198 | + //高危儿因素详情 | |
199 | + private List<String> highRiskInfo; | |
200 | + | |
197 | 201 | //是否是高危儿 |
198 | 202 | private Integer waskSon; |
199 | - | |
203 | + //低弱儿详情 | |
204 | + private List<String> waskSonInfo; | |
200 | 205 | // 修改时间 |
201 | 206 | private Date modified; |
202 | 207 | //创建时间 |
... | ... | @@ -422,6 +427,22 @@ |
422 | 427 | |
423 | 428 | public void setWaskSon(Integer waskSon) { |
424 | 429 | this.waskSon = waskSon; |
430 | + } | |
431 | + | |
432 | + public List<String> getHighRiskInfo() { | |
433 | + return highRiskInfo; | |
434 | + } | |
435 | + | |
436 | + public void setHighRiskInfo(List<String> highRiskInfo) { | |
437 | + this.highRiskInfo = highRiskInfo; | |
438 | + } | |
439 | + | |
440 | + public List<String> getWaskSonInfo() { | |
441 | + return waskSonInfo; | |
442 | + } | |
443 | + | |
444 | + public void setWaskSonInfo(List<String> waskSonInfo) { | |
445 | + this.waskSonInfo = waskSonInfo; | |
425 | 446 | } |
426 | 447 | |
427 | 448 | /***增加眼科检查项***/ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
512a588
... | ... | @@ -376,10 +376,12 @@ |
376 | 376 | model.setHighRisk(0); |
377 | 377 | } else { |
378 | 378 | model.setHighRisk(request.getHighRisk()); |
379 | + model.setHighRiskInfo(request.getHighRiskInfo()); | |
379 | 380 | } |
380 | 381 | if (request.getWeakSon() == null) { |
381 | 382 | model.setWaskSon(0); |
382 | 383 | } else { |
384 | + model.setWaskSonInfo(request.getWeakSonInfo()); | |
383 | 385 | model.setWaskSon(request.getWeakSon()); |
384 | 386 | } |
385 | 387 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
512a588
... | ... | @@ -4158,10 +4158,10 @@ |
4158 | 4158 | model.setRemark(babyModel.getMremark()); |
4159 | 4159 | //儿保添加高危儿因素 |
4160 | 4160 | model.setHighRisk(String.valueOf(babyModel.getHighRisk())); |
4161 | - List<Map> highRiskInfos = basicConfigFacade.queryBaseInfoByMap(babyModel.getHighRiskInfo()); | |
4161 | + List<Map> highRiskInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getHighRiskInfo()); | |
4162 | 4162 | model.setHighRiskInfo(highRiskInfos); |
4163 | 4163 | |
4164 | - List<Map> weakSonInfos = basicConfigFacade.queryBaseInfoByMap(babyModel.getWeakSonInfo()); | |
4164 | + List<Map> weakSonInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getWaskSonInfo()); | |
4165 | 4165 | model.setWeakSonInfo(weakSonInfos); |
4166 | 4166 | //后续更改 |
4167 | 4167 | model.setWeakSon(String.valueOf(babyModel.getWeakSon())); |