From 4782d35b97678cb044b06bb2a0e7b6f57e05d568 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 21 Aug 2017 14:48:40 +0800 Subject: [PATCH] update code --- .../platform/operate/web/facade/LisFacade.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index 6ca1452..bf25ff4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -688,6 +688,7 @@ public class LisFacade { lisReportModel.setHospitalName(organization.getName()); } List items = JsonUtil.toList(json, LisReportItemModel.class); + sortLisReportItems(items); lisReportModel.setItems(items); lisReportModel.setItemJson(null); } @@ -698,6 +699,41 @@ public class LisFacade { /** + * 排序 + * @param items + */ + private void sortLisReportItems(List items) + { + if (CollectionUtils.isNotEmpty(items)) + { + Collections.sort(items, new Comparator() { + public int compare(Object a, Object b) { + String orderA = ((LisReportItemModel) a).getPrintOrder(); + String orderB = ((LisReportItemModel) b).getPrintOrder(); + + if (com.lyms.platform.common.utils.StringUtils.isEmpty(orderA)) { + return -1; + } + if (com.lyms.platform.common.utils.StringUtils.isEmpty(orderB)) { + return -1; + } + if (com.lyms.platform.common.utils.StringUtils.isNum(orderA) && + com.lyms.platform.common.utils.StringUtils.isNum(orderB)) + { + int sortNum1 = Integer.parseInt(orderA); + int sortNum2 = Integer.parseInt(orderB); + return sortNum1 - sortNum2; + + } + + return -1; + } + }); + } + } + + + /** * 查询医院名称 * @param hospitalIds * @return -- 1.8.3.1