From 2fe9db3fd2182e9daafe325c1b09fff0ed1e70c4 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 13 Jan 2017 18:06:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=A3=80=E5=8A=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AntExRecordFacade.java      | 82 ----------------------
 1 file changed, 82 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
index ff89a9b..3709d79 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
@@ -212,30 +212,6 @@ public class AntExRecordFacade {
         return antExRecordQuery;
     }
 
-
-    private List convertToHighRisk(List<Patients> patientses, Integer userId, String hospital) {
-        List data = new ArrayList<>();
-        int batchSize = 4;
-        int end = 0;
-        List<Future> listFuture = new ArrayList<>();
-        for (int i = 0; i < patientses.size(); i += batchSize) {
-            end = (end + batchSize);
-            if (end > patientses.size()) {
-                end = patientses.size();
-            }
-            listFuture.add(commonThreadPool.submit(new WorkHR(patientses.subList(i, end), usersService, hospital, basicConfigService, antExService, patientsService, organizationService)));
-        }
-        for (Future f : listFuture) {
-            try {
-                data.addAll((List) f.get(30, TimeUnit.SECONDS));
-            } catch (Exception e) {
-                ExceptionUtils.catchException(e, "convertToHighRisk get result Future error.");
-            }
-        }
-        return data;
-    }
-
-
     /**
      * 产检管理
      *
@@ -247,64 +223,6 @@ public class AntExRecordFacade {
         List<AntExManagerResult> data = new ArrayList<>();
         List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery);
         if (CollectionUtils.isNotEmpty(antExRecordModelList)) {
-                /*AntExManagerResult antExManagerResult = new AntExManagerResult();
-                antExManagerResult.convertToResult(e);
-                if (isRegion) {
-                    //产检医院
-                    if (StringUtils.isNotEmpty(e.getHospitalId())) {
-                        Organization org = organizationService.getOrganization(Integer.valueOf(e.getHospitalId()));
-                        if (null != org) {
-                            antExManagerResult.setCheckHospital(org.getName());
-                        } else {
-                            antExManagerResult.setCheckHospital(e.getHospitalId());
-                        }
-                    }
-                    antExManagerResult.setAddr(CommonsHelper.getResidence(e.getProvinceRegisterId(), e.getCityRegisterId(), e.getAreaRegisterId(), e.getStreetRegisterId(), e.getAddressRegister(), basicConfigService));
-                }
-
-                //登记人
-                if (org.apache.commons.lang.StringUtils.isNotEmpty(e.getBuildDoctor())) {
-                    if (NumberUtils.isNumber(e.getBuildDoctor())) {
-                        Users users = usersService.getUsers(NumberUtils.toInt(e.getBuildDoctor()));
-                        if (null != users) {
-                            antExManagerResult.setlName(users.getName());
-                        } else {
-                            antExManagerResult.setlName(e.getBuildDoctor());
-                        }
-                    } else {
-                        antExManagerResult.setlName(e.getBuildDoctor());
-                    }
-                }
-                //产检医生
-                if (org.apache.commons.lang.StringUtils.isNotEmpty(e.getCheckDoctor())) {
-                    if (NumberUtils.isNumber(e.getCheckDoctor())) {
-                        Users users = usersService.getUsers(NumberUtils.toInt(e.getCheckDoctor()));
-                        if (null != users) {
-                            antExManagerResult.setCheckDoctor(users.getName());
-                        } else {
-                            antExManagerResult.setCheckDoctor(e.getCheckDoctor());
-                        }
-                    } else {
-                        antExManagerResult.setCheckDoctor(e.getCheckDoctor());
-                    }
-                }
-
-                AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery();
-                antExRecordQuery1.setCheckTimeEnd(e.getCheckTime());
-                antExRecordQuery1.setPid(e.getPid());
-                antExRecordQuery1.setHospitalId(hospital);
-
-                //本院低次
-                int dichi = recordService.count(antExRecordQuery1);
-                antExRecordQuery1.setHospitalId(null);
-
-                antExManagerResult.settTimes(recordService.count(antExRecordQuery1));
-                antExManagerResult.setChTimes(dichi);
-                //高危因素
-                antExManagerResult.setrLevel(commonService.findRiskLevel(e.gethLevel()));
-                antExManagerResult.setRiskFactor(commonService.resloveFactor(e.gethRisk()));*/
-
-
             int batchSize = 4;
             int end = 0;
             List<Future> listFuture = new ArrayList<>();
-- 
1.8.3.1