From 1034a295057f8a632b763e066161b66a3f5bd0c1 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 1 Dec 2016 13:55:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/RiskReportFacade.java   | 17 +++++++++++++++++
 .../lyms/platform/operate/web/utils/HiskCountTask.java  | 15 +++++++--------
 2 files changed, 24 insertions(+), 8 deletions(-)

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 dd7f863..76267e2 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
@@ -112,10 +112,27 @@ public class RiskReportFacade {
 
             for(BasicConfig levelConfig : riskLevelConfig)
             {
+
                 if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId()))
                 {
                     continue;
                 }
+
+                PatientsQuery query = new PatientsQuery();
+                query.setYn(YnEnums.YES.getId());
+                query.setBuildTypeList(patientsQuery.getBuildTypeList());
+                query.setHospitalId(patientsQuery.getHospitalId());
+                query.setDueStatus(patientsQuery.getDueStatus());
+                //高危等级
+                query.setrLevel(patientsQuery.getrLevel());
+                //产检医生
+                query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId());
+                query.setDueDateStart(patientsQuery.getDueDateStart());
+                query.setDueDateEnd(patientsQuery.getDueDateEnd());
+
+                query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart());
+                query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd());
+
                 Callable c = new HiskCountTask( basicConfigService,
                              patientsService, levelConfig,
                              patientsQuery,
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 74f32de..f653836 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
@@ -25,18 +25,18 @@ public class HiskCountTask implements Callable {
 
     private PatientsService patientsService;
     private BasicConfigService basicConfigService;
-    private BasicConfig basicConfig;
+    private BasicConfig levelConfig;
     private  PatientsQuery patientsQuery;
     private  int allPatientCount;
 
     public HiskCountTask(BasicConfigService basicConfigService,
-                         PatientsService patientsService,BasicConfig basicConfig,
+                         PatientsService patientsService,BasicConfig levelConfig,
                          PatientsQuery patientsQuery,
                          int allPatientCount)
     {
         this.basicConfigService = basicConfigService;
         this.patientsService = patientsService;
-        this.basicConfig = basicConfig;
+        this.levelConfig = levelConfig;
         this.patientsQuery = patientsQuery;
         this.allPatientCount = allPatientCount;
     }
@@ -45,17 +45,16 @@ public class HiskCountTask implements Callable {
 
         BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
         basicConfigQuery.setYn(YnEnums.YES.getId());
-        basicConfigQuery.setParentId(SystemConfig.HIGH_RISK_ID);
         basicConfigQuery.setEnable(1);
+        basicConfigQuery.setParentId(levelConfig.getId());
 
         List<RiskReportResult> results = new ArrayList<>();
-        basicConfigQuery.setParentId(basicConfig.getId());
         List<BasicConfig> riskConfig = basicConfigService.queryBasicConfig(basicConfigQuery);
 
         if (CollectionUtils.isNotEmpty(riskConfig)) {
             for (BasicConfig config : riskConfig) {
                 patientsQuery.setrFactor(config.getId());
-                //单个高危孕妇条数
+                //单个高危因素孕产妇条数
                 int riskPatientCount = patientsService.queryPatientCount(patientsQuery);
                 if (riskPatientCount > 0)
                 {
@@ -68,10 +67,10 @@ public class HiskCountTask implements Callable {
                     String  percent = df.format((double)riskPatientCount/allPatientCount*100)+"%";
                     risk.setPercent(percent);
 
-                    if (null != basicConfig) {
+                    if (null != levelConfig) {
                         List level = new ArrayList();
                         Map map = new HashMap();
-                        String name = basicConfig.getName();
+                        String name = levelConfig.getName();
                         if (name.indexOf("预警") > -1) {
                             name = name.replace("预警", "");
                         }
-- 
1.8.3.1