From f60f5e71aa0016469cd26634915e9751f20a4007 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 1 Dec 2016 10:31:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/result/QuanChanResult.java | 41 ++++++++++++++++ .../operate/web/result/QuanPatientsResult.java | 41 ++++++++++++++++ .../operate/web/result/RiskPatientsResult.java | 41 ++++++++++++++++ .../operate/web/worker/QuanChanPatientWorker.java | 23 ++++++++- .../operate/web/worker/QuanPatientWorker.java | 36 +++++++++++++- .../lyms/platform/operate/web/worker/WorkHR.java | 56 +++++++++++++++++----- 6 files changed, 223 insertions(+), 15 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java index 46e9a7d..1caebfd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java @@ -48,6 +48,47 @@ public class QuanChanResult implements IBasicResultConvert> { private MatDeliverService matDeliverService; private String hospital; + private OrganizationService organizationService; + private BasicConfigService basicConfigService; public QuanChanPatientWorker(List patientses, String hospital, UsersService usersService, PostReviewService postReviewService, - MatDeliverService matDeliverService,PatientsService patientsService) { + MatDeliverService matDeliverService,PatientsService patientsService,OrganizationService organizationService,BasicConfigService basicConfigService) { this.patientses = patientses; this.matDeliverService = matDeliverService; this.postReviewService = postReviewService; this.patientsService=patientsService; this.hospital = hospital; this.usersService = usersService; + this.organizationService=organizationService; + this.basicConfigService=basicConfigService; } @@ -83,6 +89,15 @@ public class QuanChanPatientWorker implements Callable> { chanResult.setlName(patients.getBookbuildingDoctor()); } } + + //注册地址 + chanResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); + chanResult.setAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); + try { + chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName()); + } catch (Exception e) { + chanResult.setFirstBH(""); + } MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setPid(patients.getPid()); matDeliverQuery.setCreatedStart(patients.getLastMenses()); @@ -91,6 +106,12 @@ public class QuanChanPatientWorker implements Callable> { List maternalDeliverModels = matDeliverService.query(matDeliverQuery); if (CollectionUtils.isNotEmpty(maternalDeliverModels)) { chanResult.setDueWeek(maternalDeliverModels.get(0).getDueDate()); + + try { + chanResult.setfCh(organizationService.getOrganization(Integer.valueOf(maternalDeliverModels.get(0).getHospitalId())).getName()); + } catch (Exception e) { + chanResult.setfCh(""); + } } stopWatch.stop(); //复查次数 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 698eed9..990bca6 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 @@ -13,7 +13,10 @@ import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.facade.PatientFacade; import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.result.QuanPatientsResult; +import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.AntenatalExaminationModel; @@ -46,18 +49,20 @@ public class QuanPatientWorker implements Callable> { private AntenatalExaminationService antExService; private BasicConfigService basicConfigService; private PatientsService patientsService; + private OrganizationService organizationService; public QuanPatientWorker(List patientses, UsersService usersService, String hospital, AntenatalExaminationService antExService, - BasicConfigService basicConfigService,PatientsService patientsService) { + BasicConfigService basicConfigService,PatientsService patientsService,OrganizationService organizationService) { this.patientses = patientses; this.usersService = usersService; this.antExService = antExService; this.hospital = hospital; this.basicConfigService = basicConfigService; this.patientsService=patientsService; + this.organizationService=organizationService; } @Override @@ -87,7 +92,25 @@ public class QuanPatientWorker implements Callable> { antExQuery.setHospitalId(null); stopWatch.start("query ant count"); //复诊次数 - int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); + List ant = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + int i = 0; + if (CollectionUtils.isNotEmpty(ant)) { + //复诊次数 + i = ant.size(); + for (AntenatalExaminationModel a : ant) { + try { + if(StringUtils.isNotEmpty(a.getHospitalId())){ + Organization og = organizationService.getOrganization(Integer.valueOf(a.getHospitalId())); + if(null!=og){ + quanPatientsResult.setCurrentCh(og.getName()); + break; + } + } + } catch (Exception e) { + quanPatientsResult.setCurrentCh(""); + } + } + } antExChuQuery.setPid(patients.getPid()); antExChuQuery.setYn(YnEnums.YES.getId()); antExChuQuery.setHospitalId(null); @@ -173,6 +196,15 @@ public class QuanPatientWorker implements Callable> { } } stopWatch.stop(); + //注册地址 + quanPatientsResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); + quanPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); + try { + quanPatientsResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName()); + } catch (Exception e) { + quanPatientsResult.setFirstBH(""); + } + quanPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType())); quanPatientsResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus())); //修改获取建档里面的高危等级不用在重新去算 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java index e8e023b..a144f97 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java @@ -13,7 +13,10 @@ import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.facade.PatientFacade; import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.result.RiskPatientsResult; +import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.AntenatalExaminationModel; @@ -33,9 +36,7 @@ import java.util.*; import java.util.concurrent.Callable; /** - * * 高危孕妇列表线程处理 - * */ public class WorkHR implements Callable> { @@ -48,15 +49,18 @@ public class WorkHR implements Callable> { private String hospital; private PatientsService patientsService; + private OrganizationService organizationService; + public WorkHR(List patientses, UsersService usersService, String hospital, BasicConfigService basicConfigService, - AntenatalExaminationService antExService,PatientsService patientsService) { + AntenatalExaminationService antExService, PatientsService patientsService,OrganizationService organizationService) { this.patientses = patientses; this.usersService = usersService; this.hospital = hospital; this.basicConfigService = basicConfigService; this.antExService = antExService; - this.patientsService=patientsService; + this.patientsService = patientsService; + this.organizationService=organizationService; } public List call() { @@ -85,8 +89,26 @@ public class WorkHR implements Callable> { antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setHospitalId(null); stopWatch.start("cap antex count"); - //复诊次数 - int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); + List ant = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + int i = 0; + if (CollectionUtils.isNotEmpty(ant)) { + //复诊次数 + i = ant.size(); + for (AntenatalExaminationModel a : ant) { + try { + if(StringUtils.isNotEmpty(a.getHospitalId())){ + Organization og = organizationService.getOrganization(Integer.valueOf(a.getHospitalId())); + if(null!=og){ + riskPatientsResult.setCurrentCh(og.getName()); + break; + } + } + } catch (Exception e) { + riskPatientsResult.setCurrentCh(""); + } + } + } + antExChuQuery.setPid(patients.getPid()); antExChuQuery.setYn(YnEnums.YES.getId()); //初诊次数 @@ -126,7 +148,7 @@ public class WorkHR implements Callable> { return 0; } }); - Patients patients1=new Patients(); + Patients patients1 = new Patients(); patients1.setId(patients.getId()); patients1.setLastCTime(list.get(0)); patientsService.updatePatient(patients1); @@ -153,13 +175,22 @@ public class WorkHR implements Callable> { riskPatientsResult.setCheckDoctor(list.get(0).getProdDoctor()); } } - Patients patients1=new Patients(); + Patients patients1 = new Patients(); patients1.setId(patients.getId()); patients1.setLastCTime(list.get(0).getCheckTime()); patientsService.updatePatient(patients1); } } stopWatch.stop(); + //注册地址 + riskPatientsResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); + riskPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); + try { + riskPatientsResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName()); + } catch (Exception e) { + riskPatientsResult.setFirstBH(""); + } + riskPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType())); riskPatientsResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus())); @@ -200,7 +231,7 @@ public class WorkHR implements Callable> { if (name.indexOf("预警") > -1) { name = name.replace("预警", ""); } - map.put("name",name); + map.put("name", name); map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); level.add(map); } @@ -218,14 +249,15 @@ public class WorkHR implements Callable> { } return dataList; } - public static void main(String[] args){ + + public static void main(String[] args) { List level = new ArrayList(); Map map = new HashMap(); String name = "黄色预警"; if (name.indexOf("预警") > -1) { name = name.replace("预警", ""); } - map.put("name",name); + map.put("name", name); map.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); Map map1 = new HashMap(); @@ -233,7 +265,7 @@ public class WorkHR implements Callable> { if (name.indexOf("预警") > -1) { name1 = name1.replace("预警", ""); } - map1.put("name",name1); + map1.put("name", name1); map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name1)); level.add(map1); -- 1.8.3.1