From 2c34c6de417ea50f66fa5e044a9832d7288dc99d Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Tue, 10 Dec 2019 16:44:28 +0800
Subject: [PATCH] =?UTF-8?q?=20=E7=BB=93=E6=9E=9C=E6=8C=89=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=80=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/result/IndividualCaseResult.java    | 21 ++++++++++++++++++++-
 .../web/service/impl/IndividualCaseServiceImpl.java |  2 ++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/IndividualCaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/IndividualCaseResult.java
index e216458..99274cd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/IndividualCaseResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/IndividualCaseResult.java
@@ -3,12 +3,15 @@ package com.lyms.platform.operate.web.result;
 import java.io.Serializable;
 import java.util.List;
 
+import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.StringUtils;
+
 /**
  * @author dongqin
  * @description
  * @date 13:50 2019/11/22
  **/
-public class IndividualCaseResult<T> implements Serializable {
+public class IndividualCaseResult<T> implements Comparable<IndividualCaseResult<T>>, Serializable {
 
     private static final long serialVersionUID = 1634160181617894592L;
 
@@ -82,6 +85,22 @@ public class IndividualCaseResult<T> implements Serializable {
         this.highRiskDesc = highRiskDesc;
     }
 
+    @Override
+    public int compareTo(IndividualCaseResult<T> result) {
+        String timeAxisStr = result.getTimeAxisStr();
+        if (StringUtils.isNotEmpty(timeAxisStr)) {
+            long time = DateUtil.parseYMD(timeAxisStr).getTime();
+            if (StringUtils.isNotEmpty(this.timeAxisStr)) {
+                long time1 = DateUtil.parseYMD(this.timeAxisStr).getTime();
+                if (time1 > time) {
+                    return -1;
+                }
+                return 1;
+            }
+        }
+        return 0;
+    }
+
     public static class Infos {
         private String level;
         private String name;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/IndividualCaseServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/IndividualCaseServiceImpl.java
index fdbf130..c1adc2a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/IndividualCaseServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/IndividualCaseServiceImpl.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.service.impl;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -84,6 +85,7 @@ public class IndividualCaseServiceImpl implements IndividualCaseService {
                     }
                 }
                 BaseResponse baseResponse = new BaseResponse();
+                Collections.sort(results);
                 baseResponse.setObject(results);
                 return baseResponse;
 
-- 
1.8.3.1