Commit fbe793d7b4b9f8b8aa774f048783da2ccb3a37f0
1 parent
0b3936f535
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 23 additions and 28 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
View file @
fbe793d
| ... | ... | @@ -266,7 +266,7 @@ |
| 266 | 266 | @TokenRequired |
| 267 | 267 | public BaseResponse findAntEx(@Valid AntExManagerQueryRequest antExManagerQueryRequest, HttpServletRequest request) { |
| 268 | 268 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 269 | - return antExRecordFacade.findList(antExManagerQueryRequest, loginState.getId(), false, "true",false); | |
| 269 | + return antExRecordFacade.findList(antExManagerQueryRequest, loginState.getId(), false, "true",antExManagerQueryRequest.isCurrent()); | |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
fbe793d
| ... | ... | @@ -320,38 +320,33 @@ |
| 320 | 320 | if (CollectionUtils.isNotEmpty(result.getrLevel())) |
| 321 | 321 | { |
| 322 | 322 | List<Map> list = result.getrLevel(); |
| 323 | + List<String> ids = new ArrayList<>(); | |
| 323 | 324 | for (Map map : list) |
| 324 | 325 | { |
| 325 | 326 | if(map.get("id") != null) |
| 326 | 327 | { |
| 327 | - if (map.get("id").toString().equals("224b2329-cb82-4da3-a071-8527f8283aab")) | |
| 328 | - { | |
| 329 | - result.setLevelNum(1); | |
| 330 | - break; | |
| 331 | - } | |
| 332 | - else if (map.get("id").toString().equals("eb146c03-b19f-4e28-b85f-fda574b2283b")) | |
| 333 | - { | |
| 334 | - result.setLevelNum(2); | |
| 335 | - break; | |
| 336 | - } | |
| 337 | - else if (map.get("id").toString().equals("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) | |
| 338 | - { | |
| 339 | - result.setLevelNum(3); | |
| 340 | - break; | |
| 341 | - } | |
| 342 | - else if (map.get("id").toString().equals("315107bd-91fe-42a1-9237-752f3c046a40")) | |
| 343 | - { | |
| 344 | - result.setLevelNum(4); | |
| 345 | - break; | |
| 346 | - } | |
| 347 | - else if (map.get("id").toString().equals("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) | |
| 348 | - { | |
| 349 | - result.setLevelNum(5); | |
| 350 | - break; | |
| 351 | - } | |
| 352 | - | |
| 328 | + ids.add(map.get("id").toString()); | |
| 353 | 329 | } |
| 354 | - | |
| 330 | + } | |
| 331 | + if (ids.contains("224b2329-cb82-4da3-a071-8527f8283aab")) | |
| 332 | + { | |
| 333 | + result.setLevelNum(1); | |
| 334 | + } | |
| 335 | + else if (ids.contains("eb146c03-b19f-4e28-b85f-fda574b2283b")) | |
| 336 | + { | |
| 337 | + result.setLevelNum(2); | |
| 338 | + } | |
| 339 | + else if (ids.contains("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) | |
| 340 | + { | |
| 341 | + result.setLevelNum(3); | |
| 342 | + } | |
| 343 | + else if (ids.contains("315107bd-91fe-42a1-9237-752f3c046a40")) | |
| 344 | + { | |
| 345 | + result.setLevelNum(4); | |
| 346 | + } | |
| 347 | + else if (ids.contains("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2")) | |
| 348 | + { | |
| 349 | + result.setLevelNum(5); | |
| 355 | 350 | } |
| 356 | 351 | } |
| 357 | 352 | } |