From 5e237ee2aca79a37db229417ef22a04fcf6a3f7c Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Sun, 22 Jan 2017 19:09:26 +0800 Subject: [PATCH] 1 --- .../operate/web/worker/QuanPatientWorker.java | 86 ++++++---------------- .../lyms/platform/operate/web/worker/WorkHR.java | 51 +++++-------- 2 files changed, 39 insertions(+), 98 deletions(-) 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 3730134..081dee3 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 @@ -55,14 +55,14 @@ public class QuanPatientWorker implements Callable> { UsersService usersService, String hospital, AntenatalExaminationService antExService, - BasicConfigService basicConfigService,PatientsService patientsService,OrganizationService organizationService) { + 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; + this.patientsService = patientsService; + this.organizationService = organizationService; } @Override @@ -100,9 +100,9 @@ public class QuanPatientWorker implements Callable> { i = ant.size(); for (AntenatalExaminationModel a : ant) { try { - if(StringUtils.isNotEmpty(a.getHospitalId())){ + if (StringUtils.isNotEmpty(a.getHospitalId())) { Organization og = organizationService.getOrganization(Integer.valueOf(a.getHospitalId())); - if(null!=og){ + if (null != og) { quanPatientsResult.setCurrentCh(og.getName()); break; } @@ -111,16 +111,16 @@ public class QuanPatientWorker implements Callable> { quanPatientsResult.setCurrentCh(""); } } - }else{ - AntExChuQuery antExChuQuery1=new AntExChuQuery(); + } else { + AntExChuQuery antExChuQuery1 = new AntExChuQuery(); antExChuQuery1.setPid(patients.getPid()); antExChuQuery1.setYn(YnEnums.YES.getId()); - List chu= antExService.queryAntExChu(antExChuQuery1); + List chu = antExService.queryAntExChu(antExChuQuery1); for (AntExChuModel a : chu) { try { - if(StringUtils.isNotEmpty(a.getHospitalId())){ + if (StringUtils.isNotEmpty(a.getHospitalId())) { Organization og = organizationService.getOrganization(Integer.valueOf(a.getHospitalId())); - if(null!=og){ + if (null != og) { quanPatientsResult.setCurrentCh(og.getName()); break; } @@ -150,70 +150,26 @@ public class QuanPatientWorker implements Callable> { stopWatch.stop(); String nextCheckTime = ""; stopWatch.start("query antex list"); - List examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); - if (CollectionUtils.isNotEmpty(examinationModels)) { - //设置最后一次检查时间 - if (null == patients.getLastCTime()) { - List list = new ArrayList<>(); - for (AntenatalExaminationModel antEx : examinationModels) { - list.add(antEx.getCheckDate()); - } - Collections.sort(list, new Comparator() { - @Override - public int compare(Date o1, Date o2) { - if (o1 != null && o1.after(o2)) { - return -1; - } - if (o1 != null && o1.before(o2)) { - return 1; - } - return 0; - } - }); - Patients patients1=new Patients(); - patients1.setId(patients.getId()); - patients1.setLastCTime(list.get(0)); - patientsService.updatePatient(patients1); - } + if (null != patients.getNextCheckTime()) { nextCheckTime = DateUtil.getyyyy_MM_dd(patients.getNextCheckTime()); + } - if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { - if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { - Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); - if (null != users) { - quanPatientsResult.setCheckDoctor(users.getName()); - } else { - quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); - } + if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { + if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { + Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); + if (null != users) { + quanPatientsResult.setCheckDoctor(users.getName()); } else { quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } - } - - } else { - List list = antExService.queryAntExChu(antExChuQuery); - if (CollectionUtils.isNotEmpty(list)) { - nextCheckTime = DateUtil.getyyyy_MM_dd(patients.getNextCheckTime()); - if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { - if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { - Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); - if (null != users) { - quanPatientsResult.setCheckDoctor(users.getName()); - } else { - quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); - } - } else { - quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); - } - } - /*Patients patients1=new Patients(); - patients1.setId(patients.getId()); - patients1.setLastCTime(list.get(0).getCheckTime()); - patientsService.updatePatient(patients1);*/ + } else { + quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } + + stopWatch.stop(); //注册地址 quanPatientsResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); 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 2f95310..0e867d5 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 @@ -53,14 +53,14 @@ public class WorkHR implements Callable> { public WorkHR(List patientses, UsersService usersService, String hospital, BasicConfigService basicConfigService, - AntenatalExaminationService antExService, PatientsService patientsService,OrganizationService organizationService) { + 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.organizationService=organizationService; + this.organizationService = organizationService; } public List call() { @@ -96,9 +96,9 @@ public class WorkHR implements Callable> { i = ant.size(); for (AntenatalExaminationModel a : ant) { try { - if(StringUtils.isNotEmpty(a.getHospitalId())){ + if (StringUtils.isNotEmpty(a.getHospitalId())) { Organization og = organizationService.getOrganization(Integer.valueOf(a.getHospitalId())); - if(null!=og){ + if (null != og) { riskPatientsResult.setCurrentCh(og.getName()); break; } @@ -107,16 +107,16 @@ public class WorkHR implements Callable> { riskPatientsResult.setCurrentCh(""); } } - }else{ - AntExChuQuery antExChuQuery1=new AntExChuQuery(); + } else { + AntExChuQuery antExChuQuery1 = new AntExChuQuery(); antExChuQuery1.setPid(patients.getPid()); antExChuQuery1.setYn(YnEnums.YES.getId()); - List chu= antExService.queryAntExChu(antExChuQuery1); + List chu = antExService.queryAntExChu(antExChuQuery1); for (AntExChuModel a : chu) { try { - if(StringUtils.isNotEmpty(a.getHospitalId())){ + if (StringUtils.isNotEmpty(a.getHospitalId())) { Organization og = organizationService.getOrganization(Integer.valueOf(a.getHospitalId())); - if(null!=og){ + if (null != og) { riskPatientsResult.setCurrentCh(og.getName()); break; } @@ -144,33 +144,18 @@ public class WorkHR implements Callable> { String nextCheckTime = ""; stopWatch.stop(); stopWatch.start("query antex count"); - - List examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); - if (CollectionUtils.isNotEmpty(examinationModels)) { - - if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { - Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); - if (null != users) { - riskPatientsResult.setCheckDoctor(users.getName()); - } else { - riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); - } - } + if(null!=patients.getNextCheckTime()){ nextCheckTime = DateUtil.getyyyy_MM_dd(patients.getNextCheckTime()); - } else { - List list = antExService.queryAntExChu(antExChuQuery); - if (CollectionUtils.isNotEmpty(list)) { - nextCheckTime = DateUtil.getyyyy_MM_dd(patients.getNextCheckTime()); - if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { - Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); - if (null != users) { - riskPatientsResult.setCheckDoctor(users.getName()); - } else { - riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); - } - } + } + if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) { + Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); + if (null != users) { + riskPatientsResult.setCheckDoctor(users.getName()); + } else { + riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } + stopWatch.stop(); //注册地址 riskPatientsResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); -- 1.8.3.1