liquanyu / regional-platform

Download as
Browse Code »

Commit a5c5845b8ff51edc79d422781d65a91afaa65dab

Authored by yangfei
1 parent f26b704b81
Exists in master and in 1 other branch dev

根据疾病查询

Showing 1 changed file with 14 additions and 30 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ a5c5845
... ... @@ -490,7 +490,6 @@
490 490 mongoCondits.add(new MongoCondition("syjg", true, MongoOper.EXISTS));
491 491 mongoCondits.add(new MongoCondition("hivkt", true, MongoOper.EXISTS));
492 492 }
493   -
494 493 criteria = criteria.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]));
495 494  
496 495 List<AntExChuModel> antExChuModels = antExService.queryAntExChu(criteria.toMongoQuery());
497 496  
498 497  
499 498  
... ... @@ -584,20 +583,20 @@
584 583 /**
585 584 * 查询高危孕妇
586 585 *
587   - * @param patientQueryRequest
  586 + * @param riskPatientsQueryRequest
588 587 * @param isHighRisk 控制是否是高危
589 588 * @param type 控制类型 1孕妇 3产妇
590 589 * @return
591 590 */
592   - public BaseResponse queryHighRisk(RiskPatientsQueryRequest patientQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
  591 + public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
593 592 //组合请求
594   - PatientsQuery patientsQuery = complayRequest(patientQueryRequest, isHighRisk, type, userId, needPage, isRegion);
  593 + PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
595 594  
596 595 String hospital = autoMatchFacade.getHospitalId(userId);
597 596 //查询符合条件的孕妇
598 597 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital);
599 598 stopWatch.start();
600   - List<Patients> patientses = patientsService.queryPatientBySort(patientsQuery,patientQueryRequest.getSort(),patientQueryRequest.getOrder());
  599 + List<Patients> patientses = patientsService.queryPatient1(patientsQuery, "modified");
601 600 stopWatch.stop();
602 601  
603 602 logger.info(stopWatch.toString());
... ... @@ -679,18 +678,11 @@
679 678 }
680 679 listFuture.add(commonThreadPool.submit(new QuanChanPatientWorker(patientses.subList(i, end), hospital, usersService, postReviewService, matDeliverService, patientsService, organizationService, basicConfigService)));
681 680 }
682   - if (CollectionUtils.isNotEmpty(listFuture))
683   - {
684   - for (Future f : listFuture) {
685   - try {
686   - if (f != null)
687   - {
688   - data.addAll((List) f.get(30, TimeUnit.SECONDS));
689   - }
690   -
691   - } catch (Exception e) {
692   - ExceptionUtils.catchException(e, "convertToQuanPatient get result Future error.");
693   - }
  681 + for (Future f : listFuture) {
  682 + try {
  683 + data.addAll((List) f.get(30, TimeUnit.SECONDS));
  684 + } catch (Exception e) {
  685 + ExceptionUtils.catchException(e, "convertToQuanCPatient get result Future error.");
694 686 }
695 687 }
696 688 return data;
697 689  
... ... @@ -709,21 +701,13 @@
709 701 }
710 702 listFuture.add(commonThreadPool.submit(new QuanPatientWorker(patientses.subList(i, end), usersService, hospital, antExService, basicConfigService, patientsService, organizationService)));
711 703 }
712   - if (CollectionUtils.isNotEmpty(listFuture))
713   - {
714   - for (Future f : listFuture) {
715   - try {
716   - if (f != null)
717   - {
718   - data.addAll((List) f.get(30, TimeUnit.SECONDS));
719   - }
720   -
721   - } catch (Exception e) {
722   - ExceptionUtils.catchException(e, "convertToQuanPatient get result Future error.");
723   - }
  704 + for (Future f : listFuture) {
  705 + try {
  706 + data.addAll((List) f.get(30, TimeUnit.SECONDS));
  707 + } catch (Exception e) {
  708 + ExceptionUtils.catchException(e, "convertToQuanPatient get result Future error.");
724 709 }
725 710 }
726   -
727 711 return data;
728 712 }
729 713