From 1b21d6b3772d5e51d2b8a50f821a941f2a789195 Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Fri, 6 Sep 2019 09:47:42 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/operate/web/facade/SieveFacade.java | 6 ++++-- .../java/com/lyms/platform/operate/web/worker/SieveWorker.java | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index b9c5d42..3a6c55a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -33,6 +33,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; @@ -95,6 +96,8 @@ public class SieveFacade { @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; + @Autowired + private MongoTemplate mongoTemplate; /** * 增加一条产筛结果记录 @@ -135,7 +138,6 @@ public class SieveFacade { * add or update SieveModel * and addTrackDownInfo() * - * * @param sieveAddRequest * @param userId * @param sieveResultModel @@ -551,7 +553,7 @@ public class SieveFacade { if (end > list.size()) { end = list.size(); } - listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService, diagnosisService, basicConfigService, usersService, sieveService))); + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService, diagnosisService, basicConfigService, usersService, sieveService, mongoTemplate))); } for (Future f : listFuture) { try { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java index f07c0ff..4138eb2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java @@ -16,6 +16,9 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; import java.util.*; import java.util.concurrent.Callable; @@ -44,11 +47,11 @@ public class SieveWorker implements Callable> { private SieveService sieveService; private MongoTemplate mongoTemplate; + private UsersService usersService; public SieveWorker(String hospitalId, List list, AntenatalExaminationService antService, PatientsService patientsService, ApplyOrderService applyOrderService, - OrganizationService organizationService, DiagnosisService diagnosisService, BasicConfigService basicConfigService, UsersService usersService, SieveService sieveService) { - OrganizationService organizationService, DiagnosisService diagnosisService, BasicConfigService basicConfigService, MongoTemplate mongoTemplate) { + OrganizationService organizationService, DiagnosisService diagnosisService, BasicConfigService basicConfigService, UsersService usersService, SieveService sieveService, MongoTemplate mongoTemplate) { this.hospitalId = hospitalId; this.list = list; this.antService = antService; -- 1.8.3.1