From 959b5ac08773fa4e00102f5aab037edf3828940e Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Thu, 25 Nov 2021 13:25:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E5=9F=BA?=
 =?UTF-8?q?=E5=87=86=E7=BA=BF=E6=AF=94=E8=BE=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/DataStatisticsService.java        | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/service/DataStatisticsService.java b/src/main/java/com/ccsens/carbasics/service/DataStatisticsService.java
index cdf3f9b..86c6d57 100644
--- a/src/main/java/com/ccsens/carbasics/service/DataStatisticsService.java
+++ b/src/main/java/com/ccsens/carbasics/service/DataStatisticsService.java
@@ -68,7 +68,7 @@ public class DataStatisticsService implements IDataStatisticsService {
                     if (areaResult.getValue().compareTo(advance.getDatumLine()) > -1) {
                         arrive++;
                     }
-                    if (areaResult.getValue().compareTo(basics.getDatumLine()) < 1) {
+                    if (areaResult.getValue().compareTo(basics.getDatumLine()) < 0) {
                         unArrive++;
                     }
                 }
@@ -220,23 +220,35 @@ public class DataStatisticsService implements IDataStatisticsService {
         List<StatisticsVo.XgzlData> xgzlDataList = new ArrayList<>();
         if (0 == param.getQueryType()) {
             xgzlDataList = dataStatisticsDao.xgzlDataForCity(param);
-
+            if (CollectionUtil.isNotEmpty(xgzlDataList)) {
+                for (StatisticsVo.XgzlData xgzlData : xgzlDataList) {
+                    if (xgzlData.getZxgnzllCity().compareTo(advance.getDatumLine()) > -1) {
+                        arrive++;
+                    }
+                    if (xgzlData.getZxgnzllCity().compareTo(basics.getDatumLine()) < 0) {
+                        unArrive++;
+                    }
+                    xgzlSynopsis.setLess50(unArrive);
+                    xgzlSynopsis.setThan90(arrive);
+                }
+            }
         }
         if (1 == param.getQueryType()) {
             xgzlDataList = dataStatisticsDao.xgzlDataForHospital(param);
-        }
-        if (CollectionUtil.isNotEmpty(xgzlDataList)) {
-            for (StatisticsVo.XgzlData xgzlData : xgzlDataList) {
-                if (xgzlData.getZxgnzll().compareTo(advance.getDatumLine()) > -1) {
-                    arrive++;
-                }
-                if (xgzlData.getZxgnzll().compareTo(basics.getDatumLine()) < 1) {
-                    unArrive++;
+            if (CollectionUtil.isNotEmpty(xgzlDataList)) {
+                for (StatisticsVo.XgzlData xgzlData : xgzlDataList) {
+                    if (xgzlData.getZxgnzll().compareTo(advance.getDatumLine()) > -1) {
+                        arrive++;
+                    }
+                    if (xgzlData.getZxgnzll().compareTo(basics.getDatumLine()) < 0) {
+                        unArrive++;
+                    }
+                    xgzlSynopsis.setLess50(unArrive);
+                    xgzlSynopsis.setThan90(arrive);
                 }
-                xgzlSynopsis.setLess50(unArrive);
-                xgzlSynopsis.setThan90(arrive);
             }
         }
+
         return xgzlSynopsis;
     }