Commit c8adca13359b6462281ca41121651c9aebbafdd1
1 parent
c0ed9e59c7
Exists in
master
and in
1 other branch
增加其他高危因素
Showing 3 changed files with 24 additions and 2 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
View file @
c8adca1
| ... | ... | @@ -198,6 +198,8 @@ |
| 198 | 198 | private List<String> riskFactorId; |
| 199 | 199 | //建档时高危风险id |
| 200 | 200 | private List<String> firstRiskFactorId; |
| 201 | + //自定义的高危因素 | |
| 202 | + private String oRiskFactor; | |
| 201 | 203 | //风险等级颜色 |
| 202 | 204 | private String riskLevelId; |
| 203 | 205 | //高危评分值 |
| ... | ... | @@ -232,6 +234,13 @@ |
| 232 | 234 | //操作人 |
| 233 | 235 | private Integer operator; |
| 234 | 236 | |
| 237 | + public String getoRiskFactor() { | |
| 238 | + return oRiskFactor; | |
| 239 | + } | |
| 240 | + | |
| 241 | + public void setoRiskFactor(String oRiskFactor) { | |
| 242 | + this.oRiskFactor = oRiskFactor; | |
| 243 | + } | |
| 235 | 244 | |
| 236 | 245 | public Date getLastCTime() { |
| 237 | 246 | return lastCTime; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
c8adca1
| ... | ... | @@ -631,7 +631,7 @@ |
| 631 | 631 | Object obj = map.get("fxysu"); |
| 632 | 632 | if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) { |
| 633 | 633 | map1.put("name", map.get("fxysu")); |
| 634 | - | |
| 634 | + highScoreResult.setOtherRisk(map.get("fxysu").toString()); | |
| 635 | 635 | Object idObj1 = map.get("fyyse"); |
| 636 | 636 | if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { |
| 637 | 637 | BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); |
| ... | ... | @@ -709,6 +709,7 @@ |
| 709 | 709 | Object obj = map.get("fxysu"); |
| 710 | 710 | if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) { |
| 711 | 711 | map1.put("name", map.get("fxysu")); |
| 712 | + highScoreResult.setOtherRisk(map.get("fxysu").toString()); | |
| 712 | 713 | Object idObj1 = map.get("fyyse"); |
| 713 | 714 | if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { |
| 714 | 715 | BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); |
| ... | ... | @@ -1559,7 +1560,8 @@ |
| 1559 | 1560 | patients1.setRiskScore(highScoreResult.getScore()); |
| 1560 | 1561 | patients1.setRiskFactorId(highScoreResult.getHighId()); |
| 1561 | 1562 | patients1.setRiskLevelId(JsonUtil.array2JsonString(highScoreResult.getLevelId())); |
| 1562 | - | |
| 1563 | + //设置其他的高危因素 | |
| 1564 | + patients1.setoRiskFactor(highScoreResult.getOtherRisk()); | |
| 1563 | 1565 | patientsService.findAndModify(patientsQuery1, patients1); |
| 1564 | 1566 | } |
| 1565 | 1567 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
View file @
c8adca1
| ... | ... | @@ -15,6 +15,9 @@ |
| 15 | 15 | private List highRisk = new ArrayList(); |
| 16 | 16 | //风险等级颜色 |
| 17 | 17 | private List level = new ArrayList(); |
| 18 | + | |
| 19 | + private String otherRisk; | |
| 20 | + | |
| 18 | 21 | //高危评分 |
| 19 | 22 | private Integer score = 0; |
| 20 | 23 | |
| ... | ... | @@ -24,6 +27,14 @@ |
| 24 | 27 | |
| 25 | 28 | public List getLevel() { |
| 26 | 29 | return /*filter(*/level/*)*/; |
| 30 | + } | |
| 31 | + | |
| 32 | + public String getOtherRisk() { | |
| 33 | + return otherRisk; | |
| 34 | + } | |
| 35 | + | |
| 36 | + public void setOtherRisk(String otherRisk) { | |
| 37 | + this.otherRisk = otherRisk; | |
| 27 | 38 | } |
| 28 | 39 | |
| 29 | 40 | public static List filter(List<java.util.Map> level){ |