Commit bb4c0c256514b6fbcb7cf441c8ec7925dbac02b3

Authored by jiangjiazhi
1 parent c180fa3736

修改转诊

Showing 2 changed files with 21 additions and 29 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CorrectDataFacade.java View file @ bb4c0c2
... ... @@ -54,16 +54,14 @@
54 54 if(CollectionUtils.isNotEmpty(patientses)){
55 55 int batchSize = 400;
56 56 int end = 0;
57   - CountDownLatch countDownLatch=new CountDownLatch(patientses.size());
58 57 java.util.concurrent.atomic.AtomicLong counter=new AtomicLong();
59 58 for (int i = 0; i < patientses.size(); i += batchSize) {
60 59 end = (end + batchSize);
61 60 if (end > patientses.size()) {
62 61 end = patientses.size();
63 62 }
64   - threadPoolExecutor.submit(new CorrectDataWorker(patientses.subList(i, end),postReviewService,patientsService,anExService,antExFacade,countDownLatch,counter));
  63 + threadPoolExecutor.submit(new CorrectDataWorker(patientses.subList(i, end),postReviewService,patientsService,anExService,antExFacade,counter));
65 64 }
66   - countDownLatch.await();
67 65 logger.info("hand hospitalId :" +hospitalId+", update count "+counter.get());
68 66 }
69 67 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CorrectDataWorker.java View file @ bb4c0c2
... ... @@ -37,24 +37,20 @@
37 37  
38 38 private List<Patients> patientses;
39 39  
40   - private CountDownLatch countDownLatch;
  40 + private java.util.concurrent.atomic.AtomicLong counter;
41 41  
42   - private java.util.concurrent.atomic.AtomicLong counter;
43   -
44 42 public CorrectDataWorker(List<Patients> patientses,
45 43 PostReviewService postReviewService,
46 44 PatientsService patientsService,
47 45 AntenatalExaminationService antExService,
48 46 AntenatalExaminationFacade antExFacade,
49   - CountDownLatch countDownLatch,
50   - java.util.concurrent.atomic.AtomicLong counter) {
  47 + java.util.concurrent.atomic.AtomicLong counter) {
51 48 this.patientses = patientses;
52 49 this.patientsService = patientsService;
53 50 this.postReviewService = postReviewService;
54   - this.antExService=antExService;
55   - this.antExFacade=antExFacade;
56   - this.countDownLatch=countDownLatch;
57   - this.counter=counter;
  51 + this.antExService = antExService;
  52 + this.antExFacade = antExFacade;
  53 + this.counter = counter;
58 54 }
59 55  
60 56 @Override
61 57  
... ... @@ -66,11 +62,11 @@
66 62 //本院产后复查次数
67 63 //Integer postViewTimes;
68 64 try {
69   - for(Patients patients:patientses){
70   - Patients patients1=new Patients();
  65 + for (Patients patients : patientses) {
  66 + Patients patients1 = new Patients();
71 67 patients1.setId(patients.getId());
72 68 //产后复查次数
73   - PostReviewQuery postReviewQuery=new PostReviewQuery();
  69 + PostReviewQuery postReviewQuery = new PostReviewQuery();
74 70 postReviewQuery.setHospitalId(patients.getHospitalId());
75 71 postReviewQuery.setYn(YnEnums.YES.getId());
76 72 postReviewQuery.setParentId(patients.getId());
77 73  
78 74  
79 75  
80 76  
... ... @@ -81,34 +77,32 @@
81 77  
82 78 patientsService.updatePatient(patients1);
83 79 //修改最后一次定义高危时间
84   - antExFacade.updateLastRhTime(patients.getId(),patients.getHospitalId());
  80 + antExFacade.updateLastRhTime(patients.getId(), patients.getHospitalId());
85 81 //修改高危
86 82 antExFacade.updateLastRisk(patients.getId());
87 83  
88 84 counter.incrementAndGet();
89 85 }
90   - }catch (Exception e){
91   - ExceptionUtils.catchException(e,"CorrectDataWorker Error.");
92   - }finally {
93   - countDownLatch.countDown();
  86 + } catch (Exception e) {
  87 + ExceptionUtils.catchException(e, "CorrectDataWorker Error.");
94 88 }
95 89 }
96 90  
97 91  
98   - private Date findLastCTime(String id){
99   - AntExQuery antExQuery=new AntExQuery();
  92 + private Date findLastCTime(String id) {
  93 + AntExQuery antExQuery = new AntExQuery();
100 94 antExQuery.setParentId(id);
101 95 antExQuery.setYn(YnEnums.YES.getId());
102 96  
103   - List<AntenatalExaminationModel> antEx= antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate"));
104   - if(CollectionUtils.isNotEmpty(antEx)){
105   - return antEx.get(0).getCheckDate();
106   - }else{
107   - AntExChuQuery antExChuQuery=new AntExChuQuery();
  97 + List<AntenatalExaminationModel> antEx = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate"));
  98 + if (CollectionUtils.isNotEmpty(antEx)) {
  99 + return antEx.get(0).getCheckDate();
  100 + } else {
  101 + AntExChuQuery antExChuQuery = new AntExChuQuery();
108 102 antExChuQuery.setParentId(id);
109 103 antExChuQuery.setYn(YnEnums.YES.getId());
110   - List<AntExChuModel> antExChu= antExService.queryAntExChu(antExChuQuery);
111   - if(CollectionUtils.isNotEmpty(antExChu)){
  104 + List<AntExChuModel> antExChu = antExService.queryAntExChu(antExChuQuery);
  105 + if (CollectionUtils.isNotEmpty(antExChu)) {
112 106 return antExChu.get(0).getCheckTime();
113 107 }
114 108 }