Commit 67cde5d27491afce5182a76121b866b8e97144d0
1 parent
44e0966670
Exists in
master
and in
1 other branch
修改新电子病历
Showing 3 changed files with 5 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
67cde5d
| ... | ... | @@ -127,7 +127,7 @@ |
| 127 | 127 | lsit.add(basicConfig.getName()); |
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | - referralApplyOrderModel.setrLevel(lsit); | |
| 130 | + referralApplyOrderModel.setrLevel(highScoreResult.filter(lsit)); | |
| 131 | 131 | // referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh()); |
| 132 | 132 | referralApplyOrderModel.setPid(patients.getPid()); |
| 133 | 133 | referralApplyOrderModel.setDueWeek(new Date()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
67cde5d
| ... | ... | @@ -421,7 +421,7 @@ |
| 421 | 421 | } |
| 422 | 422 | HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); |
| 423 | 423 | quanPatientsResult.setcTime(nextCheckTime); |
| 424 | - quanPatientsResult.setrLevel(highScoreResult.getLevel()); | |
| 424 | + quanPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel())); | |
| 425 | 425 | data.add(quanPatientsResult); |
| 426 | 426 | } |
| 427 | 427 | return data; |
| ... | ... | @@ -496,7 +496,7 @@ |
| 496 | 496 | } |
| 497 | 497 | riskPatientsResult.setcTime(nextCheckTime); |
| 498 | 498 | riskPatientsResult.setrFactor(highScoreResult.gethighRiskStr()); |
| 499 | - riskPatientsResult.setrLevel(highScoreResult.getLevel()); | |
| 499 | + riskPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel())); | |
| 500 | 500 | riskPatientsResult.sethScore(highScoreResult.getScore()); |
| 501 | 501 | data.add(riskPatientsResult); |
| 502 | 502 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
View file @
67cde5d
| ... | ... | @@ -23,10 +23,10 @@ |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | public List getLevel() { |
| 26 | - return filter(level); | |
| 26 | + return /*filter(*/level/*)*/; | |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - private List filter(List<java.util.Map> level){ | |
| 29 | + public List filter(List<java.util.Map> level){ | |
| 30 | 30 | List list = new ArrayList(); |
| 31 | 31 | List addEdList = new ArrayList(); |
| 32 | 32 | for(java.util.Map map :level){ |