diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/ReportModel.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/ReportModel.java index 9875ef6..6506529 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/ReportModel.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/ReportModel.java @@ -53,7 +53,7 @@ public class ReportModel { calcSeries(mergeMap); - CollectionUtils.removeDuplicate(xAxis); + CollectionUtils.removeDuplicate(xAxis,false); /*List xAxis = reportModel.getxAxis(); List xAxisTemp = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 2d1fcef..6914dfb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -1620,8 +1620,8 @@ public class TestController { List rlevel=Collections.emptyList(); if(StringUtils.isNotEmpty(loa.getRiskLevelId())&&!"[]".equals(loa.getRiskLevelId())){ rlevel= JsonUtil.jkstr2Obj(loa.getRiskLevelId(), List.class); - HashSet set =new HashSet(rlevel); - rlevel=new ArrayList(set); + + com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel,true); } referralApplyOrderModel.setrLevel(rlevel); applyOrderService.updateByParentId(applyOrderQuery, referralApplyOrderModel); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index a88e702..57f2506 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1763,9 +1763,9 @@ public class AntenatalExaminationFacade { HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true); patients1.setRiskScore(highScoreResult.getScore()); patients1.setRiskFactorId(highScoreResult.getHighId()); - - HashSet set = new HashSet(highScoreResult.getLevelId()); - patients1.setRiskLevelId(JsonUtil.array2JsonString(new ArrayList(set))); + List list =highScoreResult.getLevelId(); + com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(list,true); + patients1.setRiskLevelId(JsonUtil.array2JsonString(list)); //设置其他的高危因素 patients1.setoRiskFactor(StringUtils.isNotEmpty(highScoreResult.getOtherRisk()) ? highScoreResult.getOtherRisk() : ""); patientsService.findAndModify(patientsQuery1, patients1); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java index ea3a462..50b9c89 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java @@ -121,11 +121,22 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt * list去重数据 * @param list */ - public static void removeDuplicate(List list) { + public static void removeDuplicate(List list,boolean order) { Assert.notNull(list, "list must be not null!"); - Set temp = new HashSet<>(list); - list.clear(); - list.addAll(temp); + if(order){ + List ls=new ArrayList(); + for(int i=0;i temp = new HashSet<>(list); + list.clear(); + list.addAll(temp); + } } public static List transValToList(Map map) {