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 2ff645e..3980e3b 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 @@ -35,6 +35,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; @@ -97,6 +98,9 @@ public class SieveFacade { @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; + @Autowired + private MongoTemplate mongoTemplate; + /** * 增加一条产筛结果记录 * @@ -552,7 +556,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))); + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService, diagnosisService, basicConfigService, mongoTemplate))); } for (Future f : listFuture) { try { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java index 155ec0e..89c164e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java @@ -71,6 +71,16 @@ public class SieveListResult implements IBasicResultConvert> dia; + private Boolean huaDaPushResult; + + public Boolean getHuaDaPushResult() { + return huaDaPushResult; + } + + public void setHuaDaPushResult(Boolean huaDaPushResult) { + this.huaDaPushResult = huaDaPushResult; + } + public List> getDia() { return dia; } 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 a6a24ff..099cbc6 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 @@ -17,6 +17,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.ArrayList; import java.util.HashMap; @@ -45,9 +48,11 @@ public class SieveWorker implements Callable> { private DiagnosisService diagnosisService; private BasicConfigService basicConfigService; + private MongoTemplate mongoTemplate; + public SieveWorker(String hospitalId, List list, AntenatalExaminationService antService, PatientsService patientsService, ApplyOrderService applyOrderService, - OrganizationService organizationService, DiagnosisService diagnosisService, BasicConfigService basicConfigService) { + OrganizationService organizationService, DiagnosisService diagnosisService, BasicConfigService basicConfigService, MongoTemplate mongoTemplate) { this.hospitalId = hospitalId; this.list = list; this.antService = antService; @@ -56,6 +61,7 @@ public class SieveWorker implements Callable> { this.organizationService = organizationService; this.diagnosisService = diagnosisService; this.basicConfigService = basicConfigService; + this.mongoTemplate = mongoTemplate; } @Override @@ -153,6 +159,13 @@ public class SieveWorker implements Callable> { } sieveListResult.setDia(mList); + boolean huaDaPushResult = false; + List sieveApplyOrderModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(sieveModel.getParentId())).with(new Sort(Sort.Direction.DESC, "created")), SieveApplyOrderModel.class); + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { + SieveApplyOrderModel model = sieveApplyOrderModels.get(0); + huaDaPushResult = model.isHuaDaPushResult(); + } + sieveListResult.setHuaDaPushResult(huaDaPushResult); results.add(sieveListResult); } return results;