diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index 56eb910..25a6ee0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -391,12 +391,13 @@ public class PuerperaManageController extends BaseController { header.put("husbandName", "丈夫姓名"); header.put("address", "居住地"); header.put("addressRegister", "户籍地"); - header.put("bookbuildingDate", "建档时间"); + header.put("bookbuildingDoctor", "建档医生"); String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()); if("1000000117".equals(hospitalId)){ header.put("sendCareMan", "母子保健手册"); + header.put("bookbuildingDate", "发放时间"); } httpServletResponse.setContentType("application/force-download"); httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("建档管理.xls").getBytes("UTF-8"), "ISO-8859-1")); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java index 152f81e..0d6cfcc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyHiskCountTask.java @@ -3,7 +3,6 @@ package com.lyms.platform.operate.web.utils; import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.operate.web.result.RiskReportResult; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.query.BabyModelQuery; @@ -12,7 +11,9 @@ import org.apache.commons.collections.CollectionUtils; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.*; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; /** * Created by Administrator on 2016/11/30. @@ -31,7 +32,7 @@ public class BabyHiskCountTask implements Callable { public BabyHiskCountTask(BasicConfigService basicConfigService, BabyService babyService, BasicConfig levelConfig, BabyModelQuery babyModelQuery, - int allPatientCount,int type) { + int allPatientCount, int type) { this.basicConfigService = basicConfigService; this.babyService = babyService; this.levelConfig = levelConfig; @@ -42,63 +43,33 @@ public class BabyHiskCountTask implements Callable { @Override public List call() throws Exception { - BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); basicConfigQuery.setYn(YnEnums.YES.getId()); basicConfigQuery.setEnable(1); - if(type == 1) { + if (type == 1) { basicConfigQuery.setParentId(levelConfig.getId()); - }else if(type == 2){ + } else if (type == 2) { basicConfigQuery.setParentId(levelConfig.getParentId()); } List results = new ArrayList<>(); List riskConfig = basicConfigService.queryBasicConfig(basicConfigQuery); - if (CollectionUtils.isNotEmpty(riskConfig)) { - - int batchSize = 2; - int end = 0; - List futures = new ArrayList<>(); - for (int i = 0; i < riskConfig.size(); i += batchSize) { - end = (end + batchSize); - if (end > riskConfig.size()) { - end = riskConfig.size(); - } - - final List configs = riskConfig.subList(i, end); - Callable c = new Callable() { - @Override - public List call() throws Exception { - List datas = new ArrayList<>(); - - for (BasicConfig config : configs) { - babyModelQuery.setYn(YnEnums.YES.getId()); - if(type == 1){ - babyModelQuery.setHighRiskInfo(config.getId()); - }else if(type == 2){ - babyModelQuery.setWeakSonInfo(config.getId()); - } - int riskPatientCount = babyService.queryBabyCount(babyModelQuery); - // System.out.println("name:"+config.getName()+",riskPatientCount:"+riskPatientCount); - RiskReportResult risk = new RiskReportResult(); - risk.setHighRiskId(config.getId()); - risk.setHighRisk(config.getName()); - risk.setPid(config.getpId()); - risk.setRiskCount(riskPatientCount); - datas.add(risk); - } - return datas; - } - }; - Future f = pool.submit(c); - futures.add(f); - } - for (Future f : futures) { - try { - results.addAll((List) f.get(30, TimeUnit.SECONDS)); - } catch (Exception e) { - ExceptionUtils.catchException(e, "patient hisk count."); + for (int i = 0; i < riskConfig.size(); i++) { + BasicConfig config = riskConfig.get(i); + babyModelQuery.setYn(YnEnums.YES.getId()); + if (type == 1) { + babyModelQuery.setHighRiskInfo(config.getId()); + } else if (type == 2) { + babyModelQuery.setWeakSonInfo(config.getId()); } + int riskPatientCount = babyService.queryBabyCount(babyModelQuery); + System.out.println("name:" + config.getName() + ",riskPatientCount:" + riskPatientCount); + RiskReportResult risk = new RiskReportResult(); + risk.setHighRiskId(config.getId()); + risk.setHighRisk(config.getName()); + risk.setPid(config.getpId()); + risk.setRiskCount(riskPatientCount); + results.add(risk); } } return results;