Commit 600addd9648eb769e6d844d53f9c70b501921e1b
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
View file @
600addd
| ... | ... | @@ -688,12 +688,48 @@ |
| 688 | 688 | lisReportModel.setHospitalName(organization.getName()); |
| 689 | 689 | } |
| 690 | 690 | List<LisReportItemModel> items = JsonUtil.toList(json, LisReportItemModel.class); |
| 691 | + sortLisReportItems(items); | |
| 691 | 692 | lisReportModel.setItems(items); |
| 692 | 693 | lisReportModel.setItemJson(null); |
| 693 | 694 | } |
| 694 | 695 | } |
| 695 | 696 | } |
| 696 | 697 | return lises; |
| 698 | + } | |
| 699 | + | |
| 700 | + | |
| 701 | + /** | |
| 702 | + * 排序 | |
| 703 | + * @param items | |
| 704 | + */ | |
| 705 | + private void sortLisReportItems(List<LisReportItemModel> items) | |
| 706 | + { | |
| 707 | + if (CollectionUtils.isNotEmpty(items)) | |
| 708 | + { | |
| 709 | + Collections.sort(items, new Comparator() { | |
| 710 | + public int compare(Object a, Object b) { | |
| 711 | + String orderA = ((LisReportItemModel) a).getPrintOrder(); | |
| 712 | + String orderB = ((LisReportItemModel) b).getPrintOrder(); | |
| 713 | + | |
| 714 | + if (com.lyms.platform.common.utils.StringUtils.isEmpty(orderA)) { | |
| 715 | + return -1; | |
| 716 | + } | |
| 717 | + if (com.lyms.platform.common.utils.StringUtils.isEmpty(orderB)) { | |
| 718 | + return -1; | |
| 719 | + } | |
| 720 | + if (com.lyms.platform.common.utils.StringUtils.isNum(orderA) && | |
| 721 | + com.lyms.platform.common.utils.StringUtils.isNum(orderB)) | |
| 722 | + { | |
| 723 | + int sortNum1 = Integer.parseInt(orderA); | |
| 724 | + int sortNum2 = Integer.parseInt(orderB); | |
| 725 | + return sortNum1 - sortNum2; | |
| 726 | + | |
| 727 | + } | |
| 728 | + | |
| 729 | + return -1; | |
| 730 | + } | |
| 731 | + }); | |
| 732 | + } | |
| 697 | 733 | } |
| 698 | 734 | |
| 699 | 735 |