Commit 2518b73dd1c2fc81373b181adbf317ff8128d455
1 parent
50b33374ce
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 5 additions and 21 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
2518b73
| ... | ... | @@ -765,6 +765,7 @@ |
| 765 | 765 | } |
| 766 | 766 | |
| 767 | 767 | map1.put("oRiskId", map.get("fyyse")); |
| 768 | + map1.put("fpId", map.get("fxpf")); | |
| 768 | 769 | |
| 769 | 770 | if (needLevel) { |
| 770 | 771 | Object idObj1 = map.get("fyyse"); |
| ... | ... | @@ -846,6 +847,7 @@ |
| 846 | 847 | } |
| 847 | 848 | |
| 848 | 849 | map1.put("oRiskId", map.get("fyyse")); |
| 850 | + map1.put("fpId", map.get("fxpf")); | |
| 849 | 851 | |
| 850 | 852 | if (needLevel) { |
| 851 | 853 | Object idObj1 = map.get("fyyse"); |
| ... | ... | @@ -1459,8 +1461,6 @@ |
| 1459 | 1461 | if (patients != null) |
| 1460 | 1462 | { |
| 1461 | 1463 | HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true); |
| 1462 | - int score = 0; | |
| 1463 | - int index = -1; | |
| 1464 | 1464 | highRisk = highScoreResult.getHighRisk(); |
| 1465 | 1465 | if (CollectionUtils.isNotEmpty(highRisk)) |
| 1466 | 1466 | { |
| 1467 | 1467 | |
| 1468 | 1468 | |
| 1469 | 1469 | |
| ... | ... | @@ -1469,34 +1469,18 @@ |
| 1469 | 1469 | Map risk = (Map)highRisk.get(i); |
| 1470 | 1470 | if (risk != null && risk.size() > 0) |
| 1471 | 1471 | { |
| 1472 | - Object codeObj = risk.get("code"); | |
| 1473 | 1472 | Object idObj = risk.get("id"); |
| 1474 | - if (codeObj != null) | |
| 1475 | - { | |
| 1476 | - Integer code = Integer.valueOf(codeObj.toString()); | |
| 1477 | - score += code; | |
| 1478 | - } | |
| 1479 | - | |
| 1480 | 1473 | if (idObj == null || "".equals(idObj.toString())) |
| 1481 | 1474 | { |
| 1482 | 1475 | risk.put("color",risk.get("oRiskId")); |
| 1483 | 1476 | risk.remove("oRiskId"); |
| 1484 | - index = i; | |
| 1477 | + | |
| 1478 | + risk.put("code", risk.get("pfId")); | |
| 1479 | + risk.remove("pfId"); | |
| 1485 | 1480 | } |
| 1486 | 1481 | } |
| 1487 | 1482 | |
| 1488 | 1483 | } |
| 1489 | - } | |
| 1490 | - | |
| 1491 | - if (index > -1) | |
| 1492 | - { | |
| 1493 | - Integer otherScore = 0; | |
| 1494 | - if (highScoreResult.getScore() != null) | |
| 1495 | - { | |
| 1496 | - otherScore = highScoreResult.getScore() - score; | |
| 1497 | - } | |
| 1498 | - Map risk = (Map)highRisk.get(index); | |
| 1499 | - risk.put("code",otherScore); | |
| 1500 | 1484 | } |
| 1501 | 1485 | } |
| 1502 | 1486 |