From c51abcfb36528634f3735891f6629b54773c1fe0 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 4 Feb 2021 10:24:05 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/facade/AreaCountFacade.java   | 18 ++++++++----------
 .../operate/web/worker/CheckPointCountWorker.java      | 11 +++++++++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
index c5a91ff..4bfd838 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
@@ -306,8 +306,6 @@ public class AreaCountFacade {
         Date startTime = null;
         Date endTime = null;
 
-        String currentHospitalId = autoMatchFacade.getHospitalId(userId);
-
         Date checkStartTime = null;
         Date checkEndTime = null;
         if (StringUtils.isNotEmpty(time)) {
@@ -334,13 +332,6 @@ public class AreaCountFacade {
         List<Integer> num40 = new ArrayList<>();
 
 
-
-        //衡水区域并且不是衡水市第六人民医院
-        if(!"2100002324".equals(currentHospitalId))
-        {
-            hospitalIds.remove("2100002324");//衡水市第六人民医院
-        }
-
         List<Map<String, Object>> checkPointtList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(hospitalIds)) {
             int batchSize = 2;
@@ -537,6 +528,14 @@ public class AreaCountFacade {
                                    String areaId,
                                    Integer userId, PatientsQuery patientsQuery) {
         List<String> hospitalIds = new ArrayList<>();
+
+        List<Map<String, Object>> list = new ArrayList<>();
+        //衡水区域并且不是衡水市第六人民医院
+        if("2100002324".equals(hospitalId))
+        {
+            return list;
+        }
+
         if (StringUtils.isNotEmpty(hospitalId)) {
             hospitalIds.add(hospitalId);
         } else {
@@ -564,7 +563,6 @@ public class AreaCountFacade {
         patientsQuery.setBookbuildingDateEnd(endTime);
 
 
-        List<Map<String, Object>> list = new ArrayList<>();
         //建档人数
         List<Patients> patientses = patientsService.queryPatient(patientsQuery);
         if (CollectionUtils.isNotEmpty(patientses)) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java
index c3fb536..7f1ed20 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java
@@ -93,8 +93,15 @@ public class CheckPointCountWorker implements Callable {
                 patientsQuery.setBookbuildingDateStart(startTime);
                 patientsQuery.setBookbuildingDateEnd(endTime);
 
-                //建档人数
-                int buildCount = patientsService.queryPatientCount(patientsQuery);
+
+
+                int buildCount = 0;
+                //衡水区域并且不是衡水市第六人民医院
+                if(!"2100002324".equals(hId))
+                {
+                    //建档人数
+                    buildCount = patientsService.queryPatientCount(patientsQuery);
+                }
 
                 AntExChuQuery antExChuQuery1 = new AntExChuQuery();
                 antExChuQuery1.setHospitalId(hId);
-- 
1.8.3.1