From 25cc842592c314e8f57572939eb832b577f6de74 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 30 Jan 2018 16:42:03 +0800
Subject: [PATCH] 1

---
 .../java/com/lyms/platform/common/dao/BaseQuery.java     |  6 ++++++
 .../platform/operate/web/facade/RiskReportFacade.java    | 16 ++++++++--------
 .../lyms/platform/operate/web/utils/HiskCountTask.java   |  2 +-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/dao/BaseQuery.java b/platform-common/src/main/java/com/lyms/platform/common/dao/BaseQuery.java
index 761e339..4d1e722 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/dao/BaseQuery.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/dao/BaseQuery.java
@@ -2,6 +2,7 @@ package com.lyms.platform.common.dao;
 
 
 import com.lyms.platform.common.base.PageInfo;
+import org.apache.commons.lang.builder.ToStringBuilder;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -245,4 +246,9 @@ public class BaseQuery {
     public PageInfo getPageInfo() {
         return new PageInfo(this.page, this.lastPage, this.count, this.limit);
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
index 67c2970..d8fb62f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
@@ -232,7 +232,7 @@ public class RiskReportFacade {
             }
 
             for (RiskReportResult bs : mainRiskReportResults) {
-                configData(bs, slaveBasicConfigMap,allPatientCount);
+                configData(bs, slaveBasicConfigMap, allPatientCount);
             }
 
 
@@ -242,21 +242,21 @@ public class RiskReportFacade {
     }
 
     //生成层级关系
-    public void configData(RiskReportResult bs,  Map<String, List<RiskReportResult>> slaveBasicConfigMap,int allPatientCount) {
+    public void configData(RiskReportResult bs, Map<String, List<RiskReportResult>> slaveBasicConfigMap, int allPatientCount) {
         if (slaveBasicConfigMap.containsKey(bs.getHighRiskId())) {
             bs.setRiskReportResults(slaveBasicConfigMap.get(bs.getHighRiskId()));
             for (RiskReportResult basicConfig : bs.getRiskReportResults()) {
-                basicConfig.setLevel(bs.getLevel()+1);
+                basicConfig.setLevel(bs.getLevel() + 1);
 
                 DecimalFormat df = new DecimalFormat("0.00");
-                String percent = df.format((double) basicConfig.getRiskCount() / allPatientCount * 100) + "%";
+                String percent =basicConfig.getRiskCount() > 0 ? df.format((double) basicConfig.getRiskCount() / allPatientCount * 100) + "%" : "0%";
                 basicConfig.setPercent(percent);
 
-                configData(basicConfig, slaveBasicConfigMap,allPatientCount);
-                bs.setRiskCount(bs.getRiskCount()+basicConfig.getRiskCount());
+                configData(basicConfig, slaveBasicConfigMap, allPatientCount);
+                bs.setRiskCount(bs.getRiskCount() + basicConfig.getRiskCount());
 
                 df = new DecimalFormat("0.00");
-                percent = df.format((double) bs.getRiskCount() / allPatientCount * 100) + "%";
+                percent =basicConfig.getRiskCount() > 0 ? df.format((double) basicConfig.getRiskCount() / allPatientCount * 100) + "%" : "0%";
                 bs.setPercent(percent);
             }
             bs.setRiskReportResults(null);
@@ -278,7 +278,7 @@ public class RiskReportFacade {
             risk.setRiskCount(riskPatientCount);
 
             DecimalFormat df = new DecimalFormat("0.00");
-            String percent = df.format((double) riskPatientCount / allPatientCount * 100) + "%";
+            String percent =riskPatientCount>0? df.format((double) riskPatientCount / allPatientCount * 100) + "%":"0%";
             risk.setPercent(percent);
 
             List level = new ArrayList();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java
index f653f22..c97c976 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java
@@ -83,7 +83,7 @@ public class HiskCountTask implements Callable {
 
                             query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart());
                             query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd());
-                            query.setIsHighRisk(Boolean.TRUE);
+
                             query.setrFactor(config.getId());
 
                             query.setType(patientsQuery.getType());
-- 
1.8.3.1