From 14a66810ec1315e564b0d072e41784ac3b9bb84a Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 10 Feb 2017 10:52:06 +0800
Subject: [PATCH] 1

---
 .../operate/web/worker/QuanPatientWorker.java      | 26 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java
index 081dee3..8ad4f6f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java
@@ -94,7 +94,10 @@ public class QuanPatientWorker implements Callable<List<QuanPatientsResult>> {
             stopWatch.start("query ant count");
             //复诊次数
             List<AntenatalExaminationModel> ant = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
+            //系统复诊次数
             int i = 0;
+            //系统初诊次数
+            int ichu=0;
             if (CollectionUtils.isNotEmpty(ant)) {
                 //复诊次数
                 i = ant.size();
@@ -116,6 +119,7 @@ public class QuanPatientWorker implements Callable<List<QuanPatientsResult>> {
                 antExChuQuery1.setPid(patients.getPid());
                 antExChuQuery1.setYn(YnEnums.YES.getId());
                 List<AntExChuModel> chu = antExService.queryAntExChu(antExChuQuery1);
+                ichu=chu.size();
                 for (AntExChuModel a : chu) {
                     try {
                         if (StringUtils.isNotEmpty(a.getHospitalId())) {
@@ -134,9 +138,10 @@ public class QuanPatientWorker implements Callable<List<QuanPatientsResult>> {
             antExChuQuery.setYn(YnEnums.YES.getId());
             antExChuQuery.setHospitalId(null);
             //初诊次数
-            int b = antExService.queryAntExChuCount(antExChuQuery.convertToQuery());
-            quanPatientsResult.setcTimes(i + b);
-
+            if(0==ichu){
+                ichu = antExService.queryAntExChuCount(antExChuQuery.convertToQuery());
+            }
+            quanPatientsResult.setcTimes(i + ichu);
 
             antExChuQuery.setHospitalId(hospital);
 
@@ -145,7 +150,7 @@ public class QuanPatientWorker implements Callable<List<QuanPatientsResult>> {
             int chi = antExService.queryAntExChuCount(antExChuQuery.convertToQuery());
 
             //本院复诊
-            int chb = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery());
+            int chb = capLocalHospital(hospital,ant);
             quanPatientsResult.setcHTimes(chi + chb);
             stopWatch.stop();
             String nextCheckTime = "";
@@ -214,4 +219,17 @@ public class QuanPatientWorker implements Callable<List<QuanPatientsResult>> {
         }
         return data;
     }
+
+    private int capLocalHospital(String hospitalId,List<AntenatalExaminationModel> list){
+        if(CollectionUtils.isEmpty(list)){
+            return 0;
+        }
+        int count= 0;
+        for(AntenatalExaminationModel model:list){
+            if(model.getHospitalId().equals(hospitalId)){
+                count++;
+            }
+        }
+        return count;
+    }
 }
\ No newline at end of file
-- 
1.8.3.1