diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 699acc0..889b6c1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -127,7 +127,7 @@ public class ApplyOrderFacade { lsit.add(basicConfig.getName()); } } - referralApplyOrderModel.setrLevel(lsit); + referralApplyOrderModel.setrLevel(highScoreResult.filter(lsit)); // referralApplyOrderModel.setOtherHighRisk(highScoreResult.getOtherHigh()); referralApplyOrderModel.setPid(patients.getPid()); referralApplyOrderModel.setDueWeek(new Date()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index a307504..e8fc304 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -421,7 +421,7 @@ public class PatientFacade { } HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); quanPatientsResult.setcTime(nextCheckTime); - quanPatientsResult.setrLevel(highScoreResult.getLevel()); + quanPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel())); data.add(quanPatientsResult); } return data; @@ -496,7 +496,7 @@ public class PatientFacade { } riskPatientsResult.setcTime(nextCheckTime); riskPatientsResult.setrFactor(highScoreResult.gethighRiskStr()); - riskPatientsResult.setrLevel(highScoreResult.getLevel()); + riskPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel())); riskPatientsResult.sethScore(highScoreResult.getScore()); data.add(riskPatientsResult); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java index 066300e..8f01e4c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java @@ -23,10 +23,10 @@ public class HighScoreResult { } public List getLevel() { - return filter(level); + return /*filter(*/level/*)*/; } - private List filter(List level){ + public List filter(List level){ List list = new ArrayList(); List addEdList = new ArrayList(); for(java.util.Map map :level){