diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CorrectDataFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CorrectDataFacade.java index 216c2d6..21389dc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CorrectDataFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CorrectDataFacade.java @@ -54,16 +54,14 @@ public class CorrectDataFacade { if(CollectionUtils.isNotEmpty(patientses)){ int batchSize = 400; int end = 0; - CountDownLatch countDownLatch=new CountDownLatch(patientses.size()); java.util.concurrent.atomic.AtomicLong counter=new AtomicLong(); for (int i = 0; i < patientses.size(); i += batchSize) { end = (end + batchSize); if (end > patientses.size()) { end = patientses.size(); } - threadPoolExecutor.submit(new CorrectDataWorker(patientses.subList(i, end),postReviewService,patientsService,anExService,antExFacade,countDownLatch,counter)); + threadPoolExecutor.submit(new CorrectDataWorker(patientses.subList(i, end),postReviewService,patientsService,anExService,antExFacade,counter)); } - countDownLatch.await(); logger.info("hand hospitalId :" +hospitalId+", update count "+counter.get()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CorrectDataWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CorrectDataWorker.java index 5ae4247..60af0c0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CorrectDataWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CorrectDataWorker.java @@ -37,24 +37,20 @@ public class CorrectDataWorker extends Thread { private List patientses; - private CountDownLatch countDownLatch; - - private java.util.concurrent.atomic.AtomicLong counter; + private java.util.concurrent.atomic.AtomicLong counter; public CorrectDataWorker(List patientses, PostReviewService postReviewService, PatientsService patientsService, AntenatalExaminationService antExService, AntenatalExaminationFacade antExFacade, - CountDownLatch countDownLatch, - java.util.concurrent.atomic.AtomicLong counter) { + java.util.concurrent.atomic.AtomicLong counter) { this.patientses = patientses; this.patientsService = patientsService; this.postReviewService = postReviewService; - this.antExService=antExService; - this.antExFacade=antExFacade; - this.countDownLatch=countDownLatch; - this.counter=counter; + this.antExService = antExService; + this.antExFacade = antExFacade; + this.counter = counter; } @Override @@ -66,11 +62,11 @@ public class CorrectDataWorker extends Thread { //本院产后复查次数 //Integer postViewTimes; try { - for(Patients patients:patientses){ - Patients patients1=new Patients(); + for (Patients patients : patientses) { + Patients patients1 = new Patients(); patients1.setId(patients.getId()); //产后复查次数 - PostReviewQuery postReviewQuery=new PostReviewQuery(); + PostReviewQuery postReviewQuery = new PostReviewQuery(); postReviewQuery.setHospitalId(patients.getHospitalId()); postReviewQuery.setYn(YnEnums.YES.getId()); postReviewQuery.setParentId(patients.getId()); @@ -81,34 +77,32 @@ public class CorrectDataWorker extends Thread { patientsService.updatePatient(patients1); //修改最后一次定义高危时间 - antExFacade.updateLastRhTime(patients.getId(),patients.getHospitalId()); + antExFacade.updateLastRhTime(patients.getId(), patients.getHospitalId()); //修改高危 antExFacade.updateLastRisk(patients.getId()); counter.incrementAndGet(); } - }catch (Exception e){ - ExceptionUtils.catchException(e,"CorrectDataWorker Error."); - }finally { - countDownLatch.countDown(); + } catch (Exception e) { + ExceptionUtils.catchException(e, "CorrectDataWorker Error."); } } - private Date findLastCTime(String id){ - AntExQuery antExQuery=new AntExQuery(); + private Date findLastCTime(String id) { + AntExQuery antExQuery = new AntExQuery(); antExQuery.setParentId(id); antExQuery.setYn(YnEnums.YES.getId()); - List antEx= antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate")); - if(CollectionUtils.isNotEmpty(antEx)){ - return antEx.get(0).getCheckDate(); - }else{ - AntExChuQuery antExChuQuery=new AntExChuQuery(); + List antEx = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate")); + if (CollectionUtils.isNotEmpty(antEx)) { + return antEx.get(0).getCheckDate(); + } else { + AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setParentId(id); antExChuQuery.setYn(YnEnums.YES.getId()); - List antExChu= antExService.queryAntExChu(antExChuQuery); - if(CollectionUtils.isNotEmpty(antExChu)){ + List antExChu = antExService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChu)) { return antExChu.get(0).getCheckTime(); } }